[pLog-svn] r3702 - in plog/trunk: styles templates/admin/chooser

[mark at devel.lifetype.net]

Author: mark
Date: 2006-07-06 13:05:49 +0000 (Thu, 06 Jul 2006)
New Revision: 3702

Modified:
   plog/trunk/styles/admin.css
   plog/trunk/templates/admin/chooser/footer.template
   plog/trunk/templates/admin/chooser/header.template
   plog/trunk/templates/admin/chooser/resourcelist.template
Log:
Some resource list UI bugs fixed.

Modified: plog/trunk/styles/admin.css
===================================================================
--- plog/trunk/styles/admin.css	2006-07-06 12:54:47 UTC (rev 3701)
+++ plog/trunk/styles/admin.css	2006-07-06 13:05:49 UTC (rev 3702)
@@ -451,13 +451,12 @@
     text-align: right;
 }
 
-.status_bar
+#status_bar
 {
-    width: 88%;
+    width: 70%;
     margin-left: auto;
     margin-right: auto;
     text-align: right;
-    display:none;
 }
 
 

Modified: plog/trunk/templates/admin/chooser/footer.template
===================================================================
--- plog/trunk/templates/admin/chooser/footer.template	2006-07-06 12:54:47 UTC (rev 3701)
+++ plog/trunk/templates/admin/chooser/footer.template	2006-07-06 13:05:49 UTC (rev 3702)
@@ -1,2 +1,2 @@
-	</form>
+	</body>
 </html>
\ No newline at end of file

Modified: plog/trunk/templates/admin/chooser/header.template
===================================================================
--- plog/trunk/templates/admin/chooser/header.template	2006-07-06 12:54:47 UTC (rev 3701)
+++ plog/trunk/templates/admin/chooser/header.template	2006-07-06 13:05:49 UTC (rev 3702)
@@ -7,7 +7,8 @@
   <link rel="stylesheet" href="styles/admin.css" type="text/css" />
   <title>LifeType Admin</title>
   <script type="text/javascript" src="js/ui/common.js"></script>
-  <script type="text/javascript" src="js/ui/forms.js"></script>  
+  <script type="text/javascript" src="js/ui/forms.js"></script>
+  <script type="text/javascript" src="js/prototype/prototype.js"></script>
   <script type="text/javascript">
    var plogBaseUrl = '{$baseurl}';
    var indexPage = '{$config->getValue("script_name")}';

Modified: plog/trunk/templates/admin/chooser/resourcelist.template
===================================================================
--- plog/trunk/templates/admin/chooser/resourcelist.template	2006-07-06 12:54:47 UTC (rev 3701)
+++ plog/trunk/templates/admin/chooser/resourcelist.template	2006-07-06 13:05:49 UTC (rev 3702)
@@ -1,13 +1,7 @@
 {include file="$admintemplatepath/chooser/header.template"}
 <script type="text/javascript" src="js/tinymce/tiny_mce-plog-resourcelist.js"></script>
 <script type="text/javascript" src="js/ui/plogui.js"></script>
-{if $htmlarea}
-  <script type="text/javascript" src="js/tinymce/tiny_mce_popup.js"></script>
-  <script type="text/javascript">
-   tinyMCE.setWindowArg('mce_windowresize', false);
-  </script>
-{/if}
-<style>{literal}
+<style type="text/css">{literal}
 #resource_list_upload
 {
     border-bottom    : 4px solid #DEDEDE;
@@ -42,15 +36,17 @@
   </fieldset> 
  </form> 
  </div>
- <br style="clear:both">
+ <br style="clear:both" />
  </div>
  <div id="container">
   {include file="$admintemplatepath/successmessage.template"}
   {include file="$admintemplatepath/errormessage.template"} 
 <table class="info">
  <thead>
-  <th style="width:270px";>{$locale->tr("resource")}</th>
-  <th style="width:150px;">{$locale->tr("actions")}</th>
+  <tr>
+    <th style="width:270px;">{$locale->tr("resource")}</th>
+    <th style="width:150px;">{$locale->tr("actions")}</th>
+  </tr>
  </thead>
  <tbody>
   {if $album && $pager->getCurrentPage()==1}
@@ -125,7 +121,7 @@
 </table>
 {if $album}
 {** show this album only if we're not browsing the root album **}
-<div id="resource_list_upload">
+<div id="resource_list_upload" style="display: none;">
  <form name="uploadFile" method="post" action="admin.php" enctype="multipart/form-data">
  <fieldset class="inputField">
   <legend>{$locale->tr("upload_here")}</legend>
@@ -142,18 +138,14 @@
   </fieldset>
   <div class="buttons" id="buttons" style="padding-bottom:7px">
   <input type="reset" name="reset" value="{$locale->tr("reset")}" />
-  <input type="submit" name="Upload" onclick="showProgressBar('buttons');b=document.getElementById('close_button');b.style.display='none'" value="{$locale->tr("add")}" />
+  <input type="submit" name="Upload" onclick="_toggle('status_bar');_toggle('close_button');" value="{$locale->tr("add")}" />
   <input type="hidden" name="albumId" value="{$album->getId()}" />
   <input type="hidden" name="op" value="addResource" /><br/>
   <input type="hidden" name="destView" value="resourceList" />
   <input type="hidden" name="destination" value="{$destination}" />
   </div>
-  <div class="status_bar" id="status_bar">
-    {$locale->tr("upload_in_progress")}&nbsp;
-    <img src="imgs/admin/spinner_small.gif" alt="Spinner" />    
-  </div>
  </form>
-</div> 
+</div>
 {/if}
 <div id="list_action_bar">
   {include file="$admintemplatepath/adminpager.template" style=list}   
@@ -162,6 +154,10 @@
   {else}
     <input id="close_button" type="button" onClick="window.close()" value="{$locale->tr("close")}" />
   {/if}
+  <div id="status_bar" style="display: none;">
+    {$locale->tr("upload_in_progress")}&nbsp;
+    <img src="imgs/admin/spinner_small.gif" alt="Spinner" />    
+  </div>
 </div>
 <a name="upload"></a> 
 </div>