Skip to content

Commit

Permalink
Fixed issue #9825: Remove hardcoded CSS style from privacy message
Browse files Browse the repository at this point in the history
  • Loading branch information
c-schmitz committed Aug 17, 2016
1 parent 70b9c0b commit 5bb8564
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
6 changes: 3 additions & 3 deletions application/helpers/replacements_helper.php
Expand Up @@ -358,7 +358,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
'data-target' => '#clearallConfirmation',
));
$_clearall .= "
<script type='text/javascript'>
<script type='text/javascript'>
$(document).on('exitAndClear', function(){
$('#limesurvey').append('<input name=\"clearall\" value=\"clearall\" />');
$('#limesurvey').append('<input name=\"confirm-clearall\" value=\"confirm\" />');
Expand All @@ -380,7 +380,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
. '</div>'
. '<div class="modal-body">'
. gT("Are you sure you want to clear all your responses?")
.'<input type="checkbox" name="confirm-clearall" id="confirm-clearall" value="confirm" class="hide jshide"/>'
.'<input type="checkbox" name="confirm-clearall" id="confirm-clearall" value="confirm" class="hide jshide"/>'
. '</div>'
. '<div class="modal-footer">'
. '<button type="button" class="btn btn-default" data-dismiss="modal">'.gT("No").'</button>'
Expand Down Expand Up @@ -717,7 +717,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
$coreReplacements['NUMBEROFQUESTIONS'] = $_totalquestionsAsked;
$coreReplacements['PERCENTCOMPLETE'] = isset($percentcomplete) ? $percentcomplete : ''; // global
$coreReplacements['PRIVACY'] = isset($privacy) ? $privacy : ''; // global
$coreReplacements['PRIVACYMESSAGE'] = "<span style='font-weight:bold; font-style: italic;'>".gT("A Note On Privacy")."</span><br />".gT("This survey is anonymous.")."<br />".gT("The record of your survey responses does not contain any identifying information about you, unless a specific survey question explicitly asked for it.").' '.gT("If you used an identifying token to access this survey, please rest assured that this token will not be stored together with your responses. It is managed in a separate database and will only be updated to indicate whether you did (or did not) complete this survey. There is no way of matching identification tokens with survey responses.");
$coreReplacements['PRIVACYMESSAGE'] = "<span class='privacy-title'>".gT("A note on privacy")."</span><span class='privacy-body'><br />".gT("This survey is anonymous.")."<br />".gT("The record of your survey responses does not contain any identifying information about you, unless a specific survey question explicitly asked for it.").' '.gT("If you used an identifying token to access this survey, please rest assured that this token will not be stored together with your responses. It is managed in a separate database and will only be updated to indicate whether you did (or did not) complete this survey. There is no way of matching identification tokens with survey responses.").'</span>';
$coreReplacements['QUESTION_INDEX']=isset($questionindex) ? $questionindex: '';
$coreReplacements['QUESTION_INDEX_MENU']=isset($questionindexmenu) ? $questionindexmenu: '';
$coreReplacements['RESTART'] = $_restart;
Expand Down
7 changes: 6 additions & 1 deletion templates/default/css/template.css
Expand Up @@ -494,7 +494,7 @@ table > tbody > tr > td.ddprefix {
No more table transformation applies when screen is under 801px (for a few exotic tablet screens, see #11016),
whereas visible-xs-block respect bootstrap standards (767px)
If too many bugs of this kind appears in the future, we should just refuse to support weird exotic tablet screens.
We should repsect standards, we should not try to fit to non standards devices.
We should repsect standards, we should not try to fit to non standards devices.
*/
.visible-xs-block{
display: block !important;
Expand Down Expand Up @@ -982,3 +982,8 @@ div.yes-no .btn-group label {
.multipleco-other-topic {
max-width: 150px;
}

.privacy-header{
font-weight: bold;
font-style: italic;
}

0 comments on commit 5bb8564

Please sign in to comment.