Issue #30 fix: Merge with master

sunbird-content-plugins · Aug 9, 2018 · 71648fb · 71648fb
2 parents 868a131 + 780476f
commit 71648fb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/editor/question.html b/editor/question.html
@@ -81,8 +81,6 @@ <h3 class="ui left floated previewHeading">Preview</h3>
                         <div class="preview-heading">
                             <h3 class="ui left floated previewHeading">Configuration</h3>
                         </div>
-
-
                         <div class="ui twelve column preview-heading">
                             <div class="qcMetadateFormLbl">
                                 Select layout<span class="star">&nbsp;*</span>
@@ -109,6 +107,15 @@ <h3 class="ui left floated previewHeading">Configuration</h3>
                         <div class="preview-heading">
                             <h3 class="ui left floated previewHeading">Configuration</h3>
                         </div>
+                        <div class="pull-left" ng-show="selectedTemplatePluginData.plugin.id == 'org.ekstep.questionunit.mtf'">
+                            <label class="qcMetadateFormLbl pull-left">
+                                Select layout <span class="star">&nbsp;*</span>
+                            </label>
+                            <select class="ui dropdown form-control" name="templateType"
+                                    ng-model="questionData.templateType" ng-change="updatePreview();"  ng-click="generateTelemetry({type: 'TOUCH', id: 'select', target: {id: 'question-layout', ver: '', type: 'select'}})" required>
+                                <option ng-repeat="tem in templatesType" value="{{tem}}">{{tem}}</option>
+                            </select>
+                        </div>
                         <div class="ui label qb-toggle-label">Partial Scoring</div>
                         <div class="ui fluid toggle checkbox verticalcenter">
                             <input type="checkbox" ng-model="questionData.isPartialScore">
@@ -145,4 +152,4 @@ <h3 class="ui left floated previewHeading">Configuration</h3>
             </div>
         </div>
     </div>
-</script>
+</script>
diff --git a/editor/style.css b/editor/style.css
@@ -288,4 +288,8 @@ color: white;
 
 .select-template{
     cursor: pointer;
-}
+}
+
+.pull-left{
+    float: left;
+}