may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Popravki popupov

Browse Source
This commit is contained in:
pero1203 2020-08-17 10:17:37 +02:00
parent ef6ea1c397
commit 71c132c3a2
19 changed files with 163 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
admin/survey/Branching.php
View File

@ -6523,14 +6523,29 @@ class Branching {
function condition_editing ($if, $vrednost=0, $edit_fill_value=0) {
global $lang;
// opozorilo pri urejanju podifa na vrednosti
if ($vrednost > 0) {
echo '<h2>'.$lang['urejanje_podif_alert'].'</h2>';
// Pogoj na vrednost
if($vrednost > 0){
echo '<h2>'.$lang['urejanje_pogoj_popup_vrednost'].'</h2>';
echo '<div class="popup_close"><a href="#" onClick="vrednost_condition_editing_close(\''.$vrednost.'\', \''.$if.'\'); return false;"">✕</a></div>';
echo '<span class="bold">'.$lang['urejanje_podif_alert'].'</span>';
echo '<br /><br />';
$sql = sisplet_query("SELECT naslov FROM srv_vrednost WHERE id='$vrednost'");
$row = mysqli_fetch_assoc($sql);
echo '<div class="condition_editing_vrednost_title">'.$row['naslov'].'</div>';
}
// Pogoj pri npr. obvescanju
elseif($vrednost == -3){
echo '<h2>'.$lang['urejanje_pogoj_popup'].'</h2>';
echo '<div class="popup_close"><a href="#" onClick="alert_if_close(\''.$vrednost.'\', \''.$if.'\'); return false;">✕</a></div>';
}
// Validacija
elseif($vrednost == -4){
echo '<h2>'.$lang['urejanje_pogoj_popup_validacija'].'</h2>';
echo '<div class="popup_close"><a href="#" onClick="validation_if_close(\''.$this->spremenljivka.'\', \''.$if.'\'); return false;">✕</a></div>';
}
$row = Cache::srv_if($if);
@ -6696,23 +6711,31 @@ class Branching {
echo '</div>'; // -- div_condition_editing_float
} elseif ($vrednost == -1) { // filter v DisplayData
}
// filter v DisplayData
elseif ($vrednost == -1) {
// tega niti ni vec...
} elseif ($vrednost == -2) { // profili filtrov
}
// profili filtrov
elseif ($vrednost == -2) {
} elseif ($vrednost == -3) { // klasicen popup v #div_condition_editing, uporablja se npr pri ifih za obvescanje
echo '<span class="buttonwrapper spaceRight floatLeft">';
}
// klasicen popup v #div_condition_editing, uporablja se npr pri ifih za obvescanje
elseif ($vrednost == -3) {
echo '<span class="buttonwrapper floatRight">';
echo '<a class="ovalbutton ovalbutton_orange" href="#" onclick="alert_if_close(\''.$vrednost.'\', \''.$if.'\'); return false;"><span>'.$lang['srv_potrdi'].'</span></a>';
echo '</span>';
echo '<span class="buttonwrapper spaceRight floatLeft">';
echo '<span class="buttonwrapper spaceRight floatRight">';
echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="alert_if_close(\''.$vrednost.'\', \''.$if.'\'); return false;"><span>'.$lang['srv_zapri'].'</span></a>';
echo '</span>';
echo '<span class="buttonwrapper spaceRight floatLeft">';
echo '<span class="buttonwrapper spaceRight floatRight">';
echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="alert_if_remove(\''.$if.'\'); return false;" title="'.$lang['srv_if_rem'].'"><span>'.$lang['srv_if_rem'].'</span></a>'."\n\r";
echo '</span>';
} elseif ($vrednost == -4) { // validacija
echo '<span class="buttonwrapper spaceRight floatRight">';
}
// validacija
elseif ($vrednost == -4) {
echo '<span class="buttonwrapper floatRight">';
echo '<a class="ovalbutton ovalbutton_orange" href="#" onclick="validation_if_close(\''.$this->spremenljivka.'\', \''.$if.'\'); return false;"><span>'.$lang['srv_potrdi'].'</span></a>';
echo '</span>';
echo '<span class="buttonwrapper spaceRight floatRight">';
@ -6722,14 +6745,16 @@ class Branching {
echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="validation_if_remove(\''.$this->spremenljivka.'\', \''.$if.'\'); return false;" title="'.$lang['srv_if_rem'].'"><span>'.$lang['srv_if_rem'].'</span></a>'."\n\r";
echo '</span>';
} else { // filter na vrednosti
echo '<span class="buttonwrapper spaceRight floatLeft">';
}
// filter na vrednosti
else {
echo '<span class="buttonwrapper floatRight">';
echo '<a class="ovalbutton ovalbutton_orange" href="#" onclick="vrednost_condition_editing_close_save(\''.$vrednost.'\', \''.$if.'\'); return false;"><span>'.$lang['srv_potrdi'].'</span></a>';
echo '</span>';
echo '<span class="buttonwrapper spaceRight floatLeft">';
echo '<span class="buttonwrapper spaceRight floatRight">';
echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="vrednost_condition_editing_close(\''.$vrednost.'\', \''.$if.'\'); return false;"><span>'.$lang['srv_zapri'].'</span></a>';
echo '</span>';
echo '<span class="buttonwrapper spaceRight floatLeft">';
echo '<span class="buttonwrapper spaceRight floatRight">';
echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="vrednost_if_remove(\''.$if.'\', \''.$vrednost.'\'); return false;" title="'.$lang['srv_if_rem'].'"><span>'.$lang['srv_if_rem'].'</span></a>'."\n\r";
echo '</span>';
}
@ -7906,7 +7931,7 @@ class Branching {
$this->calculation_edit($row['id'], $vrednost);
}
echo '<p id="calculation_editing_operators" style="margin-left:62px">'.$lang['srv_add_cond'].':
echo '<p id="calculation_editing_operators" style="margin-left:62px; height:50px;">'.$lang['srv_add_cond'].':
<a href="#" onclick="calculation_add(\''.$condition.'\', \'0\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;+&nbsp;</strong></a>,
<a href="#" onclick="calculation_add(\''.$condition.'\', \'1\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;-&nbsp;</strong></a>,
<a href="#" onclick="calculation_add(\''.$condition.'\', \'2\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;*&nbsp;</strong></a>,

12
admin/survey/SurveyAdminAjax.php
View File

@ -4357,10 +4357,6 @@ class SurveyAdminAjax {
echo '</div>';
echo '</div>';
/*
echo '</div>';
*/
}
elseif ($_GET['a'] == 'preview_spremenljivka') {
global $site_path;
@ -4392,7 +4388,9 @@ class SurveyAdminAjax {
}
}
echo '<div id="preview_spremenljivka">';
echo '<div id="preview_spremenljivka">';
echo '<div class="popup_close"><a href="#" onClick="preview_spremenljivka_cancle(); return false;">✕</a></div>';
include_once('../../main/survey/app/global_function.php');
new \App\Controllers\SurveyController(true);
@ -5938,7 +5936,9 @@ class SurveyAdminAjax {
$question_resp_comment_inicialke = SurveySetting::getInstance()->getSurveyMiscSetting('question_resp_comment_inicialke');
$question_resp_comment_inicialke_alert = SurveySetting::getInstance()->getSurveyMiscSetting('question_resp_comment_inicialke_alert');
echo '<h2>'.$lang['srv_test_sett_txt'].'</h2>';
echo '<h2>'.$lang['srv_test_sett_txt'].'</h2>';
echo '<div class="popup_close"><a href="#" onClick="$(\'#vrednost_edit\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;">✕</a></div>';
echo '<form name="testiranje_preview_settings" action="#" method="get">';
echo '<input type="hidden" name="anketa" value="'.$this->anketa.'">';

4
admin/survey/classes/class.Dostop.php
View File

@ -473,6 +473,8 @@ class Dostop {
echo '<h2>'.$lang['srv_anketa'].' '.$rowa['naslov'].'</h2>';
echo '<div class="popup_close"><a href="#" onClick="anketa_user_dostop_close(); return false;">✕</a></div>';
echo '<h3><span class="bold">';
if ($r['type'] == 2) {
@ -621,7 +623,7 @@ class Dostop {
echo '<p>(' . $lang['srv_dostop_edit'] . ', ' . $lang['srv_dostop_data'] . ', ' . $lang['srv_dostop_export'] . ')</p>';
}
echo '<div class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_gray" onclick="anketa_user_dostop_close(); return false;" href="#"><span>' . $lang['srv_zapri'] . '</span></a></div>';
echo '<div class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_gray" onclick="anketa_user_dostop_close(); return false;" href="#"><span>' . $lang['srv_zapri'] . '</span></a></div>';
}
function ajax_anketa_user_dostop_save() {

7
admin/survey/classes/class.GDPR.php
View File

@ -2267,7 +2267,10 @@ class GDPR{
if($ank_id != '' && $ank_id != '0'){
echo '<div id="preview_spremenljivka">';
echo '<div id="preview_spremenljivka">';
echo '<div class="popup_close"><a href="#" onClick="preview_spremenljivka_cancle(); return false;">✕</a></div>';
echo ' <div class="spremenljivka">';
// Naslov vprasanja
@ -2285,7 +2288,7 @@ class GDPR{
echo ' </div>';
// Gumba zapri
echo '<div class="displayTop"><span class="floatRight spaceRight"> <div class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="preview_spremenljivka_cancle(); return false;"><span>Zapri</span></a></div>';
//echo '<div class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="preview_spremenljivka_cancle(); return false;"><span>Zapri</span></a></div>';
echo '</div>';
}

5
admin/survey/classes/class.SurveyConditionProfiles.php
View File

@ -197,10 +197,9 @@ class SurveyConditionProfiles
}
// Naslov
echo '<h2>'.$lang['srv_condition_settings'].'</h2>';
echo '<h2>'.$lang['srv_condition_settings'].'</h2>';
# seznam profilov
# echo '<div id="currentConditionProfile">'.$lang['srv_analiza_selected_profile'].': <b>' . self :: $profiles[$_currMPID]['name'] . '</b></div >';
echo '<div class="popup_close"><a href="#" onClick="conditionProfileAction(\'cancle\'); return false;">✕</a></div>';
if ( self :: $currentProfileId != SCP_DEFAULT_PROFILE ) {
echo '<div id="not_default_setting">';

6
admin/survey/classes/class.SurveyMissingProfiles.php
View File

@ -86,7 +86,9 @@ class SurveyMissingProfiles
static function DisplayProfile( $pid = null) {
global $lang;
echo '<h2>'.$lang['srv_missing_settings'].'</h2>';
echo '<h2>'.$lang['srv_missing_settings'].'</h2>';
echo '<div class="popup_close"><a href="#" onClick="missingProfileAction(\'cancle\'); return false;">✕</a></div>';
if ($pid == null ) {
$pid = self::$currentProfileId;
@ -98,8 +100,6 @@ class SurveyMissingProfiles
echo '</div><br class="clr displayNone">';
}
//echo '<div class="profileHeader">'.$lang['srv_missing_profiles_profile_title'].'</div>';
echo ' <div id="missing_profile_holder">';
self :: DisplayProfileOptions($pid);

9
admin/survey/classes/class.SurveySkupine.php
View File

@ -390,15 +390,18 @@ class SurveySkupine {
// Naslov
echo '<h2>' . $lang['srv_password_add_mass'] . '</h2>';
echo '<p class="bold">' . $lang['srv_password_add_mass_instructions'] . '<br />';
echo '<div class="popup_close"><a href="#" onClick="popupImportAnketaFromText_close();">✕</a></div>';
echo '<p class="bold">' . $lang['srv_password_add_mass_instructions'] . '</p>';
//echo '<span class="italic">' . $lang['srv_password_add_mass_sample'] . '</span></p>';
echo '<textarea id="add_passwords_mass" name="add_passwords_mass" style="width:99%; height:300px; box-sizing:border-box; padding:5px;"></textarea>';
echo '<br /><br />';
echo '<span class="buttonwrapper floatLeft spaceRight"><a class="ovalbutton ovalbutton_gray" href="#" onClick="popupImportAnketaFromText_close();">'.$lang['srv_zapri'].'</a></span>';
echo '<span class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_orange" href="#" onClick="execute_add_passwords_mass();">'.$lang['srv_password_add_mass_execute'].'</a></span>';
echo '<span class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onClick="execute_add_passwords_mass();">'.$lang['srv_password_add_mass_execute'].'</a></span>';
echo '<span class="buttonwrapper floatRight spaceRight"><a class="ovalbutton ovalbutton_gray" href="#" onClick="popupImportAnketaFromText_close();">'.$lang['srv_zapri'].'</a></span>';
}
// Masovno dodajanje gesel

7
admin/survey/classes/class.SurveyStatusProfiles.php
View File

@ -192,7 +192,7 @@ class SurveyStatusProfiles
$popUp = new PopUp();
$popUp->setId('divStatusProfile');
$popUp->setHeaderText($lang['srv_status_settings']);
$popUp->setHeaderText($lang['srv_status_settings']);
#vsebino shranimo v buffer
ob_start();
@ -202,16 +202,15 @@ class SurveyStatusProfiles
echo '</div><br class="clr displayNone">';
}
//echo ' <span style="color:#424242;" >'.$lang['srv_status_profile_note0'].'</span><br/><br class="clr"/>';
echo '<div class="popup_close"><a href="#" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\'); return false;">✕</a></div>';
echo ' <div id="status_profile_holder">';
self :: DisplayProfileOptions($pid);
echo ' </div>';
echo ' <div id="status_profile_data_holder">';
self :: DisplayProfileData($pid);
echo ' <br class="clr" />';
echo ' </div>';
// cover Div

13
admin/survey/classes/class.SurveyTimeProfiles.php
View File

@ -380,7 +380,9 @@ class SurveyTimeProfiles {
$_all_profiles = self::getProfiles();
// Naslov
echo '<h2>'.$lang['srv_obdobje_settings'].'</h2>';
echo '<h2>'.$lang['srv_obdobje_settings'].'</h2>';
echo '<div class="popup_close"><a href="#" onClick="timeProfileAction(\'cancel\'); return false;">✕</a></div>';
if ($current_pid == null) {
$current_pid = self::getCurentProfileId();
@ -434,16 +436,16 @@ class SurveyTimeProfiles {
echo '<div class="time_profile_button_right_holder floatRight">';
if ($current_pid == 0) {
echo '<span class="floatRight spaceRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
echo '<span class="floatRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
# echo '<span class="floatRight spaceRight" title="'.$lang['srv_save_run_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'run_profile\'); return false;"><span>'.$lang['srv_run_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'show_create\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
} else if ($current_pid == -1) {
echo '<span class="floatRight spaceRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
echo '<span class="floatRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'show_create\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
} else {
echo '<span class="floatRight spaceRight" title="'.$lang['srv_save_run_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'run_profile\'); return false;"><span>'.$lang['srv_run_profile'] . '</span></a></div></span>';
echo '<span class="floatRight" title="'.$lang['srv_save_run_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'run_profile\'); return false;"><span>'.$lang['srv_run_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'show_create\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
@ -476,9 +478,8 @@ class SurveyTimeProfiles {
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'do_delete\'); return false;"><span>'.$lang['srv_delete_profile_yes'].'</span></a></span></span>';
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'cancel_delete\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';
echo '</div>';
}
}
/** Funkcija prikaze osnovnih informacije profila
*
*/

11
admin/survey/classes/class.SurveyUrlLinks.php
View File

@ -62,9 +62,11 @@ class SurveyUrlLinks
$popUp->setHeaderText($lang['srv_public_link_title'].':');
#vsebino shranimo v buffer
ob_start();
if ($msg != null)
{
ob_start();
echo '<div class="popup_close"><a href="#" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\'); return false;">✕</a></div>';
if ($msg != null){
echo ($msg);
echo '<br />';
}
@ -160,7 +162,8 @@ class SurveyUrlLinks
# dodamo gumb Preklici
$buttonClose = new PopUpCancelButton();
$buttonClose->setCaption($lang['srv_zapri'])->setTitle($lang['srv_zapri']);
$buttonClose->setCaption($lang['srv_zapri'])->setTitle($lang['srv_zapri']);
$buttonClose->setFloat('right');
$popUp->addButton($buttonClose);
echo $popUp;

BIN
admin/survey/classes/phpqrcode/imgs/code97.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 292 B

38
admin/survey/export/latexclasses/Analize/AnalizaCrosstab.php
View File

@ -573,7 +573,8 @@ class AnalizaCrosstab extends LatexAnalysisElement{
$steviloArrayrulewidth = ($steviloMultiCol1-1);
if($export_format=='pdf'){
$tabela .= " & \multicolumn{".$steviloMultiCol1."}{>{\hsize=\dimexpr".$steviloMultiCol1."\hsize+".$steviloTabColSep."\\tabcolsep+".$steviloArrayrulewidth."\arrayrulewidth\\relax}C|}{".$this->encodeText($sub_q1)."} "; //prvi (prazen) in stolpec z besedilom
//$tabela .= " & \multicolumn{".$steviloMultiCol1."}{>{\hsize=\dimexpr".$steviloMultiCol1."\hsize+".$steviloTabColSep."\\tabcolsep+".$steviloArrayrulewidth."\arrayrulewidth\\relax}C|}{".$this->encodeText($sub_q1)."} "; //prvi (prazen) in stolpec z besedilom
$tabela .= " & \multicolumn{".$steviloMultiCol1."}{>{\hsize=\dimexpr".$steviloMultiCol1."\hsize+".$steviloTabColSep."\\tabcolsep+".$steviloArrayrulewidth."\arrayrulewidth\\relax}c|}{".$this->encodeText($sub_q1)."} "; //prvi (prazen) in stolpec z besedilom
}elseif($export_format=='rtf'){
$tabela .= " & \multicolumn{".$steviloMultiCol1."}{c|}{".$this->encodeText($sub_q1)."} "; //prvi (prazen) in stolpec z besedilom
}
@ -849,7 +850,7 @@ class AnalizaCrosstab extends LatexAnalysisElement{
// skupni sestevki po stolpcih - ZADNJA VRSTICA - konec #############################################################################
$stevec++;
}elseif($presirokaTabela == 1){ //ce je tabela presiroka
}elseif($presirokaTabela == 1){ //ce je tabela presiroka
//print_r($cols);
//echo "<b>velikost tabele: </b>".($velikostTabele)." podatkov je : $cols </br>";
@ -890,8 +891,9 @@ class AnalizaCrosstab extends LatexAnalysisElement{
}else{
$steviloStolpcevParameterTabular = $steviloStolpcevDelnaTabela;
}
//echo "steviloStolpcevParameterTabular1: $steviloStolpcevParameterTabular </br>";
$steviloStolpcevParameterTabular++;
/* echo "steviloStolpcevDelnaTabela: $steviloStolpcevDelnaTabela </br>";
echo "steviloStolpcevParameterTabular1: $steviloStolpcevParameterTabular </br>"; */
//$steviloStolpcevParameterTabular++;
}else{
$steviloStolpcevParameterTabular = $mejaZaVelikeTabele + 1;
}
@ -959,7 +961,8 @@ class AnalizaCrosstab extends LatexAnalysisElement{
$steviloTabColSep = ($steviloMultiCol1-1)*2;
$steviloArrayrulewidth = ($steviloMultiCol1-1);
if($export_format=='pdf'){
$tabela .= " & \multicolumn{".$steviloMultiCol1."}{>{\hsize=\dimexpr".$steviloMultiCol1."\hsize+".$steviloTabColSep."\\tabcolsep+".$steviloArrayrulewidth."\arrayrulewidth\\relax}C|}{".$this->encodeText($sub_q1)."} "; //prvi (prazen) in stolpec z besedilom
//$tabela .= " & \multicolumn{".$steviloMultiCol1."}{>{\hsize=\dimexpr".$steviloMultiCol1."\hsize+".$steviloTabColSep."\\tabcolsep+".$steviloArrayrulewidth."\arrayrulewidth\\relax}C|}{".$this->encodeText($sub_q1)."} "; //prvi (prazen) in stolpec z besedilom
$tabela .= " & \multicolumn{".$steviloMultiCol1."}{>{\hsize=\dimexpr".$steviloMultiCol1."\hsize+".$steviloTabColSep."\\tabcolsep+".$steviloArrayrulewidth."\arrayrulewidth\\relax}c|}{".$this->encodeText($sub_q1)."} "; //prvi (prazen) in stolpec z besedilom
}elseif($export_format=='rtf'){
$tabela .= " & \multicolumn{".$steviloMultiCol1."}{c|}{".$this->encodeText($sub_q1)."} "; //prvi (prazen) in stolpec z besedilom
}
@ -1013,7 +1016,8 @@ class AnalizaCrosstab extends LatexAnalysisElement{
//echo "steviloVmesnihStolpcevPodvrstic $t: $steviloVmesnihStolpcevPodvrstic</br>";
//echo $this->encodeText($text)."</br>";
}
if($niSodo && $t == ($steviloTabel-2)){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
if($niSodo && $t == ($steviloTabel-2) && $reziduali){ //ce ni sodo in je predzadnja podtabela in so reziduali, dodaj se vse potrebno za prazen stolpec
//if($niSodo && $t == ($steviloTabel-2)){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
$tabela .= $this->MultiColCellLatex($steviloVmesnihStolpcevPodvrstic, '');
}
}else{
@ -1031,7 +1035,7 @@ class AnalizaCrosstab extends LatexAnalysisElement{
}
//}else{
}elseif(($t == ($steviloTabel-1))){
}elseif(($t == ($steviloTabel-1))){ //ce je zadnja podtabela
//}elseif(($t == ($steviloTabel-1)) && $niSodo == 1){
$tabela .= " & ";
$tabela .= $this->encodeText($lang['srv_analiza_crosstab_skupaj']); //izpis naslova zadnjega stolpca 2. vrstice
@ -1080,7 +1084,6 @@ class AnalizaCrosstab extends LatexAnalysisElement{
# frekvence crostabov
$crossChk0 = ((int)$crosstabs_value[$ckey1][$ckey2] > 0) ? $crosstabs_value[$ckey1][$ckey2] : 0;
$tabela1 .= $this->DisplayLatexCells($crossChk0, $podVrstice, $colNum);
/* if($niSodo && $t == ($steviloTabel-2)){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
$tabela1 .= $this->MultiColCellLatex($steviloVmesnihStolpcevPodvrstic, '');
} */
@ -1122,8 +1125,8 @@ class AnalizaCrosstab extends LatexAnalysisElement{
//echo "tabela 3: $tabela3 </br>";
}
if($niSodo && $t == ($steviloTabel-2)){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
//if($niSodo && $t == ($steviloTabel-2)){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
if($niSodo && $t == ($steviloTabel-2) && $reziduali){ //ce ni sodo in je predzadnja podtabela in je potrebno izpisati reziduale, dodaj se vse potrebno za prazen stolpec
$tabela1 .= $this->MultiColCellLatex($steviloVmesnihStolpcevPodvrstic, '');
}
@ -1181,7 +1184,8 @@ class AnalizaCrosstab extends LatexAnalysisElement{
}
if($niSodo && $t == ($steviloTabel-2)){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
if($niSodo && $t == ($steviloTabel-2) && $reziduali){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
//if($niSodo && $t == ($steviloTabel-2)){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
$tabela2 .= $this->MultiColCellLatex($steviloVmesnihStolpcevPodvrstic, '');
}
@ -1195,7 +1199,8 @@ class AnalizaCrosstab extends LatexAnalysisElement{
$tabela .= ' \cline{2-'.$steviloStolpcevParameterTabular.'}'; //je potrebno urediti prvi stolpec tako, da ni crt med celicami
}
if($niSodo && $t == ($steviloTabel-2)){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
if($niSodo && $t == ($steviloTabel-2) && $reziduali){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
//if($niSodo && $t == ($steviloTabel-2)){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
$tabela3 .= $this->MultiColCellLatex($steviloVmesnihStolpcevPodvrstic, '');
}
@ -1221,14 +1226,15 @@ class AnalizaCrosstab extends LatexAnalysisElement{
}
}
//izpis vmesnih vrstic tabele - konec ##################################################################################
//echo "tabela 2: $tabela2 </br>";
//echo "tabela 3: $tabela3 </br>";
// skupni sestevki po stolpcih - ZADNJA VRSTICA ########################################################################
//izpis celice v prvem stolpcu
if($export_format != 'xls'){
$tabela .= $this->MultiRowCellLatex($steviloVmesnihVrstic, $this->encodeText($lang['srv_analiza_crosstab_skupaj']), $tabela2, $tabela3, $cols[$t]);
}else{
$tabela .= $this->encodeText($lang['srv_analiza_crosstab_skupaj']);
}
@ -1302,7 +1308,8 @@ class AnalizaCrosstab extends LatexAnalysisElement{
echo "tabelaZadnja2: $tabelaZadnja2</br>"; */
$tabela .= $tabelaZadnja1; //izpis 1. podvrstice s freq
if($niSodo && $t == ($steviloTabel-2)){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
if($niSodo && $t == ($steviloTabel-2) && $reziduali){ //ce ni sodo in je predzadnja podtabela in reziduali, dodaj se vse potrebno za prazen stolpec
//if($niSodo && $t == ($steviloTabel-2)){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
$tabela .= $this->MultiColCellLatex($steviloVmesnihStolpcevPodvrstic, '');
}
$tabela .= $this->texNewLine;
@ -1319,7 +1326,8 @@ class AnalizaCrosstab extends LatexAnalysisElement{
if($steviloVmesnihVrstic > 1 && $tabela2!=''){ //ce je potrebno multirow prikazovanje
$tabela .= $tabelaZadnja2; //izpis 2. vrstice z odstotki
if($niSodo && $t == ($steviloTabel-2)){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
if($niSodo && $t == ($steviloTabel-2) && $reziduali){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
//if($niSodo && $t == ($steviloTabel-2)){ //ce ni sodo in je predzadnja podtabela, dodaj se vse potrebno za prazen stolpec
$tabela .= $this->MultiColCellLatex($steviloVmesnihStolpcevPodvrstic, '');
}
$tabela .= $this->texNewLine;

1
admin/survey/script/js-lang.php
View File

@ -189,6 +189,7 @@ lang('srv_heatmap_radius');
lang('srv_delete_testdata_warning');
lang('srv_alert_upload_size');
lang('srv_alert_upload_ext');
lang('srv_trans_lang');
//LOKACIJA

6
admin/survey/script/script.js
View File

@ -4811,12 +4811,12 @@ function inline_jezik_edit(id_value){
id.replaceWith('<div class="fixed-position"><div id="vrednost_edit">'+
'<br /><textarea name="'+id_value+'" id="'+id_value+'">'+id.html()+'</textarea>'+
'<br><textarea name="'+id_value+'" id="'+id_value+'">'+id.html()+'</textarea>'+
// Hidden textarea kamor shranimo staro vrednost, da jo lahko ponastavimo
'<textarea name="old_val_'+id_value+'" style="visibility:hidden; display:none;">'+id.html()+'</textarea><br />'+
// Gumb shrani
// Gumb shrani
'<span class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inline_jezik_save(\''+id_value+'\');">'+
'<span>'+lang['save']+'</span>'+
'</a></span>'+
@ -4824,7 +4824,7 @@ function inline_jezik_edit(id_value){
// Gumb zapri
'<span class="buttonwrapper floatRight spaceRight"><a class="ovalbutton ovalbutton_gray" href="#" onclick="inline_jezik_reset(\''+id_value+'\');">'+
'<span>'+lang['srv_zapri']+'</span>'+
'</a></span>'+
'</a></span><br><br>'+
'</div></div>');

9
lang/1.php
View File

@ -113,7 +113,7 @@ $lang = array (
"app_installation" => "Lastna namestitev 1KA aplikacije",
"app_virtual_domain" => "Virtualna domena 1KA aplikacije",
"app_aai_installation" => "AAI namestitev 1KA aplikacije",
"app_aai_installation_text" => "<b>Z orodjem 1KA lahko na enostaven način izdelate spletni vprašalnik, izvedete spletno anketo, urejate in analizirate podatke, s kar najmanjšim številom klikov.</b><br /><br />Za uporabo orodja 1KA se lahko registrirate oziroma prijavite z vašim Arnes AAI računom.<br /><br />Kliknite na spodnji gumb in sledite navodilom za prijavo v AAI.",
"app_aai_installation_text" => "<b>Z orodjem 1KA lahko na enostaven način izdelate spletni vprašalnik, izvedete spletno anketo, urejate in analizirate podatke, s kar najmanjšim številom klikov.</b><br /><br />Za uporabo orodja 1KA se lahko registrirate oziroma prijavite z vašim Arnes AAI-računom.<br /><br />Kliknite na spodnji gumb in sledite navodilom za prijavo v AAI.",
"check_and" => "Preverite in",
"submit" => "potrdite spremembe",
"dontwant" => "Ne elim ve&#269; prejemati on-line novic",
@ -2022,7 +2022,7 @@ $lang = array (
"srv_alert_show_missing" => "Prikaži opcijo \"Ne vem\" ob opozorilu",
"srv_alert_show_missing_98" => "Prikaži opcijo \"Zavrnil\" ob opozorilu",
"srv_alert_show_missing_97" => "Prikaži opcijo \"Neustrezno\" ob opozorilu",
"srv_alert_upload_size" => "Naložena datoteka je prevelika! Največja dovoljena velikost je 20 MB.",
"srv_alert_upload_size" => "Naložena datoteka je prevelika! Največja dovoljena velikost je 16 MB.",
"srv_alert_upload_ext" => "Naložen tip datoteke ni dovoljen!",
"srv_dostop" => "Anketo lahko ureja avtor in vsi",
"srv_izpolnjujejo" => "Anketo lahko izpolnjujejo",
@ -2936,7 +2936,10 @@ $lang = array (
"oblikovanje_if" => "Urejanje pogojev",
"oblikovanje_blok" => "Urejanje bloka",
"sintaksa_if" => "Predogled pogojev",
"urejanje_podif_alert" => "Urejate pogoj za prikaz izbrane vrstice (kategorije, podvpra&#353;anja) in ne celega vpra&#353;anja!",
"urejanje_podif_alert" => "Urejate pogoj za prikaz izbrane vrstice (kategorije, podvpra&#353;anja) in ne celega vpra&#353;anja!",
"urejanje_pogoj_popup" => "Uredi pogoj",
"urejanje_pogoj_popup_vrednost" => "Uredi pogoj na kategoriji",
"urejanje_pogoj_popup_validacija" => "Uredi validacijo",
"srv_setting_onlyAuthor" => "Samo avtor",
"srv_url" => "URL",
"srv_embed_link" => "Embed",

13
lang/2.php
View File

@ -101,7 +101,7 @@ $lang = array (
"app_installation" => "Installation 1KA application",
"app_virtual_domain" => "Virtual domain 1KA application",
"app_aai_installation" => "AAI installation 1KA application",
"app_aai_installation_text" => "<b>With the 1KA tool, you can easily create an online questionnaire, conduct an online survey, edit and analyze data with as few clicks as possible.</b><br /><br />You can register or login into 1KA application with your Arnes AAI account.<br /><br />Click bottom button and follow instructions for AAI login.",
"app_aai_installation_text" => "<b>With the 1KA tool, you can easily create an online questionnaire, conduct an online survey, edit and analyze data with as few clicks as possible.</b><br /><br />You can register or login into 1KA application with your Arnes AAI-account.<br /><br />Click bottom button and follow instructions for AAI login.",
"check_and" => "Check and",
"submit" => "submit",
"dontwant" => "I don't want to receive any more e-mail",
@ -2009,7 +2009,7 @@ $lang = array (
"srv_alert_show_missing" => "Show option \"Don\'t know\" on alert",
"srv_alert_show_missing_98" => "Show option \"Refused\" on alert",
"srv_alert_show_missing_97" => "Show option \"Invalid\" on alert",
"srv_alert_upload_size" => "Uploaded file is too large! Maximum file size is 20 MB.",
"srv_alert_upload_size" => "Uploaded file is too large! Maximum file size is 16 MB.",
"srv_alert_upload_ext" => "Uploaded file type is not allowed!",
"srv_dostop" => "Survey can be edited by",
"srv_izpolnjujejo" => "Survey can be answered by",
@ -2912,7 +2912,10 @@ $lang = array (
"oblikovanje_if" => "Condition editing",
"oblikovanje_blok" => "Block editing",
"sintaksa_if" => "Syntax of conditions",
"urejanje_podif_alert" => "You are editing condition to display a row inside a question and not entire question!",
"urejanje_podif_alert" => "You are editing condition to display a row inside a question and not entire question!",
"urejanje_pogoj_popup" => "Edit condition",
"urejanje_pogoj_popup_vrednost" => "Edit category condition",
"urejanje_pogoj_popup_validacija" => "Edit validation",
"srv_setting_onlyAuthor" => "Only author",
"srv_url" => "URL",
"srv_embed_link" => "Embed",
@ -6360,8 +6363,8 @@ $lang = array (
'login_with_account' => 'Login with account',
'login_with_google' => 'Gmail account',
'login_with_facebook' => 'Facebook account',
'login_with_aai' => 'AAI account',
'login_with_aai_title' => 'Login with AAI account',
'login_with_aai' => 'AAI-account',
'login_with_aai_title' => 'Login with AAI-account',
'login_with_yahoo' => 'Login with Yahoo account',
'login_with_msn' => 'Login with MSN account',
'login_register' => 'Register',

30
public/css/admin.css
View File

@ -8160,6 +8160,7 @@ span.faicon.inv_unsubscribed_1::before {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -8488,6 +8489,7 @@ body.waitlong #loading {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -8650,6 +8652,7 @@ body.waitlong #loading {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -8989,7 +8992,7 @@ body.waitlong #loading {
}
#calculation #condition_editing_close {
float: right;
margin: 40px 20px 20px 0;
margin: 20px 20px 20px 0;
}
#calculation #bottom_space {
bottom: 0;
@ -9019,6 +9022,7 @@ body.waitlong #loading {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -9118,6 +9122,7 @@ body.waitlong #loading {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -9231,6 +9236,7 @@ body.waitlong #loading {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -9456,6 +9462,7 @@ and open the template in the editor.
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -10570,6 +10577,7 @@ and open the template in the editor.
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -12707,6 +12715,7 @@ table#surveyList_new tr.sl_header_new td.col10 {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -13222,6 +13231,7 @@ li.sortable_noGroup {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -15138,6 +15148,7 @@ and open the template in the editor.
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -17568,6 +17579,7 @@ and open the template in the editor.
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -18489,6 +18501,7 @@ div.inv_step.active a span.circle {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -18661,6 +18674,7 @@ div.inv_step.active a span.circle {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -18827,6 +18841,7 @@ div.inv_step.active a span.circle {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -19092,6 +19107,7 @@ div.listAccess_uid {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -20002,6 +20018,7 @@ and open the template in the editor.
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -20102,6 +20119,7 @@ and open the template in the editor.
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -20235,6 +20253,7 @@ ul.recode_number_sort li {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -20377,6 +20396,7 @@ table#recode_table tr.border_top_lite {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -21454,6 +21474,7 @@ and open the template in the editor.
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -21875,6 +21896,7 @@ and open the template in the editor.
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -24070,6 +24092,7 @@ table.analysis_reports tr td a {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -24752,6 +24775,7 @@ and open the template in the editor.
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -24906,6 +24930,7 @@ and open the template in the editor.
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -25010,6 +25035,7 @@ and open the template in the editor.
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -25114,6 +25140,7 @@ and open the template in the editor.
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;
@ -27493,6 +27520,7 @@ div.theme_label.span_theme_current img {
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;
color: lightgrey;

1
resources/sass/admin/popup/basic.scss
View File

@ -21,6 +21,7 @@
position: absolute !important;
top: 20px;
right: 20px;
z-index: 9999;
font-size: 32px !important;
line-height: 25px;

2
resources/sass/admin/popup/settings.scss
View File

@ -201,7 +201,7 @@
}
#condition_editing_close {
float: right;
margin: 40px 20px 20px 0;
margin: 20px 20px 20px 0;
}
#bottom_space {
bottom: 0;