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

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

Files:

• index.js (modified) (2 diffs)
• pages/surveyRun.js (modified) (2 diffs)
• pages/templates/question.html (modified) (2 diffs)
• pages/templates/surveyRun.html (modified) (1 diff)
• session.coffee (added)
• stddeps.js (modified) (1 diff)
• store.js (modified) (1 diff)
• store/CouchStore.js (modified) (1 diff)
• ui/LoginDialog.coffee (added)
• ui/MenuLink.js (modified) (1 diff)
• ui/SessionMenu.coffee (added)
• ui/templates/LoginDialog.html (added)
• ui/templates/MainMenu.html (modified) (1 diff)
• ui/templates/SessionBar.html (deleted)
• ui/templates/SessionMenu.html (added)
• widgets/_ComplexValueMixin.coffee (modified) (1 diff)

Dev/trunk/src/client/qed-client/index.js

@@ -4 +4 @@
     "./app/Router",
     "./routes",
+    "./session",
     "./store",
     "./store/request",
@@ -9 +10 @@
     "dojo/_base/array",
     "dojo/parser",
-    "dojo/request/registry",
     "./stddeps",
     "dojo/domReady!"
-], function(Content, Page, Router, routes, store, request, MainMenu, array, parser, registry) {
+], function(Content, Page, Router, routes, session, store, request, MainMenu, array, parser) {
 
-    registry.register(/.*/,request);
+    parser.parse();
+
+    new MainMenu({},"menu").startup();
+
+    array.forEach(routes,function(route){
+        Router.register(route);
+    });
+    Router.startup();
+
+    session.restore();
     
-    parser.parse();
-    store.info()
-    .then(function(){
-        new MainMenu({},"menu").startup();
-        array.forEach(routes,function(route){
-            Router.register(route);
-        });
-        Router.startup();
-    },function(){
-        Content.startup();
-        Content.set(new Page({
-            templateString: "<div>Application database is not properly configured. Contact your system administrator.</div>"
-        }));
-    });
 });

Dev/trunk/src/client/qed-client/pages/surveyRun.js

@@ -86 +86 @@
         },
         _link: function(url,label) {
-            return '<a target="_black" href="'+url+'">'+(label || url)+'</a>';
+            return '<a target="_blank" href="'+url+'">'+(label || url)+'</a>';
         },
         _onSave: function(evt) {
@@ -111 +111 @@
             if ( evt ) { event.stop(evt); }
             return false;
-        },
-        _onExport: function(evt) {
-            if ( evt ) { event.stop(evt); }
-            return false;
         }
     });

Dev/trunk/src/client/qed-client/pages/templates/question.html

@@ -1 @@
-<div class="orange">
+<form class="orange">
     <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'top'">
         <h2>
@@ -15 +15 @@
         </div>
     </div>
-</div>
+</form>

Dev/trunk/src/client/qed-client/pages/templates/surveyRun.html

@@ -45 +45 @@
             <div>
                 <div class="qedLabel">Export results</div>
-                <button data-dojo-type="dijit/form/Button"
-                        class="qedField blue"
-                        data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconSave'"
-                        data-dojo-attach-event="onClick:_onExport">To CSV</button>
+                <a target="_blank" href="/surveyRun/${surveyRunId}/csv" class="qedField">To CSV</a>
             </div>
         </fieldset>

Dev/trunk/src/client/qed-client/stddeps.js

@@ -33 +33 @@
     './model/widgets/SurveyWidget',
 
+    './ui/LoginDialog',
     './ui/MainMenu',
     './ui/MenuBarLink',
     './ui/MenuLink',
+    './ui/SessionMenu',
 
     './widgets/LineWithActionsWidget',

Dev/trunk/src/client/qed-client/store.js

@@ -9 +9 @@
     
     var couchStore = new CouchStore({
-        target: 'data/couch/' /*,
+        target: 'api/data/' /*,
         validate: function(object) {
             var result = jsonSchema.validate(object,schema);

Dev/trunk/src/client/qed-client/store/CouchStore.js

@@ -5 +5 @@
     "dojo/_base/json",
     "dojo/_base/lang",
-    "dojo/request/registry",
+    "dojo/request",
     "dojo/store/util/QueryResults"
 ], function(Deferred, array, declare, json, lang, request, QueryResults) {

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>

Dev/trunk/src/client/qed-client/widgets/_ComplexValueMixin.coffee

@@ -15 +15 @@
             @inherited arguments
             if @domNode.tagName.toLowerCase() isnt "form"
-                console.warn "Not scoping a _ComplexValueMixin in a form element can cause name clashes. E.g. radio buttons might stop working correctly. It is recommended to use <form> as the root element in your template for", @declaredClass
+                console.warn "Not scoping a _ComplexValueMixin in a
+                        form element can cause name clashes. E.g.
+                        radio buttons might stop working correctly.
+                        It is recommended to use <form> as the root
+                        element in your template for", @declaredClass
 
         _setDisabledAttr: (value) ->
             @_set "disabled", value
-            array.forEach @_getDescendantFormWidgets(), (child) => 
+            array.forEach @_getDescendantFormWidgets(), (child) =>
                 child.set "disabled", value