';
diff --git a/admin/survey/classes/class.SurveyTheme.php b/admin/survey/classes/class.SurveyTheme.php
index d95ef9cac..8b6f3abb3 100644
--- a/admin/survey/classes/class.SurveyTheme.php
+++ b/admin/survey/classes/class.SurveyTheme.php
@@ -64,7 +64,7 @@ class SurveyTheme {
10 => 'Otroci4.css',
11 => 'Embed.css',
12 => 'Embed2.css',
- 13 => 'Slideshow.css'
+ //13 => 'Slideshow.css'
);
$standard_skins[14] = 'Uni.css';
diff --git a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
index 91459185b..b6e09fa06 100644
--- a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
+++ b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
@@ -101,9 +101,7 @@ class SurveyInvitationsNew {
}
if ($NoNavi == false) {
- echo '
';
}
// Warning za nastavitev streznika
@@ -1677,7 +1675,7 @@ class SurveyInvitationsNew {
echo '
';
echo '
';
- echo ' '.$lang['srv_invitation_recipients_filter'].': '.$lang['srv_invitation_recipients_filter'].'
';
echo '
';
@@ -2957,6 +2955,9 @@ class SurveyInvitationsNew {
if($isEmail) {
+ echo '
';
+
+
// Step 1 - nastavitve
echo '
';
+ echo '
';
+
+
echo '
';
}
diff --git a/lang/1.php b/lang/1.php
index 1c7a1a8bb..8b91d4120 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -4436,7 +4436,7 @@ $lang = array (
"srv_invitation_nonActivated_title" => "Pošiljanje vabil v anketo",
"srv_invitation_nonActivated_text1" => "V spletnih anketah običajno zadoščata dve splošni emaili vabili vsem enotam (drugo vabilo je hkrati zahvala respondentom). V primeru manjšega števila enot (npr. nekaj sto) uporabimo kar privzeti email sistem (npr. Gmail, Outlook...), če je enot več, pa orodja za masovno pošiljanje (npr. SqualoMail, MailChimp...).",
"srv_invitation_nonActivated_text2" => "Večje število vabil in sledenje respondentom je večinoma nepotrebno, hkrati pa tudi zahtevno (glej
priporočila za pošiljanje vabil ).",
- "srv_invitation_nonActivated_text3" => "Email vabila lahko pošiljamo tudi preko sistema 1KA, in to tako splošna kot individualizirana vabila s kodo in sledenjem. Sistem 1KA poleg tega podpira (dokumentira) tudi pošiljanje vabil na preko pošta, SMS, ipd.",
+ "srv_invitation_nonActivated_text3" => "Email vabila lahko pošiljamo tudi preko sistema 1KA, in to tako splošna kot individualizirana vabila s kodo in sledenjem. Sistem 1KA poleg tega podpira (dokumentira) tudi pošiljanje vabil preko pošte, SMS, ipd.",
"srv_invitation_nonActivated_button_details" => "Podrobnosti o 1KA sistemu vabil",
"srv_invitation_nonActivated_button_activate" => "Omogoči 1KA sistem vabil",
"srv_invitation_nonActivated_more" => "Več >>",
@@ -4989,7 +4989,7 @@ $lang = array (
'srv_inv_recipiens_from_list' => "Ročni vnos",
'srv_inv_recipiens_from_file' => "Datoteke (csv)",
'srv_inv_recipiens_from_system' => "Iz obstoječe spremenljivke",
- 'srv_inv_recipiens_temporary_list' => "Začasni seznam",
+ 'srv_inv_recipiens_temporary_list' => "Začasen seznam",
'srv_inv_recipiens_list_created_by' => "Kreiral: ",
'srv_inv_recipiens_list_created_day' => "Kreiral dne: ",
'srv_inv_recipiens_list_comment' => "komentar: ",
@@ -6206,7 +6206,7 @@ $lang = array (
'srv_inv_list_edit_from_all_surveys' => 'Vse moje ankete',
'srv_inv_list_edit_from_archive' => 'Arhivi pošiljanja',
'srv_inv_list_table_name' => 'Ime seznama',
- 'srv_inv_list_table_cnt_receive' => 'Št.prej.',
+ 'srv_inv_list_table_cnt_receive' => 'Št. prej.',
'srv_inv_list_table_comment' => 'Komentar',
'srv_inv_list_table_date_create' => 'Datum kreiranja',
'srv_inv_list_table_author' => 'Avtor',
@@ -6290,7 +6290,7 @@ $lang = array (
'srv_te_custom_border_radius' => 'Ostrina roba',
'srv_te_custom_background_keywords' => 'Barva ozadja',
'srv_te_custom_font_style_keywords' => 'Stil',
- 'srv_te_custom_font_style_keywords_bold' => 'Odobeljeno',
+ 'srv_te_custom_font_style_keywords_bold' => 'Odebeljeno',
'srv_te_custom_font_style_keywords_italic' => 'Poševno',
'srv_te_custom_font_style_keywords_underline'=> 'Podčrtano',
'srv_mv_Neustrezno' => 'Neustrezno',
diff --git a/main/survey/skins/1046_1kaBlue.css b/main/survey/skins/1046_1kaBlue.css
new file mode 100644
index 000000000..db110abf2
--- /dev/null
+++ b/main/survey/skins/1046_1kaBlue.css
@@ -0,0 +1,529 @@
+/*
+ Default tema ankete - 1ka - Modra barva
+*/
+/* Barve */
+/* Import osnovne postavitve */
+/*
+ Osnovna tema ankete - 1ka - brez definiranih barv
+*/
+/* Fonti */
+body {
+ margin: 0;
+ padding: 0;
+ color: #505050;
+ font-size: 100%;
+ font-family: Montserrat, Arial, Sans-Serif !important;
+ background: #ffffff;
+}
+
+body.preview, body.testdata {
+ margin-top: 26px;
+}
+
+#outercontainer {
+ width: 100%;
+ margin: 0 auto;
+}
+#outercontainer .outercontainer_header {
+ position: absolute;
+ width: 100%;
+ height: 80px;
+ border-bottom: 6px #1e88e5 solid;
+}
+#outercontainer #container {
+ position: relative;
+ width: 100%;
+ max-width: 1200px;
+ margin: 0px auto 10px;
+}
+
+/* Warning bar (preview, cookie) */
+#cookie_alert,
+#test_alert {
+ height: 26px;
+ font-size: 15px;
+ line-height: 25px;
+ color: #ffffff;
+ background-color: #ffa608;
+ border-bottom: 1px solid #ffa608;
+}
+#cookie_alert a,
+#test_alert a {
+ text-decoration: none;
+ font-weight: bold;
+ color: #ffffff;
+}
+#cookie_alert a:hover,
+#test_alert a:hover {
+ text-decoration: underline;
+}
+#cookie_alert span,
+#test_alert span {
+ color: #ffffff;
+}
+#cookie_alert span a,
+#test_alert span a {
+ color: #ffffff;
+ font-weight: normal;
+}
+
+/* Header - logo, naslov, progressbar */
+h1 {
+ margin: 0px auto 30px;
+ padding: 120px 0 50px 0;
+ font-size: 28px;
+ color: #1e88e5;
+ text-align: center;
+ border-bottom: 1px solid #ddeffd;
+}
+
+h1.evalvacija {
+ margin-bottom: 0;
+}
+
+#logo {
+ right: auto;
+ left: 25px;
+ top: 13px;
+ max-height: 56px !important;
+ background: url("../../../public/img/logo/1ka_logo_slo.svg");
+ background-repeat: no-repeat !important;
+ background-size: auto 100% !important;
+}
+#logo a {
+ width: 250px;
+ height: 56px;
+}
+
+#logo.english {
+ background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+.header_settings_holder {
+ top: 0px;
+ right: 20px;
+ left: auto;
+}
+.header_settings_holder .progress_bar span {
+ float: left !important;
+ /* ie6,7 doesnt support inline-block */
+ display: block;
+ width: 20px;
+ font-size: 11px;
+ color: #6D87AF;
+}
+.header_settings_holder .progress_bar div {
+ height: 10px;
+ width: 130px;
+ padding: 2px;
+ margin: 0 5px;
+ border: 1px #cccccc solid;
+ background-color: #ffffff;
+}
+.header_settings_holder .progress_bar div span {
+ height: 10px;
+ background-color: #1e88e5;
+}
+.header_settings_holder .progress_bar p a {
+ color: #1e88e5;
+ text-decoration: none;
+}
+.header_settings_holder .progress_bar p a:hover {
+ color: #ffa608;
+}
+.header_settings_holder .continue_later_setting a {
+ color: #1e88e5;
+}
+.header_settings_holder .continue_later_setting a:hover {
+ color: #ffa608;
+}
+.header_settings_holder .tawk_chat a {
+ color: #1e88e5;
+}
+.header_settings_holder .tawk_chat a:hover {
+ color: #ffa608;
+}
+
+/* Spremenljivke */
+.spremenljivka {
+ margin: 20px 10px 20px 10px;
+ padding: 20px 2px 50px 12px !important;
+ border-bottom: 1px #ddeffd solid;
+}
+.spremenljivka .naslov {
+ padding: 5px 0 15px 5px;
+ font-size: 18px;
+ font-weight: 600;
+}
+.spremenljivka .naslov .spremenljivka_info {
+ font-size: 14px;
+ font-weight: 400;
+ padding-top: 7px;
+}
+.spremenljivka .sequence_number {
+ background-color: #ddeffd;
+ color: #42A5F5;
+}
+.spremenljivka .sequence_number:hover {
+ background-color: #add8fb;
+}
+.spremenljivka .sequence_number.active {
+ background-color: #42A5F5;
+ color: #ffffff;
+}
+.spremenljivka .counter {
+ font-size: 18px;
+}
+.spremenljivka #dynamic_count {
+ color: #1e88e5;
+}
+.spremenljivka .arrow {
+ color: #1e88e5;
+}
+.spremenljivka .arrow:hover {
+ color: #ffa608;
+}
+
+.spremenljivka.limited {
+ outline: 1px #F15A24 solid;
+}
+
+.required, .required_require, .required_limit {
+ outline: 1px #F15A24 solid;
+}
+
+div.variabla,
+td.variabla,
+td.question,
+td.differential,
+.variabla_sum label {
+ font-size: 14px;
+}
+
+div.variable_holder {
+ padding: 10px 0 0 0;
+}
+div.variable_holder thead,
+div.variable_holder tr.table-header {
+ font-weight: normal;
+ font-size: 14px;
+}
+div.variable_holder thead td,
+div.variable_holder tr.table-header td {
+ padding: 10px 5px;
+}
+
+table.grid_table thead tr td {
+ border-bottom: 2px #42A5F5 solid;
+}
+table.grid_table thead tr.middle_row td {
+ border-top: 2px #42A5F5 solid;
+}
+table.grid_table tbody tr.table-header td {
+ border-bottom: 2px #42A5F5 solid;
+ border-top: 2px #42A5F5 solid;
+ background-color: #ffffff;
+}
+table.grid_table tbody tr:nth-child(2n+1) {
+ background-color: #ffffff;
+}
+table.grid_table tbody tr:nth-child(2n) {
+ background-color: #ddeffd;
+}
+table.grid_table td {
+ padding: 10px 10px;
+}
+
+span.reminder {
+ left: 3px;
+}
+
+/* Textboxi, textarea, select */
+input, textarea, select {
+ font-family: Montserrat, Arial, Sans-Serif !important;
+}
+
+input[type=text], textarea, select {
+ padding: 10px 15px;
+ border-radius: 3px;
+ border: 1px solid #d1d1d1;
+ border-radius: 3px;
+ background-color: #fff;
+}
+
+/* ranking */
+.dropzone {
+ border-top: 1px #ddeffd solid;
+ margin-top: 12px;
+ padding-top: 17px;
+}
+
+table.ranking_table ul {
+ margin-top: 19px;
+}
+
+.ranking,
+.ranking_long,
+.handle,
+.handle_long,
+.ime,
+.izbran,
+.frame_ranking,
+.frame_ranking_hover,
+.frame_dropping,
+.frame_dropping_hover,
+.frame_moving {
+ font-size: 13px;
+ padding: 7px 10px 9px;
+ border: 2px solid #1e88e5;
+ background-color: #ffffff;
+}
+
+.ranking:hover {
+ background-color: #f5fafe;
+}
+
+div.variable_holder .frame_ranking_hover {
+ border: 2px #1e88e5 solid;
+ background-color: #ddeffd;
+}
+
+div.variable_holder .frame_ranking,
+div.variable_holder .frame_moving,
+div.variable_holder .frame_dropping,
+div.variable_holder .frame_dropping_hover {
+ text-indent: -35px;
+ border: 2px #42A5F5 solid;
+ background-color: #ddeffd;
+}
+
+table.ranking_table b {
+ font-size: 13px;
+ font-weight: 600;
+}
+
+/* Photo upload button */
+button.record_foto {
+ border: 2px solid #1e88e5;
+}
+button.record_foto::before {
+ color: #1e88e5;
+}
+button.record_foto:hover, button.record_foto:focus {
+ border-color: #ffa608;
+}
+button.record_foto:hover::before, button.record_foto:focus::before {
+ color: #ffa608;
+}
+
+/* Koledar */
+.ui-datepicker {
+ font-size: 14px;
+}
+
+button.ui-datepicker-trigger {
+ color: #1e88e5;
+}
+button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
+ color: #ffa608;
+}
+
+/* Slider */
+.grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
+ color: #505050;
+}
+.grupa .spremenljivka .slider.ui-widget-content {
+ /*background-color: $color_light !important;*/
+ background-image: none !important;
+ border: 0;
+}
+.grupa .spremenljivka .ui-slider-horizontal {
+ height: 8px;
+}
+.grupa .spremenljivka .ui-slider-handle {
+ cursor: pointer;
+ height: 10px !important;
+ width: 18px !important;
+ margin-top: 1px;
+ border: 0;
+ border-radius: 15px 15px !important;
+ background-color: #1e88e5 !important;
+ background-image: none !important;
+}
+.grupa .spremenljivka .ui-slider-handle:active {
+ background-color: #1e88e5 !important;
+}
+.grupa .spremenljivka .sliderText {
+ padding-top: 2px;
+ color: #505050;
+ background-color: #42A5F5;
+ border: 0;
+}
+.grupa .spremenljivka .sliderText::after {
+ border-color: #42A5F5 transparent;
+}
+
+/* Warning levo od vprasanja */
+.validation_alert {
+ position: absolute;
+ z-index: 51;
+ top: 20px;
+ left: -150px;
+ width: 130px;
+ min-height: 29px;
+ margin: 0;
+ text-align: center;
+ font-size: 11px;
+ line-height: 14px;
+ background-color: #ddeffd;
+ border: 2px solid red;
+ padding: 4px 7px;
+ border-radius: 4px;
+ box-shadow: none;
+}
+
+/* Gumbi na dnu */
+div.buttons {
+ padding: 20px 20px 35px;
+ margin: 0 10px;
+}
+div.buttons input {
+ cursor: pointer;
+ margin: 8px 10px;
+ /*padding: 7px 11px;*/
+ padding: 10px 20px;
+ text-align: center;
+ font-size: 12px;
+ letter-spacing: 1px;
+ font-weight: 600;
+ color: #FFFFFF;
+ border-radius: 20px;
+ border: 0;
+}
+div.buttons input.next {
+ background-color: #1e88e5;
+ border: 1px solid #1e88e5;
+}
+div.buttons input.next:hover, div.buttons input.next:focus {
+ background-color: #ffa608;
+ border: 1px solid #ffa608;
+}
+div.buttons input.prev {
+ color: #1e88e5;
+ background-color: #fff;
+ border: 1px solid #1e88e5;
+}
+div.buttons input.prev:hover, div.buttons input.prev:focus {
+ color: #fff;
+ background-color: #1e88e5;
+}
+
+/* Footer */
+#footer_survey {
+ padding: 40px;
+ background-color: #ffffff;
+ border-top: 1px #ddeffd solid;
+}
+#footer_survey p, #footer_survey a, #footer_survey a:visited {
+ color: #505050;
+ font-size: 14px;
+ line-height: 25px;
+ font-weight: 400;
+ text-decoration: none;
+}
+#footer_survey a:hover, #footer_survey a:active {
+ text-decoration: none;
+}
+
+/* awesome radio in checkboxi */
+input[type=checkbox] + span.enka-checkbox-radio,
+input[type=radio] + span.enka-checkbox-radio,
+.custom_radio_picture.obarvan > label > span.enka-custom-radio:before,
+.visual-radio-scale.checked .enka-vizualna-skala {
+ color: #42A5F5;
+ font-size: 20px;
+ vertical-align: -1px;
+}
+
+input[type=checkbox]:focus + span.enka-checkbox-radio:before,
+input[type=radio]:focus + span.enka-checkbox-radio:before,
+input[type=radio]:focus + span.enka-custom-radio:before,
+input[type=radio]:focus + span.enka-vizualna-skala::before {
+ color: #0965ae;
+}
+
+input[type=text]:focus,
+input[type=number]:focus,
+input[type=email]:focus,
+input[type=password]:focus,
+textarea:focus {
+ border-color: #42A5F5;
+}
+
+/* Ranking drag drop */
+.drag_and_drop {
+ top: -9px;
+ left: -12px;
+}
+
+.drag_and_drop_right {
+ top: -9px !important;
+ left: -12px !important;
+}
+
+.frame_dropping_titles {
+ width: 240px;
+ padding: 5px;
+ margin: 0px auto 0px auto;
+ height: 15px;
+ text-align: center;
+ background-color: #FFFFFF;
+ border-top: 2px solid #b9c5d9;
+ border-left: 2px solid #b9c5d9;
+ border-right: 2px solid #b9c5d9;
+ font-size: 13px;
+}
+
+.drag_and_drop_box {
+ top: -9px;
+ left: -12px;
+}
+.drag_and_drop_box img {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+.drag_and_drop_box_right {
+ top: 19px !important;
+ left: -12px !important;
+}
+
+.drag_and_drop_box_right_after_refresh {
+ /*top: 44px!important;*/
+ left: -12px !important;
+}
+
+.drag_and_drop_box_right_over {
+ left: -12px !important;
+}
+
+.frame_dropping_titles_box {
+ width: 240px;
+ padding: 5px;
+ margin: 0px auto 0px auto;
+ height: 15px;
+ text-align: center;
+ background-color: #FFFFFF;
+ font-size: 13px;
+}
+
+.frame_dropping {
+ padding: 7px 10px 9px;
+}
+
+.frame_dropping_box {
+ padding: 7px 10px 9px;
+}
+
+/*# sourceMappingURL=1kaBlue.css.map */
diff --git a/utils/cache/.gitignore b/utils/cache/.gitignore
new file mode 100644
index 000000000..c96a04f00
--- /dev/null
+++ b/utils/cache/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/utils/cache/index.html b/utils/cache/index.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/utils/cache/timthumb_cacheLastCleanTime.touch b/utils/cache/timthumb_cacheLastCleanTime.touch
new file mode 100644
index 000000000..e69de29bb
diff --git a/utils/cache/timthumb_int_aaad143384997b4a319a3a0afddea174.timthumb.txt b/utils/cache/timthumb_int_aaad143384997b4a319a3a0afddea174.timthumb.txt
new file mode 100644
index 000000000..5f494232e
Binary files /dev/null and b/utils/cache/timthumb_int_aaad143384997b4a319a3a0afddea174.timthumb.txt differ