Skip to content

Commit

Permalink
Updated feature: in copy mode all conditions are checked by default. …
Browse files Browse the repository at this point in the history
…The multi-selection box to select target question is now using a new layout making it easier to select multiple questions

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9796 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
Thibault Le Meur committed Feb 15, 2011
1 parent 8d9b0a4 commit 4d2368c
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 3 deletions.
11 changes: 8 additions & 3 deletions admin/conditionshandling.php
Expand Up @@ -1221,7 +1221,7 @@
}
if ($subaction == "copyconditionsform" || $subaction == "copyconditions")
{
$initialCheckbox = "<td><input type='checkbox' id='scenarioCbx{$scenarionr['scenario']}'/>\n"
$initialCheckbox = "<td><input type='checkbox' id='scenarioCbx{$scenarionr['scenario']}' checked='checked'/>\n"
."<script type='text/javascript'>$(document).ready(function () { $('#scenarioCbx{$scenarionr['scenario']}').checkgroup({groupName:'aConditionFromScenario{$scenarionr['scenario']}'}); });</script>"
."</td><td>&nbsp;</td>\n";
}
Expand Down Expand Up @@ -1368,7 +1368,7 @@
{
$conditionsoutput_main_content .= "<td>&nbsp;&nbsp;</td>"
. "<td valign='middle' align='right'>\n"
. "\t<input type='checkbox' name='aConditionFromScenario{$scenarionr['scenario']}' id='cbox{$rows['cid']}' value='{$rows['cid']} '/>\n"
. "\t<input type='checkbox' name='aConditionFromScenario{$scenarionr['scenario']}' id='cbox{$rows['cid']}' value='{$rows['cid']}' checked='checked'/>\n"
. "</td>\n";
}
$conditionsoutput_main_content .= ""
Expand Down Expand Up @@ -1617,11 +1617,16 @@

if (isset($conditionsList) && is_array($conditionsList))
{
//TIBO
$js_admin_includes[]= $rooturl.'/scripts/jquery/jquery.multiselect.min.js';
$css_admin_includes[] = '../scripts/jquery/css/jquery.multiselect.css';

$conditionsoutput_main_content .= "<script type='text/javascript'>$(document).ready(function () { $('#copytomultiselect').multiselect( {autoOpen: true, height: 200 } ); });</script>";

$conditionsoutput_main_content .= "\t<div class='condition-tbl-row'>\n"
."\t<div class='condition-tbl-left'>".$clang->gT("Copy the selected conditions to").":</div>\n"
."\t<div class='condition-tbl-right'>\n"
."\t\t<select name='copyconditionsto[]' multiple style='font-family:verdana; font-size:10; width:600px' size='10'>\n";
."\t\t<select name='copyconditionsto[]'id='copytomultiselect' multiple style='font-family:verdana; font-size:10; width:600px' size='10'>\n";
if (isset($pquestions) && count($pquestions) != 0)
{
foreach ($pquestions as $pq)
Expand Down
1 change: 1 addition & 0 deletions admin/styles/default/adminstyle.css
Expand Up @@ -945,6 +945,7 @@ div.messagebox .warningheader {

.condition-tbl-row {
width: 100%;
height: 300px;
float: left;
padding: 0;
margin: 0;
Expand Down
24 changes: 24 additions & 0 deletions scripts/jquery/css/jquery.multiselect.css
@@ -0,0 +1,24 @@
.ui-multiselect { padding:2px 0 2px 4px; text-align:left }
.ui-multiselect span.ui-icon { float:right }
.ui-multiselect-single input { position:absolute !important; top: auto !important; left:-9999px; }
.ui-multiselect-single label { padding:5px !important }

.ui-multiselect-header { margin-bottom:3px; padding:3px 0 3px 4px }
.ui-multiselect-header ul { font-size:0.9em }
.ui-multiselect-header ul li { float:left; padding:0 10px 0 0 }
.ui-multiselect-header a { text-decoration:none }
.ui-multiselect-header a:hover { text-decoration:underline }
.ui-multiselect-header span.ui-icon { float:left }
.ui-multiselect-header li.ui-multiselect-close { float:right; text-align:right; padding-right:0 }

.ui-multiselect-menu { display:none; padding:3px; position:absolute; z-index:10000 }
.ui-multiselect-checkboxes { position:relative /* fixes bug in IE6/7 */; overflow-y:scroll }
.ui-multiselect-checkboxes label { cursor:default; display:block; border:1px solid transparent; padding:3px 1px }
.ui-multiselect-checkboxes label input { position:relative; top:1px }
.ui-multiselect-checkboxes li { clear:both; font-size:0.9em; padding-right:3px }
.ui-multiselect-checkboxes li.ui-multiselect-optgroup-label { text-align:center; font-weight:bold; border-bottom:1px solid }
.ui-multiselect-checkboxes li.ui-multiselect-optgroup-label a { display:block; padding:3px; margin:1px 0; text-decoration:none }

/* remove label borders in IE6 because IE6 does not support transparency */
* html .ui-multiselect-checkboxes label { border:none }

20 changes: 20 additions & 0 deletions scripts/jquery/jquery.multiselect.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4d2368c

Please sign in to comment.