diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 9858da44f..08a124a8a 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -2704,41 +2704,19 @@ class SurveyAdminSettings { $preview_hidecomment = SurveySetting::getInstance()->getSurveyMiscSetting('preview_hidecomment'); $preview_options = ''.($preview_disableif==1?'&disableif=1':'').($preview_disablealert==1?'&disablealert=1':'').($preview_displayifs==1?'&displayifs=1':'').($preview_displayvariables==1?'&displayvariables=1':'').($preview_hidecomment==1?'&hidecomment=1':'').''; - /*// Predogled url - echo '
'; - - echo '

' . $lang['srv_poglejanketo2'] . ''; - echo '('.$lang['srv_preview_text'].')'; - echo '

' . $lang['url'] . ': ' . $link . '&preview=on'.$preview_options.''; - echo '' - .'  ' - . '

'; - - echo '
'; - - // Test url - if($this->survey_type > 1){ - echo '
'; - - echo '

' . $lang['srv_survey_testdata2'] . ''; - echo '('.$lang['srv_testdata_text'].')

'; - echo '

'.$lang['url'] . ': ' . $link . '&preview=on&testdata=on'.$preview_options; - echo '' - .'  ' - . ''; - echo ' ('.$lang['srv_testrianje_how'].')

'; - - echo '
'; - }*/ + + echo '
'; + //Zlistamo vse lepe url-je $title = 0; $sqll = sisplet_query("SELECT id, link FROM srv_nice_links WHERE ank_id = '$this->anketa' ORDER BY id ASC"); while ($rowl = mysqli_fetch_assoc($sqll)) { + if ($title == 0) { - echo '

'.$lang['srv_publication_survey_niceurl'].'

'; - $title = 1; + echo '

'.$lang['srv_publication_survey_niceurl'].'

'; + $title = 1; } $link_nice = $site_url . $rowl['link']; @@ -2750,25 +2728,37 @@ class SurveyAdminSettings { echo '
'; } - echo '

'.$lang['srv_publication_survey_grouplang'].'

'; - // Navaden url + + // Povezave za skupine in jezike + // Navaden url $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); - $spr_id = $ss->hasSkupine(); + $spr_id = $ss->hasSkupine(); + + if (count($lang_array) > 0 || $spr_id > 0){ + echo '

'.$lang['srv_publication_survey_grouplang'].'

'; + + if (count($lang_array) > 0){ + + $link1 = isset($vrednost['nice_url']) ? $vrednost['nice_url'] : $vrednost['url']; + $link1 = $site_url.'a/'.$row['hash']; + echo '
'; + echo ''.$link1.''.(count($lang_array) > 0 ? ' - '.$base_lang_resp : ''); + echo ''; + echo '
'; + } + } + + // Imamo vec linkov za skupine if($spr_id > 0){ - $vrednosti = $ss->getVrednosti($spr_id); + + $vrednosti = $ss->getVrednosti($spr_id); + foreach($vrednosti as $vrednost){ $link_skupine = isset($vrednost['nice_url']) ? $vrednost['nice_url'] : $vrednost['url']; echo '
'; @@ -2780,10 +2770,11 @@ class SurveyAdminSettings { // 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 ''; + echo ' '.$link.'?language='.$lang_id.' - '.$lang_name; + echo ' '; echo '
'; if($spr_id > 0){ diff --git a/lang/1.php b/lang/1.php index 800735a8a..acc60c5e5 100644 --- a/lang/1.php +++ b/lang/1.php @@ -1918,8 +1918,8 @@ $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 za izpolnjevanje na mobilnih napravah.", "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.", diff --git a/lang/2.php b/lang/2.php index d8953da88..50d5dd463 100644 --- a/lang/2.php +++ b/lang/2.php @@ -1911,8 +1911,8 @@ $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 survey link with friends on social media (Facebook, Twitter, Linkedin etc.) ", + "srv_anketa_href_friends" => "QR Code", + "srv_anketa_href_friends_text" => "Share the survey link with QR code for mobile devices.", "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.", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 404bfb707..e0d832473 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -26503,6 +26503,9 @@ div#vabila div.niceurl span.faicon { margin-left: 9px; cursor: pointer; } +div#vabila .publish_url_holder .title { + margin-top: 48px !important; +} div#vabila div.more { display: grid; grid-template-columns: 1fr 1fr 1fr; diff --git a/resources/sass/admin_new/pages/survey_objava/pregled.scss b/resources/sass/admin_new/pages/survey_objava/pregled.scss index 1a6029563..56067cf1d 100644 --- a/resources/sass/admin_new/pages/survey_objava/pregled.scss +++ b/resources/sass/admin_new/pages/survey_objava/pregled.scss @@ -183,6 +183,10 @@ div#vabila { } } + .publish_url_holder .title{ + margin-top: 48px !important; + } + // Več načinov deljenja ankete div.more { display: grid;