Dev: Condition design styling for quick-add

LimeSurvey · Oct 19, 2016 · aca5ce7 · aca5ce7
1 parent e8ce82f
commit aca5ce7
Show file tree

Hide file tree

Showing 21 changed files with 71 additions and 30 deletions.
diff --git a/application/views/admin/conditions/conditionshead_view.php b/application/views/admin/conditions/conditionshead_view.php
@@ -66,8 +66,9 @@ class='btn btn-default pull-right condition-header-button'
                 <?php echo $quickAddConditionForm; ?>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">&nbsp;<?php eT("Close"); ?></button>
                 <button type='submit' class='btn btn-primary'><?php eT('Save'); ?></button>
+                <button type='submit' class='btn btn-default'><?php eT('Save and close'); ?></button>
+                <button type="button" class="btn btn-danger" data-dismiss="modal">&nbsp;<?php eT("Close"); ?></button>
             </div>
         </div>
     </div>

diff --git a/application/views/admin/conditions/includes/quickAddConditionForm.php b/application/views/admin/conditions/includes/quickAddConditionForm.php
@@ -32,7 +32,7 @@
             </div>
 
             <div class='tab-content'>
-                <div role='tabpanel' class='tab-pane active' id='quick-add-SRCPREVQUEST'>
+                <div role='tabpanel' class='tab-pane active' id='QUICKADD-SRCPREVQUEST'>
                     <div class='form-group question-option'>
                         <div class='col-sm-2'></div>
                         <div class='col-sm-10'>
@@ -46,7 +46,7 @@
                         </div>
                     </div>
                 </div>
-                <div role='tabpanel' class='tab-pane ' id='quick-add-SRCTOKENATTRS'>
+                <div role='tabpanel' class='tab-pane ' id='QUICKADD-SRCTOKENATTRS'>
                     <div class='form-group question-option'>
                         <div class='col-sm-2'></div>
                         <div class='col-sm-10'>
@@ -99,7 +99,7 @@
             </div>
 
             <div class='tab-content'>
-                <div role='tabpanel' class='tab-pane active' id='quick-add-CANSWERSTAB'>
+                <div role='tabpanel' class='tab-pane active' id='QUICKADD-CANSWERSTAB'>
                     <div class='form-group answer-option'>
                         <div class='col-sm-2'></div>
                         <div class='col-sm-10'>
@@ -115,7 +115,7 @@ class='form-control'
                     </div>
                 </div>
 
-                <div role='tabpanel' class='tab-pane active' id='quick-add-CONST'>
+                <div role='tabpanel' class='tab-pane active' id='QUICKADD-CONST'>
                     <div class='form-group answer-option'>
                         <div class='col-sm-2'></div>
                         <div class='col-sm-10'>
@@ -124,7 +124,7 @@ class='form-control'
                     </div>
                 </div>
 
-                <div role='tabpanel' class='tab-pane active' id='quick-add-PREVQUESTIONS'>
+                <div role='tabpanel' class='tab-pane active' id='QUICKADD-PREVQUESTIONS'>
                     <div class='form-group answer-option'>
                         <div class='col-sm-2'></div>
                         <div class='col-sm-10'>
@@ -146,7 +146,7 @@ class='form-control'
                     </div>
                 </div>
 
-                <div role='tabpanel' class='tab-pane active' id='quick-add-TOKENATTRS'>
+                <div role='tabpanel' class='tab-pane' id='QUICKADD-TOKENATTRS'>
                     <div class='form-group answer-option'>
                         <div class='col-sm-2'></div>
                         <div class='col-sm-10'>
@@ -161,7 +161,7 @@ class='form-control'
                     </div>
                 </div>
 
-                <div role='tabpanel' class='tab-pane active' id='quick-add-REGEXP'>
+                <div role='tabpanel' class='tab-pane active' id='QUICKADD-REGEXP'>
                     <div class='form-group answer-option'>
                         <div class='col-sm-2'></div>
                         <div class='col-sm-10'>
@@ -184,8 +184,8 @@ class='form-control'
                     <input type='hidden' name='quick-add-qid' value='<?php echo $qid; ?>' />
                     <input type='hidden' name='quick-add-cqid' id='quick-add-cqid' value='' />
                     <input type='hidden' name='quick-add-canswersToSelect' id='quick-add-canswersToSelect' value='' />
-                    <input type='hidden' name='quick-add-editSourceTab' id='quick-add-editSourceTab' value='' />
-                    <input type='hidden' name='quick-add-editTargetTab' id='quick-add-editTargetTab' value='' />
+                    <input type='hidden' name='quick-add-editSourceTab' id='quick-add-editSourceTab' value='#QUICKADD-SRCPREVQUEST' />
+                    <input type='hidden' name='quick-add-editTargetTab' id='quick-add-editTargetTab' value='#QUICKADD-CANSWERSTAB' />
                 </div>
             </div>
         </form>

diff --git a/scripts/admin/conditions.js b/scripts/admin/conditions.js
@@ -78,7 +78,6 @@ $(document).ready(function(){
         }
     });
 
-     //$('#languagetabs').bootTabs();
     $('#radiototal,#radiogroup').change(function() {
         if ($('#radiototal').attr('checked')==true) {
             $('#newgroupselect').attr('disabled','disabled');
@@ -226,7 +225,6 @@ $(document).ready(function() {
 	});
 
 	// Select the condition target Tab depending on operator
-        //selectTabFromOper($('#method').val());
 	$('#method').change(selectTabFromOper);
 
     var p = new populateCanswersSelectObject();
@@ -265,6 +263,12 @@ $(document).ready(function() {
     $('a[href="' + editTargetTab + '"]').trigger('click');
     $('a[href="' + editSourceTab + '"]').trigger('click');
 
+    // Tab management for quick-add modal
+    var editTargetTab = $('input[name="quick-add-editTargetTab"]').val();
+    var editSourceTab = $('input[name="quick-add-editSourceTab"]').val();
+    $('a[href="' + editTargetTab + '"]').trigger('click');
+    $('a[href="' + editSourceTab + '"]').trigger('click');
+
     // When user clicks tab, update hidden input
     $('.src-tab').on('click', function(e) {
         var href = $(e.currentTarget).find('a').attr('href');

diff --git a/styles/Apple_Blossom/css/lime-admin-common-rtl.css b/styles/Apple_Blossom/css/lime-admin-common-rtl.css
diff --git a/styles/Apple_Blossom/css/lime-admin-common.css b/styles/Apple_Blossom/css/lime-admin-common.css
@@ -2152,6 +2152,10 @@ table#responsedetail tr td{
 }
 
 /* Tabs used within form in condition designer */
-#editconditions .tab-content {
+#editconditions .tab-content, #quick-add-conditions-form .tab-content {
     padding-top: 0;
 }
+
+#quick-add-condition-modal .modal-dialog {
+    width: 800px;
+}
diff --git a/styles/Bay_of_Many/css/lime-admin-common-rtl.css b/styles/Bay_of_Many/css/lime-admin-common-rtl.css
diff --git a/styles/Bay_of_Many/css/lime-admin-common.css b/styles/Bay_of_Many/css/lime-admin-common.css
@@ -2152,6 +2152,10 @@ table#responsedetail tr td{
 }
 
 /* Tabs used within form in condition designer */
-#editconditions .tab-content {
+#editconditions .tab-content, #quick-add-conditions-form .tab-content {
     padding-top: 0;
 }
+
+#quick-add-condition-modal .modal-dialog {
+    width: 800px;
+}
diff --git a/styles/Black_Pearl/css/lime-admin-common-rtl.css b/styles/Black_Pearl/css/lime-admin-common-rtl.css
diff --git a/styles/Black_Pearl/css/lime-admin-common.css b/styles/Black_Pearl/css/lime-admin-common.css
@@ -2152,6 +2152,10 @@ table#responsedetail tr td{
 }
 
 /* Tabs used within form in condition designer */
-#editconditions .tab-content {
+#editconditions .tab-content, #quick-add-conditions-form .tab-content {
     padding-top: 0;
 }
+
+#quick-add-condition-modal .modal-dialog {
+    width: 800px;
+}
diff --git a/styles/Dark_Sky/css/lime-admin-common-rtl.css b/styles/Dark_Sky/css/lime-admin-common-rtl.css
diff --git a/styles/Dark_Sky/css/lime-admin-common.css b/styles/Dark_Sky/css/lime-admin-common.css
@@ -2152,6 +2152,10 @@ table#responsedetail tr td{
 }
 
 /* Tabs used within form in condition designer */
-#editconditions .tab-content {
+#editconditions .tab-content, #quick-add-conditions-form .tab-content {
     padding-top: 0;
 }
+
+#quick-add-condition-modal .modal-dialog {
+    width: 800px;
+}
diff --git a/styles/Free_Magenta/css/lime-admin-common-rtl.css b/styles/Free_Magenta/css/lime-admin-common-rtl.css
diff --git a/styles/Free_Magenta/css/lime-admin-common.css b/styles/Free_Magenta/css/lime-admin-common.css
@@ -2152,6 +2152,10 @@ table#responsedetail tr td{
 }
 
 /* Tabs used within form in condition designer */
-#editconditions .tab-content {
+#editconditions .tab-content, #quick-add-conditions-form .tab-content {
     padding-top: 0;
 }
+
+#quick-add-condition-modal .modal-dialog {
+    width: 800px;
+}
diff --git a/styles/Noto_All_Languages/css/lime-admin-common-rtl.css b/styles/Noto_All_Languages/css/lime-admin-common-rtl.css
diff --git a/styles/Noto_All_Languages/css/lime-admin-common.css b/styles/Noto_All_Languages/css/lime-admin-common.css
@@ -2152,6 +2152,10 @@ table#responsedetail tr td{
 }
 
 /* Tabs used within form in condition designer */
-#editconditions .tab-content {
+#editconditions .tab-content, #quick-add-conditions-form .tab-content {
     padding-top: 0;
 }
+
+#quick-add-condition-modal .modal-dialog {
+    width: 800px;
+}
diff --git a/styles/Purple_Tentacle/css/lime-admin-common-rtl.css b/styles/Purple_Tentacle/css/lime-admin-common-rtl.css
diff --git a/styles/Purple_Tentacle/css/lime-admin-common.css b/styles/Purple_Tentacle/css/lime-admin-common.css
@@ -2152,6 +2152,10 @@ table#responsedetail tr td{
 }
 
 /* Tabs used within form in condition designer */
-#editconditions .tab-content {
+#editconditions .tab-content, #quick-add-conditions-form .tab-content {
     padding-top: 0;
 }
+
+#quick-add-condition-modal .modal-dialog {
+    width: 800px;
+}
diff --git a/styles/Sea_Green/css/lime-admin-common-rtl.css b/styles/Sea_Green/css/lime-admin-common-rtl.css
diff --git a/styles/Sea_Green/css/lime-admin-common.css b/styles/Sea_Green/css/lime-admin-common.css
@@ -2152,6 +2152,10 @@ table#responsedetail tr td{
 }
 
 /* Tabs used within form in condition designer */
-#editconditions .tab-content {
+#editconditions .tab-content, #quick-add-conditions-form .tab-content {
     padding-top: 0;
 }
+
+#quick-add-condition-modal .modal-dialog {
+    width: 800px;
+}
diff --git a/styles/Sunset_Orange/css/lime-admin-common-rtl.css b/styles/Sunset_Orange/css/lime-admin-common-rtl.css
diff --git a/styles/Sunset_Orange/css/lime-admin-common.css b/styles/Sunset_Orange/css/lime-admin-common.css
@@ -2152,6 +2152,10 @@ table#responsedetail tr td{
 }
 
 /* Tabs used within form in condition designer */
-#editconditions .tab-content {
+#editconditions .tab-content, #quick-add-conditions-form .tab-content {
     padding-top: 0;
 }
+
+#quick-add-condition-modal .modal-dialog {
+    width: 800px;
+}