Dev: Comment out regexp; fix width of scenario input

LimeSurvey · Oct 7, 2016 · c4e18fd · c4e18fd
1 parent ae4c850
commit c4e18fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/application/views/admin/conditions/includes/form_editconditions_header.php b/application/views/admin/conditions/includes/form_editconditions_header.php
@@ -28,7 +28,7 @@
             <!-- Condition -->
             <div class='form-group'>
                 <label class='control-label col-sm-2'><?php eT('Scenario'); ?></label>
-                <div class='col-sm-4'>
+                <div class='<?php if ($showScenario): ?> col-sm-4 <?php else: ?> col-sm-2 <?php endif; ?> add-scenario-column'>
                     <input class='form-control' type='number' name='scenario' id='scenario' value='1' <?php if($showScenario):?> style='display: none;' <?php endif;?>/>
                     <?php if($showScenario):?>
                         <span id='defaultscenariotxt'>
@@ -107,7 +107,7 @@
                             '#CONST' => gT('Constant'),
                             '#PREVQUESTIONS' => gT('Questions'),
                             '#TOKENATTRS' => gT('Token fields'),
-                            '#REGEXP' => gT('RegExp')
+                            //'#REGEXP' => gT('RegExp')
                     )));?>
                 </div>
             </div>

diff --git a/scripts/admin/conditions.js b/scripts/admin/conditions.js
@@ -339,5 +339,6 @@ $(document).ready(function(){
 function scenarioaddbtnOnClickAction() {
     $('#scenarioaddbtn').hide();
     $('#defaultscenariotxt').hide('slow');
+    $('.add-scenario-column').removeClass('col-sm-4').addClass('col-sm-2');
     $('#scenario').show('slow');
 }