[pLog-svn] r3740 - in plog/trunk: js/ui templates/admin/chooser

[mark at devel.lifetype.net]

Author: mark
Date: 2006-07-19 20:02:22 +0000 (Wed, 19 Jul 2006)
New Revision: 3740

Modified:
   plog/trunk/js/ui/plogui.js
   plog/trunk/templates/admin/chooser/header.template
   plog/trunk/templates/admin/chooser/resourcelist.template
   plog/trunk/templates/admin/chooser/userpictureselect.template
Log:
Some cosmetic change according to Oscar's showProgressBar Change.

BTW, I have to change the "buttons" variable name to "button". "buttons" seems a reserved word in IE. That's why the effect does not work in IE. :(

Anyway, it works now.

Modified: plog/trunk/js/ui/plogui.js
===================================================================
--- plog/trunk/js/ui/plogui.js	2006-07-19 16:55:02 UTC (rev 3739)
+++ plog/trunk/js/ui/plogui.js	2006-07-19 20:02:22 UTC (rev 3740)
@@ -223,8 +223,8 @@
 
 function showProgressBar( elementToHide )
 {
-   buttons = document.getElementById( elementToHide );
-   buttons.style.display = "none";     
+   button = document.getElementById( elementToHide );
+   button.style.display = "none";     
    bar = document.getElementById("status_bar");
    bar.style.display = "block";
 }
\ No newline at end of file

Modified: plog/trunk/templates/admin/chooser/header.template
===================================================================
--- plog/trunk/templates/admin/chooser/header.template	2006-07-19 16:55:02 UTC (rev 3739)
+++ plog/trunk/templates/admin/chooser/header.template	2006-07-19 20:02:22 UTC (rev 3740)
@@ -8,7 +8,6 @@
   <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/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-19 16:55:02 UTC (rev 3739)
+++ plog/trunk/templates/admin/chooser/resourcelist.template	2006-07-19 20:02:22 UTC (rev 3740)
@@ -146,12 +146,16 @@
   </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="_toggle('status_bar');_toggle('close_button');" value="{$locale->tr("add")}" />
+  <input type="submit" name="Upload" onclick="showProgressBar('buttons')" 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" style="display: none;">
+    {$locale->tr("upload_in_progress")}&nbsp;
+    <img src="imgs/admin/spinner_small.gif" alt="Spinner" />    
+  </div>
  </form>
 </div>
 {/if}
@@ -162,10 +166,6 @@
   {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>

Modified: plog/trunk/templates/admin/chooser/userpictureselect.template
===================================================================
--- plog/trunk/templates/admin/chooser/userpictureselect.template	2006-07-19 16:55:02 UTC (rev 3739)
+++ plog/trunk/templates/admin/chooser/userpictureselect.template	2006-07-19 20:02:22 UTC (rev 3740)
@@ -102,22 +102,22 @@
   </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="_toggle('status_bar');_toggle('close_button');" value="{$locale->tr("add")}" />
+  <input type="submit" name="Upload" onclick="showProgressBar('buttons')" 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="userPictureSelect" />
   <input type="hidden" name="destination" value="{$destination}" />
   </div>
+  <div class="status_bar" id="status_bar" style="display: none;">
+    {$locale->tr("upload_in_progress")}&nbsp;
+    <img src="imgs/admin/spinner_small.gif" alt="Spinner" />    
+  </div>
  </form>
 </div>
 {/if}
 <div id="list_action_bar">
   {include file="$admintemplatepath/adminpager.template" style=list}
   <a id="close_button" href="javascript:window.close()">{$locale->tr("close")}</a>
-  <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>