Fixed issue #11336: Bad text display when adding participant from CPD…

…B to survey participants
LimeSurvey · Jun 7, 2016 · 31b5470 · 31b5470
1 parent 33abca9
commit 31b5470
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 22 deletions.
diff --git a/application/views/admin/participants/displayParticipants_view.php b/application/views/admin/participants/displayParticipants_view.php
@@ -287,8 +287,8 @@
 <!--<div id="addsurvey" title="addsurvey" style="display:none">-->
 
 <!-- Add To Survey Popup Window -->
-<div class="ui-widget ui-helper-hidden" id="client-script-return-msg" style="display:none">
-    <?php echo CHtml::form(array("admin/participants/sa/attributeMap"), 'post', array('id'=>'addsurvey','name'=>'addsurvey', 'class' => 'form-horizonta')); ?>
+<div id="client-script-return-msg" style="display:none">
+    <?php echo CHtml::form(array("admin/participants/sa/attributeMap"), 'post', array('id'=>'addsurvey','name'=>'addsurvey','class'=>'form-horizontal')); ?>
         <input type="hidden" name="participant_id" id="participant_id" value=""></input>
         <input type="hidden" name="count" id="count" value=""></input>
         <fieldset class='popupgroup'>
@@ -310,7 +310,7 @@
                 {
                     $option[$row['surveyls_survey_id']] = $row['surveyls_title'];
                 }
-                echo CHtml::listBox('survey_id', 'id="survey_id"', $option, array('style'=>'width: 400px; border: 0px; cursor: pointer', 'size'=>10));
+                echo CHtml::listBox('survey_id', 'id="survey_id"', $option, array('class'=>'form-control', 'size'=>8));
             }
             ?>
           </p><br />
@@ -319,27 +319,22 @@
           <legend>
             <?php eT("Options") ?>
           </legend>
-          <div class='row'>
-            <div class='form-group'>
-                <label class='control-label col-sm-8' for='redirect'><?php eT("Display survey tokens after adding?"); ?></label>
-                <div class='col-sm-4'>
-                    <?php
-                    $data = array(
-                        'id' => 'redirect',
-                        'value' => 'TRUE',
-                        'style' => 'margin:10px',
-                    );
-
-                    echo CHtml::checkBox('redirect', TRUE, $data);
-                    ?>
-                </div>
+        <div class='form-group'>
+            <label class='control-label col-sm-8' for='redirect'><?php eT("Display survey participants after adding?"); ?></label>
+            <div class='col-sm-4'>
+                <?php
+                echo CHtml::checkBox('redirect', TRUE,  array(
+                    'id' => 'redirect',
+                    'value' => 'TRUE',
+                    'class' => '',
+                ));
+                ?>
             </div>
-          </div>
+        </div>
+
         </fieldset>
     </form>
 </div>
 <div id="notauthorised" title="notauthorised" style="display:none">
-    <p>
-<?php eT("You do not have the permission to edit this participant."); ?></p>
-
+    <p><?php eT("You do not have the permission to edit this participant."); ?></p>
 </div>
diff --git a/styles/Sea_Green/css/lime-admin-common.css b/styles/Sea_Green/css/lime-admin-common.css
@@ -1994,3 +1994,32 @@ div[id^="alertmod_"]
 {
     display: none;
 }
+
+/* Can be removed when jqGrid is replaced */
+
+.ui-helper-clearfix {
+    min-height: 0;
+}
+.ui-dialog .ui-dialog-buttonpane {
+    background-image: none;
+    border-width: 1px 0 0;
+    margin-top: 0.5em;
+    padding: 0.3em 1em 0.5em 0.4em;
+    text-align: left;
+}
+.ui-helper-clearfix::before, .ui-helper-clearfix::after {
+    border-collapse: collapse;
+    content: "";
+    display: table;
+}
+.ui-helper-clearfix::after {
+    clear: both;
+}
+.ui-helper-clearfix::before, .ui-helper-clearfix::after {
+    border-collapse: collapse;
+    content: "";
+    display: table;
+}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+    float: right;
+}
diff --git a/templates/default/css/template.css b/templates/default/css/template.css
@@ -952,4 +952,4 @@ label, th {
 
 div.yes-no .btn-group label {
   white-space:normal;
-}
+}