';
+
+ $row = SurveyInfo::getInstance()->getSurveyRow();
+
+ $p->include_lang($p->lang_resp);
+ $base_lang_resp = $lang['language'];
+ $p->include_base_lang();
+
+ $link1 = $site_url.'a/'.$row['hash'];
+ echo '
';
+ echo '
'.$link1.''.(count($lang_array) > 0 ? ' - '.$base_lang_resp : '');
+ echo '
';
+ echo '
';
// Imamo vec linkov za skupine
$ss = new SurveySkupine($this->anketa);
@@ -2947,36 +3017,34 @@ class SurveyAdminSettings {
$vrednosti = $ss->getVrednosti($spr_id);
foreach($vrednosti as $vrednost){
$link_skupine = isset($vrednost['nice_url']) ? $vrednost['nice_url'] : $vrednost['url'];
- echo '
';
- echo ''.$link_skupine.''.(count($lang_array) > 0 ? ' - '.$base_lang_resp : '').' - '.$vrednost['naslov'].'';
+ echo '
';
+ echo '
'.$link_skupine.''.(count($lang_array) > 0 ? ' - '.$base_lang_resp : '').' - '.$vrednost['naslov'];
+ echo '
';
+ echo '
';
}
}
// Imamo vec linkov za jezike
if (count($lang_array) > 0) {
foreach ($lang_array AS $lang_id => $lang_name) {
- echo '
';
- echo ''.$link.'?language='.$lang_id.' - '.$lang_name.'';
+ echo '
';
if($spr_id > 0){
foreach($vrednosti as $vrednost){
$link_skupine = isset($vrednost['nice_url']) ? $vrednost['nice_url'] : $vrednost['url'];
- echo '
';
- echo ''.$link_skupine.'&language='.$lang_id.' - '.$lang_name.' - '.$vrednost['naslov'].'';
+ echo '
';
}
}
}
}
- echo '';
-
- echo '';
-
-
- echo '
';
-
-
- // Okno za dodajanje lepega url-ja
+ /*/ Okno za dodajanje lepega url-ja
echo '
';
+ echo '';*/
}
function anketa_vabila_url() {
diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php
index cadd6dba2..f32287551 100644
--- a/admin/survey/classes/tracking/CrossRoad.php
+++ b/admin/survey/classes/tracking/CrossRoad.php
@@ -253,7 +253,7 @@ class CrossRoad {
$first_action = NAVI_OBJAVA;
$_GET['m'] == 'settings' ? $second_action = NAVI_OBJAVA_SETTINGS : ($_GET['m'] == 'url' ? $second_action = NAVI_OBJAVA_URL : $second_action = '');
- $layout_width = 'wide';
+ $layout_width = 'narrow';
$status = 5;
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index a9a1fb1bc..d4c7ca141 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5529,3 +5529,10 @@ function actionNotePopupClose(){
$('#action_note_holder').html('');
});
}
+
+//Hide top_note div
+function top_note_hide(id) {
+
+ $('#'+id).addClass('displayNone');
+
+}
diff --git a/lang/1.php b/lang/1.php
index 8a3b6189c..5399298a3 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -1898,9 +1898,15 @@ $lang = array (
"srv_anketa_is_not_active" => "NEAKTIVNA",
"srv_anketa_is_finished" => "ZAKLJUČENA",
"srv_anketa_href" => "HTML koda povezave",
- "srv_anketa_href_text" => "Običajna HTML koda za povezavo",
- "srv_anketa_href_count" => "HTML koda povezave s števcem ogledov",
- "srv_anketa_href_count_text" => "HTML koda skupaj s števcem, ki šteje število ogledov
povezave na anketo",
+ "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. ",
+ "srv_anketa_href_friends" => "Delite s prijatelji",
+ "srv_anketa_href_friends_text" => "Delite povezavo do ankete s prijatelji na družbenih medijih (Facebook, Twitter, Linkedin, itd.)",
+ "srv_anketa_href_ijs" => "iFrame - JavaScript verzija",
+ "srv_anketa_href_ijs_text" => "Vdelajte anketo na vašo spletno stran, da lahko respondenti anketo rešujejo na vaši strani.",
+ "srv_anketa_href_inojs" => "iFrame - brez JavaScripta",
+ "srv_anketa_href_inojs_text" => "Vdelajte anketo na vašo spletno stran, da lahko respondenti anketo rešujejo na vaši strani.",
"srv_anketa_noactive_email" => "Označi anketo kot 'Email vabila''.",
"srv_anketa_setActive_email" => "aktiviraj 'Email vabila'",
"srv_anketa_active_email" => "Anketa je označena kot 'Email vabila'.",
@@ -4278,7 +4284,14 @@ $lang = array (
# "srv_collect_full_meta" => "Para podatke (lastnosti računalika, podrobni podatki o e-poštnih vabilih in telefonskih klicih).",
"srv_publication_base" => "Pregled",#"Nastavitve",#"Objava URL",
"srv_publication_base_title" => "Osnovne URL povezave",
- "srv_publication_survey_warnings" => "Anketa ima napake, opozorila, priporočila, nerešene komentarje.",
+ "srv_publication_survey_warnings" => "Anketa ima napake, opozorila, priporočila ali nerešene komentarje, ki jih lahko pregledate v zavihku ",
+ "srv_publication_survey_noactive" => "Vaša anketa še ni aktivirana",
+ "srv_publication_survey_links" => "Delite povezavo do ankete",
+ "srv_publication_survey_links_note" => "Spodaj je povezava do vprašalnika, kjer se podatki normalno shranjujejo v bazo. To povezavo sporočite dejanskim respondentom, denimo z objavo na družbenih omrežjih, forumih, prek e-maila, ipd.",
+ "srv_publication_survey_noactive_note" => "Če želite zbirati realne podatke, je anketo treba aktivirati.",
+ "srv_publication_survey_grouplang" => "Povezave za skupine in jezike",
+ "srv_publication_survey_more" => "Več načinov deljenja ankete",
+ "srv_publication_survey_copylink" => "Kopiraj povezavo",
"srv_publication_advanced_url" => "Napredne URL povezave",
"srv_publication_advanced_url_text" => "HTML koda, QR koda, vdelava, pop-up, Twitter, Facebook...",
"srv_publication_invitations" => "Vabila v anketo",
@@ -4522,7 +4535,7 @@ $lang = array (
"admin_please_enable_this_b" => "Prosimo, vklopite B za to navigacijo v urejanju navigacij",
"admin_too_many_b" => "Žtevilo prikazanih kategorij je zaradi hitrosti omejeno na 2000.",
"srv_nice_url" => "Lep URL",
- "srv_nice_url_add" => "Dodaj nov lep URL",
+ "srv_nice_url_add" => "Ustvari lepo URL povezavo",
"srv_nice_url_remove" => "Odstrani lep URL",
"srv_nice_url_taken" => "je že zaseden!",
"srv_nice_url_short" => "je prekratek! Minimalna dolžina so 3 znaki.",
diff --git a/lang/2.php b/lang/2.php
index 5634fc564..88a7e10f5 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -1891,9 +1891,15 @@ $lang = array (
"srv_anketa_is_not_active" => "NOT ACTIVE",
"srv_anketa_is_finished" => "FINISHED",
"srv_anketa_href" => "HTML code for link",
- "srv_anketa_href_text" => "",
- "srv_anketa_href_count" => "HTML code for link with view counter",
- "srv_anketa_href_count_text" => "",
+ "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. ",
+ "srv_anketa_href_friends" => "Share with friends",
+ "srv_anketa_href_friends_text" => "Share the link to the survey with your friends on social media (Facebook, Twitter, Linkedin, etc.)",
+ "srv_anketa_href_ijs" => "iFrame - JavaScript version",
+ "srv_anketa_href_ijs_text" => "Embed the survey on your website so that respondents can complete the survey on your website.",
+ "srv_anketa_href_inojs" => "iFrame - without JavaScripta",
+ "srv_anketa_href_inojs_text" => "Embed the survey on your website so that respondents can complete the survey on your website.",
"srv_anketadelete" => "Delete survey",
"srv_anketarename_txt" => "Rename",
"srv_anketadelete_txt" => "Delete",
@@ -4256,7 +4262,14 @@ $lang = array (
# "srv_collect_full_meta" => "meta podatke (lastnosti računalika, podrobni podatki o e-poštnih vabilih in telefonskih klicih).",
"srv_publication_base" => "Overview",#"URL publication",
"srv_publication_base_title" => "Survey links",
- "srv_publication_survey_warnings" => "Survey has errors, warnings, recommendations, unresolved comments.",
+ "srv_publication_survey_warnings" => "Survey has errors, warnings, recommendationsor unresolved comments which you can review here: ",
+ "srv_publication_survey_noactive" => "Your survey has not been activated yet",
+ "srv_publication_survey_noactive_note" => "To collect real data, the survey must be activated.",
+ "srv_publication_survey_grouplang" => "Group and language links",
+ "srv_publication_survey_copylink" => "Copy link",
+ "srv_publication_survey_more" => "More ways to share the survey",
+ "srv_publication_survey_links" => "Share survey link",
+ "srv_publication_survey_links_note" => "Below is a link to the questionnaire where the data is normally stored in the database. Share this link with the actual respondents, e.g. by posting on social networks, forums, via email, etc.",
"srv_publication_advanced_url" => "Advanced URL links",
"srv_publication_advanced_url_text" => "HTML code, QR code, embedd, pop-up, Twitter, Facebook...",
"srv_publication_invitations" => "Individualised invitations",
@@ -4497,7 +4510,7 @@ $lang = array (
"admin_please_enable_this_b" => "Please enable B for this category in menu editing.",
"admin_too_many_b" => "Number of categories is limited to 2000.",
"srv_nice_url" => "Set custom URL",
- "srv_nice_url_add" => "Add new custom URL",
+ "srv_nice_url_add" => "Create custom URL",
"srv_nice_url_remove" => "Remove custom URL",
"srv_nice_url_taken" => "is already taken!",
"srv_nice_url_short" => "is too short! Minimal length is 3 characters.",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 28333d5eb..580786211 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -6048,6 +6048,14 @@ span.faicon.link-chain::before {
content: "\f0c1";
}
+span.faicon.html5::before {
+ content: "\f13b";
+}
+
+span.faicon.stopwatch20::before {
+ content: "\e06f";
+}
+
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
@@ -10868,6 +10876,200 @@ div.theme_label.span_theme_current img {
line-height: 50px;
}
+div#vabila div.top_note {
+ position: relative;
+}
+div#vabila div.top_note .note_hide {
+ position: absolute !important;
+ top: 10px;
+ right: 10px;
+ z-index: 9999;
+ font-size: 12px !important;
+ color: #777777;
+}
+div#vabila div.top_note .note_hide:hover {
+ color: #333333;
+}
+div#vabila div.top_note .note_hide a {
+ color: #777777;
+ text-decoration: none;
+}
+div#vabila div.top_note .note_hide a:hover {
+ color: #333333;
+}
+div#vabila div.top_note div.top_note_activate {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+}
+div#vabila div.top_note div.top_note_activate p {
+ margin-right: 12px;
+}
+div#vabila div.top_note div.top_note_activate .switch_anketa {
+ position: relative;
+ display: block;
+ width: 46px;
+ height: 16px;
+}
+div#vabila div.top_note div.top_note_activate .switch_anketa .switch_anketa_content {
+ position: absolute;
+ cursor: pointer;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ padding-top: 1px;
+ color: white;
+ font-size: 12px;
+ font-weight: 400;
+ line-height: 12px;
+ background-color: #1E88E5;
+ border-radius: 16px;
+}
+div#vabila div.top_note div.top_note_activate .switch_anketa .switch_anketa_content:before {
+ position: absolute;
+ content: "";
+ height: 14px;
+ width: 14px;
+ bottom: 1px;
+ background-color: white;
+ border-radius: 50%;
+}
+div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_on .switch_anketa_content {
+ padding-left: 20px;
+ background-color: #1E88E5;
+}
+div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_on .switch_anketa_content:before {
+ left: 1px;
+}
+div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_on:hover .switch_anketa_content {
+ background-color: #0059ab;
+}
+div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_off .switch_anketa_content {
+ padding-left: 6px;
+ background-color: #808080;
+}
+div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_off .switch_anketa_content:before {
+ right: 1px;
+}
+div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_off:hover .switch_anketa_content {
+ background-color: #777777;
+}
+div#vabila div.title {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ margin-bottom: 24px;
+ margin-top: 48px;
+}
+div#vabila div.title:first-of-type {
+ margin-top: 0;
+}
+div#vabila div.title div.title_icon {
+ height: 30px;
+ width: 30px;
+ border-radius: 2px;
+ background-color: #EAF9FE;
+ color: #1E88E5;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-right: 8px;
+}
+div#vabila div.title h2 {
+ width: 100%;
+ overflow: hidden;
+ font-weight: 300;
+ font-size: 24px;
+ margin-block-start: 0;
+ margin-block-end: 0;
+}
+div#vabila div.title h2:after {
+ content: "";
+ display: inline-block;
+ height: 0.5em;
+ vertical-align: bottom;
+ width: 100%;
+ box-sizing: border-box;
+ margin-right: -100%;
+ margin-left: 8px;
+ border-top: 1px solid #E5E5E5;
+}
+div#vabila div.button_holder {
+ align-items: center;
+ margin-bottom: 16px;
+}
+div#vabila div.button_holder button {
+ margin: 0 32px 0 8px;
+}
+div#vabila div.button_holder div.input_box {
+ border: 1px solid #C4C4C4;
+ width: 300px;
+ padding: 10px 0 10px 8px;
+}
+div#vabila div.button_holder div.input_box input {
+ border: none;
+ margin: 0;
+ padding: 0;
+ font-size: 16px;
+ width: 90%;
+}
+div#vabila div.grouplang {
+ margin-top: 16px;
+ display: flex;
+ align-items: center;
+}
+div#vabila div.grouplang span.faicon {
+ margin-left: 9px;
+ cursor: pointer;
+}
+div#vabila div.more {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ gap: 16px 32px;
+}
+div#vabila div.more div.more_block {
+ height: auto;
+ width: 298px;
+ background-color: #F8F8F8;
+ border: 1px solid #E5E5E5;
+ padding: 16px;
+ font-size: 14px;
+ cursor: pointer;
+ transition: 0.2s;
+}
+div#vabila div.more div.more_block:hover {
+ background-color: #ebebeb;
+}
+div#vabila div.more div.more_block div.more_title {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ text-transform: uppercase;
+ font-weight: 600;
+ margin-bottom: 8px;
+ font-size: 16px;
+}
+div#vabila div.more div.more_block div.more_title div.more_title_icon {
+ height: 24px;
+ width: 24px;
+ border-radius: 2px;
+ background-color: #EAF9FE;
+ color: #1E88E5;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-right: 8px;
+ position: relative;
+}
+div#vabila div.more div.more_block div.more_title div.more_title_icon span.stopwatch20 {
+ font-size: 8px;
+ position: absolute;
+ bottom: 1px;
+ right: 1px;
+}
+
.dashboard_top_settings {
display: flex;
align-items: center;
diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss
index fb5c77dc3..d59e4086d 100644
--- a/resources/sass/admin_new/basic/icons/standard.scss
+++ b/resources/sass/admin_new/basic/icons/standard.scss
@@ -684,3 +684,13 @@ span.faicon.list::before{
span.faicon.link-chain::before{
content: "\f0c1";
}
+
+//HTML5
+span.faicon.html5::before{
+ content: "\f13b";
+}
+
+//Stopwatch
+span.faicon.stopwatch20::before{
+ content: "\e06f";
+}
diff --git a/resources/sass/admin_new/pages/my_surveys/my_surveys.scss b/resources/sass/admin_new/pages/my_surveys/my_surveys.scss
index 1681e8559..39c2d6b2b 100644
--- a/resources/sass/admin_new/pages/my_surveys/my_surveys.scss
+++ b/resources/sass/admin_new/pages/my_surveys/my_surveys.scss
@@ -10,4 +10,5 @@
@import "podatki";
@import "testiranje";
@import "oblika_teme";
+@import "objava";
diff --git a/resources/sass/admin_new/pages/my_surveys/objava.scss b/resources/sass/admin_new/pages/my_surveys/objava.scss
new file mode 100644
index 000000000..f26981700
--- /dev/null
+++ b/resources/sass/admin_new/pages/my_surveys/objava.scss
@@ -0,0 +1,262 @@
+div#vabila {
+
+ div.top_note {
+ position: relative;
+
+ .note_hide{
+ position: absolute !important;
+ top: 10px;
+ right: 10px;
+ z-index: 9999;
+
+ font-size: 12px !important;
+ color: $very-dark-gray;
+
+ &:hover{
+ color: $black;
+ }
+
+ a{
+ color: $very-dark-gray;
+ text-decoration: none;
+
+ &:hover{
+ color: $black;
+ }
+ }
+ }
+
+ // Toggle za aktivacijo ankete
+ div.top_note_activate{
+
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+
+ p {
+ margin-right: 12px;
+ }
+
+ // Gumb za aktivacijo ankete - kopirano iz headerja
+ .switch_anketa {
+ position: relative;
+ display: block;
+
+ width: 46px;
+ height: 16px;
+
+ .switch_anketa_content {
+ position: absolute;
+ cursor: pointer;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ padding-top: 1px;
+
+ color: white;
+ font-size: 12px;
+ font-weight: 400;
+ line-height: 12px;
+
+ background-color: $blue;
+ border-radius: 16px;
+ }
+ .switch_anketa_content:before {
+ position: absolute;
+ content: "";
+
+ height: 14px;
+ width: 14px;
+ bottom: 1px;
+
+ background-color: white;
+ border-radius: 50%;
+ }
+ }
+
+ .switch_anketa.anketa_on{
+ .switch_anketa_content{
+ padding-left: 20px;
+ background-color: $blue;
+ }
+ .switch_anketa_content:before{
+ left: 1px;
+ }
+ &:hover{
+ .switch_anketa_content{
+ background-color: $dark-blue;
+ }
+ }
+ }
+
+ .switch_anketa.anketa_off{
+ .switch_anketa_content{
+ padding-left: 6px;
+ background-color: $very-dark-gray2;
+ }
+ .switch_anketa_content:before{
+ right: 1px;
+ }
+ &:hover{
+ .switch_anketa_content{
+ background-color: $very-dark-gray;
+ }
+ }
+ }
+ }
+ }
+
+ // Naslovi z ikonami
+ div.title {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+
+ margin-bottom: 24px;
+ margin-top: 48px;
+ &:first-of-type {
+ margin-top: 0;
+ }
+
+ div.title_icon {
+ height: 30px;
+ width: 30px;
+ border-radius: 2px;
+ background-color: $light-blue;
+ color: $blue;
+
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ margin-right: 8px;
+ }
+
+ h2 {
+ width: 100%;
+ overflow: hidden;
+ font-weight: $light;
+ font-size: 24px;
+
+ margin-block-start: 0;
+ margin-block-end: 0;
+
+ &:after {
+ content: "";
+ display: inline-block;
+ height: 0.5em;
+ vertical-align: bottom;
+ width: 100%;
+ box-sizing: border-box;
+ margin-right: -100%;
+ margin-left: 8px;
+ border-top: 1px solid $gray;
+ }
+ }
+ }
+
+ // Polje za kopiranje linka
+ div.button_holder {
+ align-items: center;
+ margin-bottom: 16px;
+
+ button {
+ margin: 0 32px 0 8px;
+ }
+
+ div.input_box {
+ border: 1px solid $dark-gray;
+ width: 300px;
+ padding: 10px 0 10px 8px;
+
+ input {
+ border: none;
+ margin: 0;
+ padding: 0;
+ font-size: 16px;
+ width: 90%
+ }
+ }
+ }
+
+ //Seznam linkov za skupine/jezike
+ div.grouplang {
+ margin-top: 16px;
+ display: flex;
+ align-items: center;
+
+ span.faicon {
+ margin-left: 9px;
+ cursor: pointer;
+ }
+ }
+
+ // Več načinov deljenja ankete
+ div.more {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+
+ gap: 16px 32px;
+
+ div.more_block {
+ height: auto;
+ width: 298px;
+
+ background-color: $light-gray;
+ border: 1px solid $gray;
+
+ padding: 16px;
+
+ font-size: 14px;
+
+ cursor: pointer;
+
+ transition: 0.2s;
+ &:hover {
+ background-color: darken($light-gray, 5%);
+ }
+
+ div.more_title {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+
+ text-transform: uppercase;
+ font-weight: $semi-bold;
+
+ margin-bottom: 8px;
+
+ font-size: 16px;
+
+ div.more_title_icon {
+ height: 24px;
+ width: 24px;
+ border-radius: 2px;
+ background-color: $light-blue;
+ color: $blue;
+
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ margin-right: 8px;
+
+ position: relative;
+
+ span.stopwatch20 {
+ font-size: 8px;
+ position: absolute;
+
+ bottom: 1px;
+ right: 1px
+ }
+ }
+
+ }
+
+ }
+ }
+
+}
\ No newline at end of file