diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index d83b20584..1b5cf3bfe 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -3294,6 +3294,8 @@ class SurveyAdminSettings { echo ''; echo ''; + echo ''; + echo '
'; echo '
'; diff --git a/lang/1.php b/lang/1.php index afb91702e..a23ab371e 100644 --- a/lang/1.php +++ b/lang/1.php @@ -3614,21 +3614,21 @@ $lang = array ( "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", - "srv_alert_instruction_date" => "[DATE] => datum", - "srv_alert_instruction_site" => "[SITE] => URL do ankete", - "srv_alert_instruction_url" => "[URL] => URL do urejanja ankete", - "srv_alert_instruction_pdf" => "[PDF] => povezava do PDF datoteke z odgovori respondenta ", - "srv_alert_instruction_rtf" => "[RTF] => povezava do RTF datoteke z odgovori respondenta", - "srv_alert_instruction_meta_referer_url" => "[META_REFERER_URL] => Referer URL", + "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", + "srv_alert_instruction_date" => "[DATE] - datum", + "srv_alert_instruction_site" => "[SITE] - povezava do ankete", + "srv_alert_instruction_url" => "[URL] - povezava do urejanja ankete", + "srv_alert_instruction_pdf" => "[PDF] - povezava do PDF datoteke z odgovori respondenta ", + "srv_alert_instruction_rtf" => "[RTF] - povezava do RTF datoteke z odgovori respondenta", + "srv_alert_instruction_meta_referer_url" => "[META_REFERER_URL] - Referer URL", "srv_alert_instruction_system" => "

Dodatne sistemske spremenljivke iz ankete navedite med dva znaka #.

", "srv_alert_instruction_sample" => "

Primer:

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

", "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
[SITE] - URL do ankete
[URL] - URL do urejanja ankete
[DAYS] - število dni pred potekom ankete
[DURATION] - čas aktivnosti ankete

", - "srv_alert_instruction5" => "[SURVEY] - ime ankete
[DATE] - datum
[SITE] - URL do ankete
[URL] - URL do urejanja ankete", + "srv_alert_instruction3" => "[SURVEY] - ime ankete
[DATE] - datum
[SITE] - povezava do ankete
[URL] -> povezava 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
[SITE] - povezava do ankete
[URL] - povezava do urejanja ankete
[DAYS] - število dni pred potekom ankete
[DURATION] - čas aktivnosti ankete

", + "srv_alert_instruction5" => "[SURVEY] - ime ankete
[DATE] - datum
[SITE] - povezava do ankete
[URL] - povezava do urejanja ankete", "srv_alert_instruction5a" => "[SURVEY] - ime ankete
[DATE] - datum", "versions" => "Verzije", "ip_browser_login" => "Prijava glede na IP in brskalnik:", diff --git a/lang/2.php b/lang/2.php index 92726d80d..490690e72 100644 --- a/lang/2.php +++ b/lang/2.php @@ -3588,17 +3588,17 @@ $lang = array ( "srv_alert_instruction_name" => " [NAME] => user name (from the database (CMS)) or system variable \"name\"", "srv_alert_instruction_survey" => "[SURVEY] => survey name", "srv_alert_instruction_date" => "[DATE] => date", - "srv_alert_instruction_site" => "[SITE] => URL of survey", - "srv_alert_instruction_url" => "[URL] => URL to editing of survey", + "srv_alert_instruction_site" => "[SITE] => link to survey", + "srv_alert_instruction_url" => "[URL] => link to editing of survey", "srv_alert_instruction_pdf" => "[PDF] => link to PDF file with respondent answers", "srv_alert_instruction_rtf" => "[RTF] => link to RTF file with respondent answers", "srv_alert_instruction_meta_referer_url" => "[META_REFERER_URL] => Referer URL", "srv_alert_instruction_system" => "

Additional system variables from the survey should be placed between two # characters.

", "srv_alert_instruction_sample" => "

Example:

If you wish to use the answer which the user entered in the system question email, you simply write #email#.

", "srv_alert_instruction_available" => "

System variables that are already available in the survey:

", - "srv_alert_instruction3" => "[SURVEY] - survey name
[DATE] - date
[SITE] - URL of survey

Additional system variables from the survey indicate between the two characters #.

Example:

if we want to display the answer which the user entered for the system question about email, we will use the #email#

System variables that are already available in the survey:

", - "srv_alert_instruction4" => "

[SURVEY] - survey name
[SITE] - URL to survey
[URL] - URL to editing of survey
[DAYS] - number of days before expiration
[DURATION] - survey duration

", - "srv_alert_instruction5" => "[SURVEY] - survey name
[DATE] - date
[SITE] - URL of survey
[URL] - URL to editing of survey", + "srv_alert_instruction3" => "[SURVEY] - survey name
[DATE] - date
[SITE] - link to survey

Additional system variables from the survey indicate between the two characters #.

Example:

if we want to display the answer which the user entered for the system question about email, we will use the #email#

System variables that are already available in the survey:

", + "srv_alert_instruction4" => "

[SURVEY] - survey name
[SITE] - link to survey
[URL] - link to editing of survey
[DAYS] - number of days before expiration
[DURATION] - survey duration

", + "srv_alert_instruction5" => "[SURVEY] - survey name
[DATE] - date
[SITE] - link to survey
[URL] - link to editing of survey", "srv_alert_instruction5a" => "[SURVEY] - survey name
[DATE] - date", "versions" => "Versions", "ip_browser_login" => "Login based on browser and IP:", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 74973110a..01d88245c 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -13960,6 +13960,7 @@ fieldset #obvescanje_sidebyside_holder #obvescanje_sidebyside_right div.message_ box-sizing: border-box; padding: 16px; margin-left: 32px; + width: 100%; } fieldset #obvescanje_sidebyside_holder #obvescanje_sidebyside_right div.message_instructions div.izpolnjena_spremenljivke { margin-bottom: 16px; diff --git a/resources/sass/admin_new/pages/survey_edit/survey_settings/obvescanje.scss b/resources/sass/admin_new/pages/survey_edit/survey_settings/obvescanje.scss index 25dae899d..69b5b7d98 100644 --- a/resources/sass/admin_new/pages/survey_edit/survey_settings/obvescanje.scss +++ b/resources/sass/admin_new/pages/survey_edit/survey_settings/obvescanje.scss @@ -19,6 +19,7 @@ fieldset{ box-sizing: border-box; padding: 16px; margin-left: 32px; + width: 100%; div.izpolnjena_spremenljivke { margin-bottom: 16px;