Skip to content

Commit

Permalink
Fixed issue #10310: Inconsistent use of colon
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-schmitz
c-schmitz committed Feb 5, 2016
1 parent 7960ff5 commit 044b6d2
Show file tree
Hide file tree
Showing 10 changed files with 174 additions and 174 deletions.
6 changes: 3 additions & 3 deletions application/views/admin/export/statistics_subviews/_dataselection.php
View file
Expand Up @@ -17,14 +17,14 @@
</div>

<div class='form-group'>
<label class="col-sm-4 control-label" for='viewsummaryall'><?php eT("View summary of all available fields"); ?></label>
<label class="col-sm-4 control-label" for='viewsummaryall'><?php eT("View summary of all available fields:"); ?></label>
<div class='col-sm-1'>
<input type='checkbox' id='viewsummaryall' name='viewsummaryall' <?php if (isset($_POST['viewsummaryall'])) { echo "checked='checked'";} ?> />
</div>
</div>

<div class='form-group'>
<label class="col-sm-4 control-label" id='noncompletedlbl' for='noncompleted' title='<?php eT("Count stats for each question based only on the total number of responses for which the question was displayed"); ?>'><?php eT("Subtotals based on displayed questions"); ?></label>
<label class="col-sm-4 control-label" id='noncompletedlbl' for='noncompleted' title='<?php eT("Count stats for each question based only on the total number of responses for which the question was displayed"); ?>'><?php eT("Subtotals based on displayed questions:"); ?></label>
<div class='col-sm-1'>
<input type='checkbox' id='noncompleted' name='noncompleted' <?php if (isset($_POST['noncompleted'])) {echo "checked='checked'"; } ?> />
</div>
Expand All @@ -46,7 +46,7 @@
?>

<div class='form-group'>
<label for='statlang' class="col-sm-4 control-label" ><?php eT("Statistics report language"); ?></label>
<label for='statlang' class="col-sm-4 control-label" ><?php eT("Statistics report language:"); ?></label>
<div class='col-sm-4'>
<select name="statlang" id="statlang" class="form-control"><?php echo $language_options; ?></select>
</div>
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/export/statistics_subviews/_outputoptions.php
View file
Expand Up @@ -11,7 +11,7 @@
</div>

<div class='form-group'>
<label for='usegraph' class="col-sm-5 control-label" ><?php eT("Show graphs"); ?></label>
<label for='usegraph' class="col-sm-5 control-label" ><?php eT("Show graphs:"); ?></label>
<div class='col-sm-1'>
<input type='checkbox' id='usegraph' name='usegraph' <?php if (isset($usegraph) && $usegraph == 1) { echo "checked='checked'"; } ?> />
</div>
Expand Down
76 changes: 38 additions & 38 deletions application/views/admin/global_settings/_presentation.php
View file
@@ -1,8 +1,8 @@
<?php
/**
* This view generate the presentation tab inside global settings.
*
*
*
*
*/
?>
<?php $shownoanswer=getGlobalSetting('shownoanswer');
Expand All @@ -15,19 +15,19 @@
<option value="1" <?php echo $sel_na[1]; ?> ><?php eT('Yes'); ?></option>
<option value="0" <?php echo $sel_na[0]; ?> ><?php eT('No'); ?></option>
<option value="2" <?php echo $sel_na[2]; ?> ><?php eT('Survey admin can choose'); ?></option>
</select>
</div>
</select>
</div>
</div>


<?php $thisrepeatheadings=getGlobalSetting('repeatheadings'); ?>
<div class="form-group">
<label class="col-sm-6 control-label" for='repeatheadings'><?php eT("Repeating headings in array questions every X subquestions:"); ?></label>
<div class="col-sm-6">
<input class="form-control" id='repeatheadings' name='repeatheadings' value='<?php echo $thisrepeatheadings; ?>' size='4' maxlength='4' />
</div>
<input class="form-control" id='repeatheadings' name='repeatheadings' value='<?php echo $thisrepeatheadings; ?>' size='4' maxlength='4' />
</div>
</div>


<?php
// showxquestions
Expand All @@ -40,16 +40,16 @@
};
?>
<div class="form-group">
<label class="col-sm-6 control-label" for="showxquestions"><?php eT('Show "There are X questions in this survey"'); ?></label>
<label class="col-sm-6 control-label" for="showxquestions"><?php eT('Show "There are X questions in this survey":'); ?></label>
<div class="col-sm-6">
<select class="form-control" id="showxquestions" name="showxquestions">
<option value="show"<?php echo $sel_xq['show']; ?>><?php eT('Yes'); ?></option>
<option value="hide"<?php echo $sel_xq['hide']; ?>><?php eT('No'); ?></option>
<option value="choose"<?php echo $sel_xq['choose']; ?>><?php eT('Survey admin can choose'); ?></option>
</select>
</div>
</select>
</div>
</div>

<?php unset($set_xq,$sel_xq);
$set_gri=getGlobalSetting('showgroupinfo');
$sel_gri = array( 'both' => '' , 'choose' =>'' , 'description' => '' , 'name' => '' , 'none' => '' );
Expand All @@ -59,16 +59,16 @@
$sel_gri['choose'] = ' selected="selected"';
}; ?>
<div class="form-group">
<label class="col-sm-6 control-label" for="showgroupinfo"><?php eT('Show question group name and/or description'); ?></label>
<label class="col-sm-6 control-label" for="showgroupinfo"><?php eT('Show question group name and/or description:'); ?></label>
<div class="col-sm-6">
<select class="form-control" id="showgroupinfo" name="showgroupinfo">
<option value="both"<?php echo $sel_gri['both']; ?>><?php eT('Show both'); ?></option>
<option value="name"<?php echo $sel_gri['name']; ?>><?php eT('Show group name only'); ?></option>
<option value="description"<?php echo $sel_gri['description']; ?>><?php eT('Show group description only'); ?></option>
<option value="none"<?php echo $sel_gri['none']; ?>><?php eT('Hide both'); ?></option>
<option value="choose"<?php echo $sel_gri['choose']; ?>><?php eT('Survey admin can choose'); ?></option>
</select>
</div>
</select>
</div>
</div>
<?php
unset($set_gri,$sel_gri);
Expand All @@ -83,30 +83,30 @@
};
?>
<div class="form-group">
<label class="col-sm-6 control-label" for="showqnumcode"><?php eT('Show question number and/or question code'); ?></label>
<label class="col-sm-6 control-label" for="showqnumcode"><?php eT('Show question number and/or question code:'); ?></label>
<div class="col-sm-6">
<select class="form-control" id="showqnumcode" name="showqnumcode">
<option value="both"<?php echo $sel_qnc['both']; ?>><?php eT('Show both'); ?></option>
<option value="number"<?php echo $sel_qnc['number']; ?>><?php eT('Show question number only'); ?></option>
<option value="code"<?php echo $sel_qnc['code']; ?>><?php eT('Show question code only'); ?></option>
<option value="none"<?php echo $sel_qnc['none']; ?>><?php eT('Hide both'); ?></option>
<option value="choose"<?php echo $sel_qnc['choose']; ?>><?php eT('Survey admin can choose'); ?></option>
</select>
</div>
</select>
</div>
</div>
<?php
unset($set_qnc,$sel_qnc);
?>
<div class="form-group">
<label class="col-sm-6 control-label" for='pdffontsize'><?php eT("Font size of PDFs"); ?></label>
<label class="col-sm-6 control-label" for='pdffontsize'><?php eT("Font size of PDFs:"); ?></label>
<div class="col-sm-6">
<input class="form-control" type='text' size='5' id='pdffontsize' name='pdffontsize' value="<?php echo htmlspecialchars(getGlobalSetting('pdffontsize')); ?>" />
</div>

</div>
</div>

<div class="form-group">
<label class="col-sm-6 control-label" for='pdfshowheader'><?php eT("Show header in answers export PDFs?") ; ?></label>
<label class="col-sm-6 control-label" for='pdfshowheader'><?php eT("Show header in answers export PDFs:") ; ?></label>
<div class="col-sm-6">
<select class="form-control" id='pdfshowheader' name='pdfshowheader'>
<option value='Y'
Expand All @@ -122,34 +122,34 @@
><?php eT("No") ; ?>
</option>
</select>
</div>

</div>
</div>

<div class="form-group">
<label class="col-sm-6 control-label" for='pdflogowidth'><?php eT("Width of PDF header logo"); ?></label>
<label class="col-sm-6 control-label" for='pdflogowidth'><?php eT("Width of PDF header logo:"); ?></label>
<div class="col-sm-6">
<input class="form-control" type='text' size='5' id='pdflogowidth' name='pdflogowidth' value="<?php echo htmlspecialchars(getGlobalSetting('pdflogowidth')); ?>" />
</div>

</div>
</div>

<div class="form-group">
<label class="col-sm-6 control-label" for='pdfheadertitle'><?php eT("PDF header title (if empty, site name will be used)"); ?></label>
<label class="col-sm-6 control-label" for='pdfheadertitle'><?php eT("PDF header title (if empty, site name will be used):"); ?></label>
<div class="col-sm-6">
<input class="form-control" type='text' id='pdfheadertitle' size='50' maxlength='256' name='pdfheadertitle' value="<?php echo htmlspecialchars(getGlobalSetting('pdfheadertitle')); ?>" />
</div>

</div>
</div>

<div class="form-group">
<label class="col-sm-6 control-label" for='pdfheaderstring'><?php eT("PDF header string (if empty, survey name will be used)"); ?></label>
<label class="col-sm-6 control-label" for='pdfheaderstring'><?php eT("PDF header string (if empty, survey name will be used):"); ?></label>
<div class="col-sm-6">
<input class="form-control" type='text' id='pdfheaderstring' size='50' maxlength='256' name='pdfheaderstring' value="<?php echo htmlspecialchars(getGlobalSetting('pdfheaderstring')); ?>" />
</div>

</div>
</div>


<?php if (Yii::app()->getConfig("demoMode")==true):?>
<p><?php eT("Note: Demo mode is activated. Marked (*) settings can't be changed."); ?></p>
Expand Down
38 changes: 19 additions & 19 deletions application/views/admin/global_settings/_security.php
View file
@@ -1,26 +1,26 @@
<?php
/**
* This view generate the 'security' tab inside global settings.
*
*
*/
?>
<?php $thissurveyPreview_require_Auth=getGlobalSetting('surveyPreview_require_Auth'); ?>
<div class="form-group">
<label class="col-sm-5 control-label" for='surveyPreview_require_Auth'><?php eT("Survey preview only for administration users"); ?></label>

<label class="col-sm-5 control-label" for='surveyPreview_require_Auth'><?php eT("Survey preview only for administration users:"); ?></label>
<div class="col-sm-6">

<select class="form-control" id='surveyPreview_require_Auth' name='surveyPreview_require_Auth'>
<option value='1'
<?php if ($thissurveyPreview_require_Auth == true) { echo " selected='selected'";}?>
><?php eT("Yes"); ?></option>
<option value='0'
<?php if ($thissurveyPreview_require_Auth == false) { echo " selected='selected'";}?>
><?php eT("No"); ?></option>
</select>
</div>
</select>
</div>
</div>


<?php $thisfilterxsshtml=getGlobalSetting('filterxsshtml'); ?>
<div class="form-group">
Expand All @@ -33,10 +33,10 @@
<option value='0'
<?php if ( $thisfilterxsshtml == false) { echo " selected='selected'";}?>
><?php eT("No"); ?></option>
</select>&nbsp;<span class='hint'><?php eT("(XSS filtering is always disabled for the superadministrator.)"); ?></span>
</div>
</select>&nbsp;<span class='hint'><?php eT("(XSS filtering is always disabled for the superadministrator.)"); ?></span>
</div>
</div>


<?php $thisusercontrolSameGroupPolicy=getGlobalSetting('usercontrolSameGroupPolicy'); ?>
<div class="form-group">
Expand All @@ -49,10 +49,10 @@
<option value='0'
<?php if ( $thisusercontrolSameGroupPolicy == false) { echo " selected='selected'";}?>
><?php eT("No"); ?></option>
</select>
</div>
</select>
</div>
</div>


<?php $thisforce_ssl = getGlobalSetting('force_ssl');
$opt_force_ssl_on = $opt_force_ssl_off = $opt_force_ssl_neither = '';
Expand All @@ -79,16 +79,16 @@
<option value="on" <?php echo $opt_force_ssl_on; ?>><?php eT('On'); ?></option>
<option value="off" <?php echo $opt_force_ssl_off; ?>><?php eT('Off'); ?></option>
<option value="neither" <?php echo $opt_force_ssl_neither; ?>><?php eT("Don't force on or off"); ?></option>
</select>
</div>
</select>
</div>
</div>

<div class="form-group">
<span style='font-size:0.7em;'><?php echo $warning_force_ssl; ?></span>
<span style='font-size:0.7em;'><?php echo $warning_force_ssl; ?></span>
</div>

<?php unset($thisforce_ssl,$opt_force_ssl_on,$opt_force_ssl_off,$opt_force_ssl_neither,$warning_force_ssl,$this_opt); ?>

<?php if (Yii::app()->getConfig("demoMode")==true):?>
<p><?php eT("Note: Demo mode is activated. Marked (*) settings can't be changed."); ?></p>
<?php endif; ?>
<?php endif; ?>

0 comments on commit 044b6d2

Please sign in to comment.