[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

SF.net SVN: ledger-smb:[6064] trunk/UI



Revision: 6064
          http://sourceforge.net/p/ledger-smb/code/6064
Author:   einhverfr
Date:     2013-09-20 05:30:51 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
Login screen now using an indeterminate progress indicator, but does not seem to actually animate.

Modified Paths:
--------------
    trunk/UI/lib/setup.js
    trunk/UI/lib/ui-header.html
    trunk/UI/login.html
    trunk/UI/login.js

Modified: trunk/UI/lib/setup.js
===================================================================
--- trunk/UI/lib/setup.js	2013-09-20 03:33:09 UTC (rev 6063)
+++ trunk/UI/lib/setup.js	2013-09-20 05:30:51 UTC (rev 6064)
@@ -169,7 +169,7 @@
               'dijit/form/Button',
               'dijit/layout/ContentPane',
               'dijit/form/Textarea',
-              'dojo/ready'
+              'dojo/domReady!'
              ],
       function(query, registry, cls, construct, table, textbox, checkbox, datebox, 
                radio, select, button, textarea, contentpane)

Modified: trunk/UI/lib/ui-header.html
===================================================================
--- trunk/UI/lib/ui-header.html	2013-09-20 03:33:09 UTC (rev 6063)
+++ trunk/UI/lib/ui-header.html	2013-09-20 05:30:51 UTC (rev 6064)
@@ -35,11 +35,11 @@
            var dateformat = '<?lsmb USER.dateformat ?>';
         </script>
        <script type="text/javascript" language="JavaScript" src="UI/lib/dojo/dojo/dojo.js"></script>
+        <script type="text/javascript" language="JavaScript" 
+           src="UI/lib/setup.js"></script>
 	<?lsmb FOREACH s = include_script ?>
 	<script type="text/javascript" language="JavaScript" src="<?lsmb s ?>" ></script>
 	<?lsmb END ?>
-        <script type="text/javascript" language="JavaScript" 
-           src="UI/lib/setup.js"></script>
 	
         <?lsmb IF html_charset ?>
         <meta http-equiv="content-type" content="text/html; charset=<?lsmb

Modified: trunk/UI/login.html
===================================================================
--- trunk/UI/login.html	2013-09-20 03:33:09 UTC (rev 6063)
+++ trunk/UI/login.html	2013-09-20 05:30:51 UTC (rev 6064)
@@ -70,9 +70,8 @@
 				</div>
 				<button type="submit" name="action" value="login" accesskey="l" id="action-login"><?lsmb text('Login') ?></button>
 			</div>
-                <div id="login-indicator" 
-                     onLoad="set_indicator()">
-                  <?lsmb text('Logging in.  Please wait.') ?>
+                <div id="login-indicator">
+                  <span><?lsmb text('Logging in.  Please wait.') ?></span>
                 </div>
 		</div></div>
 		</form>

Modified: trunk/UI/login.js
===================================================================
--- trunk/UI/login.js	2013-09-20 03:33:09 UTC (rev 6063)
+++ trunk/UI/login.js	2013-09-20 05:30:51 UTC (rev 6064)
@@ -45,24 +45,16 @@
     );
 }
 
-function set_indicator() {
-    require(['dojo/on', 'dijit/registry', 'dojo/ready!'],
-    function(on, registry){
-        var button = registry.byId('action-login');
-        button.set('type', 'button');
-        on(button, 'click', function(evt){
-           require(['dojo/dom', 'dijit/ProgressBar', 'dojo/_base/window'],
-           function(dom, progressbar, win){
-               var indicator = new progressbar({
-                  "indeterminate": true,
-                  "style": "width: 25em"
-               }, dom.byId("login-indicator"));
-               indicator.startup();
+    require(['dojo/dom-construct', 'dijit/ProgressBar', 'dojo/domReady!'],
+    function(construct, progressbar){
+           var indicator = new progressbar({
+                  "style": "width: 10em",
+                  "id": "login-progressbar",
+                  "value": 100,
+                "indeterminate": true
+           }).placeAt("login-indicator", "only");
+           indicator.startup();
                
-           });
-           send_form();
-           return false;
-        });
-      });
-}
+    });
 
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. 
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits