may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Objava - popravek segmenta z url-ji, popravek texta pri qr kodi

Browse Source
This commit is contained in:
pero1203 2022-10-31 14:38:30 +01:00
parent fee15d8687
commit 2a4178d2c5
5 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
admin/survey/SurveyAdminSettings.php
View File

@ -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 '<div class="publish_url_holder">';
echo '<p style="margin: 2px 0;"><a href="' . $link . '&preview=on'.$preview_options.'" target="_blank" class="srv_icox spaceRight"><span class="faicon preview"></span> ' . $lang['srv_poglejanketo2'] . '</b></a>';
echo '<span class="spaceLeft italic">('.$lang['srv_preview_text'].')</span>';
echo '<p style="margin: 2px 0;">' . $lang['url'] . ': ' . $link . '&preview=on'.$preview_options.'';
echo '<a href="#" onclick="CopyToClipboard(\''. $link . '&preview=on'.$preview_options.'\');" return false;" title="Kopiraj povezavo" class="srv_ico">'
.'&nbsp;&nbsp'
. '<span class="faicon copy"></span></a></p>';
echo '</div>';
// Test url
if($this->survey_type > 1){
echo '<div class="publish_url_holder">';
echo '<p style="margin: 2px 0;"><a href="' . $link . '&preview=on&testdata=on'.$preview_options.'" title="" target="_blank" class="srv_ico spaceRight"><span class="faicon test large"></span> ' . $lang['srv_survey_testdata2'] . '</b></a>';
echo '<span class="spaceLeft italic">('.$lang['srv_testdata_text'].')</span></p>';
echo '<p style="margin: 2px 0;">'.$lang['url'] . ': ' . $link . '&preview=on&testdata=on'.$preview_options;
echo '<a href="#" onclick="CopyToClipboard(\''. $link . '&preview=on&testdata=on'.$preview_options.'\');" return false;" title="Kopiraj povezavo" class="srv_ico">'
.'&nbsp;&nbsp'
. '<span class="faicon copy"></span></a>';
echo ' (<a href="#" id="popup-open" onclick="javascript:testiranje_preview_settings(); return false;">'.$lang['srv_testrianje_how'].'</a>)</p>';
echo '</div>';
}*/
echo '<div class="publish_url_holder">';
//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 '<p class="semi-bold survey_links">'.$lang['srv_publication_survey_niceurl'].'</p>';
$title = 1;
echo '<p class="semi-bold survey_links">'.$lang['srv_publication_survey_niceurl'].'</p>';
$title = 1;
}
$link_nice = $site_url . $rowl['link'];
@ -2750,25 +2728,37 @@ class SurveyAdminSettings {
echo '</div>';
}
echo '<p class="semi-bold survey_links">'.$lang['srv_publication_survey_grouplang'].'</p>';
// 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 '<div class="grouplang">';
echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
echo '</div>';
// 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 '<p class="semi-bold survey_links">'.$lang['srv_publication_survey_grouplang'].'</p>';
if (count($lang_array) > 0){
$link1 = isset($vrednost['nice_url']) ? $vrednost['nice_url'] : $vrednost['url'];
$link1 = $site_url.'a/'.$row['hash'];
echo '<div class="grouplang">';
echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
echo '</div>';
}
}
// 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 '<div class="grouplang">';
@ -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 '<div class="grouplang">';
echo '<a href="'.$link.'?language='.$lang_id.'" target="_blank">'.$link.'?language='.$lang_id.'</a>&nbsp- '.$lang_name;
echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link.'?language='.$lang_id.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
echo ' <a href="'.$link.'?language='.$lang_id.'" target="_blank">'.$link.'?language='.$lang_id.'</a>&nbsp- '.$lang_name;
echo ' <span class="faicon blue copy" onclick="CopyToClipboard(\''.$link.'?language='.$lang_id.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
echo '</div>';
if($spr_id > 0){

4
lang/1.php
View File

@ -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.",

4
lang/2.php
View File

@ -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.",

3
public/css/admin_new.css
View File

@ -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;

4
resources/sass/admin_new/pages/survey_objava/pregled.scss
View File

@ -183,6 +183,10 @@ div#vabila {
}
}
.publish_url_holder .title{
margin-top: 48px !important;
}
// Več načinov deljenja ankete
div.more {
display: grid;