Changeset 466 for Dev/trunk/src/client


Ignore:
Timestamp:
06/26/13 14:43:57 (12 years ago)
Author:
hendrikvanantwerpen
Message:

Added authentication (fixed user now).

Location:
Dev/trunk/src/client
Files:
5 added
1 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • Dev/trunk/src/client/index.html

    r452 r466  
    3030        </div>
    3131        <div id="toaster" data-dojo-type="qed-client/app/Notifications"></div>
     32        <div id="loginDialog" data-dojo-type="qed-client/ui/LoginDialog"></div>
    3233    </body>
    3334</html>

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

    r463 r466  
    44    "./app/Router",
    55    "./routes",
     6    "./session",
    67    "./store",
    78    "./store/request",
    … …  
    910    "dojo/_base/array",
    1011    "dojo/parser",
    11     "dojo/request/registry",
    1212    "./stddeps",
    1313    "dojo/domReady!"
    14 ], function(Content, Page, Router, routes, store, request, MainMenu, array, parser, registry) {
     14], function(Content, Page, Router, routes, session, store, request, MainMenu, array, parser) {
    1515
    16     registry.register(/.*/,request);
     16    parser.parse();
     17
     18    new MainMenu({},"menu").startup();
     19
     20    array.forEach(routes,function(route){
     21        Router.register(route);
     22    });
     23    Router.startup();
     24
     25    session.restore();
    1726   
    18     parser.parse();
    19     store.info()
    20     .then(function(){
    21         new MainMenu({},"menu").startup();
    22         array.forEach(routes,function(route){
    23             Router.register(route);
    24         });
    25         Router.startup();
    26     },function(){
    27         Content.startup();
    28         Content.set(new Page({
    29             templateString: "<div>Application database is not properly configured. Contact your system administrator.</div>"
    30         }));
    31     });
    3227});

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

    r463 r466  
    8686        },
    8787        _link: function(url,label) {
    88             return '<a target="_black" href="'+url+'">'+(label || url)+'</a>';
     88            return '<a target="_blank" href="'+url+'">'+(label || url)+'</a>';
    8989        },
    9090        _onSave: function(evt) {
    … …  
    111111            if ( evt ) { event.stop(evt); }
    112112            return false;
    113         },
    114         _onExport: function(evt) {
    115             if ( evt ) { event.stop(evt); }
    116             return false;
    117113        }
    118114    });

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

    r443 r466  
    1 <div class="orange">
     1<form class="orange">
    22    <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'top'">
    33        <h2>
    … …  
    1515        </div>
    1616    </div>
    17 </div>
     17</form>

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

    r463 r466  
    4545            <div>
    4646                <div class="qedLabel">Export results</div>
    47                 <button data-dojo-type="dijit/form/Button"
    48                         class="qedField blue"
    49                         data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconSave'"
    50                         data-dojo-attach-event="onClick:_onExport">To CSV</button>
     47                <a target="_blank" href="/surveyRun/${surveyRunId}/csv" class="qedField">To CSV</a>
    5148            </div>
    5249        </fieldset>

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

    r457 r466  
    3333    './model/widgets/SurveyWidget',
    3434
     35    './ui/LoginDialog',
    3536    './ui/MainMenu',
    3637    './ui/MenuBarLink',
    3738    './ui/MenuLink',
     39    './ui/SessionMenu',
    3840
    3941    './widgets/LineWithActionsWidget',

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

    r443 r466  
    99   
    1010    var couchStore = new CouchStore({
    11         target: 'data/couch/' /*,
     11        target: 'api/data/' /*,
    1212        validate: function(object) {
    1313            var result = jsonSchema.validate(object,schema);

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

    r463 r466  
    55    "dojo/_base/json",
    66    "dojo/_base/lang",
    7     "dojo/request/registry",
     7    "dojo/request",
    88    "dojo/store/util/QueryResults"
    99], function(Deferred, array, declare, json, lang, request, QueryResults) {

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

    r443 r466  
    1 define(['dojo/_base/declare','dijit/MenuItem','../app/Router'
    2 ], function(declare,MenuItem,Router) {
     1define([
     2    "../app/Router",
     3    "dijit/MenuItem",
     4    "dojo/_base/declare",
     5    "dojo/_base/event"
     6], function(Router, MenuItem, declare, event) {
    37    return declare([MenuItem],{
    48        options:{
    59            path: null
    610        },
    7         onClick: function() {
     11        onClick: function(evt) {
    812            if ( this.path ) { Router.go(this.path); }
     13            if ( evt ) { event.stop(evt); }
     14            return false;
    915        }
    1016    });

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

    r443 r466  
    1212        </div>
    1313        <div class="rftMainMenuButton" data-dojo-type="./MenuBarLink" data-dojo-props="path:'/results'">Results</div>
    14         <div class="rftMainMenuButton" data-dojo-type="./MenuBarLink">Logout</div>
     14        <div class="rftMainMenuButton" data-dojo-type="./SessionMenu"></div>
    1515    </div>
    1616</div>

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

    r465 r466  
    1515            @inherited arguments
    1616            if @domNode.tagName.toLowerCase() isnt "form"
    17                 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
     17                console.warn "Not scoping a _ComplexValueMixin in a
     18                        form element can cause name clashes. E.g.
     19                        radio buttons might stop working correctly.
     20                        It is recommended to use <form> as the root
     21                        element in your template for", @declaredClass
    1822
    1923        _setDisabledAttr: (value) ->
    2024            @_set "disabled", value
    21             array.forEach @_getDescendantFormWidgets(), (child) => 
     25            array.forEach @_getDescendantFormWidgets(), (child) =>
    2226                child.set "disabled", value
    2327
Note: See TracChangeset for help on using the changeset viewer.