Changeset 377


Ignore:
Timestamp:
07/26/12 13:16:16 (13 years ago)
Author:
jkraaijeveld
Message:

QuestionEditorToolkit? now uses a TitleGroup? rather than an AccordionContainer? - they do the same but the TitlePanes? scales automatically (which was required for the list of categories of a question).

There still needs to be done some .css for this TitleGroup? stuff, but I'm not booking much progress on that.

Location:
Dev/branches/rest-dojo-ui/client/rft
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • Dev/branches/rest-dojo-ui/client/rft/css/layout.css

    r374 r377  
    288288}
    289289.claro .dijitAccordionContainer {
    290     height: 600;
    291290    /* No styling for now, use this for margins and other layout-related business. This class does not affect the look of the AccordionContainer currently! */
    292291}

  • Dev/branches/rest-dojo-ui/client/rft/pages/question.html

    r372 r377  
    1111                                <div id="QuestionEditorToolkit"></div>
    1212                        </div>
    13                         <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'bottom'">
     13                        <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
    1414                                <button id="btnDiscard" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">Discard</button>
    1515                                <button id="btnSave" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">Save and exit</button>

  • Dev/branches/rest-dojo-ui/client/rft/pages/question.js

    r376 r377  
    4949                    content.goTo('questions');
    5050                });
    51                 return false;
     51                return true;
    5252            },
    5353            _onDiscard: function() {
    5454                content.goTo('questions');
    55                 return false;
     55                return true;
    5656            },
    5757            _setupButtons: function() {
    … …  
    7777                this._preview = new rft.ui.QuestionEditorPreview();
    7878                this._preview.placeAt("QuestionEditorPreview");
     79                this._supportingWidgets.push(this._toolkit, this._preview);
    7980            }
    8081        });

  • Dev/branches/rest-dojo-ui/client/rft/ui/QuestionEditorPreview.js

    r376 r377  
    3737                                        case "avatar":
    3838                                        node = document.createElement("span");
    39                                         node.innerHTML = item.title || "Dragging!!!";
     39                                        node.innerHTML = item.item.data || "Dragging!!!";
    4040                                        return {node: node, data: item, type: "PreviewItem"};
    4141                                        break;

  • Dev/branches/rest-dojo-ui/client/rft/ui/QuestionEditorToolkit.js

    r376 r377  
    104104                                        searchAttr: "id"
    105105                                }, "categoriesBox");
     106                                this._supportingWidgets.push(this._categorySelect);
    106107
    107108            },
    … …  
    119120                                        value: topic
    120121                                }, "topicBox");
     122                                this._supportingWidgets.push(this._topicSelect);
    121123            },
    122124                        _addCategory: function(item) {

  • Dev/branches/rest-dojo-ui/client/rft/ui/templates/QuestionEditorToolkit.html

    r374 r377  
    11<div>
    2         <div data-dojo-type="dijit.layout.AccordionContainer" class="orange">
    3                 <div data-dojo-type="dijit.layout.ContentPane" title="Properties" data-dojo-props="iconClass:'rftIcon rftIconProperties'">
    4             <div id="propertiesForm" data-dojo-type="dijit.form.Form" data-dojo-attach-point="propertiesForm" data-rft-attach-event="onSubmit:onSave">
     2        <div data-dojo-type="dojox.widget.TitleGroup">
     3                <div data-dojo-type="dijit.TitlePane" class="orange" open="true" title="Properties" data-dojo-props="iconClass:'rftIcon rftIconProperties'">
     4            <div data-dojo-type="dijit.form.Form" data-dojo-attach-point="propertiesForm" data-rft-attach-event="onSubmit:onSave">
    55                                <fieldset class="align">
    6                                         <label for="propertiesTitle">Title:</label><input data-dojo-type="dijit.form.TextBox" id="propertiesTitle" name="title"/>
    7                                         <label for="propertiesCode">Code:</label><input data-dojo-type="dijit.form.TextBox" id="propertiesCode" name= "_id"/>
    8                                         <label for="propertiesCategories">Categories:</label>
     6                                        <label>Title:</label><input data-dojo-type="dijit.form.TextBox" data-dojo-attach-point="propertiesTitle" name="title"/>
     7                                        <label>Code:</label><input data-dojo-type="dijit.form.TextBox" data-dojo-attach-point="propertiesCode" name= "_id"/>
     8                                        <label>Categories:</label>
    99                                        <div data-dojo-attach-point="listNode" class="rftLineListView"></div>
    1010                                        <select id="categoriesBox"></select>
    1111                                        <button data-rft-attach-point="btnCategory" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onCategoryAdd" data-dojo-props="baseClass:'rftBlockButton', class:'orange', iconClass: 'rftIcon rftIconPlus'">Add</button><br>
    12                                         <label for="propertiesTopic">Topic:</label>
     12                                        <label>Topic:</label>
    1313                                        <select id="topicBox"></select>
    14                                         <label for="propertiesDescription">Description:</label><textarea data-dojo-type="dijit.form.TextBox" id="propertiesDescription" name="description"></textarea>
     14                                        <label>Description:</label><textarea data-dojo-type="dijit.form.TextBox" data-dojo-attach-point="propertiesDescription" name="description"></textarea>
    1515                                </fieldset>
    1616                        </div>
    1717                </div>
    1818
    19                 <div data-dojo-type="dijit.layout.ContentPane" title="Content" data-dojo-props="iconClass:'rftIcon rftIconPlus'">
     19                <div data-dojo-type="dijit.TitlePane" open="false" title="Content" data-dojo-props="iconClass:'rftIcon rftIconPlus'">
    2020                        <div data-dojo-attach-point="ToolkitContentSourceNode">
    2121                               
    … …  
    2323                </div>
    2424
    25                 <div data-dojo-type="dijit.layout.ContentPane" title="Inputs" data-dojo-props="iconClass:'rftIcon rftIconInput'">
     25                <div data-dojo-type="dijit.TitlePane" open="false" title="Inputs" data-dojo-props="iconClass:'rftIcon rftIconInput'">
    2626                        <div data-dojo-attach-point="ToolkitInputsSourceNode">
    2727                               
Note: See TracChangeset for help on using the changeset viewer.