diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 87d2bf435..4fa18c97d 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -3574,8 +3574,10 @@ class SurveyAdminSettings { //Navodila na desni echo '
'; echo '
'; - echo $lang['srv_alert_instruction1']; - echo $lang['srv_alert_instruction5']; + echo '

'.$lang['srv_alert_instruction1'].'

'; + echo '

'.$lang['srv_alert_instruction1a'].':

'; + echo '

'.$lang['srv_alert_instruction5'].':

'; + echo '

'.$lang['srv_alert_instruction1b'].'

'; //@TG7 echo '
'; echo '
'; @@ -5132,12 +5134,29 @@ class SurveyAdminSettings { case 'active_author': // obveščanje ob aktivaciji/deaktivaciej ankete case 'delete_author': // obveščanje ob izbrisu ankete - // avtor ankete - if($forma) - echo ''; - else - echo ''; + // preberemo nastavitve alertov + $sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '$anketa'"); + if (!$sqlAlert) + echo mysqli_error($GLOBALS['connect_db']); + if (mysqli_num_rows($sqlAlert) > 0) { + $rowAlert = mysqli_fetch_array($sqlAlert); + } + else { + SurveyAlert::getInstance()->Init($anketa, $global_user_id); + $rowAlert = SurveyAlert::setDefaultAlertBeforeExpire(); + } + + // avtor ankete + if($forma) { + echo ''; + echo ''; + } + else { + //echo $rowAlert['delete_author']; //@TG6 + echo ''; + echo ''; + } if ($isChecked) { //$sql = sisplet_query("SELECT insert_uid, edit_uid FROM srv_anketa WHERE id='$this->anketa'"); //$row = mysqli_fetch_assoc($sql); @@ -5145,8 +5164,6 @@ class SurveyAdminSettings { $row = SurveyInfo::getInstance()->getSurveyRow(); - echo '
'; - if ($what == 'finish_author') $db_field = 'alert_complete'; else if ($what == 'expire_author') @@ -5171,14 +5188,18 @@ class SurveyAdminSettings { $checked = ($row1[$db_field] == '1') ? ' checked="checked" ' : ''; } - echo '' . "\n\r"; - echo '' . "\n\r"; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + if ($what == 'finish_author') { echo ' '; echo ' '; if ($row1['alert_complete_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['alert_complete_if']); } } - echo '' . "\n\r"; + echo '
'; } // polovimo avtorja pri ostalih obvestilih else{ @@ -5187,14 +5208,18 @@ class SurveyAdminSettings { $sql1 = sisplet_query("SELECT *, uid AS id FROM srv_dostop WHERE ank_id='$this->anketa' AND uid='".$row['insert_uid']."'"); $row1 = mysqli_fetch_array($sql1); - echo '' . "\n\r"; - echo '' . "\n\r"; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + if ($what == 'finish_author') { echo ' '; echo ' '; if ($row1['alert_complete_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['alert_complete_if']); } } - echo '' . "\n\r"; + echo '
'; } @@ -5205,14 +5230,17 @@ class SurveyAdminSettings { if ($row1['id']) { // se zgodi da je prazno za metauserje // avtor je vedno chekiran $checked = ( $row1[$db_field] == '1') ? ' checked="checked"' : ''; - echo '' . "\n\r"; - echo '' . "\n\r"; - if ($what == 'finish_author') { + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + if ($what == 'finish_author') { echo ' '; echo ' '; if ($row1['alert_complete_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['alert_complete_if']); } } - echo '' . "\n\r"; + echo '
'; } } } diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php index c03a25bd0..20ebf823b 100644 --- a/admin/survey/classes/tracking/CrossRoad.php +++ b/admin/survey/classes/tracking/CrossRoad.php @@ -517,7 +517,7 @@ class CrossRoad { # NASTAVITVE case 'nastavitve': - $layout_width = 'wide'; + $layout_width = 'narrow'; break; @@ -534,7 +534,7 @@ class CrossRoad { if ($_GET['m'] == 'gdpr_requests' || $_GET['m'] == 'gdpr_requestsall') $layout_width = 'wide'; else - $layout_width = 'narrow'; + $layout_width = 'narrow'; break; diff --git a/lang/1.php b/lang/1.php index 00463ea0a..4afda0f01 100644 --- a/lang/1.php +++ b/lang/1.php @@ -3607,7 +3607,9 @@ $lang = array ( "srv_alert_expire_days2" => " dni pred potekom ankete. Vrednost 0 pomeni, da bo obvestilo bo poslano isti dan.
", "srv_alert_expire_expire_at" => " Anketa poteče: ", "srv_alert_expire_note_at" => " Obvestilo bo poslano: ", - "srv_alert_instruction1" => "Navodila oblikovanja sporočil za obveščanje!

Uporabite lahko naslednje spremenljivke iz baze:

", + "srv_alert_instruction1" => "Navodila za oblikovanje sporočil", + "srv_alert_instruction1a" => "Legenda spremenljivk iz baze", + "srv_alert_instruction1b" => "V sporočilu lahko uporabite tudi sistemske spremenljivke, ki jih trenutno ni v anketi", "srv_alert_instruction2" => " [NAME] => ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime
", "srv_alert_instruction_name" => " [NAME] => ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime", "srv_alert_instruction_survey" => "[SURVEY] => ime ankete", @@ -3622,7 +3624,7 @@ $lang = array ( "srv_alert_instruction_available" => "

Sistemske spremenljivke, ki so v anketi že na voljo:

", "srv_alert_instruction3" => "[SURVEY] => ime ankete
[DATE] => datum
[SITE] => URL do ankete
[URL] => URL do urejanja ankete

Dodatne sistemske spremenljivke iz ankete navedite med dva znaka #.

Primer:

če želimo izpisati odgovor, ki ga je uporabnik vnesel pri sistemskem vprašanju email, bomo uporabili #email#

Sistemske spremenljivke, ki so v anketi že na voljo:

", "srv_alert_instruction4" => "

[SURVEY] => ime ankete
[DATE] => datum
[SITE] => URL do ankete
[URL] => URL do urejanja ankete
[DAYS] => število dni nastavljeno v intervalu

", - "srv_alert_instruction5" => "

[SURVEY] => ime ankete
[DATE] => datum
[SITE] => URL do ankete
[URL] => URL do urejanja ankete

", + "srv_alert_instruction5" => "[SURVEY] => ime ankete
[DATE] => datum
[SITE] => URL do ankete
[URL] => URL do urejanja ankete", "versions" => "Verzije", "ip_browser_login" => "Prijava glede na IP in brskalnik:", "select_user" => "Izberite Uporabnika", diff --git a/lang/2.php b/lang/2.php index e61840b08..c583337e8 100644 --- a/lang/2.php +++ b/lang/2.php @@ -3577,7 +3577,9 @@ $lang = array ( "srv_alert_expire_days2" => "days before the survey expires. Value 0 means that the notification will be sent on the same day.
", "srv_alert_expire_expire_at" => " Survey expire: ", "srv_alert_expire_note_at" => " Notification will be sent: ", - "srv_alert_instruction1" => "Instructions for email notification design!

You can use the following variables from the database:

", + "srv_alert_instruction1" => "Instructions for message formatting", + "srv_alert_instruction1a" => "Legend of database variables", + "srv_alert_instruction1b" => "You can also use system variables in the message which are currently not in the survey", "srv_alert_instruction2" => " [NAME] => user name (from the database (CMS)) or system variable \"name\"
", "srv_alert_instruction_name" => " [NAME] => user name (from the database (CMS)) or system variable \"name\"", "srv_alert_instruction_survey" => "[SURVEY] => survey name", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 10037c4fe..462f700a2 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -7731,7 +7731,7 @@ span.active-editors { .alert_authors { display: block; - text-indent: 30px; + text-indent: 12px; } .alert_textarea { diff --git a/resources/sass/admin_new/components/popup/other.scss b/resources/sass/admin_new/components/popup/other.scss index e0d06b574..f281ef498 100644 --- a/resources/sass/admin_new/components/popup/other.scss +++ b/resources/sass/admin_new/components/popup/other.scss @@ -89,7 +89,7 @@ span.active-editors { } .alert_authors { display: block; - text-indent: 30px; + text-indent: 12px; } .alert_textarea { border: 1px solid silver;