Changeset 466 for Dev/trunk/src/client/qed-client/ui

Timestamp:

06/26/13 14:43:57 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Added authentication (fixed user now).

Location:

Dev/trunk/src/client/qed-client/ui

Files:

• LoginDialog.coffee (added)
• MenuLink.js (modified) (1 diff)
• SessionMenu.coffee (added)
• templates/LoginDialog.html (added)
• templates/MainMenu.html (modified) (1 diff)
• templates/SessionBar.html (deleted)
• templates/SessionMenu.html (added)

Dev/trunk/src/client/qed-client/ui/MenuLink.js

@@ -1 @@
-define(['dojo/_base/declare','dijit/MenuItem','../app/Router'
-], function(declare,MenuItem,Router) {
+define([
+    "../app/Router",
+    "dijit/MenuItem",
+    "dojo/_base/declare",
+    "dojo/_base/event"
+], function(Router, MenuItem, declare, event) {
     return declare([MenuItem],{
         options:{
             path: null
         },
-        onClick: function() {
+        onClick: function(evt) {
             if ( this.path ) { Router.go(this.path); }
+            if ( evt ) { event.stop(evt); }
+            return false;
         }
     });

Dev/trunk/src/client/qed-client/ui/templates/MainMenu.html

@@ -12 +12 @@
         </div>
         <div class="rftMainMenuButton" data-dojo-type="./MenuBarLink" data-dojo-props="path:'/results'">Results</div>
-        <div class="rftMainMenuButton" data-dojo-type="./MenuBarLink">Logout</div>
+        <div class="rftMainMenuButton" data-dojo-type="./SessionMenu"></div>
     </div>
 </div>