Skip to content

Commit

Permalink
Fixed issue #10735: wider drop down menues in survey options
Browse files Browse the repository at this point in the history
  • Loading branch information
LouisGac committed Mar 11, 2016
1 parent 2bb2ef7 commit 9a0e64e
Show file tree
Hide file tree
Showing 10 changed files with 126 additions and 122 deletions.
4 changes: 2 additions & 2 deletions application/views/admin/survey/editLocalSettings_main_view.php
View file
Expand Up @@ -27,12 +27,12 @@
<?php echo CHtml::form(array("admin/database/index/updatesurveylocalesettings"), 'post', array('id'=>'globalsetting','name'=>'globalsetting','class'=>'form-horizontal form30')); ?>

<!-- text edition -->
<div class="col-sm-12 col-md-8 content-right">
<div class="col-sm-12 col-md-6 content-right">
<?php $this->renderPartial('/admin/survey/subview/tab_edit_view',$data); ?>
</div>

<!-- settings -->
<div class="col-sm-12 col-md-4" id="accordion-container" style="background-color: #fff;">
<div class="col-sm-12 col-md-6" id="accordion-container" style="background-color: #fff;">
<?php $this->renderPartial('/admin/survey/subview/accordion/_accordion_container', array('data'=>$settings_data)); ?>
</div>
</form>
Expand Down
1 change: 1 addition & 0 deletions application/views/admin/survey/subview/accordion/_accordion_container.php
View file
Expand Up @@ -27,6 +27,7 @@
</div>
</div>


<!-- Presentation & navigation -->
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingTwo">
Expand Down
9 changes: 4 additions & 5 deletions application/views/admin/survey/subview/accordion/_generaloptions_panel.php
View file
Expand Up @@ -19,17 +19,16 @@

<!-- Base language -->
<div class="form-group">
<label class="col-sm-5 control-label" ><?php eT("Base language:") ; ?></label>
<div class="col-sm-7" style="padding-top: 7px;">
<label class="col-sm-3 control-label" ><?php eT("Base language:") ; ?></label>
<div class="col-sm-9" style="padding-top: 7px;">
<?php echo getLanguageNameFromCode($esrow['language'],false) ?>
</div>
</div>

<!-- Additional Languages -->
<div class="form-group">
<label class="col-sm-5 text-right" for='additional_languages'><?php eT("Additional Languages"); ?>:</label>
<div class="col-sm-12">
<br/>
<label class="col-sm-3 text-right" for='additional_languages'><?php eT("Additional Languages"); ?>:</label>
<div class="col-sm-9">
<table>
<tr>
<td style='text-align:left'>
Expand Down
40 changes: 20 additions & 20 deletions application/views/admin/survey/subview/accordion/_notification_panel.php
View file
Expand Up @@ -8,24 +8,24 @@

<!-- email basic to -->
<div class="form-group">
<label class="col-sm-4 control-label" for='emailnotificationto'><?php eT("Send basic admin notification email to:"); ?></label>
<div class="col-sm-8">
<label class="col-sm-6 control-label" for='emailnotificationto'><?php eT("Send basic admin notification email to:"); ?></label>
<div class="col-sm-6">
<?php echo CHtml::textField('emailnotificationto',$esrow['emailnotificationto'],array('size'=>70, 'class'=>"form-control")); ?>
</div>
</div>

<!-- email detail to -->
<div class="form-group">
<label class="col-sm-4 control-label" for='emailresponseto'><?php eT("Send detailed admin notification email to:"); ?></label>
<div class="col-sm-8">
<label class="col-sm-6 control-label" for='emailresponseto'><?php eT("Send detailed admin notification email to:"); ?></label>
<div class="col-sm-6">
<?php echo CHtml::textField('emailresponseto',$esrow['emailresponseto'],array('size'=>70, 'class'=>"form-control")) ?>
</div>
</div>

<!-- Date Stamp -->
<div class="form-group">
<label class="col-sm-4 control-label" for='datestamp'><?php eT("Date stamp:"); ?></label>
<div class="col-sm-8">
<label class="col-sm-6 control-label" for='datestamp'><?php eT("Date stamp:"); ?></label>
<div class="col-sm-6">
<?php if ($esrow['active'] == "Y") { ?>
<?php if ($esrow['datestamp'] != "Y") {
eT("Responses will not be date stamped.");
Expand All @@ -42,8 +42,8 @@

<!-- Save IP Address -->
<div class="form-group">
<label class="col-sm-4 control-label" for='ipaddr'><?php eT("Save IP Address:"); ?></label>
<div class="col-sm-8">
<label class="col-sm-6 control-label" for='ipaddr'><?php eT("Save IP Address:"); ?></label>
<div class="col-sm-6">
<?php if ($esrow['active'] == "Y") { ?>
<?php if ($esrow['ipaddr'] != "Y") {
eT("Responses will not have the IP address logged.");
Expand All @@ -60,8 +60,8 @@

<!-- Save referrer URL -->
<div class="form-group">
<label class="col-sm-4 control-label" for='refurl'><?php eT("Save referrer URL:"); ?></label>
<div class="col-sm-8">
<label class="col-sm-6 control-label" for='refurl'><?php eT("Save referrer URL:"); ?></label>
<div class="col-sm-6">
<?php if ($esrow['active'] == "Y") { ?>
<?php if ($esrow['refurl'] != "Y") {
eT("Responses will not have their referring URL logged.");
Expand All @@ -78,8 +78,8 @@

<!-- Save timings -->
<div class="form-group">
<label class="col-sm-4 control-label" for='savetimings'><?php eT("Save timings:"); ?></label>
<div class="col-sm-8">
<label class="col-sm-6 control-label" for='savetimings'><?php eT("Save timings:"); ?></label>
<div class="col-sm-6">
<?php
if ($esrow['active']=="Y")
{ ?>
Expand All @@ -97,32 +97,32 @@

<!-- Enable assessment mode -->
<div class="form-group">
<label class="col-sm-4 control-label" for='assessments'><?php eT("Enable assessment mode:"); ?></label>
<div class="col-sm-8">
<label class="col-sm-6 control-label" for='assessments'><?php eT("Enable assessment mode:"); ?></label>
<div class="col-sm-6">
<?php echo CHtml::dropDownList('assessments', $esrow['assessments'],array("Y"=>gT("Yes",'unescaped'),"N"=>gT("No",'unescaped')), array('class'=>"form-control")); ?>
</div>
</div>

<!-- Participant may save and resume -->
<div class="form-group">
<label class="col-sm-4 control-label" for='allowsave'><?php eT("Participant may save and resume later:"); ?></label>
<div class="col-sm-8">
<label class="col-sm-6 control-label" for='allowsave'><?php eT("Participant may save and resume later:"); ?></label>
<div class="col-sm-6">
<?php echo CHtml::dropDownList('allowsave', $esrow['allowsave'],array("Y"=>gT("Yes",'unescaped'),"N"=>gT("No",'unescaped')), array('class'=>"form-control")); ?>
</div>
</div>

<!-- Google Analytics -->
<div class="form-group">
<label class="col-sm-4 control-label" for='googleanalyticsapikey'><?php eT("Google Analytics API key for this survey:"); ?></label>
<div class="col-sm-8">
<label class="col-sm-6 control-label" for='googleanalyticsapikey'><?php eT("Google Analytics API key for this survey:"); ?></label>
<div class="col-sm-6">
<?php echo CHtml::textField('googleanalyticsapikey',$esrow['googleanalyticsapikey'],array('size'=>20), array('class'=>"form-control")); ?>
</div>
</div>

<!-- Google Analytics style -->
<div class="form-group">
<label class="col-sm-4 control-label" for='googleanalyticsstyle'><?php eT("Google Analytics style for this survey:"); ?></label>
<div class="col-sm-8">
<label class="col-sm-6 control-label" for='googleanalyticsstyle'><?php eT("Google Analytics style for this survey:"); ?></label>
<div class="col-sm-6">
<?php echo CHtml::dropDownList('googleanalyticsstyle', $esrow['googleanalyticsstyle'],array("0"=>gT("Do not use Google Analytics",'unescaped'),"1"=>gT("Default Google Analytics",'unescaped'),"2"=>gT("Survey name-[SID]/Group name",'unescaped')), array('class'=>"form-control")); ?>
</div>
</div>
Expand Down

0 comments on commit 9a0e64e

Please sign in to comment.