Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/LimeSurvey/LimeSurvey.git in…
Browse files Browse the repository at this point in the history 
…to dev
  • Loading branch information
@TMSWhite
TMSWhite committed Feb 29, 2012
2 parents b1933d2 + 377d126 commit 6b9287c
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 33 deletions.
50 changes: 24 additions & 26 deletions qanda.php
View file
Expand Up @@ -1087,7 +1087,7 @@ function do_date($ia)
{
// Show day select box
case 'j':
case 'd': $answer .= ' <label for="day'.$ia[1].'"><select id="day'.$ia[1].'" class="day">
case 'd': $answer .= ' <label for="day'.$ia[1].'" class="hide">'.$clang->gT('Day').'</label><select id="day'.$ia[1].'" class="day">
<option value="">'.$clang->gT('Day')."</option>\n";
for ($i=1; $i<=31; $i++) {
if ($i == $currentdate)
Expand All @@ -1100,11 +1100,11 @@ function do_date($ia)
}
$answer .= ' <option value="'.sprintf('%02d', $i).'"'.$i_date_selected.'>'.sprintf('%02d', $i)."</option>\n";
}
$answer .='</select></label>';
$answer .='</select>';
break;
// Show month select box
case 'n':
case 'm': $answer .= ' <label for="month'.$ia[1].'"><select id="month'.$ia[1].'" class="month">
case 'm': $answer .= ' <label for="month'.$ia[1].'" class="hide">'.$clang->gT('Month').'</label><select id="month'.$ia[1].'" class="month">
<option value="">'.$clang->gT('Month')."</option>\n";
$montharray=array(
$clang->gT('Jan'),
Expand All @@ -1131,10 +1131,10 @@ function do_date($ia)

$answer .= ' <option value="'.sprintf('%02d', $i).'"'.$i_date_selected.'>'.$montharray[$i-1].'</option>';
}
$answer .= ' </select></label>';
$answer .= ' </select>';
break;
// Show year select box
case 'Y': $answer .= ' <label for="year'.$ia[1].'"><select id="year'.$ia[1].'" class="year">
case 'Y': $answer .= ' <label for="year'.$ia[1].'" class="hide">'.$clang->gT('Year').'</label><select id="year'.$ia[1].'" class="year">
<option value="">'.$clang->gT('Year').'</option>';

/*
Expand Down Expand Up @@ -1193,7 +1193,7 @@ function do_date($ia)
}
$answer .= ' <option value="'.$i.'"'.$i_date_selected.'>'.$i.'</option>';
}
$answer .= '</select></label>';
$answer .= '</select>';

break;
}
Expand Down Expand Up @@ -1246,9 +1246,8 @@ function do_date($ia)
$goodchars = "0123456789".$goodchars[0];

$answer ="<p class=\"question\">
<label for=\"answer{$ia[1]}\">
<input class='popupdate' type=\"text\" alt=\"".$clang->gT('Date picker')."\" size=\"10\" name=\"{$ia[1]}\" id=\"answer{$ia[1]}\" value=\"$dateoutput\" maxlength=\"10\" onkeypress=\"return goodchars(event,'".$goodchars."')\" onchange=\"$checkconditionFunction(this.value, this.name, this.type)\" />
</label>
<label for='answer{$ia[1]}' class='hide label'>{$clang->gT('Date picker')}</label>
<input class='popupdate' type=\"text\" title=\"".sprintf($clang->gT('Format: %s'),$dateformatdetails['dateformat'])."\" size=\"10\" name=\"{$ia[1]}\" id=\"answer{$ia[1]}\" value=\"$dateoutput\" maxlength=\"10\" onkeypress=\"return goodchars(event,'".$goodchars."')\" onchange=\"$checkconditionFunction(this.value, this.name, this.type)\" />
<input type='hidden' name='dateformat{$ia[1]}' id='dateformat{$ia[1]}' value='{$dateformatdetails['jsdate']}' />
<input type='hidden' name='datelanguage{$ia[1]}' id='datelanguage{$ia[1]}' value='{$clang->langcode}' />
<input type='hidden' name='dateyearrange{$ia[1]}' id='dateyearrange{$ia[1]}' value='{$minyear}:{$maxyear}' />
Expand All @@ -1275,7 +1274,7 @@ function do_language($ia)

$answerlangs = GetAdditionalLanguagesFromSurveyID($surveyid);
$answerlangs [] = GetBaseLanguageFromSurveyID($surveyid);
$answer = "\n\t<p class=\"question\">\n<label for=\"answer$ia[1]\"><select name=\"$ia[1]\" id=\"answer$ia[1]\" onchange=\"document.getElementById('lang').value=this.value; $checkconditionFunction(this.value, this.name, this.type);\">\n";
$answer = "\n\t<p class=\"question\">\n.<label for='answer{$ia[1]}' class='hide label'>{$clang->gT('Choose your language')}</label><select name=\"$ia[1]\" id=\"answer$ia[1]\" onchange=\"document.getElementById('lang').value=this.value; $checkconditionFunction(this.value, this.name, this.type);\">\n";
if (!$_SESSION[$ia[1]]) {$answer .= "\t<option value=\"\" selected=\"selected\">".$clang->gT('Please choose...')."</option>\n";}
foreach ($answerlangs as $ansrow)
{
Expand All @@ -1286,7 +1285,7 @@ function do_language($ia)
}
$answer .= '>'.getLanguageNameFromCode($ansrow, true)."</option>\n";
}
$answer .= "</select></label>\n";
$answer .= "</select>\n";
$answer .= "<input type=\"hidden\" name=\"java$ia[1]\" id=\"java$ia[1]\" value=\"{$_SESSION[$ia[1]]}\" />\n";

$inputnames[]=$ia[1];
Expand Down Expand Up @@ -1470,7 +1469,7 @@ function do_list_dropdown($ia)
if ($prefixStyle == 1) {
$_prefix = ++$_rowNum . ') ';
}
$answer .= ' <option value="-oth-"'.$opt_select.'>'.$_prefix.$othertext."</option>\n";
$answer .= '<option value="-oth-"'.$opt_select.'>'.$_prefix.$othertext."</option>\n";
}

if ((isset($_SESSION[$ia[1]]) || $_SESSION[$ia[1]] != '') && $ia[6] != 'Y' && $ia[6] != 'Y' && SHOW_NO_ANSWER == 1)
Expand All @@ -1480,8 +1479,7 @@ function do_list_dropdown($ia)
}
$answer .= '<option value="">'.$_prefix.$clang->gT('No answer')."</option>\n";
}
$answer .= ' </select></label>
<input type="hidden" name="java'.$ia[1].'" id="java'.$ia[1].'" value="'.$_SESSION[$ia[1]].'" />';
$answer .= '</select><input type="hidden" name="java'.$ia[1].'" id="java'.$ia[1].'" value="'.$_SESSION[$ia[1]].'" />';

if (isset($other) && $other=='Y')
{
Expand All @@ -1493,7 +1491,7 @@ function do_list_dropdown($ia)
}
$sselect = '
<p class="question">
<label for="answer'.$ia[1].'">
<label for="answer'.$ia[1].'" class="hide label">'.$clang->gT('Please choose').'</label>
<select name="'.$ia[1].'" id="answer'.$ia[1].'"'.$dropdownSize.' onchange="'.$checkconditionFunction.'(this.value, this.name, this.type);'.$sselect_show_hide.'">
';
$answer = $sselect.$answer;
Expand Down Expand Up @@ -3915,9 +3913,9 @@ function do_numerical($ia)
$kpclass = "";
}
// --> START NEW FEATURE - SAVE
$answer = "<p class=\"question\">\n\t$prefix\n\t<label for=\"answer{$ia[1]}\"><input class=\"text $kpclass\" type=\"text\" size=\"$tiwidth\" name=\"$ia[1]\" "
. "id=\"answer{$ia[1]}\" value=\"{$dispVal}\" alt=\"".$clang->gT('Answer')."\" onkeypress=\"return goodchars(event,'-0123456789{$acomma}')\" onchange='$checkconditionFunction(this.value, this.name, this.type)' "
. " {$maxlength} /></label>\n\t{$suffix}\n</p>\n";
$answer = "<p class=\"question\"><label for='answer{$ia[1]}' class='hide label'>{$clang->gT('Answer')}</label>\n$prefix\t<input class=\"text $kpclass\" type=\"text\" size=\"$tiwidth\" name=\"$ia[1]\" "
. "id=\"answer{$ia[1]}\" value=\"{$dispVal}\" title=\"".$clang->gT('Only numbers may be entered in this field')."\" onkeypress=\"return goodchars(event,'-0123456789{$acomma}')\" onchange='$checkconditionFunction(this.value, this.name, this.type)' "
. " {$maxlength} />\n\t{$suffix}\n</p>\n";
if ($qidattributes['hide_tip']==0)
{
$answer .= "<p class=\"tip\">".$clang->gT('Only numbers may be entered in this field')."</p>\n";
Expand Down Expand Up @@ -4008,7 +4006,7 @@ function do_shortfreetext($ia)
//NEW: textarea instead of input=text field

// --> START NEW FEATURE - SAVE
$answer = '<label for="answer'.$ia[1].'"><textarea class="textarea '.$kpclass.'" name="'.$ia[1].'" id="answer'.$ia[1].'" '
$answer = '<textarea class="textarea '.$kpclass.'" name="'.$ia[1].'" id="answer'.$ia[1].'" <label for="answer'.$ia[1].'" class="hide label">'.$clang->gT('Answer').'</label>'
.'rows="'.$drows.'" cols="'.$tiwidth.'" '.$maxlength.' onchange="'.$checkconditionFunction.'(this.value, this.name, this.type);" '.$numbersonly.'>';
// --> END NEW FEATURE - SAVE

Expand All @@ -4021,7 +4019,7 @@ function do_shortfreetext($ia)
$answer .= $dispVal;
}

$answer .= "</textarea></label>\n";
$answer .= "</textarea>\n";
}
elseif((int)($qidattributes['location_mapservice'])!=0){

Expand Down Expand Up @@ -4102,7 +4100,7 @@ class=\"mapservice\" value = \"{$qidattributes['location_mapservice']}\" >
else
{
//no question attribute set, use common input text field
$answer = "<p class=\"question\">\n\t$prefix\n\t<label for=\"answer$ia[1]\"><input class=\"text $kpclass\" type=\"text\" size=\"$tiwidth\" name=\"$ia[1]\" id=\"answer$ia[1]\"";
$answer = "<p class=\"question\">\n<label for='answer{$ia[1]}' class='hide label'>{$clang->gT('Answer')}</label>\t$prefix\n\t<input class=\"text $kpclass\" type=\"text\" size=\"$tiwidth\" name=\"$ia[1]\" id=\"answer$ia[1]\"";

$dispVal = $_SESSION[$ia[1]];
if ($qidattributes['numbers_only']==1)
Expand All @@ -4112,7 +4110,7 @@ class=\"mapservice\" value = \"{$qidattributes['location_mapservice']}\" >
$dispVal = htmlspecialchars($dispVal,ENT_QUOTES,'UTF-8');
$answer .= " value=\"$dispVal\"";

$answer .=" {$maxlength} onchange=\"$checkconditionFunction(this.value, this.name, this.type)\" $numbersonly /></label>\n\t$suffix\n</p>\n";
$answer .=" {$maxlength} onchange=\"$checkconditionFunction(this.value, this.name, this.type)\" $numbersonly />\n\t$suffix\n</p>\n";
}


Expand Down Expand Up @@ -4195,13 +4193,13 @@ function do_longfreetext($ia)
// <-- END ENHANCEMENT - TEXT INPUT WIDTH

// --> START NEW FEATURE - SAVE
$answer = '<label for="answer'.$ia[1].'"><textarea class="textarea '.$kpclass.'" name="'.$ia[1].'" id="answer'.$ia[1].'" alt="'.$clang->gT('Answer').'" '
$answer = '<label for="answer'.$ia[1].'" class="hide label">'.$clang->gT('Answer').'</label><textarea class="textarea '.$kpclass.'" name="'.$ia[1].'" id="answer'.$ia[1].'" '
.'rows="'.$drows.'" cols="'.$tiwidth.'" '.$maxlength.' onchange="'.$checkconditionFunction.'(this.value, this.name, this.type)" >';
// --> END NEW FEATURE - SAVE

if ($_SESSION[$ia[1]]) {$answer .= str_replace("\\", "", $_SESSION[$ia[1]]);}

$answer .= "</textarea></label>\n";
$answer .= "</textarea>\n";

if (trim($qidattributes['time_limit'])!='')
{
Expand Down Expand Up @@ -4269,13 +4267,13 @@ function do_hugefreetext($ia)
// <-- END ENHANCEMENT - TEXT INPUT WIDTH

// --> START NEW FEATURE - SAVE
$answer = '<label for="answer'.$ia[1].'"><textarea class="textarea '.$kpclass.'" name="'.$ia[1].'" id="answer'.$ia[1].'" alt="'.$clang->gT('Answer').'" '
$answer = '<label for="answer'.$ia[1].'" class="hide label">'.$clang->gT('Answer').'</label><textarea class="textarea '.$kpclass.'" name="'.$ia[1].'" id="answer'.$ia[1].'" '
.'rows="'.$drows.'" cols="'.$tiwidth.'" '.$maxlength.' onchange="'.$checkconditionFunction.'(this.value, this.name, this.type)" >';
// --> END NEW FEATURE - SAVE

if ($_SESSION[$ia[1]]) {$answer .= str_replace("\\", "", $_SESSION[$ia[1]]);}

$answer .= "</textarea></label>\n";
$answer .= "</textarea>\n";

if (trim($qidattributes['time_limit']) != '')
{
Expand Down
8 changes: 2 additions & 6 deletions replacements.php
View file
Expand Up @@ -175,11 +175,7 @@ function templatereplace($line, $replacements=array(), $anonymized=false, $quest

global $answer_id;

if ($_question_type == 'N' || $_question_type == 'U' || $_question_type == 'T' || $_question_type == 'S')
{
$_question_text = '<label for="answer'.$answer_id.'" >'.$_question_text.'</label>';
}
else if ($_question_type == '*')
if ($_question_type == '*')
{
$_question_text = '<div class="em_equation">' .$_question_text. '</div>';
}
Expand Down Expand Up @@ -805,4 +801,4 @@ function dTexts__run($text,$questionNum=NULL)
{
// return LimeExpressionManager::ProcessString($text,$questionNum,NULL,true);
return $text;
}
}
2 changes: 1 addition & 1 deletion templates/citronade/template.css
View file
Expand Up @@ -45,7 +45,7 @@ table{border-collapse:separate;border-spacing:0;border:1px solid gray;margin:0}
table td,table th{border:1px solid #ccc;vertical-align:top;padding:4px}
article,aside,dialog,figure,footer,header,hgroup,menu,nav,section{display:block}
ul#surveylist{list-style:none}
.hide{position:absolute;top:-9999px;left:-9999px}
.hide{position:absolute;top:auto;left:-999999px}
.good{color:#090}
#progress-wrapper{width:252px;font-size:12px;height:20px;margin:0 auto}
#progress-wrapper #progress-pre{float:left;width:45px;text-align:right;margin:0 5px 0 0}
Expand Down

0 comments on commit 6b9287c

Please sign in to comment.