diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php index 4e41f62d9..2af3656cd 100644 --- a/admin/survey/SurveyAdminAjax.php +++ b/admin/survey/SurveyAdminAjax.php @@ -6741,7 +6741,7 @@ class SurveyAdminAjax { $code = ''.$lang['srv_complete_survey'].''; - echo '

'.$lang['srv_anketa_href'].'

'; + echo '

'.$lang['srv_anketa_href'].'

'; echo ''; break; } echo '
'; - if ($name != 'settings') { - echo ''; - echo ''; + if ($name == 'settings' || $name == 'QR') { + echo ''; } else { - echo ''; + echo ''; + echo ''; } echo '
'; } diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 14262a44f..5b4e3f681 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -2600,21 +2600,20 @@ class SurveyAdminSettings { echo $lang['srv_anketa_href_count_text']; echo ''; - //Delite s prijatelji - echo '
'; + //QR koda + echo '
'; echo '
'; echo '
'; echo $lang['srv_anketa_href_friends']; echo '
'; echo $lang['srv_anketa_href_friends_text']; - echo 'friend share'; echo '
'; // iFrame - js echo '
'; echo '
'; echo '
'; - echo $lang['srv_anketa_href_ijs'].Help :: display('srv_embed_js'); + echo $lang['srv_anketa_href_ijs']; echo '
'; echo $lang['srv_anketa_href_ijs_text']; echo '
'; @@ -2623,7 +2622,7 @@ class SurveyAdminSettings { echo '
'; echo '
'; echo '
'; - echo $lang['srv_anketa_href_inojs'].Help :: display('srv_embed_fixed'); + echo $lang['srv_anketa_href_inojs']; echo '
'; echo $lang['srv_anketa_href_inojs_text']; echo '
'; diff --git a/lang/1.php b/lang/1.php index 79aee094e..b5c10f363 100644 --- a/lang/1.php +++ b/lang/1.php @@ -1901,12 +1901,14 @@ $lang = array ( "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_friends" => "QR koda", + "srv_anketa_href_friends_text" => "Delite povezavo do ankete s QR kodo.", "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_ijs_text2" => "Tu lahko skopirate kodo vaše ankete (Javascript verzija) in jo vdelate v vašo spletno stran.", "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_href_inojs_text2" => "Tu lahko skopirate kodo vaše ankete (verzija brez Javascript-a) in jo vdelate v vašo spletno stran.", "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'.", diff --git a/lang/2.php b/lang/2.php index bd9d73b4e..6f9e6434f 100644 --- a/lang/2.php +++ b/lang/2.php @@ -1894,12 +1894,14 @@ $lang = array ( "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_friends" => "QR code", + "srv_anketa_href_friends_text" => "Share the link to the survey with a QR code.", "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_ijs_text2" => "You can copy the code of your survey (Javascript version) and embed it into your own 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_anketa_href_inojs_text2" => "You can copy the code of your survey (version without Javascript) and embed it into your own website.", "srv_anketadelete" => "Delete survey", "srv_anketarename_txt" => "Rename", "srv_anketadelete_txt" => "Delete", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 2fd2976d8..cde5a004b 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -5230,31 +5230,31 @@ span.faicon.yellow, a.faicon.yellow, span.fa-brands.yellow, a.fa-brands.yellow { - color: #FFC700; + color: #FFC700 !important; } span.faicon.blue, a.faicon.blue, span.fa-brands.blue, a.fa-brands.blue { - color: #1E88E5; + color: #1E88E5 !important; } span.faicon.red, a.faicon.red, span.fa-brands.red, a.fa-brands.red { - color: #FF0000; + color: #FF0000 !important; } span.faicon.ultra_dark_gray, a.faicon.ultra_dark_gray, span.fa-brands.ultra_dark_gray, a.fa-brands.ultra_dark_gray { - color: #555555; + color: #555555 !important; } span.faicon.green, a.faicon.green, span.fa-brands.green, a.fa-brands.green { - color: #00C437; + color: #00C437 !important; } span.faicon.aslink, a.faicon.aslink, @@ -6973,12 +6973,16 @@ a.help { margin-block-start: 0; } .divPopUp h2 span.faicon, -.divPopUp .divPopUp_top span.faicon { +.divPopUp h2 span.fa-brands, +.divPopUp .divPopUp_top span.faicon, +.divPopUp .divPopUp_top span.fa-brands { margin-right: 6px; color: #1E88E5; } .divPopUp h2 span.faicon:before, -.divPopUp .divPopUp_top span.faicon:before { +.divPopUp h2 span.fa-brands:before, +.divPopUp .divPopUp_top span.faicon:before, +.divPopUp .divPopUp_top span.fa-brands:before { font-size: 14px; } .divPopUp p { @@ -7488,12 +7492,16 @@ body.waitlong #loading { margin-block-start: 0; } #check_pogoji h2 span.faicon, -#check_pogoji .divPopUp_top span.faicon { +#check_pogoji h2 span.fa-brands, +#check_pogoji .divPopUp_top span.faicon, +#check_pogoji .divPopUp_top span.fa-brands { margin-right: 6px; color: #1E88E5; } #check_pogoji h2 span.faicon:before, -#check_pogoji .divPopUp_top span.faicon:before { +#check_pogoji h2 span.fa-brands:before, +#check_pogoji .divPopUp_top span.faicon:before, +#check_pogoji .divPopUp_top span.fa-brands:before { font-size: 14px; } #check_pogoji p { @@ -7661,12 +7669,16 @@ body.waitlong #loading { margin-block-start: 0; } #dropped_alert h2 span.faicon, -#dropped_alert .divPopUp_top span.faicon { +#dropped_alert h2 span.fa-brands, +#dropped_alert .divPopUp_top span.faicon, +#dropped_alert .divPopUp_top span.fa-brands { margin-right: 6px; color: #1E88E5; } #dropped_alert h2 span.faicon:before, -#dropped_alert .divPopUp_top span.faicon:before { +#dropped_alert h2 span.fa-brands:before, +#dropped_alert .divPopUp_top span.faicon:before, +#dropped_alert .divPopUp_top span.fa-brands:before { font-size: 14px; } #dropped_alert p { @@ -7843,12 +7855,16 @@ body.waitlong #loading { margin-block-start: 0; } #popup_user_access h2 span.faicon, -#popup_user_access .divPopUp_top span.faicon { +#popup_user_access h2 span.fa-brands, +#popup_user_access .divPopUp_top span.faicon, +#popup_user_access .divPopUp_top span.fa-brands { margin-right: 6px; color: #1E88E5; } #popup_user_access h2 span.faicon:before, -#popup_user_access .divPopUp_top span.faicon:before { +#popup_user_access h2 span.fa-brands:before, +#popup_user_access .divPopUp_top span.faicon:before, +#popup_user_access .divPopUp_top span.fa-brands:before { font-size: 14px; } #popup_user_access p { @@ -10776,12 +10792,16 @@ div#theme-edit-wrap div#theme-editor #picker .divPopUp_top { margin-block-start: 0; } div#theme-edit-wrap div#theme-editor #picker h2 span.faicon, -div#theme-edit-wrap div#theme-editor #picker .divPopUp_top span.faicon { +div#theme-edit-wrap div#theme-editor #picker h2 span.fa-brands, +div#theme-edit-wrap div#theme-editor #picker .divPopUp_top span.faicon, +div#theme-edit-wrap div#theme-editor #picker .divPopUp_top span.fa-brands { margin-right: 6px; color: #1E88E5; } div#theme-edit-wrap div#theme-editor #picker h2 span.faicon:before, -div#theme-edit-wrap div#theme-editor #picker .divPopUp_top span.faicon:before { +div#theme-edit-wrap div#theme-editor #picker h2 span.fa-brands:before, +div#theme-edit-wrap div#theme-editor #picker .divPopUp_top span.faicon:before, +div#theme-edit-wrap div#theme-editor #picker .divPopUp_top span.fa-brands:before { font-size: 14px; } div#theme-edit-wrap div#theme-editor #picker p { @@ -11033,7 +11053,7 @@ div#vabila div.title { display: flex; flex-direction: row; align-items: center; - margin-bottom: 24px; + margin-bottom: 16px; margin-top: 48px; } div#vabila div.title:first-of-type { @@ -11100,6 +11120,7 @@ div#vabila div.button_holder div#nice_url_holder input { } div#vabila div.button_holder div#nice_url_holder button { margin-right: 8px; + margin-left: 0; } div#vabila div#nice_url_error { width: 100%; @@ -11131,7 +11152,7 @@ div#vabila div.more { div#vabila div.more div.more_block { height: auto; width: 298px; - background-color: #F8F8F8; + background-color: #FFFFFF; border: 1px solid #E5E5E5; padding: 16px; font-size: 14px; @@ -11139,7 +11160,7 @@ div#vabila div.more div.more_block { transition: 0.2s; } div#vabila div.more div.more_block:hover { - background-color: #ebebeb; + background-color: #f2f2f2; } div#vabila div.more div.more_block div.more_title { display: flex; @@ -11174,11 +11195,16 @@ div#vabila div.more div.more_block div.more_title a.help { margin-left: 5px; } +div.popup_content.publish { + max-width: 600px; +} div.popup_content.publish textarea { width: 568px; padding: 8px; - display: block; - overflow: auto; + height: auto; +} +div.popup_content.publish textarea.iframe { + height: 155px; } .dashboard_top_settings { @@ -15172,12 +15198,16 @@ textarea#addusers, textarea#addusers_note { margin-block-start: 0; } #vrednost_edit h2 span.faicon, -#vrednost_edit .divPopUp_top span.faicon { +#vrednost_edit h2 span.fa-brands, +#vrednost_edit .divPopUp_top span.faicon, +#vrednost_edit .divPopUp_top span.fa-brands { margin-right: 6px; color: #1E88E5; } #vrednost_edit h2 span.faicon:before, -#vrednost_edit .divPopUp_top span.faicon:before { +#vrednost_edit h2 span.fa-brands:before, +#vrednost_edit .divPopUp_top span.faicon:before, +#vrednost_edit .divPopUp_top span.fa-brands:before { font-size: 14px; } #vrednost_edit p { @@ -15360,12 +15390,16 @@ textarea#addusers, textarea#addusers_note { margin-block-start: 0; } #calculation h2 span.faicon, -#calculation .divPopUp_top span.faicon { +#calculation h2 span.fa-brands, +#calculation .divPopUp_top span.faicon, +#calculation .divPopUp_top span.fa-brands { margin-right: 6px; color: #1E88E5; } #calculation h2 span.faicon:before, -#calculation .divPopUp_top span.faicon:before { +#calculation h2 span.fa-brands:before, +#calculation .divPopUp_top span.faicon:before, +#calculation .divPopUp_top span.fa-brands:before { font-size: 14px; } #calculation p { @@ -15595,12 +15629,16 @@ and open the template in the editor. margin-block-start: 0; } #preview_spremenljivka h2 span.faicon, -#preview_spremenljivka .divPopUp_top span.faicon { +#preview_spremenljivka h2 span.fa-brands, +#preview_spremenljivka .divPopUp_top span.faicon, +#preview_spremenljivka .divPopUp_top span.fa-brands { margin-right: 6px; color: #1E88E5; } #preview_spremenljivka h2 span.faicon:before, -#preview_spremenljivka .divPopUp_top span.faicon:before { +#preview_spremenljivka h2 span.fa-brands:before, +#preview_spremenljivka .divPopUp_top span.faicon:before, +#preview_spremenljivka .divPopUp_top span.fa-brands:before { font-size: 14px; } #preview_spremenljivka p { @@ -16551,12 +16589,16 @@ dl.arch_email dd { margin-block-start: 0; } #inv_view_arch_recipients h2 span.faicon, -#inv_view_arch_recipients .divPopUp_top span.faicon { +#inv_view_arch_recipients h2 span.fa-brands, +#inv_view_arch_recipients .divPopUp_top span.faicon, +#inv_view_arch_recipients .divPopUp_top span.fa-brands { margin-right: 6px; color: #1E88E5; } #inv_view_arch_recipients h2 span.faicon:before, -#inv_view_arch_recipients .divPopUp_top span.faicon:before { +#inv_view_arch_recipients h2 span.fa-brands:before, +#inv_view_arch_recipients .divPopUp_top span.faicon:before, +#inv_view_arch_recipients .divPopUp_top span.fa-brands:before { font-size: 14px; } #inv_view_arch_recipients p { @@ -17422,12 +17464,16 @@ and open the template in the editor. margin-block-start: 0; } #div_export_setting_show h2 span.faicon, -#div_export_setting_show .divPopUp_top span.faicon { +#div_export_setting_show h2 span.fa-brands, +#div_export_setting_show .divPopUp_top span.faicon, +#div_export_setting_show .divPopUp_top span.fa-brands { margin-right: 6px; color: #1E88E5; } #div_export_setting_show h2 span.faicon:before, -#div_export_setting_show .divPopUp_top span.faicon:before { +#div_export_setting_show h2 span.fa-brands:before, +#div_export_setting_show .divPopUp_top span.faicon:before, +#div_export_setting_show .divPopUp_top span.fa-brands:before { font-size: 14px; } #div_export_setting_show p { @@ -19906,12 +19952,16 @@ and open the template in the editor. margin-block-start: 0; } #dsp_inspect_cover h2 span.faicon, -#dsp_inspect_cover .divPopUp_top span.faicon { +#dsp_inspect_cover h2 span.fa-brands, +#dsp_inspect_cover .divPopUp_top span.faicon, +#dsp_inspect_cover .divPopUp_top span.fa-brands { margin-right: 6px; color: #1E88E5; } #dsp_inspect_cover h2 span.faicon:before, -#dsp_inspect_cover .divPopUp_top span.faicon:before { +#dsp_inspect_cover h2 span.fa-brands:before, +#dsp_inspect_cover .divPopUp_top span.faicon:before, +#dsp_inspect_cover .divPopUp_top span.fa-brands:before { font-size: 14px; } #dsp_inspect_cover p { @@ -20425,12 +20475,16 @@ input#endDate { margin-block-start: 0; } .mc_table_settings h2 span.faicon, -.mc_table_settings .divPopUp_top span.faicon { +.mc_table_settings h2 span.fa-brands, +.mc_table_settings .divPopUp_top span.faicon, +.mc_table_settings .divPopUp_top span.fa-brands { margin-right: 6px; color: #1E88E5; } .mc_table_settings h2 span.faicon:before, -.mc_table_settings .divPopUp_top span.faicon:before { +.mc_table_settings h2 span.fa-brands:before, +.mc_table_settings .divPopUp_top span.faicon:before, +.mc_table_settings .divPopUp_top span.fa-brands:before { font-size: 14px; } .mc_table_settings p { @@ -20627,12 +20681,16 @@ input#endDate { margin-block-start: 0; } #newMCTable h2 span.faicon, -#newMCTable .divPopUp_top span.faicon { +#newMCTable h2 span.fa-brands, +#newMCTable .divPopUp_top span.faicon, +#newMCTable .divPopUp_top span.fa-brands { margin-right: 6px; color: #1E88E5; } #newMCTable h2 span.faicon:before, -#newMCTable .divPopUp_top span.faicon:before { +#newMCTable h2 span.fa-brands:before, +#newMCTable .divPopUp_top span.faicon:before, +#newMCTable .divPopUp_top span.fa-brands:before { font-size: 14px; } #newMCTable p { @@ -20805,12 +20863,16 @@ input#endDate { margin-block-start: 0; } #renameMCTable h2 span.faicon, -#renameMCTable .divPopUp_top span.faicon { +#renameMCTable h2 span.fa-brands, +#renameMCTable .divPopUp_top span.faicon, +#renameMCTable .divPopUp_top span.fa-brands { margin-right: 6px; color: #1E88E5; } #renameMCTable h2 span.faicon:before, -#renameMCTable .divPopUp_top span.faicon:before { +#renameMCTable h2 span.fa-brands:before, +#renameMCTable .divPopUp_top span.faicon:before, +#renameMCTable .divPopUp_top span.fa-brands:before { font-size: 14px; } #renameMCTable p { @@ -20983,12 +21045,16 @@ input#endDate { margin-block-start: 0; } #deleteMCTable h2 span.faicon, -#deleteMCTable .divPopUp_top span.faicon { +#deleteMCTable h2 span.fa-brands, +#deleteMCTable .divPopUp_top span.faicon, +#deleteMCTable .divPopUp_top span.fa-brands { margin-right: 6px; color: #1E88E5; } #deleteMCTable h2 span.faicon:before, -#deleteMCTable .divPopUp_top span.faicon:before { +#deleteMCTable h2 span.fa-brands:before, +#deleteMCTable .divPopUp_top span.faicon:before, +#deleteMCTable .divPopUp_top span.fa-brands:before { font-size: 14px; } #deleteMCTable p { diff --git a/resources/sass/admin_new/basic/icons/icons.scss b/resources/sass/admin_new/basic/icons/icons.scss index 6b3d4bf7a..f4ef96ac6 100644 --- a/resources/sass/admin_new/basic/icons/icons.scss +++ b/resources/sass/admin_new/basic/icons/icons.scss @@ -59,25 +59,25 @@ a.fa-brands { //BARVE &.yellow { - color: $yellow; + color: $yellow !important; } &.blue { - color: $blue; + color: $blue !important; } &.red { - color: $red; + color: $red !important; } &.ultra_dark_gray { - color: $ultra-dark-gray; + color: $ultra-dark-gray !important; } &.green { - color: $green; + color: $green !important; } &.red { - $color: $red; + $color: $red !important; } &.dark_gray2 { - $color: $dark-gray2; + $color: $dark-gray2 !important; } //ikona kot link diff --git a/resources/sass/admin_new/components/popup/basic.scss b/resources/sass/admin_new/components/popup/basic.scss index b452bc739..62aa73c43 100644 --- a/resources/sass/admin_new/components/popup/basic.scss +++ b/resources/sass/admin_new/components/popup/basic.scss @@ -102,7 +102,8 @@ margin-block-start: 0; - span.faicon { + span.faicon, + span.fa-brands { margin-right: 6px; color: $blue; diff --git a/resources/sass/admin_new/pages/my_surveys/objava.scss b/resources/sass/admin_new/pages/my_surveys/objava.scss index 2fcedc2a2..bc299563c 100644 --- a/resources/sass/admin_new/pages/my_surveys/objava.scss +++ b/resources/sass/admin_new/pages/my_surveys/objava.scss @@ -113,7 +113,7 @@ div#vabila { flex-direction: row; align-items: center; - margin-bottom: 24px; + margin-bottom: 16px; margin-top: 48px; &:first-of-type { margin-top: 0; @@ -193,6 +193,7 @@ div#vabila { button { margin-right: 8px; + margin-left: 0; } } } @@ -234,7 +235,7 @@ div#vabila { height: auto; width: 298px; - background-color: $light-gray; + background-color: $white; border: 1px solid $gray; padding: 16px; @@ -245,7 +246,7 @@ div#vabila { transition: 0.2s; &:hover { - background-color: darken($light-gray, 5%); + background-color: darken($white, 5%); } div.more_title { @@ -301,11 +302,16 @@ div#vabila { div.popup_content { &.publish { + max-width: 600px; + textarea { width: 568px; padding: 8px; - display: block; - overflow: auto; + height: auto; + + &.iframe { + height: 155px; + } } } } \ No newline at end of file