';
- echo '';
+ echo ' ';
echo $variable['naslov'];
echo ' ';
- echo '';
+ echo ' ';
echo ' ['.$variable['variable'].']';
echo ' ';
echo '';
diff --git a/admin/survey/classes/class.SurveyCustomReport.php b/admin/survey/classes/class.SurveyCustomReport.php
index cf26bc19e..20fcbb1d5 100644
--- a/admin/survey/classes/class.SurveyCustomReport.php
+++ b/admin/survey/classes/class.SurveyCustomReport.php
@@ -561,10 +561,10 @@ class SurveyCustomReport {
// Izbira podtipa (tabela / graf)
echo ' '.$lang['srv_table'].' ';
+ echo ' '.$lang['srv_table'].' ';
echo ' '.$lang['srv_chart'].' ';
+ echo ' '.$lang['srv_chart'].' ';
}
// Nastavitve za TTEST
@@ -1807,19 +1807,17 @@ class SurveyCustomReport {
// Preimenuje, brise in share lahko samo za lastna porocila
if($this->creportAuthor == $global_user_id){
- echo '';
}
- // 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'");
if(mysqli_num_rows($sqlt) > 0){
$rowt = mysqli_fetch_array($sqlt);
@@ -1838,7 +1836,7 @@ class SurveyCustomReport {
if($time_edit != '' && $time_edit != '0000-00-00 00:00:00'){
$time_edit = strtotime($time_edit);
echo ''.$lang['srv_custom_report_time_edited'].': '.date("d.m.Y H:i", $time_edit).'
';
- }
+ }*/
echo '';
@@ -1858,7 +1856,7 @@ class SurveyCustomReport {
$comment = $row['value'];
}
- echo ''.$lang['srv_inv_archive_comment'].':
';
+ echo ''.$lang['srv_inv_archive_comment'].':
';
// Komentar lahko popravlja samo avtor porocila
if($this->creportAuthor == $global_user_id)
echo '';
diff --git a/admin/survey/classes/class.SurveyStaticHtml.php b/admin/survey/classes/class.SurveyStaticHtml.php
index cf98c8111..b30b21e3a 100644
--- a/admin/survey/classes/class.SurveyStaticHtml.php
+++ b/admin/survey/classes/class.SurveyStaticHtml.php
@@ -982,15 +982,16 @@ class SurveyStaticHtml
}
}
- public function displayChartOptions()
- {
+ public function displayChartOptions(){
global $lang, $admin_type;
+ SurveyChart::Init($this->sid);
+
// Nastavitev HQ grafov
- echo '';
- echo $lang['srv_chart_hq'] . ': ';
- echo ' ';
+ echo ' '.$lang['srv_chart_hq'] . ' ';
+ echo ' ';
// Nastavitev skina grafov
@@ -1053,7 +1054,7 @@ class SurveyStaticHtml
if ($hideAdvanced == false) {
echo '';
- echo '' . $lang['srv_chart_skin'] . ': ' . $name . ' ';
+ echo ' ' . $lang['srv_chart_skin'] . ': ' . $name . ' ';
echo ' ';
}
}
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
index 90ad0f69d..76b765e14 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
@@ -2007,7 +2007,7 @@ class SurveyAnalysis {
if ($variable['other'] != true) {
echo ' ';
- echo ' ';
+ echo ' ';
echo ' ';
echo ' '.$_cnt.' ';
echo ' ';
@@ -2156,7 +2156,7 @@ class SurveyAnalysis {
echo '';
- echo '';
+ echo '';
echo ' ';
echo ' 0 ? ' vkey="1"' : '')
@@ -2178,7 +2178,7 @@ class SurveyAnalysis {
echo ' ';
- echo '';
+ echo '';
echo ' ';
echo ' '.$_arguments.' ';
echo ' ';
@@ -2962,7 +2962,7 @@ class SurveyAnalysis {
echo '';
- echo ' ';
+ echo ' ';
echo ' ';
echo ' 0 ? ' vkey="'.$key.'"' : '')
@@ -2983,7 +2983,7 @@ class SurveyAnalysis {
// suma
echo ' ';
- echo ' ';
+ echo ' ';
echo ' ';
echo ' '.((int)self::$_FREQUENCYS[$_sequence]['validCnt']).' ';
echo ' ';
@@ -3313,7 +3313,7 @@ class SurveyAnalysis {
#mg_inspectž
echo '';
- echo ' ';
+ echo ' ';
echo ' ';
echo ' 0 ? ' gid="'.$variable['key'].'_1"' : '').'>'.$variable['freq'].' ';
echo ' ';
@@ -3332,7 +3332,7 @@ class SurveyAnalysis {
// suma
echo '';
- echo ' ';
+ echo ' ';
echo ' ';
echo ' '.(int)$grid['suma'].' ';
echo ' ';
@@ -3361,7 +3361,7 @@ class SurveyAnalysis {
echo '';
#mg_inspect
- echo ' ';
+ echo ' ';
echo ' ';
echo ' 0 ? ' gid="'.$variable['key'].'_2"' : '').'>'.$variable['freq'].' ';
echo ' ';
@@ -3379,7 +3379,7 @@ class SurveyAnalysis {
// suma
echo '';
- echo ' ';
+ echo ' ';
echo ' ';
echo ' '.(int)$_right_grid['suma'].' ';
echo ' ';
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
index 078c45ed4..340e5823c 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
@@ -479,79 +479,84 @@ class SurveyAnalysisArchive {
echo '';
- echo ''.$lang['srv_analiza_arhiv'].' ';
+ echo ''.$lang['srv_export_hover_archive_mail'].' ';
# preverimo obstoj datoteke, in dostop
$CAE = self::CheckArchiveExistance($aid);
if ( $CAE > 0) {
# vsebina emaila in naslovi
+
+ echo '';
+ echo ''.$lang['srv_analiza_archive_message_emails'].' ';
+ echo '';
+ echo '
';
+
+ echo '';
+ echo '' . $lang['srv_inv_archive_subject_text'] . ': ';
+ echo '
';
+
+ echo '' . $lang['message'] . ':';
+
echo '';
echo '
';
-
- echo '
'.$lang['srv_analiza_archive_message_note'].'
';
-
- echo '
'.$lang['srv_analiza_archive_message_emails'].': '."\n";
- echo ''."\n";
- echo '
';
-
- echo '
';
-
- echo '
';
- echo '
' . $lang['subject'] . ': ';
- echo '
';
- echo '
' . $lang['text'] . ': '."\n";
$signature = Common::getEmailSignature();
echo ''."\n";
- echo '
';
+
echo ''."\n";
-
- echo '
'."\n";
- #gumbi
+
+ echo '
'."\n";
+
+ //Navodila
+ echo '
';
+
+ echo '
'.$lang['srv_alert_instruction1'].'
';
+ echo '
'.$lang['srv_alert_instruction1c'].'
';
- echo '
'; //right
echo '
'; //wrap
+
+ #gumbi
+ echo '
';
+ echo ''.$lang['srv_analiza_arhiviraj_close'].' ';
+ echo ''.$lang['srv_analiza_arhiviraj_do_send_mail'].' ';
+ echo '
';
+
} else {
self::DisplayError($CAE);
}
- echo '
'.$lang['srv_analiza_arhiviraj_close'].' ';
+ echo ''.$lang['srv_analiza_arhiviraj_close'].' ';
+ echo '
';
}
}
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
index ce2373ce4..19b8c4659 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
@@ -313,7 +313,6 @@ class SurveyChart {
// prikazemo nastavitve
if (self::$isArchive != true && self::$publicChart != true) {
self::displayGlobalSettings();
- echo "';
echo '';
- echo $lang['srv_chart_hq'].': ';
- echo ''.$lang['srv_chart_hq'].' ';
echo ' ';
# nastavitev skina grafov
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
index 6e09e315d..9699372ab 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
@@ -2182,9 +2182,9 @@ class SurveyMultiCrosstabs {
echo '';
// Cas kreiranja tabele
- echo '';
+ echo '
';
$time_created = strtotime($current_table['time_created']);
- echo $lang['srv_multicrosstabs_tables_time'].': '.date("d.m.Y H:i", $time_created).' '.date("d.m.Y H:i", $time_created).' ';
echo '
';
diff --git a/admin/survey/script/progressBar.js b/admin/survey/script/progressBar.js
index 5c481f8ef..067526945 100644
--- a/admin/survey/script/progressBar.js
+++ b/admin/survey/script/progressBar.js
@@ -34,8 +34,12 @@ var starttime = 0;
* @param getProgress - ali bomo v sessionu sporocali napredek, ali ne (ce ne, potem samo stejemo cas)
*/
function init_progressBar (getProgress) {
+
+ // Po novem nimamo vec progress bara in prikazemo samo "nalaganje"
+ $('body').addClass('waitlong');
+ $("#loading").show();
- if (typeof(getProgress) == 'undefined') getProgress = false;
+ /*if (typeof(getProgress) == 'undefined') getProgress = false;
$('#fade').fadeTo('slow', 1);
$('#fullscreen').show();
@@ -55,8 +59,7 @@ function init_progressBar (getProgress) {
var d = new Date();
starttime = d.getTime();
- pbInterval=window.setInterval("refresh_progressBar("+getProgress+")",250); // klicemo na 250ms
-
+ pbInterval=window.setInterval("refresh_progressBar("+getProgress+")",250); // klicemo na 250ms*/
}
/**
diff --git a/admin/survey/script/script_analiza.js b/admin/survey/script/script_analiza.js
index dcb6f72e5..d5a15b7df 100644
--- a/admin/survey/script/script_analiza.js
+++ b/admin/survey/script/script_analiza.js
@@ -732,13 +732,19 @@ function show_single_percent(id, status) {
if($('#freq-p_button_1_'+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');
}
}
// Prizgemo
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');
}
}
@@ -749,13 +755,19 @@ function show_single_percent(id, status) {
if($('#freq-p_button_2_'+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');
}
}
// Prizgemo
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');
}
}
@@ -953,7 +965,7 @@ function createArchiveBeforeEmail() {
if (parseInt(response) > 0) {
var aid = parseInt(response);
$("#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 {
if (parseInt(response) == -1) {
diff --git a/lang/1.php b/lang/1.php
index 143b4661a..10c07a829 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -1907,6 +1907,7 @@ $lang = array (
"srv_anketa_is_not_active" => "NEAKTIVNA",
"srv_anketa_is_finished" => "ZAKLJUČENA",
"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_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. ",
@@ -3732,8 +3733,12 @@ $lang = array (
"srv_alert_instruction1" => "Navodila za oblikovanje sporočil",
"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_instruction1c" => "Uporabite lahko naslednje spremenljivke:",
"srv_alert_instruction2" => " [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_date" => "[DATE] - datum",
"srv_alert_instruction_site" => "[SITE] - povezava do ankete",
@@ -4098,8 +4103,8 @@ $lang = array (
"srv_analiza_arhiviraj_ime" => "Ime arhiva",
"srv_analiza_archive_note" => "Opomba",
"srv_analiza_archive_access" => "Dostop",
- "srv_analiza_archive_message_note" => "Sporočilo ob kreaciji arhiva ankete",
- "srv_analiza_archive_message_emails" => "Elektronski naslovi",
+ "srv_analiza_archive_message_note" => "Sporočilo ob kreaciji arhiva ankete",
+ "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_admins" => "Administratorji ankete",
"srv_analiza_archive_access_password" => "Z geslom",
@@ -4307,7 +4312,8 @@ $lang = array (
"srv_dashboard_new_units" => " Število nedodanih enot: ",
"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_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_diferencial2" => "Tabela diferencial",
"srv_classic" => "Klasična tabela",
@@ -5346,6 +5352,7 @@ $lang = array (
"srv_testiranje_komentarji_anketa_title" => "Splošni komentarji",
"srv_testiranje_komentarji_anketa_title2" => "Splošni komentarji na anketo",
"srv_testiranje_vnosi" => "Avtomatski vnosi",
+ "srv_testiranje_vnosi2" => "Avtomatski testni vnos",
"srv_testiranje_trajanje" => "Trajanje",
"stopwords_explain_title" => "Omejevanje pogostih besed v iskalniku",
"stopwords_explain_txt_a" => "Za večjo natančnost iskanih zadetkov, se pogoste besede pri iskanju znotraj vsebine zapisov (podstrani, novic, rubrik, priponk,..) ne upoštevajo.",
diff --git a/lang/2.php b/lang/2.php
index adfd9d70d..1ee4c8d64 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -1900,6 +1900,7 @@ $lang = array (
"srv_anketa_is_not_active" => "NOT ACTIVE",
"srv_anketa_is_finished" => "FINISHED",
"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_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. ",
@@ -3700,8 +3701,12 @@ $lang = array (
"srv_alert_instruction1" => "Instructions for message formatting",
"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_instruction1c" => "You can use the following variables:",
"srv_alert_instruction2" => " [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_date" => "[DATE] => date",
"srv_alert_instruction_site" => "[SITE] => link to survey",
@@ -4080,7 +4085,7 @@ $lang = array (
"srv_analiza_archive_note" => "Note",
"srv_analiza_archive_access" => "Access",
"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_admins" => "Only admins of survey",
"srv_analiza_archive_access_password" => "With password",
@@ -4286,7 +4291,8 @@ $lang = array (
"srv_dashboard_new_units" => " Number of new units: ",
"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_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_diferencial2" => "Semantic differential",
"srv_classic" => "Classic table",
@@ -5305,7 +5311,8 @@ $lang = array (
"srv_testiranje_diagnostika_lastnosti" => "Survey properties",
"srv_testiranje_diagnostika_base" => "Base diagnostics",
"srv_testiranje_komentarji" => "Comments",
- "srv_testiranje_vnosi" => "Test responses",
+ "srv_testiranje_vnosi" => "Automatic responses",
+ "srv_testiranje_vnosi2" => "Automatic test response",
"srv_testiranje_trajanje" => "Duration",
"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.",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index eec6817b8..972865d50 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -6531,8 +6531,9 @@ and open the template in the editor.
*/
/* Izvozi */
span.faicon.pdf::before {
- font-size: 16px;
content: "";
+ font-size: 16px;
+ font-weight: 400;
color: #ed1c24;
}
@@ -8312,32 +8313,31 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left {
width: 50%;
}
-#div_archives_email_left {
- width: 75%;
-}
-
-#div_archives_email_right {
- width: 25%;
-}
-
-#creport_profiles {
+#div_creport_settings_profiles #creport_profiles {
cursor: pointer;
width: 99%;
height: 140px;
display: inline-block;
border: 1px solid #E5E5E5;
}
-#creport_profiles .option {
- padding: 1px;
+#div_creport_settings_profiles #creport_profiles .option {
+ padding: 8px;
+ border: 1px solid #E5E5E5;
}
-#creport_profiles .active {
- background-color: #1E88E5;
- color: white;
- border-bottom: 1px solid #E5E5E5;
+#div_creport_settings_profiles #creport_profiles .active {
+ background-color: #EAF9FE;
+ color: #1E88E5;
}
-
-#creport_settings_profiles_comment textarea {
+#div_creport_settings_profiles #creport_settings_profiles_comment textarea {
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,
@@ -8538,6 +8538,26 @@ div#div_condition_editing div#div_condition_editing_container div#div_condition_
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 {
display: flex;
flex-direction: row;
@@ -8573,6 +8593,41 @@ div#mc_table_settings form {
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...
*/
@@ -11058,6 +11113,11 @@ div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder p.b
margin-bottom: 4px;
}
+table#unconfirmed_mail_user_list {
+ border-left: 1px solid #E5E5E5;
+ border-right: 1px solid #E5E5E5;
+}
+
div#user_info_segment_narocila {
background-color: #F8F8F8;
border: 1px solid #E5E5E5;
@@ -26773,6 +26833,38 @@ and open the template in the editor.
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_means_data .div_analiza_holder,
#div_break_data .div_analiza_holder,
@@ -27550,20 +27642,20 @@ and open the template in the editor.
text-align: center;
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 td table.cell_table tr:first-of-type td,
-#div_means_data table tr th table.cell_table tr:first-of-type td,
-#div_means_data table tr td table.cell_table tr:first-of-type td,
-#div_break_data table tr th table.cell_table tr:first-of-type td,
-#div_break_data table tr td table.cell_table tr:first-of-type td,
-#ttestResults table tr th table.cell_table tr:first-of-type td,
-#ttestResults table tr td table.cell_table tr:first-of-type td,
-.subpage_analysis_creport table tr th table.cell_table tr:first-of-type td,
-.subpage_analysis_creport table tr td table.cell_table tr:first-of-type td,
-.report_element_data table tr th table.cell_table tr:first-of-type td,
-.report_element_data table tr td table.cell_table tr:first-of-type td,
-#arch_body_div table tr th table.cell_table tr:first-of-type td,
-#arch_body_div table tr td 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.percent_row.freq_row 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.percent_row.freq_row 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.percent_row.freq_row 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.percent_row.freq_row 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.percent_row.freq_row 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.percent_row.freq_row 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.percent_row.freq_row tr:first-of-type td {
border-bottom: 1px #E5E5E5 dashed;
}
#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 {
font-size: 14px;
+ font-style: normal;
}
.analysis_bottom_settings .comment_holder span.faicon:before {
font-size: 14px;
@@ -27906,6 +27999,9 @@ and open the template in the editor.
.analysis_bottom_settings a .faicon.xls:before {
color: #00C437;
}
+.analysis_bottom_settings a .faicon.ppt:before {
+ color: #fa4913;
+}
iframe#ifmcontentstoprint {
border: 0;
@@ -28737,6 +28833,10 @@ iframe#ifmcontentstoprint {
overflow: hidden;
text-align: center;
}
+.chart_holder.chart_holder:first-child,
+.tableChart.chart_holder:first-child {
+ padding-top: 6px;
+}
.chart_holder .chart_title,
.tableChart .chart_title {
width: 800px;
@@ -29799,21 +29899,6 @@ ul.vrednost_sort input[type=text] {
width: 98%;
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 {
display: flex;
@@ -30597,13 +30682,15 @@ input#endDate {
line-height: 20px;
background-color: white;
display: none;
- position: fixed;
- left: calc(50% - 275px);
- top: 40vh;
+ position: absolute;
z-index: 999;
- height: auto;
- margin: 10px;
+ left: calc(50% - 300px);
+ top: 40%;
+ padding: 20px;
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 {
position: absolute !important;
@@ -30784,13 +30871,15 @@ input#endDate {
line-height: 20px;
background-color: white;
display: none;
- position: fixed;
- left: calc(50% - 275px);
- top: 40vh;
+ position: absolute;
z-index: 999;
- height: auto;
- margin: 10px;
+ left: calc(50% - 300px);
+ top: 40%;
+ padding: 20px;
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 {
position: absolute !important;
@@ -30971,13 +31060,15 @@ input#endDate {
line-height: 20px;
background-color: white;
display: none;
- position: fixed;
- left: calc(50% - 275px);
- top: 40vh;
+ position: absolute;
z-index: 999;
- height: auto;
- margin: 10px;
+ left: calc(50% - 300px);
+ top: 40%;
+ padding: 20px;
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 {
position: absolute !important;
@@ -31660,6 +31751,10 @@ fieldset textarea {
height: auto !important;
}
+ .setting_horizontal_wrapper {
+ flex-direction: column !important;
+ }
+
#vnosi_paginacija div select {
display: inline-block;
width: fit-content;
@@ -32213,7 +32308,8 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
align-items: left;
width: 100%;
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 {
display: flex;
@@ -32222,11 +32318,12 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
margin: 0;
}
#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner a {
- margin: 0 8px 0 0;
+ margin: 0 11px 0 2px;
padding: 0;
}
#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner button {
margin: 0;
+ padding: 0 12px;
}
.toolbox_holder {
@@ -32418,6 +32515,41 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
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 {
display: none;
}
diff --git a/public/img/images/no_data.svg b/public/img/images/no_data.svg
new file mode 100644
index 000000000..73f374cbc
--- /dev/null
+++ b/public/img/images/no_data.svg
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/sass/admin/analysis/multi_crosstabs.scss b/resources/sass/admin/analysis/multi_crosstabs.scss
index 3e37e9d69..3ed188b5b 100644
--- a/resources/sass/admin/analysis/multi_crosstabs.scss
+++ b/resources/sass/admin/analysis/multi_crosstabs.scss
@@ -294,13 +294,17 @@ and open the template in the editor.
@include popup_general();
display: none;
- position: fixed;
- left: calc(50% - 275px);
- top: 40vh;
- z-index: 999;
+ position: absolute;
+ z-index: 20;
+
+ left: calc(50% - 300px);
+ top: 40%;
+ padding: 20px;
+ width: 550px;
- margin: 10px;
- 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*/
diff --git a/resources/sass/admin_new/basic/icons/export.scss b/resources/sass/admin_new/basic/icons/export.scss
index 3241d7b2a..cbe74614e 100644
--- a/resources/sass/admin_new/basic/icons/export.scss
+++ b/resources/sass/admin_new/basic/icons/export.scss
@@ -12,22 +12,23 @@ and open the template in the editor.
// PDF
span.faicon.pdf::before{
- font-size: 16px;
- content: "\f1c1";
-
- color: #ed1c24;
+ content: "\f1c1";
+ font-size: 16px;
+
+ font-weight: 400;
+ color: #ed1c24;
}
span.faicon.pdf.black{
color: $blue !important;
&:hover{
- color: #ed1c24 !important;
+ color: #ed1c24 !important;
}
}
a:hover span.faicon.pdf.black{
color: #ed1c24 !important;
}
span.faicon.pdf.black::before{
- color: inherit !important;
+ color: inherit !important;
}
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index b1c9dc952..2b7124639 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -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
-#creport_profiles {
- cursor: pointer;
- width: 99%;
- height: 140px;
- display: inline-block;
- border: 1px solid $gray;
- .option {
- padding: 1px;
+#div_creport_settings_profiles {
+ #creport_profiles {
+ cursor: pointer;
+ width: 99%;
+ height: 140px;
+ display: inline-block;
+ border: 1px solid $gray;
+ .option {
+ padding: 8px;
+ border: 1px solid $gray;
+ }
+ .active {
+ background-color: $light-blue;
+ color: $blue;
+ }
}
- .active {
- background-color: $blue;
- color: white;
- border-bottom: 1px solid $gray;
+
+ #creport_settings_profiles_comment {
+ textarea {
+ width: 100%;
+ height: 80px;
+ }
}
-}
-#creport_settings_profiles_comment {
- textarea {
- width: 100%;
+ .button_holder {
+ display: flex;
+ border-top: 1px solid $gray;
+ padding-top: 16px !important;
+ margin-top: 16px !important;
+ justify-content: space-between !important;
}
+
}
#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//////
//Zoom
@@ -560,3 +594,55 @@ div#mc_table_settings {
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;
+ }
+ }
+
+ }
+ }
+ }
+}
diff --git a/resources/sass/admin_new/mobile/basic.scss b/resources/sass/admin_new/mobile/basic.scss
index 89ac8a6bf..1205dac6a 100644
--- a/resources/sass/admin_new/mobile/basic.scss
+++ b/resources/sass/admin_new/mobile/basic.scss
@@ -71,6 +71,10 @@ fieldset {
}
}
+.setting_horizontal_wrapper{
+ flex-direction: column !important;
+}
+
#vnosi_paginacija {
div {
select {
diff --git a/resources/sass/admin_new/mobile/mobile.scss b/resources/sass/admin_new/mobile/mobile.scss
index b060f12bf..f8467caa8 100644
--- a/resources/sass/admin_new/mobile/mobile.scss
+++ b/resources/sass/admin_new/mobile/mobile.scss
@@ -60,6 +60,7 @@ $main_text: $grey_super_dark;
@import "pages/status";
@import "pages/branching";
@import "pages/survey_settings";
+ @import "pages/survey_theme";
@import "pages/testing";
@import "pages/publish";
@import "pages/data";
diff --git a/resources/sass/admin_new/mobile/pages/branching.scss b/resources/sass/admin_new/mobile/pages/branching.scss
index 25196627e..43df048b8 100644
--- a/resources/sass/admin_new/mobile/pages/branching.scss
+++ b/resources/sass/admin_new/mobile/pages/branching.scss
@@ -65,7 +65,8 @@
width: 100%;
height: auto;
- padding: 30px 10px 20px 20px;
+ padding: 30px 0 20px 0;
+ box-sizing: border-box;
.forma_bottom_inner{
display: flex;
@@ -78,6 +79,11 @@
margin: 0 11px 0 2px;
padding: 0;
}
+
+ button{
+ margin: 0;
+ padding: 0 12px;
+ }
}
}
diff --git a/resources/sass/admin_new/mobile/pages/survey_theme.scss b/resources/sass/admin_new/mobile/pages/survey_theme.scss
new file mode 100644
index 000000000..2674e601f
--- /dev/null
+++ b/resources/sass/admin_new/mobile/pages/survey_theme.scss
@@ -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;
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/settings/uporabniki.scss b/resources/sass/admin_new/pages/settings/uporabniki.scss
index 2cbc0b758..7880ec354 100644
--- a/resources/sass/admin_new/pages/settings/uporabniki.scss
+++ b/resources/sass/admin_new/pages/settings/uporabniki.scss
@@ -142,4 +142,9 @@ div.subpage_uporabniki {
}
}
+}
+
+table#unconfirmed_mail_user_list {
+ border-left: 1px solid $gray;
+ border-right: 1px solid $gray;
}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/survey_analysis/basic.scss b/resources/sass/admin_new/pages/survey_analysis/basic.scss
index c87afef10..2bdea3575 100644
--- a/resources/sass/admin_new/pages/survey_analysis/basic.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/basic.scss
@@ -241,10 +241,10 @@
text-align: center;
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{
font-size: 14px;
+ font-style: normal;
&.faicon:before{
font-size: 14px;
@@ -485,6 +486,9 @@
&.xls:before{
color: $green;
}
+ &.ppt:before{
+ color: #fa4913;
+ }
}
}
}
diff --git a/resources/sass/admin_new/pages/survey_analysis/page_charts.scss b/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
index b5de8317f..6afcdf1c3 100644
--- a/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
@@ -12,6 +12,10 @@
overflow: hidden;
text-align: center;
+
+ &.chart_holder:first-child{
+ padding-top: 6px;
+ }
.chart_title {
width: 800px;
diff --git a/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss b/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss
index 218a0dcd2..7123e64b7 100644
--- a/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss
@@ -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;
- }
- }
}
diff --git a/resources/sass/admin_new/pages/survey_analysis/popups/multicrosstab.scss b/resources/sass/admin_new/pages/survey_analysis/popups/multicrosstab.scss
index e6b275428..7d9cedeb7 100644
--- a/resources/sass/admin_new/pages/survey_analysis/popups/multicrosstab.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/popups/multicrosstab.scss
@@ -40,14 +40,17 @@
@include popup_general();
display: none;
- position: fixed;
- left: calc(50% - 275px);
- top: 40vh;
- z-index: 999;
- height: auto;
+ position: absolute;
+ z-index: 999;
+
+ left: calc(50% - 300px);
+ top: 40%;
+ padding: 20px;
+ width: 550px;
- margin: 10px;
- width: 550px;
+ background-color: $white;
+ border-left: 6px $blue solid !important;
+ box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.34);
}
diff --git a/resources/sass/admin_new/pages/survey_data/no_data.scss b/resources/sass/admin_new/pages/survey_data/no_data.scss
new file mode 100644
index 000000000..7ce4b35fe
--- /dev/null
+++ b/resources/sass/admin_new/pages/survey_data/no_data.scss
@@ -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;
+ }
+ }
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/survey_data/survey_data.scss b/resources/sass/admin_new/pages/survey_data/survey_data.scss
index 643002d25..9cdb38a02 100644
--- a/resources/sass/admin_new/pages/survey_data/survey_data.scss
+++ b/resources/sass/admin_new/pages/survey_data/survey_data.scss
@@ -10,3 +10,5 @@
@import "quick_list_data";
@import "popups/popups";
+
+@import "no_data";
';
+
+ echo '
'.$lang['srv_admin_comment'].''; - //$rowss = mysqli_num_rows($sql); - //if ($rowss > 0) - echo '.'.gif "'.($sortpostorder==1?$lang['forum_desc']:$lang['forum_asc']).'")
';
- echo '
'; - + echo ''; + echo $lang['srv_comments_archive'].'
'; + + echo ''.$lang['srv_comments_archived'].'
'; + echo ''; + echo $lang['srv_comments_unarchive'].'
'; + + } } - echo ''.$lang['srv_comment_comment'].''; - echo '
'.$rowt['vsebina'].'
'; - echo ''; + + echo '
'.$lang['srv_comments_add_comment'].'
'; - echo ''; + + + echo '