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

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source 
# Conflicts:
#	public/css/admin_new.css
This commit is contained in:
pero1203 2022-06-07 10:34:52 +02:00
commit ecead8fd95
30 changed files with 756 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/SurveyAdmin.php
View File

@ -4175,7 +4175,7 @@ class SurveyAdmin
echo '<a href="#" onClick="printAnaliza(\'Grafi\'); return false;"' . $lan_print . ' class="srv_ico"><span class="hover_export_icon"><span class="faicon print"></span></span>' . $lang['srv_export_hover_print'] . '</a>'; echo '<a href="#" onClick="printAnaliza(\'Grafi\'); return false;"' . $lan_print . ' class="srv_ico"><span class="hover_export_icon"><span class="faicon print"></span></span>' . $lang['srv_export_hover_print'] . '</a>';
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=charts&anketa=' . $this->anketa) . '" target="_blank"' . $lan_pdf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_charts') ? 'user_access_locked' : '').'" user-access="analysis_charts"><span class="hover_export_icon"><span class="faicon pdf black very_large"></span></span>' . $lang['srv_export_hover_pdf'] . '</a>'; echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=charts&anketa=' . $this->anketa) . '" target="_blank"' . $lan_pdf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_charts') ? 'user_access_locked' : '').'" user-access="analysis_charts"><span class="hover_export_icon"><span class="faicon pdf black very_large"></span></span>' . $lang['srv_export_hover_pdf'] . '</a>';
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=charts_rtf&anketa=' . $this->anketa) . '" target="_blank"' . $lan_rtf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_charts') ? 'user_access_locked' : '').'" user-access="analysis_charts"><span class="hover_export_icon"><span class="faicon rtf black very_large"></span></span>' . $lang['srv_export_hover_rtf'] . '</a>'; echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=charts_rtf&anketa=' . $this->anketa) . '" target="_blank"' . $lan_rtf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_charts') ? 'user_access_locked' : '').'" user-access="analysis_charts"><span class="hover_export_icon"><span class="faicon rtf black very_large"></span></span>' . $lang['srv_export_hover_rtf'] . '</a>';
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=charts_ppt&anketa=' . $this->anketa) . '" target="_blank"' . $lan_ppt . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_charts') ? 'user_access_locked' : '').'" user-access="analysis_charts"><span class="hover_export_icon"><span class="sprites ppt_large"></span></span>' . $lang['srv_export_hover_ppt'] . '</a>'; echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=charts_ppt&anketa=' . $this->anketa) . '" target="_blank"' . $lan_ppt . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_charts') ? 'user_access_locked' : '').'" user-access="analysis_charts"><span class="hover_export_icon"><span class="faicon ppt black"></span></span>' . $lang['srv_export_hover_ppt'] . '</a>';
} }
else if ($_GET['m'] == M_ANALYSIS_MEANS) { else if ($_GET['m'] == M_ANALYSIS_MEANS) {
echo '<a href="#" onclick="doArchiveMeans();"' . $lan_archive . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').' hidden" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv black very_large"></span></span>' . $lang['srv_export_hover_archive'] . '</a>'; echo '<a href="#" onclick="doArchiveMeans();"' . $lan_archive . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').' hidden" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv black very_large"></span></span>' . $lang['srv_export_hover_archive'] . '</a>';

98
admin/survey/SurveyAdminSettings.php
View File

@ -7589,39 +7589,44 @@ class SurveyAdminSettings {
echo '</p>'; echo '</p>';
} }
echo '<div class="question_comment editor">';
// komentarji na vprasanje // komentarji na vprasanje
if ($row1['thread'] > 0) { if ($row1['thread'] > 0) {
if (mysqli_num_rows($sqlt) > 0) { if (mysqli_num_rows($sqlt) > 0) {
echo '<p class="red"><b>'.$lang['srv_admin_comment'].'</b>'; echo '<div class="comment_type">';
//$rowss = mysqli_num_rows($sql);
//if ($rowss > 0) echo $lang['srv_admin_comment'].':';
echo '<img src="img_0/'.($sortpostorder==1?'up':'down').'.gif" style="float:right" title="'.($sortpostorder==1?$lang['forum_desc']:$lang['forum_asc']).'" />';
echo '</p>'; echo '</div>';
$i = 0; $i = 0;
while ($rowt = mysqli_fetch_array($sqlt)) { while ($rowt = mysqli_fetch_array($sqlt)) {
if ($_GET['only_unresolved'] == 1) {
if ($rowt['ocena'] == 0) echo '<span style="color:black">';
elseif ($rowt['ocena'] == 1) echo '<span style="color:darkgreen">';
elseif ($rowt['ocena'] == 2) echo '<span style="color:#999999">';
elseif ($rowt['ocena'] == 3) echo '<span style="color:#999999">';
else echo '<span>';
} else {
if ($rowt['ocena'] == 0) echo '<span style="color:#990000">';
elseif ($rowt['ocena'] == 1) echo '<span style="color:darkgreen">';
elseif ($rowt['ocena'] == 2) echo '<span style="color:black">';
elseif ($rowt['ocena'] == 3) echo '<span style="color:black">';
else echo '<span>';
}
echo '<b>'.$f->user($rowt['uid']).'</b> ('.$f->datetime1($rowt['time']).'):'; echo '<div class="comment_box">';
echo '<div class="by">';
echo $lang['srv_comments_user'].'<span class="user">'.$f->user($rowt['uid']).'</span>'.$lang['srv_comments_user2'];
echo '</div>';
$datetime = strtotime($rowt['time']);
$datetime = date("d.m.Y G:i", $datetime);
echo '<div class="date">';
echo $f->datetime1($rowt['time']);
echo '</div>';
echo '<div class="content">';
echo $rowt['vsebina'];
echo '</div>';
echo '<div class="bottom_options">';
if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) { if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {
echo '<div style="float:right; text-align:right">';
if ($commentmarks == 1) { if ($commentmarks == 1) {
echo ' <select name="ocena" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: this.value, id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> echo ' <select name="ocena" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: this.value, id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});">
<option value="0"'.($rowt['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option> <option value="0"'.($rowt['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
@ -7630,30 +7635,61 @@ class SurveyAdminSettings {
<option value="3"'.($rowt['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option> <option value="3"'.($rowt['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
</select>'; </select>';
} else { } else {
echo '<input type="checkbox" name="ocena_'.$rowt['id'].'" id="ocena_'.$rowt['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (this.checked?\'2\':\'0\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});" value="2" '.($rowt['ocena'] >= 2?' checked':'').' /><label for="ocena_'.$rowt['id'].'">'.$lang['srv_done'].'</label>';
} if ($rowt['ocena']==0) {
echo ' <br /><a href="javascript:comment_on_comment(\''.$rowt['id'].'\');">'.$lang['srv_comment_comment'].'</a>';
echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
echo $lang['srv_comments_archive'].'</p>';
echo '<div class="reply_to" onClick="$(\'#comment_toggle_'.$spr_id.'\').toggle();">';
echo '<a href="javascript:comment_on_comment(\''.$rowt['id'].'\',\''.$f->user($rowt['uid']).'\',\''.$f->datetime1($rowt['time']).'\',\''.$spr_id.'\');"><span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment'].'</a>';
echo '</div>'; echo '</div>';
} }
echo '<br/>'.$rowt['vsebina'].'<span id="comment_on_comment_'.$rowt['id'].'"></span><hr>'; else {
echo '</span>';
echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'0\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon inv_sent_0 empty link-right"></span>';
echo $lang['srv_comments_unarchive'].'</p>';
}
}
}
echo '</div>'; // .bottom_options
echo '</div>'; // comment_box
echo '<div class="reply_to_text" id="comment_on_comment_'.$spr_id.'">';
echo '</div>';
} }
} }
} }
if ($addfieldposition == '' || $addfieldposition == 0) { if ($addfieldposition == '' || $addfieldposition == 0) {
echo '<div id="survey_comment_'.$spr_id.'_'.'4'.'" style="display:none"></div>';
echo '<p><a href="#" onclick="$(\'#comment_field_'.$spr_id.'\').toggle(); return false;">'.$lang['srv_comments_add_comment'].'</a></p>';
echo '<p id="comment_field_'.$spr_id.'" style="display:none">'; echo '<div id="comment_toggle_'.$spr_id.'" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\''.$spr_id.'\')">';
echo '<span class="faicon link-right comments"></span>';
echo $lang['srv_add_comment_toggle'];
echo '</div>';
echo '<div class="comment_wrapper" id="comment_wrapper_'.$spr_id.'">';
echo '<div class="new_comment" id="survey_comment_'.$spr_id.'">';
$ba = new BranchingAjax($this->anketa); $ba = new BranchingAjax($this->anketa);
$ba->add_comment_field($spr_id, '1', '4', false); $ba->add_comment_field($spr_id, '1', '4', false);
echo '</p>'; echo '</div>';
echo '</div>';
} }
echo '</div>'; #editor
echo '<div class="question_comment resp">'; //prazen, respondenti ne komentirajo na IFe in bloke
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>'; #question_comment_holder
} }
} }
// Gre za navadno vprasanje // Gre za navadno vprasanje

22
admin/survey/classes/class.Common.php
View File

@ -2131,9 +2131,29 @@ class Common {
// Izpise obvestilo, da ni podatkov // Izpise obvestilo, da ni podatkov
static function noDataAlert() { static function noDataAlert() {
global $lang; global $lang;
global $anketa;
echo '<div class="no_data_alert">'; echo '<div class="no_data_alert">';
echo $lang['srv_data_no_data'];
echo '<img src="/public/img/images/no_data.svg" />';
echo '<h2>'.$lang['srv_data_no_data'].'</h2>';
echo '<div id="note">';
echo '<p>'.$lang['srv_data_no_data2'].'</p>';
echo '</div>';
$auto = "'". 'index.php?anketa='.$anketa.'&a=testiranje&m=testnipodatki' . "'";
$manual = "'". SurveyInfo::getSurveyLink() . '?preview=on' . "'";
$share = "'". 'index.php?anketa='.$anketa.'&amp;a=vabila' . "'";
echo '<div id="buttons">';
echo '<button class="medium white-blue" onClick="window.location.href='.$auto.';return false;">'.$lang['srv_testiranje_vnosi2'].'</button>';
echo '<button class="medium white-blue" onClick="window.open('.$manual.', \'_blank\');return false;">'.$lang['srv_archive_test_data_text2a'].'</button>';
echo '<button class="medium blue" onclick="window.location.href='.$share.';return false;">'.$lang['srv_anketa_share'].'</button>';
echo '</div>';
echo '</div>'; echo '</div>';
} }

14
admin/survey/classes/class.RecodeValues.php
View File

@ -730,29 +730,31 @@ class RecodeValues {
//echo '<table style="width:65% !important;">'; //echo '<table style="width:65% !important;">';
echo '<table class="question_recode_table">'; echo '<table class="question_recode_table">';
echo '<tr>'; echo '<tr>';
echo '<th class="halfWidth center" colspan="2">'; echo '<th class="main_head center" colspan="2">';
echo $lang['srv_recode_original']; echo $lang['srv_recode_original'];
echo '</th>'; echo '</th>';
echo '<th class="halfWidth center" rowspan="2" style="vertical-align:top;">'; echo '<th class="main_head center" style="vertical-align:top;">';
echo $lang['srv_recode_to']; echo $lang['srv_recode_to'];
echo '</th>'; echo '</th>';
echo '</tr>'; echo '</tr>';
echo '<tr>'; echo '<tr>';
echo '<th class="halfWidth anl_ac">'; echo '<th class="dark">';
echo $lang['srv_label']; echo $lang['srv_label'];
echo '</th>'; echo '</th>';
echo '<th class="halfWidth anl_ac">'; echo '<th class="dark center">';
echo $lang['srv_vrednost']; echo $lang['srv_vrednost'];
echo '</th>'; echo '</th>';
echo '<th>';
echo '</th>';
echo '</tr>'; echo '</tr>';
foreach (self::$variables AS $vKey => $variable) { foreach (self::$variables AS $vKey => $variable) {
echo '<tr>'; echo '<tr>';
echo '<td class="anl_ac">'; echo '<td class="labela">';
echo $variable['naslov']; echo $variable['naslov'];
echo '</td>'; echo '</td>';
echo '<td class="anl_ac">'; echo '<td class="center">';
echo '&nbsp;&nbsp;['.$variable['variable'].']'; echo '&nbsp;&nbsp;['.$variable['variable'].']';
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';

18
admin/survey/classes/class.SurveyCustomReport.php
View File

@ -561,10 +561,10 @@ class SurveyCustomReport {
// Izbira podtipa (tabela / graf) // Izbira podtipa (tabela / graf)
echo ' <input style="margin-left:16px;" type="radio" value="0" id="report_element_sub_type_'.$reportElement['id'].'_0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />'; echo ' <input style="margin-left:16px;" type="radio" value="0" id="report_element_sub_type_'.$reportElement['id'].'_0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
echo ' <label for="id="report_element_sub_type_'.$reportElement['id'].'_0">'.$lang['srv_table'].'</label>'; echo ' <label for="report_element_sub_type_'.$reportElement['id'].'_0">'.$lang['srv_table'].'</label>';
echo ' <input type="radio" value="1" id="report_element_sub_type_'.$reportElement['id'].'_1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />'; echo ' <input type="radio" value="1" id="report_element_sub_type_'.$reportElement['id'].'_1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
echo ' <label for="id="report_element_sub_type_'.$reportElement['id'].'_1">'.$lang['srv_chart'].'</label>'; echo ' <label for="report_element_sub_type_'.$reportElement['id'].'_1">'.$lang['srv_chart'].'</label>';
} }
// Nastavitve za TTEST // Nastavitve za TTEST
@ -1807,19 +1807,17 @@ class SurveyCustomReport {
// Preimenuje, brise in share lahko samo za lastna porocila // Preimenuje, brise in share lahko samo za lastna porocila
if($this->creportAuthor == $global_user_id){ if($this->creportAuthor == $global_user_id){
echo '<div class="button_holder">'; echo '<p class="blue pointer top16 bottom8" onClick="creport_profile_action(\'show_rename\'); return false;">'.$lang['srv_rename_profile'].'</p>';
echo '<button class="medium white-blue" onClick="creport_profile_action(\'show_rename\'); return false;">'.$lang['srv_rename_profile'].'</button>';
if($this->creportProfile > 0) if($this->creportProfile > 0)
echo '<button class="medium white-blue" onclick="creport_profile_action(\'show_delete\'); return false;">'.$lang['srv_delete_profile'].'</button>'; echo '<p class="blue pointer bottom8" onclick="creport_profile_action(\'show_delete\'); return false;">'.$lang['srv_delete_profile'].'</p>';
echo '<button class="medium blue" onclick="creport_profile_action(\'show_share\'); return false;">'.$lang['srv_custom_report_share'].'</button>'; echo '<p class="blue pointer bottom16" onclick="creport_profile_action(\'show_share\'); return false;">'.$lang['srv_custom_report_share'].'</p>';
echo '</div>';
} }
// Preberemo najkasneje editiran element (cas spreminjanja) /*/ Preberemo najkasneje editiran element (cas spreminjanja)
$sqlt = sisplet_query("SELECT MAX(time_edit) FROM srv_custom_report WHERE ank_id='$this->ank_id' AND usr_id='$this->creportAuthor' AND profile='$this->creportProfile'"); $sqlt = sisplet_query("SELECT MAX(time_edit) FROM srv_custom_report WHERE ank_id='$this->ank_id' AND usr_id='$this->creportAuthor' AND profile='$this->creportProfile'");
if(mysqli_num_rows($sqlt) > 0){ if(mysqli_num_rows($sqlt) > 0){
$rowt = mysqli_fetch_array($sqlt); $rowt = mysqli_fetch_array($sqlt);
@ -1838,7 +1836,7 @@ class SurveyCustomReport {
if($time_edit != '' && $time_edit != '0000-00-00 00:00:00'){ if($time_edit != '' && $time_edit != '0000-00-00 00:00:00'){
$time_edit = strtotime($time_edit); $time_edit = strtotime($time_edit);
echo '<p>'.$lang['srv_custom_report_time_edited'].': <span class="bold">'.date("d.m.Y H:i", $time_edit).'</span></p>'; echo '<p>'.$lang['srv_custom_report_time_edited'].': <span class="bold">'.date("d.m.Y H:i", $time_edit).'</span></p>';
} }*/
echo '</div>'; echo '</div>';
@ -1858,7 +1856,7 @@ class SurveyCustomReport {
$comment = $row['value']; $comment = $row['value'];
} }
echo '<p class="bold">'.$lang['srv_inv_archive_comment'].':</p>'; echo '<p>'.$lang['srv_inv_archive_comment'].':</p>';
// Komentar lahko popravlja samo avtor porocila // Komentar lahko popravlja samo avtor porocila
if($this->creportAuthor == $global_user_id) if($this->creportAuthor == $global_user_id)
echo '<textarea class="textarea" onBlur="creport_profile_comment(this.value)">'.$comment.'</textarea>'; echo '<textarea class="textarea" onBlur="creport_profile_comment(this.value)">'.$comment.'</textarea>';

15
admin/survey/classes/class.SurveyStaticHtml.php
View File

@ -982,15 +982,16 @@ class SurveyStaticHtml
} }
} }
public function displayChartOptions() public function displayChartOptions(){
{
global $lang, $admin_type; global $lang, $admin_type;
SurveyChart::Init($this->sid);
// Nastavitev HQ grafov // Nastavitev HQ grafov
echo '<li><label>'; echo '<li>';
echo $lang['srv_chart_hq'] . ': '; echo ' <input type="checkbox" name="chart_hq" id="chart_hq" onClick="changeChartHq(this)" '.(SurveyChart::$quality == 3 ? ' checked="checked"' : '').'>';
echo '<input type="checkbox" name="chart_hq" id="chart_hq" onClick="changeChartHq(this)" ' . (SurveyChart::$quality == 3 ? ' checked="checked"' : '') . '>'; echo ' <label for="chart_hq">'.$lang['srv_chart_hq'] . '</label>';
echo '</label></li>'; echo '</li>';
// Nastavitev skina grafov // Nastavitev skina grafov
@ -1053,7 +1054,7 @@ class SurveyStaticHtml
if ($hideAdvanced == false) { if ($hideAdvanced == false) {
echo '<li>'; echo '<li>';
echo '<span class="as_link" id="link_chart_color" title="' . $lang['srv_chart_skin'] . '">' . $lang['srv_chart_skin'] . ': <span style="font-weight: 500;">' . $name . '</span></span>'; echo ' <span id="link_chart_color" title="' . $lang['srv_chart_skin'] . '">' . $lang['srv_chart_skin'] . ': <span style="font-weight: 500;">' . $name . '</span></span>';
echo '</li>'; echo '</li>';
} }
} }

18
admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
View File

@ -2007,7 +2007,7 @@ class SurveyAnalysis {
if ($variable['other'] != true) { if ($variable['other'] != true) {
echo '<td class="cell_value cell_noPadding">'; echo '<td class="cell_value cell_noPadding">';
echo ' <table class="cell_table">'; echo ' <table class="cell_table freq_row percent_row">';
echo ' <tr id="'.$spid.'_'.$_sequence.'" name="single_sums_percent_cnt_'.$spid.'">'; echo ' <tr id="'.$spid.'_'.$_sequence.'" name="single_sums_percent_cnt_'.$spid.'">';
echo ' <td>'.$_cnt.'</td>'; echo ' <td>'.$_cnt.'</td>';
echo ' </tr>'; echo ' </tr>';
@ -2156,7 +2156,7 @@ class SurveyAnalysis {
echo '<td class="cell_value cell_noPadding">'; echo '<td class="cell_value cell_noPadding">';
echo '<table class="cell_table">'; echo '<table class="cell_table freq_row percent_row">';
echo ' <tr id="'.$spid.'_'.$_sequence.'" name="single_sums_percent_cnt_'.$spid.'">'; echo ' <tr id="'.$spid.'_'.$_sequence.'" name="single_sums_percent_cnt_'.$spid.'">';
echo ' <td class="' . (self::$enableInspect == true && (int)$_cnt > 0 ? ' mc_inspect' : '').'"' echo ' <td class="' . (self::$enableInspect == true && (int)$_cnt > 0 ? ' mc_inspect' : '').'"'
. (self::$enableInspect == true && (int)$_cnt > 0 ? ' vkey="1"' : '') . (self::$enableInspect == true && (int)$_cnt > 0 ? ' vkey="1"' : '')
@ -2178,7 +2178,7 @@ class SurveyAnalysis {
echo '<td class="cell_value cell_noPadding">'; echo '<td class="cell_value cell_noPadding">';
echo '<table class="cell_table">'; echo '<table class="cell_table freq_row percent_row">';
echo ' <tr name="single_sums_percent_cnt_'.$spid.'">'; echo ' <tr name="single_sums_percent_cnt_'.$spid.'">';
echo ' <td>'.$_arguments.'</td>'; echo ' <td>'.$_arguments.'</td>';
echo ' </tr>'; echo ' </tr>';
@ -2962,7 +2962,7 @@ class SurveyAnalysis {
echo '<td class="cell_value cell_noPadding">'; echo '<td class="cell_value cell_noPadding">';
echo ' <table class="cell_table">'; echo ' <table class="cell_table freq_row percent_row">';
echo ' <tr name="single_sums_percent_cnt_'.$spid.'">'; echo ' <tr name="single_sums_percent_cnt_'.$spid.'">';
echo ' <td class="'.(self::$enableInspect == true && (int)self::$_FREQUENCYS[$_sequence]['valid'][$key]['cnt'] > 0 ? ' mg_inspect' : '').'"' echo ' <td class="'.(self::$enableInspect == true && (int)self::$_FREQUENCYS[$_sequence]['valid'][$key]['cnt'] > 0 ? ' mg_inspect' : '').'"'
.(self::$enableInspect == true && (int)self::$_FREQUENCYS[$_sequence]['valid'][$key]['cnt'] > 0 ? ' vkey="'.$key.'"' : '') .(self::$enableInspect == true && (int)self::$_FREQUENCYS[$_sequence]['valid'][$key]['cnt'] > 0 ? ' vkey="'.$key.'"' : '')
@ -2983,7 +2983,7 @@ class SurveyAnalysis {
// suma // suma
echo '<td class="cell_value cell_noPadding">'; echo '<td class="cell_value cell_noPadding">';
echo ' <table class="cell_table">'; echo ' <table class="cell_table freq_row percent_row">';
echo ' <tr name="single_sums_percent_cnt_'.$spid.'">'; echo ' <tr name="single_sums_percent_cnt_'.$spid.'">';
echo ' <td>'.((int)self::$_FREQUENCYS[$_sequence]['validCnt']).'</td>'; echo ' <td>'.((int)self::$_FREQUENCYS[$_sequence]['validCnt']).'</td>';
echo ' </tr>'; echo ' </tr>';
@ -3313,7 +3313,7 @@ class SurveyAnalysis {
#mg_inspectž #mg_inspectž
echo '<td class="cell_value cell_noPadding">'; echo '<td class="cell_value cell_noPadding">';
echo ' <table class="cell_table">'; echo ' <table class="cell_table freq_row percent_row">';
echo ' <tr name="single_sums_percent_cnt_'.$spid.'">'; echo ' <tr name="single_sums_percent_cnt_'.$spid.'">';
echo ' <td class="'.(self::$enableInspect == true && (int)$variable['freq'] > 0 ? ' dmg_inspect' : '').'" '.(self::$enableInspect == true && (int)$variable['freq'] > 0 ? ' gid="'.$variable['key'].'_1"' : '').'>'.$variable['freq'].'</td>'; echo ' <td class="'.(self::$enableInspect == true && (int)$variable['freq'] > 0 ? ' dmg_inspect' : '').'" '.(self::$enableInspect == true && (int)$variable['freq'] > 0 ? ' gid="'.$variable['key'].'_1"' : '').'>'.$variable['freq'].'</td>';
echo ' </tr>'; echo ' </tr>';
@ -3332,7 +3332,7 @@ class SurveyAnalysis {
// suma // suma
echo '<td class="cell_value cell_noPadding">'; echo '<td class="cell_value cell_noPadding">';
echo ' <table class="cell_table">'; echo ' <table class="cell_table freq_row percent_row">';
echo ' <tr name="single_sums_percent_cnt_'.$spid.'">'; echo ' <tr name="single_sums_percent_cnt_'.$spid.'">';
echo ' <td>'.(int)$grid['suma'].'</td>'; echo ' <td>'.(int)$grid['suma'].'</td>';
echo ' </tr>'; echo ' </tr>';
@ -3361,7 +3361,7 @@ class SurveyAnalysis {
echo '<td class="cell_value cell_noPadding">'; echo '<td class="cell_value cell_noPadding">';
#mg_inspect #mg_inspect
echo ' <table class="cell_table">'; echo ' <table class="cell_table freq_row percent_row">';
echo ' <tr name="single_sums_percent_cnt_'.$spid.'">'; echo ' <tr name="single_sums_percent_cnt_'.$spid.'">';
echo ' <td class="anl_ac'.(self::$enableInspect == true && (int)$variable['freq'] > 0 ? ' dmg_inspect' : '').'" '.(self::$enableInspect == true && (int)$variable['freq'] > 0 ? ' gid="'.$variable['key'].'_2"' : '').'>'.$variable['freq'].'</td>'; echo ' <td class="anl_ac'.(self::$enableInspect == true && (int)$variable['freq'] > 0 ? ' dmg_inspect' : '').'" '.(self::$enableInspect == true && (int)$variable['freq'] > 0 ? ' gid="'.$variable['key'].'_2"' : '').'>'.$variable['freq'].'</td>';
echo ' </tr>'; echo ' </tr>';
@ -3379,7 +3379,7 @@ class SurveyAnalysis {
// suma // suma
echo '<td class="cell_value cell_noPadding">'; echo '<td class="cell_value cell_noPadding">';
echo ' <table class="cell_table">'; echo ' <table class="cell_table freq_row percent_row">';
echo ' <tr name="single_sums_percent_cnt_'.$spid.'">'; echo ' <tr name="single_sums_percent_cnt_'.$spid.'">';
echo ' <td>'.(int)$_right_grid['suma'].'</td>'; echo ' <td>'.(int)$_right_grid['suma'].'</td>';
echo ' </tr>'; echo ' </tr>';

88
admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
View File

@ -479,32 +479,32 @@ class SurveyAnalysisArchive {
echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>'; echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>';
echo '<h2>'.$lang['srv_analiza_arhiv'].'</h2>'; echo '<h2>'.$lang['srv_export_hover_archive_mail'].'</h2>';
# preverimo obstoj datoteke, in dostop # preverimo obstoj datoteke, in dostop
$CAE = self::CheckArchiveExistance($aid); $CAE = self::CheckArchiveExistance($aid);
if ( $CAE > 0) { if ( $CAE > 0) {
# vsebina emaila in naslovi # vsebina emaila in naslovi
echo '<div class="setting_holder">';
echo '<label for="email_archive_list">'.$lang['srv_analiza_archive_message_emails'].'</label>';
echo '<textarea class="textarea email" name="email_archive_list" id="email_archive_list" ></textarea>';
echo '</div>';
echo '<div class="setting_holder">';
echo '<label for="subject">' . $lang['srv_inv_archive_subject_text'] . ': </label>';
echo '<input type="text" class="text large wauto" name="email_archive_subject" id="email_archive_subject" value="'.$lang['srv_analiza_arhiviraj_mail_subject'].'"/>';
echo '</div>';
echo '<labelfor="email_archive_text">' . $lang['message'] . ':</label>';
echo '<div id="div_archives_email_wrap">'; echo '<div id="div_archives_email_wrap">';
echo '<div id="div_archives_email_left">'; echo '<div id="div_archives_email_left">';
echo '<p>'.$lang['srv_analiza_archive_message_note'].'</p>';
echo '<div ><label for="email_archive_list">'.$lang['srv_analiza_archive_message_emails'].':</label>'."\n";
echo '<textarea name="email_archive_list" rows="4" id="email_archive_list" ></textarea>'."\n";
echo '</div>';
echo '<br>';
echo '<div class="anl_dash_bt">';
echo '<br/><label for="subject">' . $lang['subject'] . ': </label>';
echo '<input type="text" name="email_archive_subject" id="email_archive_subject" value="'.$lang['srv_analiza_arhiviraj_mail_subject'].'" size="90"/></p>';
echo '<p><label for="email_archive_text">' . $lang['text'] . ':</label>'."\n";
$signature = Common::getEmailSignature(); $signature = Common::getEmailSignature();
echo '<textarea name="email_archive_text" id="email_archive_text" rows="2" >' . nl2br($lang['srv_analiza_arhiviraj_mail_text'].$signature). '</textarea>'."\n"; echo '<textarea name="email_archive_text" id="email_archive_text" rows="2" >' . nl2br($lang['srv_analiza_arhiviraj_mail_text'].$signature). '</textarea>'."\n";
echo '</div>';
echo '<script type="text/javascript">'."\n"; echo '<script type="text/javascript">'."\n";
echo 'if ($("#email_archive_text")) {'."\n"; echo 'if ($("#email_archive_text")) {'."\n";
@ -512,46 +512,51 @@ class SurveyAnalysisArchive {
echo '}'."\n"; echo '}'."\n";
echo '</script>'."\n"; echo '</script>'."\n";
echo '</div>'."\n"; echo '</div>'; #left
#gumbi
echo '<div id="div_archives_email_right" >'."\n"; echo '<div id="div_archives_email_right" >'."\n";
echo '<div id="div_archives_email_buttons">'; //Navodila
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_do_send_mail'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="sendEmailArchiveAnaliza(\''.$aid.'\'); return false;"><span>'.$lang['srv_analiza_arhiviraj_do_send_mail'].'</span></a></span></span>'."\n"; echo '<div class="message_instructions">';
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="cancleArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n";
echo '<br class="clr" />'; echo '<p class="bold caps bottom32">'.$lang['srv_alert_instruction1'].'</p>';
echo '<p class="bottom32">'.$lang['srv_alert_instruction1c'].'</p>';
echo '<div class="sistemske">';
echo '<p>'.$lang['srv_alert_instruction_link_archive'].'</p>';
echo '<p>'.$lang['srv_alert_instruction_url_archive'].'</p>';
echo '<p>'.$lang['srv_alert_instruction_name_archive'].'</p>';
echo '<p>'.$lang['srv_alert_instruction_survey'].'</p>';
echo '<p>'.$lang['srv_alert_instruction_date'].'</p>';
echo '<p>'.$lang['srv_alert_instruction_site'].'</p>';
echo '</div>'; echo '</div>';
echo '<div id="div_error">';
# navodila
echo $lang['srv_analiza_arhiviraj_mail_note_0'];
echo '</div>';
echo '<br/>';
echo '<br/>';
echo '<div id="div_error">';
# navodila
echo $lang['srv_analiza_arhiviraj_mail_note_1'];
echo '</div>'; echo '</div>';
echo '</div>'; //right echo '</div>'; //right
echo '</div>'; //wrap echo '</div>'; //wrap
#gumbi
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="cancleArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';
echo '<button class="medium blue" onclick="sendEmailArchiveAnaliza(\''.$aid.'\'); return false;">'.$lang['srv_analiza_arhiviraj_do_send_mail'].'</button>';
echo '</div>';
} else { } else {
self::DisplayError($CAE); self::DisplayError($CAE);
} }
echo '</div>'."\n"; // end div_analiza_archive_name echo '</div>'; // end div_analiza_archive_name
} }
static function SendEmailArchive($aid = null, $subject, $text, $emails) { static function SendEmailArchive($aid = null, $subject, $text, $emails) {
global $lang, $site_url, $site_path, $global_user_id; global $lang, $site_url, $site_path, $global_user_id;
echo '<div id="div_analiza_archive_name" class="divPopUp PopUpNarrow">'."\n"; echo '<div id="div_analiza_archive_name">'."\n";
echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>'; echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>';
echo '<h2>'.$lang['srv_analiza_arhiv'].'</h2>'; echo '<h2>'.$lang['srv_export_hover_archive_mail'].'</h2>';
$CAE = self::CheckArchiveExistance($aid); $CAE = self::CheckArchiveExistance($aid);
if ( $CAE > 0) { if ( $CAE > 0) {
@ -652,13 +657,15 @@ class SurveyAnalysisArchive {
echo 'Pri pošiljanju e-mailov je prišlo do napake!'; echo 'Pri pošiljanju e-mailov je prišlo do napake!';
} }
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="cancleArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n"; echo '<div class="button_holder">';
echo '<br class="clr" />'; echo '<button class="medium blue" onclick="closeArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';
echo '</div>';
} else { } else {
self::DisplayError($CAE); self::DisplayError($CAE);
} }
echo '</div>'."\n"; // end div_analiza_archive_name echo '</div>'; // end div_analiza_archive_name
} }
static function EditArchive($aid) { static function EditArchive($aid) {
@ -984,8 +991,9 @@ class SurveyAnalysisArchive {
echo '</div>'; echo '</div>';
if ($showButton) { if ($showButton) {
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="closeArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n"; echo '<div class="button_holder">';
echo '<br class="clr" />'; echo '<button class="medium blue" onclick="closeArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';
echo '</div>';
} }
} }

5
admin/survey/classes/surveyAnalysis/class.SurveyChart.php
View File

@ -313,7 +313,6 @@ class SurveyChart {
// prikazemo nastavitve // prikazemo nastavitve
if (self::$isArchive != true && self::$publicChart != true) { if (self::$isArchive != true && self::$publicChart != true) {
self::displayGlobalSettings(); self::displayGlobalSettings();
echo "<br/>\n";
} }
# preberemo header # preberemo header
@ -7091,8 +7090,8 @@ class SurveyChart {
echo '<ul>'; echo '<ul>';
echo '<li>'; echo '<li>';
echo $lang['srv_chart_hq'].': '; echo ' <input type="checkbox" name="chart_hq" id="chart_hq" onClick="changeChartHq(this)" '.(self::$quality == 3 ? ' checked="checked"' : '').'>';
echo '<input type="checkbox" name="chart_hq" id="chart_hq" onClick="changeChartHq(this)" '.(self::$quality == 3 ? ' checked="checked"' : '').'>'; echo ' <label for="chart_hq">'.$lang['srv_chart_hq'].'</label>';
echo '</li>'; echo '</li>';
# nastavitev skina grafov # nastavitev skina grafov

4
admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
View File

@ -2182,9 +2182,9 @@ class SurveyMultiCrosstabs {
echo '</span>'; echo '</span>';
// Cas kreiranja tabele // Cas kreiranja tabele
echo '<div style="float:right; text-align:right;">'; echo '<div id="table_create_time">';
$time_created = strtotime($current_table['time_created']); $time_created = strtotime($current_table['time_created']);
echo $lang['srv_multicrosstabs_tables_time'].': <span class="bold">'.date("d.m.Y H:i", $time_created).'</span><br />'; echo $lang['srv_multicrosstabs_tables_time'].': <span class="bold">'.date("d.m.Y H:i", $time_created).'</span>';
echo '</div>'; echo '</div>';

9
admin/survey/script/progressBar.js
View File

@ -35,7 +35,11 @@ var starttime = 0;
*/ */
function init_progressBar (getProgress) { function init_progressBar (getProgress) {
if (typeof(getProgress) == 'undefined') getProgress = false; // Po novem nimamo vec progress bara in prikazemo samo "nalaganje"
$('body').addClass('waitlong');
$("#loading").show();
/*if (typeof(getProgress) == 'undefined') getProgress = false;
$('#fade').fadeTo('slow', 1); $('#fade').fadeTo('slow', 1);
$('#fullscreen').show(); $('#fullscreen').show();
@ -55,8 +59,7 @@ function init_progressBar (getProgress) {
var d = new Date(); var d = new Date();
starttime = d.getTime(); starttime = d.getTime();
pbInterval=window.setInterval("refresh_progressBar("+getProgress+")",250); // klicemo na 250ms pbInterval=window.setInterval("refresh_progressBar("+getProgress+")",250); // klicemo na 250ms*/
} }
/** /**

22
admin/survey/script/script_analiza.js
View File

@ -732,13 +732,19 @@ function show_single_percent(id, status) {
if($('#freq-p_button_1_'+id).hasClass('active')){ if($('#freq-p_button_1_'+id).hasClass('active')){
if($('#freq-p_button_2_'+id).hasClass('active')){ if($('#freq-p_button_2_'+id).hasClass('active')){
$('[name=single_sums_percent_cnt_'+id+']').each(function() {$(this).hide();}); $('[name=single_sums_percent_cnt_'+id+']').each(function() {
$(this).hide().parent().parent().removeClass('freq_row');
});
$('#freq-p_button_1_'+id).removeClass('active'); $('#freq-p_button_1_'+id).removeClass('active');
} }
} }
// Prizgemo // Prizgemo
else{ else{
$('[name=single_sums_percent_cnt_'+id+']').each(function() {$(this).show();}); $('[name=single_sums_percent_cnt_'+id+']').each(function() {
$(this).show().parent().parent().addClass('freq_row');
});
$('#freq-p_button_1_'+id).addClass('active'); $('#freq-p_button_1_'+id).addClass('active');
} }
} }
@ -749,13 +755,19 @@ function show_single_percent(id, status) {
if($('#freq-p_button_2_'+id).hasClass('active')){ if($('#freq-p_button_2_'+id).hasClass('active')){
if($('#freq-p_button_1_'+id).hasClass('active')){ if($('#freq-p_button_1_'+id).hasClass('active')){
$('[name=single_sums_percent_'+id+']').each(function() {$(this).hide();}); $('[name=single_sums_percent_'+id+']').each(function() {
$(this).hide().parent().parent().removeClass('percent_row');
});
$('#freq-p_button_2_'+id).removeClass('active'); $('#freq-p_button_2_'+id).removeClass('active');
} }
} }
// Prizgemo // Prizgemo
else{ else{
$('[name=single_sums_percent_'+id+']').each(function() {$(this).show();}); $('[name=single_sums_percent_'+id+']').each(function() {
$(this).show().parent().parent().addClass('percent_row');
});
$('#freq-p_button_2_'+id).addClass('active'); $('#freq-p_button_2_'+id).addClass('active');
} }
} }
@ -953,7 +965,7 @@ function createArchiveBeforeEmail() {
if (parseInt(response) > 0) { if (parseInt(response) > 0) {
var aid = parseInt(response); var aid = parseInt(response);
$("#fullscreen").load('ajax.php?a=emailArchiveAnaliza', {anketa: srv_meta_anketa_id, podstran: srv_meta_podstran, aid:aid}, function() { $("#fullscreen").load('ajax.php?a=emailArchiveAnaliza', {anketa: srv_meta_anketa_id, podstran: srv_meta_podstran, aid:aid}, function() {
$('#fullscreen').addClass("PopUpNarrow divPopUp").show(); $('#fullscreen').addClass("divPopUp").show();
}); });
} else { } else {
if (parseInt(response) == -1) { if (parseInt(response) == -1) {

13
lang/1.php
View File

@ -1907,6 +1907,7 @@ $lang = array (
"srv_anketa_is_not_active" => "NEAKTIVNA", "srv_anketa_is_not_active" => "NEAKTIVNA",
"srv_anketa_is_finished" => "ZAKLJUČENA", "srv_anketa_is_finished" => "ZAKLJUČENA",
"srv_anketa_href" => "HTML koda povezave", "srv_anketa_href" => "HTML koda povezave",
"srv_anketa_share" => "Deli anketo z respondenti",
"srv_anketa_href_text" => "Delite povezavo do ankete na vaši spletni strani.", "srv_anketa_href_text" => "Delite povezavo do ankete na vaši spletni strani.",
"srv_anketa_href_count" => "HTML koda s števcem ogledov", "srv_anketa_href_count" => "HTML koda s števcem ogledov",
"srv_anketa_href_count_text" => "Delite povezavo do ankete na vaši spletni strani in beležite število ogledov povezave na anketo. ", "srv_anketa_href_count_text" => "Delite povezavo do ankete na vaši spletni strani in beležite število ogledov povezave na anketo. ",
@ -3732,8 +3733,12 @@ $lang = array (
"srv_alert_instruction1" => "Navodila za oblikovanje sporočil", "srv_alert_instruction1" => "Navodila za oblikovanje sporočil",
"srv_alert_instruction1a" => "Legenda spremenljivk iz baze", "srv_alert_instruction1a" => "Legenda spremenljivk iz baze",
"srv_alert_instruction1b" => "V sporočilu lahko uporabite tudi sistemske spremenljivke, ki jih trenutno ni v anketi", "srv_alert_instruction1b" => "V sporočilu lahko uporabite tudi sistemske spremenljivke, ki jih trenutno ni v anketi",
"srv_alert_instruction1c" => "Uporabite lahko naslednje spremenljivke:",
"srv_alert_instruction2" => " [NAME] - ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime<br/> ", "srv_alert_instruction2" => " [NAME] - ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime<br/> ",
"srv_alert_instruction_name" => " [NAME] - ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime", "srv_alert_instruction_name" => " [NAME] - ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime",
"srv_alert_instruction_link_archive" => "[LINK] - HTML povezava do arhiva",
"srv_alert_instruction_name_archive" => "[NAME] - ime uporabnika (iz baze CMS)",
"srv_alert_instruction_URL_archive" => "[URL] - URL povezava do arhiva",
"srv_alert_instruction_survey" => "[SURVEY] - ime ankete", "srv_alert_instruction_survey" => "[SURVEY] - ime ankete",
"srv_alert_instruction_date" => "[DATE] - datum", "srv_alert_instruction_date" => "[DATE] - datum",
"srv_alert_instruction_site" => "[SITE] - povezava do ankete", "srv_alert_instruction_site" => "[SITE] - povezava do ankete",
@ -4098,8 +4103,8 @@ $lang = array (
"srv_analiza_arhiviraj_ime" => "Ime arhiva", "srv_analiza_arhiviraj_ime" => "Ime arhiva",
"srv_analiza_archive_note" => "Opomba", "srv_analiza_archive_note" => "Opomba",
"srv_analiza_archive_access" => "Dostop", "srv_analiza_archive_access" => "Dostop",
"srv_analiza_archive_message_note" => "Sporo&#269;ilo ob kreaciji arhiva ankete", "srv_analiza_archive_message_note" => "Sporočilo ob kreaciji arhiva ankete",
"srv_analiza_archive_message_emails" => "Elektronski naslovi", "srv_analiza_archive_message_emails" => "Vnesite e-poštne naslove prejemnikov (vsak prejemnik naj bo v svoji vrstici):",
"srv_analiza_archive_access_all" => "Vsi", "srv_analiza_archive_access_all" => "Vsi",
"srv_analiza_archive_access_admins" => "Administratorji ankete", "srv_analiza_archive_access_admins" => "Administratorji ankete",
"srv_analiza_archive_access_password" => "Z geslom", "srv_analiza_archive_access_password" => "Z geslom",
@ -4307,7 +4312,8 @@ $lang = array (
"srv_dashboard_new_units" => " Število nedodanih enot: ", "srv_dashboard_new_units" => " Število nedodanih enot: ",
"srv_dashboard_up_to_date" => "Datoteka s podatki je ažurna.", "srv_dashboard_up_to_date" => "Datoteka s podatki je ažurna.",
"srv_dashboard_paradata_date_warning" => "Shranjevanje datumov odgovarjanja na vprašanja (parapodatki) je izklopljeno. Zato nekateri statusi ne bodo prikazani.", "srv_dashboard_paradata_date_warning" => "Shranjevanje datumov odgovarjanja na vprašanja (parapodatki) je izklopljeno. Zato nekateri statusi ne bodo prikazani.",
"srv_data_no_data" => "V bazi ni podatkov o izpolnjenih anketah!", "srv_data_no_data" => "V bazi še ni podatkov o izpolnjenih anketah!",
"srv_data_no_data2" => "Pridobite realne podatke in delite anketo s svojimi respondenti ali za vpogled v strani, ki za prikaz zahtevajo podatke uporabite testne podatke. ",
"srv_data_no_data_filtred" => "Ni podatkov.", "srv_data_no_data_filtred" => "Ni podatkov.",
"srv_diferencial2" => "Tabela diferencial", "srv_diferencial2" => "Tabela diferencial",
"srv_classic" => "Klasi&#269;na tabela", "srv_classic" => "Klasi&#269;na tabela",
@ -5346,6 +5352,7 @@ $lang = array (
"srv_testiranje_komentarji_anketa_title" => "Splošni komentarji", "srv_testiranje_komentarji_anketa_title" => "Splošni komentarji",
"srv_testiranje_komentarji_anketa_title2" => "Splošni komentarji na anketo", "srv_testiranje_komentarji_anketa_title2" => "Splošni komentarji na anketo",
"srv_testiranje_vnosi" => "Avtomatski vnosi", "srv_testiranje_vnosi" => "Avtomatski vnosi",
"srv_testiranje_vnosi2" => "Avtomatski testni vnos",
"srv_testiranje_trajanje" => "Trajanje", "srv_testiranje_trajanje" => "Trajanje",
"stopwords_explain_title" => "Omejevanje pogostih besed v iskalniku", "stopwords_explain_title" => "Omejevanje pogostih besed v iskalniku",
"stopwords_explain_txt_a" => "Za ve&#269;jo natan&#269;nost iskanih zadetkov, se pogoste besede pri iskanju znotraj vsebine zapisov (podstrani, novic, rubrik, priponk,..) ne upo&#154;tevajo.", "stopwords_explain_txt_a" => "Za ve&#269;jo natan&#269;nost iskanih zadetkov, se pogoste besede pri iskanju znotraj vsebine zapisov (podstrani, novic, rubrik, priponk,..) ne upo&#154;tevajo.",

13
lang/2.php
View File

@ -1900,6 +1900,7 @@ $lang = array (
"srv_anketa_is_not_active" => "NOT ACTIVE", "srv_anketa_is_not_active" => "NOT ACTIVE",
"srv_anketa_is_finished" => "FINISHED", "srv_anketa_is_finished" => "FINISHED",
"srv_anketa_href" => "HTML code for link", "srv_anketa_href" => "HTML code for link",
"srv_anketa_share" => "Share survey with respondents",
"srv_anketa_href_text" => "Share the link to the survey on your website.", "srv_anketa_href_text" => "Share the link to the survey on your website.",
"srv_anketa_href_count" => "HTML code with view counter", "srv_anketa_href_count" => "HTML code with view counter",
"srv_anketa_href_count_text" => "Share the link to the survey on your website and keep track of the number of views of the survey link. ", "srv_anketa_href_count_text" => "Share the link to the survey on your website and keep track of the number of views of the survey link. ",
@ -3700,8 +3701,12 @@ $lang = array (
"srv_alert_instruction1" => "Instructions for message formatting", "srv_alert_instruction1" => "Instructions for message formatting",
"srv_alert_instruction1a" => "Legend of database variables", "srv_alert_instruction1a" => "Legend of database variables",
"srv_alert_instruction1b" => "You can also use system variables in the message which are currently not in the survey", "srv_alert_instruction1b" => "You can also use system variables in the message which are currently not in the survey",
"srv_alert_instruction1c" => "You can use the following variables:",
"srv_alert_instruction2" => " [NAME] => user name (from the database (CMS)) or system variable \"name\" <br/> ", "srv_alert_instruction2" => " [NAME] => user name (from the database (CMS)) or system variable \"name\" <br/> ",
"srv_alert_instruction_name" => " [NAME] => user name (from the database (CMS)) or system variable \"name\"", "srv_alert_instruction_name" => " [NAME] => user name (from the database (CMS)) or system variable \"name\"",
"srv_alert_instruction_link_archive" => "[LINK] - HTML link to the archive",
"srv_alert_instruction_URL_archive" => "[URL] - URL link the archive",
"srv_alert_instruction_name_archive" => "[NAME] - username (from the CMS database)",
"srv_alert_instruction_survey" => "[SURVEY] => survey name", "srv_alert_instruction_survey" => "[SURVEY] => survey name",
"srv_alert_instruction_date" => "[DATE] => date", "srv_alert_instruction_date" => "[DATE] => date",
"srv_alert_instruction_site" => "[SITE] => link to survey", "srv_alert_instruction_site" => "[SITE] => link to survey",
@ -4080,7 +4085,7 @@ $lang = array (
"srv_analiza_archive_note" => "Note", "srv_analiza_archive_note" => "Note",
"srv_analiza_archive_access" => "Access", "srv_analiza_archive_access" => "Access",
"srv_analiza_archive_message_note" => "Message on the creation of an survey analysis archive", "srv_analiza_archive_message_note" => "Message on the creation of an survey analysis archive",
"srv_analiza_archive_message_emails" => "Emails", "srv_analiza_archive_message_emails" => "Enter the recipients' email addresses (each email should be in its own line):",
"srv_analiza_archive_access_all" => "All", "srv_analiza_archive_access_all" => "All",
"srv_analiza_archive_access_admins" => "Only admins of survey", "srv_analiza_archive_access_admins" => "Only admins of survey",
"srv_analiza_archive_access_password" => "With password", "srv_analiza_archive_access_password" => "With password",
@ -4286,7 +4291,8 @@ $lang = array (
"srv_dashboard_new_units" => " Number of new units: ", "srv_dashboard_new_units" => " Number of new units: ",
"srv_dashboard_up_to_date" => "Data file is up to date.", "srv_dashboard_up_to_date" => "Data file is up to date.",
"srv_dashboard_paradata_date_warning" => "Saving respondent dates (paradata) is turned off. Some statuses will not be displayed.", "srv_dashboard_paradata_date_warning" => "Saving respondent dates (paradata) is turned off. Some statuses will not be displayed.",
"srv_data_no_data" => "There are no completed surveys!", "srv_data_no_data" => "There are no completed surveys yet!",
"srv_data_no_data2" => "Get real data and share the survey with your respondents or use test data to see the pages that require data to be displayed.",
"srv_data_no_data_filtred" => "No data", "srv_data_no_data_filtred" => "No data",
"srv_diferencial2" => "Semantic differential", "srv_diferencial2" => "Semantic differential",
"srv_classic" => "Classic table", "srv_classic" => "Classic table",
@ -5305,7 +5311,8 @@ $lang = array (
"srv_testiranje_diagnostika_lastnosti" => "Survey properties", "srv_testiranje_diagnostika_lastnosti" => "Survey properties",
"srv_testiranje_diagnostika_base" => "Base diagnostics", "srv_testiranje_diagnostika_base" => "Base diagnostics",
"srv_testiranje_komentarji" => "Comments", "srv_testiranje_komentarji" => "Comments",
"srv_testiranje_vnosi" => "Test responses", "srv_testiranje_vnosi" => "Automatic responses",
"srv_testiranje_vnosi2" => "Automatic test response",
"srv_testiranje_trajanje" => "Duration", "srv_testiranje_trajanje" => "Duration",
"stopwords_explain_title" => "Restriction of common words in search", "stopwords_explain_title" => "Restriction of common words in search",
"stopwords_explain_txt_a" => "Common words are removed from search inside articles, web page content, attachments and other blocks of text.", "stopwords_explain_txt_a" => "Common words are removed from search inside articles, web page content, attachments and other blocks of text.",

260
public/css/admin_new.css
View File

@ -6531,8 +6531,9 @@ and open the template in the editor.
*/ */
/* Izvozi */ /* Izvozi */
span.faicon.pdf::before { span.faicon.pdf::before {
font-size: 16px;
content: ""; content: "";
font-size: 16px;
font-weight: 400;
color: #ed1c24; color: #ed1c24;
} }
@ -8312,32 +8313,31 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left {
width: 50%; width: 50%;
} }
#div_archives_email_left { #div_creport_settings_profiles #creport_profiles {
width: 75%;
}
#div_archives_email_right {
width: 25%;
}
#creport_profiles {
cursor: pointer; cursor: pointer;
width: 99%; width: 99%;
height: 140px; height: 140px;
display: inline-block; display: inline-block;
border: 1px solid #E5E5E5; border: 1px solid #E5E5E5;
} }
#creport_profiles .option { #div_creport_settings_profiles #creport_profiles .option {
padding: 1px; padding: 8px;
border: 1px solid #E5E5E5;
} }
#creport_profiles .active { #div_creport_settings_profiles #creport_profiles .active {
background-color: #1E88E5; background-color: #EAF9FE;
color: white; color: #1E88E5;
border-bottom: 1px solid #E5E5E5;
} }
#div_creport_settings_profiles #creport_settings_profiles_comment textarea {
#creport_settings_profiles_comment textarea {
width: 100%; width: 100%;
height: 80px;
}
#div_creport_settings_profiles .button_holder {
display: flex;
border-top: 1px solid #E5E5E5;
padding-top: 16px !important;
margin-top: 16px !important;
justify-content: space-between !important;
} }
#newCReportProfile .text, #newCReportProfile .text,
@ -8538,6 +8538,26 @@ div#div_condition_editing div#div_condition_editing_container div#div_condition_
min-width: auto; min-width: auto;
} }
table.question_recode_table {
border: 1px solid #E5E5E5;
}
table.question_recode_table td, table.question_recode_table th {
border-left: 1px solid #E5E5E5;
}
table.question_recode_table td.main_head, table.question_recode_table th.main_head {
width: 50%;
}
table.question_recode_table td.dark, table.question_recode_table th.dark {
background-color: #F2F2F2;
}
table.question_recode_table td.labela, table.question_recode_table th.labela {
width: 190px;
}
div.column.variable select {
margin-left: 8px !important;
}
div#inspect_div .setting_holder .horizontal { div#inspect_div .setting_holder .horizontal {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -8573,6 +8593,41 @@ div#mc_table_settings form {
padding: 0; padding: 0;
} }
#table_create_time {
margin: 16px 0 32px 0;
text-align: right;
}
div#div_analiza_archive_name {
width: 900px !important;
}
div#div_analiza_archive_name div.setting_holder textarea.email {
height: 60px !important;
}
div#div_analiza_archive_name div#div_archives_email_wrap {
display: flex;
flex-direction: row;
gap: 16px;
margin-top: 4px;
}
div#div_analiza_archive_name div#div_archives_email_wrap div#div_archives_email_left {
width: 60%;
}
div#div_analiza_archive_name div#div_archives_email_wrap div#div_archives_email_right {
min-height: 100% !important;
}
div#div_analiza_archive_name div#div_archives_email_wrap div#div_archives_email_right div.message_instructions {
background-color: #F8F8F8;
border: 1px solid #E5E5E5;
box-sizing: border-box;
padding: 16px;
width: 100%;
min-height: 100% !important;
}
div#div_analiza_archive_name div#div_archives_email_wrap div#div_archives_email_right div.message_instructions div.sistemske p {
margin-bottom: 4px;
}
/* /*
Header scss - top line, menu... Header scss - top line, menu...
*/ */
@ -11058,6 +11113,11 @@ div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder p.b
margin-bottom: 4px; margin-bottom: 4px;
} }
table#unconfirmed_mail_user_list {
border-left: 1px solid #E5E5E5;
border-right: 1px solid #E5E5E5;
}
div#user_info_segment_narocila { div#user_info_segment_narocila {
background-color: #F8F8F8; background-color: #F8F8F8;
border: 1px solid #E5E5E5; border: 1px solid #E5E5E5;
@ -26773,6 +26833,38 @@ and open the template in the editor.
width: 250px; width: 250px;
} }
div.no_data_alert {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
}
div.no_data_alert img {
max-width: 466px;
margin-bottom: 32px;
}
div.no_data_alert h2 {
font-weight: 300;
font-size: 24px;
margin-block-start: 0;
margin-block-end: 0;
margin-bottom: 16px;
}
div.no_data_alert div#note {
max-width: 800px;
margin-bottom: 32px;
text-align: center;
}
div.no_data_alert div#buttons {
display: flex;
flex-direction: row;
gap: 32px;
}
div.no_data_alert div#buttons button::first-letter {
text-transform: uppercase;
}
#div_analiza_data:not(.anal_arch) .div_analiza_holder, #div_analiza_data:not(.anal_arch) .div_analiza_holder,
#div_means_data .div_analiza_holder, #div_means_data .div_analiza_holder,
#div_break_data .div_analiza_holder, #div_break_data .div_analiza_holder,
@ -27550,20 +27642,20 @@ and open the template in the editor.
text-align: center; text-align: center;
border: 0; border: 0;
} }
#div_analiza_data:not(.anal_arch) table tr th table.cell_table tr:first-of-type td, #div_analiza_data:not(.anal_arch) table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
#div_analiza_data:not(.anal_arch) table tr td table.cell_table tr:first-of-type td, #div_analiza_data:not(.anal_arch) table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
#div_means_data table tr th table.cell_table tr:first-of-type td, #div_means_data table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
#div_means_data table tr td table.cell_table tr:first-of-type td, #div_means_data table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
#div_break_data table tr th table.cell_table tr:first-of-type td, #div_break_data table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
#div_break_data table tr td table.cell_table tr:first-of-type td, #div_break_data table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
#ttestResults table tr th table.cell_table tr:first-of-type td, #ttestResults table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
#ttestResults table tr td table.cell_table tr:first-of-type td, #ttestResults table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
.subpage_analysis_creport table tr th table.cell_table tr:first-of-type td, .subpage_analysis_creport table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
.subpage_analysis_creport table tr td table.cell_table tr:first-of-type td, .subpage_analysis_creport table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
.report_element_data table tr th table.cell_table tr:first-of-type td, .report_element_data table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
.report_element_data table tr td table.cell_table tr:first-of-type td, .report_element_data table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
#arch_body_div table tr th table.cell_table tr:first-of-type td, #arch_body_div table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
#arch_body_div table tr td table.cell_table tr:first-of-type td { #arch_body_div table tr td table.cell_table.percent_row.freq_row tr:first-of-type td {
border-bottom: 1px #E5E5E5 dashed; border-bottom: 1px #E5E5E5 dashed;
} }
#div_analiza_data:not(.anal_arch) table tr.row1 th, #div_analiza_data:not(.anal_arch) table tr.row1 th,
@ -27865,6 +27957,7 @@ and open the template in the editor.
} }
.analysis_bottom_settings .comment_holder span { .analysis_bottom_settings .comment_holder span {
font-size: 14px; font-size: 14px;
font-style: normal;
} }
.analysis_bottom_settings .comment_holder span.faicon:before { .analysis_bottom_settings .comment_holder span.faicon:before {
font-size: 14px; font-size: 14px;
@ -27906,6 +27999,9 @@ and open the template in the editor.
.analysis_bottom_settings a .faicon.xls:before { .analysis_bottom_settings a .faicon.xls:before {
color: #00C437; color: #00C437;
} }
.analysis_bottom_settings a .faicon.ppt:before {
color: #fa4913;
}
iframe#ifmcontentstoprint { iframe#ifmcontentstoprint {
border: 0; border: 0;
@ -28737,6 +28833,10 @@ iframe#ifmcontentstoprint {
overflow: hidden; overflow: hidden;
text-align: center; text-align: center;
} }
.chart_holder.chart_holder:first-child,
.tableChart.chart_holder:first-child {
padding-top: 6px;
}
.chart_holder .chart_title, .chart_holder .chart_title,
.tableChart .chart_title { .tableChart .chart_title {
width: 800px; width: 800px;
@ -29799,21 +29899,6 @@ ul.vrednost_sort input[type=text] {
width: 98%; width: 98%;
height: 30px; height: 30px;
} }
.subpage_analysis_creport #anketa_custom_report #creport_profiles {
cursor: pointer;
width: 99%;
height: 140px;
display: inline-block;
border: 1px solid #E5E5E5;
}
.subpage_analysis_creport #anketa_custom_report #creport_profiles .option {
padding: 1px;
}
.subpage_analysis_creport #anketa_custom_report #creport_profiles .active {
background-color: #1E88E5;
color: white;
border-bottom: 1px solid #E5E5E5;
}
div.reports_holder { div.reports_holder {
display: flex; display: flex;
@ -30597,13 +30682,15 @@ input#endDate {
line-height: 20px; line-height: 20px;
background-color: white; background-color: white;
display: none; display: none;
position: fixed; position: absolute;
left: calc(50% - 275px);
top: 40vh;
z-index: 999; z-index: 999;
height: auto; left: calc(50% - 300px);
margin: 10px; top: 40%;
padding: 20px;
width: 550px; width: 550px;
background-color: #FFFFFF;
border-left: 6px #1E88E5 solid !important;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.34);
} }
#newMCTable .popup_close { #newMCTable .popup_close {
position: absolute !important; position: absolute !important;
@ -30784,13 +30871,15 @@ input#endDate {
line-height: 20px; line-height: 20px;
background-color: white; background-color: white;
display: none; display: none;
position: fixed; position: absolute;
left: calc(50% - 275px);
top: 40vh;
z-index: 999; z-index: 999;
height: auto; left: calc(50% - 300px);
margin: 10px; top: 40%;
padding: 20px;
width: 550px; width: 550px;
background-color: #FFFFFF;
border-left: 6px #1E88E5 solid !important;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.34);
} }
#renameMCTable .popup_close { #renameMCTable .popup_close {
position: absolute !important; position: absolute !important;
@ -30971,13 +31060,15 @@ input#endDate {
line-height: 20px; line-height: 20px;
background-color: white; background-color: white;
display: none; display: none;
position: fixed; position: absolute;
left: calc(50% - 275px);
top: 40vh;
z-index: 999; z-index: 999;
height: auto; left: calc(50% - 300px);
margin: 10px; top: 40%;
padding: 20px;
width: 550px; width: 550px;
background-color: #FFFFFF;
border-left: 6px #1E88E5 solid !important;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.34);
} }
#deleteMCTable .popup_close { #deleteMCTable .popup_close {
position: absolute !important; position: absolute !important;
@ -31660,6 +31751,10 @@ fieldset textarea {
height: auto !important; height: auto !important;
} }
.setting_horizontal_wrapper {
flex-direction: column !important;
}
#vnosi_paginacija div select { #vnosi_paginacija div select {
display: inline-block; display: inline-block;
width: fit-content; width: fit-content;
@ -32213,7 +32308,8 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
align-items: left; align-items: left;
width: 100%; width: 100%;
height: auto; height: auto;
padding: 30px 10px 20px 20px; padding: 30px 0 20px 0;
box-sizing: border-box;
} }
#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner { #branching #bottom_icons_holder .forma_bottom .forma_bottom_inner {
display: flex; display: flex;
@ -32222,11 +32318,12 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
margin: 0; margin: 0;
} }
#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner a { #branching #bottom_icons_holder .forma_bottom .forma_bottom_inner a {
margin: 0 8px 0 0; margin: 0 11px 0 2px;
padding: 0; padding: 0;
} }
#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner button { #branching #bottom_icons_holder .forma_bottom .forma_bottom_inner button {
margin: 0; margin: 0;
padding: 0 12px;
} }
.toolbox_holder { .toolbox_holder {
@ -32418,6 +32515,41 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
width: 100% !important; width: 100% !important;
} }
div.page_tema .theme_list {
flex-wrap: wrap;
}
div.page_tema .theme_list .theme {
margin-bottom: 8px;
}
div.page_tema .theme_list .options {
width: 100%;
flex-wrap: wrap;
}
div.page_tema .theme_list .options .button {
margin-bottom: 4px;
}
div.page_tema div#theme_grid_holder {
padding: 0;
}
div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label {
width: 100%;
height: auto;
}
div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options {
justify-content: flex-start;
}
div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
margin-right: 8px;
}
.page_theme-editor #theme-preview {
display: none;
}
.page_theme-editor #theme-editor .columns {
width: 100% !important;
flex-wrap: wrap;
}
#srv_diagnostic br { #srv_diagnostic br {
display: none; display: none;
} }

77
public/img/images/no_data.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

14
resources/sass/admin/analysis/multi_crosstabs.scss
View File

@ -294,14 +294,18 @@ and open the template in the editor.
@include popup_general(); @include popup_general();
display: none; display: none;
position: fixed; position: absolute;
left: calc(50% - 275px); z-index: 20;
top: 40vh;
z-index: 999;
margin: 10px; left: calc(50% - 300px);
top: 40%;
padding: 20px;
width: 550px; width: 550px;
background-color: white;
border-left: 6px $blue solid !important;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.34);
} }
/*new table popup*/ /*new table popup*/
#newMCTable { #newMCTable {

3
resources/sass/admin_new/basic/icons/export.scss
View File

@ -12,9 +12,10 @@ and open the template in the editor.
// PDF // PDF
span.faicon.pdf::before{ span.faicon.pdf::before{
font-size: 16px;
content: "\f1c1"; content: "\f1c1";
font-size: 16px;
font-weight: 400;
color: #ed1c24; color: #ed1c24;
} }
span.faicon.pdf.black{ span.faicon.pdf.black{

116
resources/sass/admin_new/components/popup/page_specific.scss
View File

@ -223,35 +223,39 @@ div#div_analiza_archive_name {
} }
} }
//Pošji arhiv
#div_archives_email_left {
width: 75%;
}
#div_archives_email_right {
width: 25%;
}
//Poročila //Poročila
#creport_profiles { #div_creport_settings_profiles {
#creport_profiles {
cursor: pointer; cursor: pointer;
width: 99%; width: 99%;
height: 140px; height: 140px;
display: inline-block; display: inline-block;
border: 1px solid $gray; border: 1px solid $gray;
.option { .option {
padding: 1px; padding: 8px;
border: 1px solid $gray;
} }
.active { .active {
background-color: $blue; background-color: $light-blue;
color: white; color: $blue;
border-bottom: 1px solid $gray; }
} }
}
#creport_settings_profiles_comment { #creport_settings_profiles_comment {
textarea { textarea {
width: 100%; width: 100%;
height: 80px;
} }
}
.button_holder {
display: flex;
border-top: 1px solid $gray;
padding-top: 16px !important;
margin-top: 16px !important;
justify-content: space-between !important;
}
} }
#newCReportProfile, #newCReportProfile,
@ -505,6 +509,36 @@ div#div_condition_editing {
} }
} }
table.question_recode_table {
border: 1px solid $gray;
td,th {
border-left: 1px solid $gray;
&.main_head {
width: 50%;
}
&.dark {
background-color: $light-gray2;
}
&.labela {
width: 190px;
}
}
}
//Izbira spremenljivke pri kalkulaciji
div.column.variable {
select {
margin-left: 8px !important;
}
}
//////ANALIZA////// //////ANALIZA//////
//Zoom //Zoom
@ -560,3 +594,55 @@ div#mc_table_settings {
padding: 0; padding: 0;
} }
} }
#table_create_time {
margin: 16px 0 32px 0;
text-align: right;
}
//Pošilji arhiv
div#div_analiza_archive_name {
width: 900px !important;
div.setting_holder {
textarea.email {
height: 60px !important;
}
}
div#div_archives_email_wrap {
display: flex;
flex-direction: row;
gap: 16px;
margin-top: 4px;
div#div_archives_email_left {
width: 60%;
}
div#div_archives_email_right {
min-height: 100% !important;
div.message_instructions {
background-color: $light-gray;
border: 1px solid $gray;
box-sizing: border-box;
padding: 16px;
width: 100%;
min-height: 100% !important;
div.sistemske {
p {
margin-bottom: 4px;
}
}
}
}
}
}

4
resources/sass/admin_new/mobile/basic.scss
View File

@ -71,6 +71,10 @@ fieldset {
} }
} }
.setting_horizontal_wrapper{
flex-direction: column !important;
}
#vnosi_paginacija { #vnosi_paginacija {
div { div {
select { select {

1
resources/sass/admin_new/mobile/mobile.scss
View File

@ -60,6 +60,7 @@ $main_text: $grey_super_dark;
@import "pages/status"; @import "pages/status";
@import "pages/branching"; @import "pages/branching";
@import "pages/survey_settings"; @import "pages/survey_settings";
@import "pages/survey_theme";
@import "pages/testing"; @import "pages/testing";
@import "pages/publish"; @import "pages/publish";
@import "pages/data"; @import "pages/data";

8
resources/sass/admin_new/mobile/pages/branching.scss
View File

@ -65,7 +65,8 @@
width: 100%; width: 100%;
height: auto; height: auto;
padding: 30px 10px 20px 20px; padding: 30px 0 20px 0;
box-sizing: border-box;
.forma_bottom_inner{ .forma_bottom_inner{
display: flex; display: flex;
@ -78,6 +79,11 @@
margin: 0 11px 0 2px; margin: 0 11px 0 2px;
padding: 0; padding: 0;
} }
button{
margin: 0;
padding: 0 12px;
}
} }
} }

54
resources/sass/admin_new/mobile/pages/survey_theme.scss Normal file
View File

@ -0,0 +1,54 @@
div.page_tema{
.theme_list{
flex-wrap: wrap;
.theme{
margin-bottom: 8px;
}
.options{
width: 100%;
flex-wrap: wrap;
.button{
margin-bottom: 4px;
}
}
}
div#theme_grid_holder{
padding: 0;
div.div_theme_group div.theme_label{
width: 100%;
height: auto;
.theme_label_options{
justify-content: flex-start;
.button{
margin-right: 8px;
}
}
}
}
}
.page_theme-editor{
#theme-preview{
display: none;
}
#theme-editor{
.columns{
width: 100% !important;
flex-wrap: wrap;
}
}
}

5
resources/sass/admin_new/pages/settings/uporabniki.scss
View File

@ -143,3 +143,8 @@ div.subpage_uporabniki {
} }
} }
table#unconfirmed_mail_user_list {
border-left: 1px solid $gray;
border-right: 1px solid $gray;
}

10
resources/sass/admin_new/pages/survey_analysis/basic.scss
View File

@ -241,10 +241,10 @@
text-align: center; text-align: center;
border: 0; border: 0;
} }
&:first-of-type td{
border-bottom: 1px $gray dashed;
} }
&.percent_row.freq_row tr:first-of-type td{
border-bottom: 1px $gray dashed;
} }
} }
} }
@ -426,6 +426,7 @@
span{ span{
font-size: 14px; font-size: 14px;
font-style: normal;
&.faicon:before{ &.faicon:before{
font-size: 14px; font-size: 14px;
@ -485,6 +486,9 @@
&.xls:before{ &.xls:before{
color: $green; color: $green;
} }
&.ppt:before{
color: #fa4913;
}
} }
} }
} }

4
resources/sass/admin_new/pages/survey_analysis/page_charts.scss
View File

@ -13,6 +13,10 @@
text-align: center; text-align: center;
&.chart_holder:first-child{
padding-top: 6px;
}
.chart_title { .chart_title {
width: 800px; width: 800px;
margin: 0 0 16px 0; margin: 0 0 16px 0;

15
resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss
View File

@ -504,20 +504,5 @@
} }
} }
} }
#creport_profiles {
cursor: pointer;
width: 99%;
height: 140px;
display: inline-block;
border: 1px solid $gray;
.option {
padding: 1px;
}
.active {
background-color: $blue;
color: white;
border-bottom: 1px solid $gray;
}
}
} }

13
resources/sass/admin_new/pages/survey_analysis/popups/multicrosstab.scss
View File

@ -40,15 +40,18 @@
@include popup_general(); @include popup_general();
display: none; display: none;
position: fixed; position: absolute;
left: calc(50% - 275px);
top: 40vh;
z-index: 999; z-index: 999;
height: auto;
margin: 10px; left: calc(50% - 300px);
top: 40%;
padding: 20px;
width: 550px; width: 550px;
background-color: $white;
border-left: 6px $blue solid !important;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.34);
} }
/*new table popup*/ /*new table popup*/

37
resources/sass/admin_new/pages/survey_data/no_data.scss Normal file
View File

@ -0,0 +1,37 @@
div.no_data_alert {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
img {
max-width: 466px;
margin-bottom: 32px;
}
h2 {
font-weight: $light;
font-size: 24px;
margin-block-start: 0;
margin-block-end: 0;
margin-bottom: 16px;
}
div#note {
max-width: 800px;
margin-bottom: 32px;
text-align: center;
}
div#buttons {
display: flex;
flex-direction: row;
gap: 32px;
button::first-letter {
text-transform: uppercase;
}
}
}

2
resources/sass/admin_new/pages/survey_data/survey_data.scss
View File

@ -10,3 +10,5 @@
@import "quick_list_data"; @import "quick_list_data";
@import "popups/popups"; @import "popups/popups";
@import "no_data";