From 5d2f540cb2e3eb63f32a213dfbfb76ed9f2a066c Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Wed, 5 Jan 2022 17:46:49 +0100 Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20-=20Urejanje=20-->=20Nastavi?= =?UTF-8?q?tve=20-->=20Obve=C5=A1=C4=8Danje=20o=20izpolnjeni=20anketi=20-?= =?UTF-8?q?=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/survey/Branching.php | 2 +- admin/survey/SurveyAdminAjax.php | 24 ++-- admin/survey/SurveyAdminSettings.php | 129 ++++++++++-------- admin/survey/script/script.js | 4 +- lang/1.php | 22 +-- lang/2.php | 16 +-- public/css/admin_new.css | 82 ++++++++--- .../sass/admin_new/basic/icons/icons.scss | 3 + .../sass/admin_new/basic/icons/standard.scss | 4 +- .../sass/admin_new/basic/typography.scss | 4 + .../admin_new/components/popup/other.scss | 5 +- .../survey_settings/obvescanje.scss | 90 ++++++++++-- 12 files changed, 260 insertions(+), 125 deletions(-) diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php index 3110a1704..7a070afc0 100644 --- a/admin/survey/Branching.php +++ b/admin/survey/Branching.php @@ -6869,7 +6869,7 @@ class Branching { } else { if ($condition_check != 0) - echo ' '.$lang['srv_if_error'].''; + echo ' '.$lang['srv_if_error'].''; } diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php index cb72bcbfd..f7c146726 100644 --- a/admin/survey/SurveyAdminAjax.php +++ b/admin/survey/SurveyAdminAjax.php @@ -5594,18 +5594,24 @@ class SurveyAdminAjax { echo ''; echo ''; echo ''; - - echo '

'; - - // prikaze editor za ne-spremenljivko (za karkoli druzga pac) - echo '

'; - echo ' '; - echo '

'; + echo '
'; + echo ''; + echo ''; echo '
'; - echo '
'.$lang['save'].'
'; - echo '
'.$lang['srv_analiza_arhiviraj_cancle'].'
'; + // prikaze editor za ne-spremenljivko (za karkoli druzga pac) + echo '
'; + + echo ''; + echo ''; + + echo '
'; + + echo '
'; + echo ''; + echo ''; + echo '
'; echo ''; diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 1b5cf3bfe..817412421 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -3247,18 +3247,17 @@ class SurveyAdminSettings { echo '
'; echo ' ' . $lang['srv_alert_completed_2'] . ''; - echo '
'; + echo '
'; echo ''.$lang['srv_alert_completed_prejemniki'].''; // respondent - ne prikazemo ce gre za glasovanje oz. volitve if($rowS['survey_type'] != 0 && !SurveyInfo::getInstance()->checkSurveyModule('voting')){ echo '
'; - echo ''; $this->display_alert_label('finish_respondent',($rowAlert['finish_respondent'] == 1)); echo '
'; - // Ce imamo vec prevodov omogocimo za vsak prevod svoj email - v delu @TG + // Ce imamo vec prevodov omogocimo za vsak prevod svoj email $this->display_alert_label('finish_respondent_language',($rowAlert['finish_respondent'] == 1)); } @@ -3267,7 +3266,7 @@ class SurveyAdminSettings { if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){ echo '
'; - echo '

'; + echo ''; $this->display_alert_label('finish_respondent_cms',($rowAlert['finish_respondent_cms'] == 1)); echo '

'; @@ -3281,7 +3280,7 @@ class SurveyAdminSettings { //Posebej navedeni maili echo '
'; echo ''; - echo ' '; + echo ' '; echo ' '; if ($rowAlert['finish_other_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($rowAlert['finish_other_if']); } echo '
'; @@ -3355,18 +3354,20 @@ class SurveyAdminSettings { echo '
'; - echo '

'.$lang['srv_alert_instruction_system'].'

'; - echo '

'.$lang['srv_alert_instruction_sample'].'

'; - echo '

'.$lang['srv_alert_instruction_available'].'

'; - $sqlSistemske = sisplet_query("SELECT s.id, s.naslov, s.variable FROM srv_spremenljivka s, srv_grupa g WHERE s.sistem='1' AND s.gru_id=g.id AND g.ank_id='$anketa' ORDER BY g.vrstni_red, s.vrstni_red"); $prefix = ""; + while ($rowSistemske = mysqli_fetch_assoc($sqlSistemske)) { - echo $prefix . '#' . $rowSistemske['variable'] . '#'; - $prefix = ", "; + $prefix = $prefix . $rowSistemske['variable'] . ', '; } - if ($prefix == "") { // ni sistemskih spremenljivk - echo '

'.$lang['srv_alert_no_sys_var'].'

'; + if($prefix != "") { + echo '

'.$lang['srv_alert_instruction_available'].'

'; + echo '

'.rtrim($prefix, ", ").'

'; + echo '

'.$lang['srv_alert_instruction_system'].'

'; + echo '

'.$lang['srv_alert_instruction_sample'].'

'; + } + else{ // ni sistemskih spremenljivk + echo '

'.$lang['srv_alert_no_sys_var'].'

'; } echo '
'; @@ -3609,7 +3610,7 @@ class SurveyAdminSettings { echo ' ' . "\n"; echo ' ' . "\n"; - //Obveščanje ob izbrisu ankete + //Obveščanje o izbrisu ankete echo '
'; echo '' . $lang['srv_alert_surveydelete'] . ''; @@ -5100,12 +5101,12 @@ class SurveyAdminSettings { if(!empty($jeziki)){ $row = SurveyInfo::getInstance()->getSurveyRow(); - echo '
'; foreach($jeziki as $key => $jezik){ - echo ''.$lang['srv_alert_respondent'].' - '.$jezik; - echo ' '; - echo ''; + echo '
'; + echo ''; + echo ''; + echo '
'; } } } @@ -5114,14 +5115,15 @@ class SurveyAdminSettings { case 'finish_respondent': // respondent ki je zakljucil anketo if ($isChecked) { - // preverimo ali obszaja sistemska spremenljivka email če ne jo dodamo + // preverimo, ali obstaja sistemska spremenljivka email, če ne jo dodamo $sqlEmail = sisplet_query("SELECT s.sistem, s.variable, s.id FROM srv_spremenljivka s, srv_grupa g WHERE s.sistem='1' AND s.variable='email' AND s.gru_id=g.id AND g.ank_id='$this->anketa'"); $sqlIme = sisplet_query("SELECT s.sistem, s.variable, s.id FROM srv_spremenljivka s, srv_grupa g WHERE s.sistem='1' AND s.variable='ime' AND s.gru_id=g.id AND g.ank_id='$this->anketa'"); - // ce sta dodani obe sistemski spremenljivki je fse ok + // ce sta dodani obe sistemski spremenljivki, je vse ok $email_ok = $ime_ok = false; if ( mysqli_num_rows($sqlEmail) > 0 && mysqli_num_rows($sqlIme) > 0) { $email_ok = $ime_ok = true; - } else { + } + else { // manjka ena ali obe potrebni sistemski spremenljivki // email je nujen, zato ga dodamo avtomatsko @@ -5131,7 +5133,7 @@ class SurveyAdminSettings { if (in_array('email',$sa->alert_add_necessary_sysvar( array('email') , false))) { $email_ok = true; } - // email v tem primeru spremenimo da je viden, ker gre za alert + // email v tem primeru spremenimo, da je viden, ker gre za alert $sqlEmail = sisplet_query("SELECT s.id FROM srv_spremenljivka s, srv_grupa g WHERE s.sistem='1' AND s.variable='email' AND s.gru_id=g.id AND g.ank_id='$this->anketa'"); $rowEmail = mysqli_fetch_array($sqlEmail); sisplet_query("UPDATE srv_spremenljivka SET visible='1' WHERE id = '$rowEmail[id]'"); @@ -5140,48 +5142,48 @@ class SurveyAdminSettings { $v->spremenljivka = $rowEmail['id']; $v->set_email($reminder=1); - } else { - // email je ze dodan damo tekst za ok + } + else { + // email je ze dodan, damo tekst za ok $email_ok = true; } // preverimo še za ime if ( mysqli_num_rows($sqlIme) == 0 ) { - - } else{ + } + else{ $ime_ok = true; } } - - echo ''; + echo ''; + echo ''; if ($email_ok && $ime_ok) { - echo $lang['srv_alert_respondent_note_ok_email_ime']; - echo ' ' . "\n\r"; - - echo ' '; + echo ' '; $sql1 = sisplet_query("SELECT finish_respondent_if FROM srv_alert WHERE ank_id='$this->anketa'"); $row1 = mysqli_fetch_array($sql1); echo ' '; if ($row1['finish_respondent_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['finish_respondent_if']); } + + echo ''.$lang['srv_alert_respondent_note_ok_email_ime'].' '; } else { if ($ime_ok) { // pomeni da email ni ok! napaka - echo $lang['srv_alert_respondent_note_notok_email']; + echo ''.$lang['srv_alert_respondent_note_notok_email'].''; } else { - // email je ok, ime ni, uporabnika fprasamo ali hoce se ime - echo $lang['srv_alert_respondent_note_ok_email']; - - echo ' '; + // email je ok, ime ni, uporabnika vprasamo, ali hoce se ime + echo ''; $sql1 = sisplet_query("SELECT finish_respondent_if FROM srv_alert WHERE ank_id='$this->anketa'"); $row1 = mysqli_fetch_array($sql1); - echo ' '; + echo ' '; if ($row1['finish_respondent_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['finish_respondent_if']); } + echo '

'.$lang['srv_alert_respondent_note_ok_email'].'

'; + if(!$forma){ - echo $lang['srv_alert_respondent_note_ime']; - echo '   '.$lang['srv_alert_respondent_note_link'].'' . "\n\r"; + echo '

'.$lang['srv_alert_respondent_note_ime'].''; + echo ' '.$lang['srv_alert_respondent_note_link'].'

'; } } } @@ -5189,13 +5191,15 @@ class SurveyAdminSettings { // preverimo sistemske nastavitve in spremenljivke ime } else { - echo ''; + echo ''; + echo ''; } break; case 'finish_respondent_cms': // respondent prepoznan iz CMS ko je izpolnil anketo //respondent iz cms + echo ''; echo ''; if ($isChecked) { @@ -5204,27 +5208,26 @@ class SurveyAdminSettings { //$rowCMS = mysqli_fetch_assoc($sqlCMS); $rowCMS = SurveyInfo::getInstance()->getSurveyRow(); if ($rowCMS['user_from_cms'] > 0) { - echo $lang['srv_alert_respondent_cms_note_ok']; - echo ' ' . "\n\r"; - - echo ' '; + echo ' '; $sql1 = sisplet_query("SELECT finish_respondent_cms_if FROM srv_alert WHERE ank_id='$this->anketa'"); $row1 = mysqli_fetch_array($sql1); echo ' '; if ($row1['finish_respondent_cms_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['finish_respondent_cms_if']); } + echo ''.$lang['srv_alert_respondent_cms_note_ok'].' '; + } else { - echo $lang['srv_alert_respondent_cms_note']; - echo '   '.$lang['srv_alert_respondent_cms_note_link'].'' . "\n\r"; + echo '

'.$lang['srv_alert_respondent_cms_note'].''; + echo ' '.$lang['srv_alert_respondent_cms_note_link'].'

'; } } break; - case 'finish_author': // obveščanje ob izpolnjeni anketi - case 'expire_author': // obveščanje ob poteku ankete - case 'active_author': // obveščanje ob aktivaciji/deaktivaciej ankete - case 'delete_author': // obveščanje ob izbrisu ankete + case 'finish_author': // obveščanje o izpolnjeni anketi + case 'expire_author': // obveščanje o poteku ankete + case 'active_author': // obveščanje o aktivaciji/deaktivaciej ankete + case 'delete_author': // obveščanje o izbrisu ankete // preberemo nastavitve alertov $sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '$anketa'"); @@ -5283,14 +5286,17 @@ class SurveyAdminSettings { echo '
'; echo ''; echo ''; - echo '
'; if ($what == 'finish_author') { - echo ' '; + echo ''; + echo ' '; echo ' '; if ($row1['alert_complete_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['alert_complete_if']); } + echo ''; } echo '
'; + + echo '
'; } // polovimo avtorja pri ostalih obvestilih else{ @@ -5303,14 +5309,17 @@ class SurveyAdminSettings { echo '
'; echo ''; echo ''; - echo '
'; if ($what == 'finish_author') { - echo ' '; + echo ''; + echo ' '; echo ' '; if ($row1['alert_complete_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['alert_complete_if']); } + echo ''; } echo ''; + + echo ''; } @@ -5325,13 +5334,17 @@ class SurveyAdminSettings { echo '
'; echo ''; echo ''; - echo '
'; - if ($what == 'finish_author') { - echo ' '; + + if ($what == 'finish_author') { + echo ''; + echo ' '; echo ' '; if ($row1['alert_complete_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['alert_complete_if']); } + echo ''; } echo ''; + + echo ''; } } } diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js index 10f070a0f..fe28c6d68 100644 --- a/admin/survey/script/script.js +++ b/admin/survey/script/script.js @@ -3229,10 +3229,10 @@ function change_alert_instruction(el) { function alert_add_necessary_sysvar(what,el) { var id = el.attr("id"); var checked = $("#alert_"+what).is(':checked'); - $("span#label_alert_"+what).load('ajax.php?a=alert_add_necessary_sysvar', {anketa: srv_meta_anketa_id, checked: checked, what:what}); + $("div#label_alert_"+what).load('ajax.php?a=alert_add_necessary_sysvar', {anketa: srv_meta_anketa_id, checked: checked, what:what}); } function alert_change_user_from_cms(what, el) { - $("span#label_alert_"+what).load('ajax.php?a=alert_change_user_from_cms', {anketa: srv_meta_anketa_id}); + $("div#label_alert_"+what).load('ajax.php?a=alert_change_user_from_cms', {anketa: srv_meta_anketa_id}); } function alert_edit_if (type, uid) { diff --git a/lang/1.php b/lang/1.php index a23ab371e..b627e6995 100644 --- a/lang/1.php +++ b/lang/1.php @@ -2241,16 +2241,16 @@ $lang = array ( "srv_alert_title" => "Obveščanje o vsaki izpolnjeni anketi:", "srv_alert_expired_title" => "Obveščanje pred iztekom ankete:", "srv_alert_expired_time_title" => "Datum - interval obveščanja:", - "srv_alert_no_sys_var" => "V anketi ni sistemskih spremenljivk.", + "srv_alert_no_sys_var" => "V sporočilu lahko uporabite tudi sistemske spremenljivke, ki jih trenutno ni v anketi.", "srv_alert_respondent" => "Respondent", - "srv_alert_respondent_note_ok_email_ime" => " (Dodani sta sistemski spremenljivki \"email\" in \"ime\")", - "srv_alert_respondent_note_ime" => " Želite dodati tudi sistemsko spremenljivko \"ime\"", - "srv_alert_respondent_note_ok_email" => " (Dodana je sistemska spremenljivka \"email\")", - "srv_alert_respondent_note_notok_email" => " (Sistemske spremenljivke \"email\" ne morem dodati!)", - "srv_alert_respondent_note_link" => "Dodaj potrebne sistemske spremenljivke!", + "srv_alert_respondent_note_ok_email_ime" => "(Dodani sta sistemski spremenljivki \"email\" in \"ime\")", + "srv_alert_respondent_note_ime" => "Želite dodati tudi sistemsko spremenljivko \"ime\"?", + "srv_alert_respondent_note_ok_email" => "(Dodana je sistemska spremenljivka \"email\")", + "srv_alert_respondent_note_notok_email" => "(Sistemske spremenljivke \"email\" ni bilo mogoče dodati!)", + "srv_alert_respondent_note_link" => "Dodaj potrebne sistemske spremenljivke", "srv_alert_respondent_cms" => "Respondent, registriran v CMS", - "srv_alert_respondent_cms_note" => " (V nastavitah mora biti označeno, da prepozna uporabnika iz CMS!)", - "srv_alert_respondent_cms_note_ok" => " (Uporabnik bo prepoznan iz sisplet CMS)", + "srv_alert_respondent_cms_note" => "(V nastavitah mora biti označeno, da prepozna uporabnika iz CMS!)", + "srv_alert_respondent_cms_note_ok" => "(Uporabnik bo prepoznan iz sisplet CMS)", "srv_alert_respondent_cms_note_link" => "Dodaj nastavitev!", "srv_alert_author" => "Avtor ankete oziroma souredniki", "srv_alert_msg" => "je izpolnil formo/anketo", @@ -3623,9 +3623,9 @@ $lang = array ( "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_instruction_system" => "Sistemske spremenljivke 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 v anketi:", "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", diff --git a/lang/2.php b/lang/2.php index 490690e72..2b702a5ba 100644 --- a/lang/2.php +++ b/lang/2.php @@ -2227,13 +2227,13 @@ $lang = array ( "srv_alert_title" => "Notification about each completed questionnaire:", "srv_alert_expired_title" => "Notification before survey expiration:", "srv_alert_expired_time_title" => "Date - notification interval:", - "srv_alert_no_sys_var" => "There are no system variables in the survey.", + "srv_alert_no_sys_var" => "You can also use system variables in your message, which are currently not in the survey.", "srv_alert_respondent" => "Respondent", "srv_alert_respondent_note_ok_email_ime" => " (System variables \"email\" and \"name\" were added)", - "srv_alert_respondent_note_ime" => " Do you want to add a system variable \"name\"", - "srv_alert_respondent_note_ok_email" => " (System variable \"email\" were added)", - "srv_alert_respondent_note_notok_email" => " (System variable \"email\" could not be added!)", - "srv_alert_respondent_note_link" => "Add the necessary system variables!", + "srv_alert_respondent_note_ime" => "Do you want to add a system variable \"name\"?", + "srv_alert_respondent_note_ok_email" => "(System variable \"email\" was added)", + "srv_alert_respondent_note_notok_email" => "(System variable \"email\" could not be added!)", + "srv_alert_respondent_note_link" => "Add the necessary system variables", "srv_alert_respondent_cms" => "Respondent, registered to Sisplet CMS", "srv_alert_respondent_cms_note" => " (The seting should be marked to identify the user of CMS!)", "srv_alert_respondent_cms_note_ok" => " (The user will be identify from CMS)", @@ -3593,9 +3593,9 @@ $lang = array ( "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_instruction_system" => "System variables need to be placed between two # signs.", + "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 available in the 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", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 01d88245c..af541463c 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -5067,6 +5067,10 @@ p, span { color: #1E88E5; } +.gray { + color: #C4C4C4; +} + .italic { font-style: italic; } @@ -5169,6 +5173,10 @@ span.faicon.blue, a.faicon.blue { color: #1E88E5; } +span.faicon.red, +a.faicon.red { + color: #FF0000; +} span.faicon.fa-stack, a.faicon.fa-stack { height: 1em; @@ -5646,7 +5654,7 @@ span.faicon.test::before { } a.faicon.if_add { - font-size: 12px; + font-size: 10px; font-family: Source Sans Pro, sans-serif; font-weight: 400; } @@ -5662,7 +5670,7 @@ a.faicon.if_add:hover:before { } span.faicon.if_add { - font-size: 12px; + font-size: 10px; font-family: Source Sans Pro, sans-serif; font-weight: 400; } @@ -5678,8 +5686,6 @@ span.faicon.if_add:hover:before { } span.faicon.text_file::before { - font-size: 24px; - font-weight: 400; content: "\f15c"; } @@ -7953,11 +7959,6 @@ span.active-editors { margin-right: 5px; } -.alert_authors { - display: block; - text-indent: 12px; -} - .alert_textarea { border: 1px solid silver; background-color: #E5E5E5; @@ -13965,19 +13966,64 @@ fieldset #obvescanje_sidebyside_holder #obvescanje_sidebyside_right div.message_ fieldset #obvescanje_sidebyside_holder #obvescanje_sidebyside_right div.message_instructions div.izpolnjena_spremenljivke { margin-bottom: 16px; } -fieldset .setting_holder.alert_other_emails { - margin-left: 24px; -} -fieldset textarea.alert_other_emails { - width: 538px; - height: 100px; -} -fieldset label { +fieldset #obvescanje_sidebyside_holder label { cursor: default; } -fieldset label.bottom4 { +fieldset #obvescanje_sidebyside_holder label.bottom4 { margin-bottom: 4px; } +fieldset .setting_holder.alert_prejemniki .alert_authors { + display: block; + text-indent: 12px; +} +fieldset .setting_holder.alert_prejemniki .setting_item label { + margin-right: 8px; +} +fieldset .setting_holder.alert_prejemniki .setting_item.respondent_jeziki { + margin-left: 24px; +} +fieldset .setting_holder.alert_prejemniki span.faicon { + vertical-align: middle; + text-indent: 0; +} +fieldset .setting_holder .alert_other_emails { + margin-left: 24px; +} +fieldset .setting_holder .alert_other_emails label { + cursor: default; +} +fieldset .setting_holder textarea.alert_other_emails { + width: 538px; + height: 100px; + margin-left: 0; +} + +span.faicon.respondent_iconwithlink { + margin-left: 16px; + margin-right: 4px; +} + +#vrednost_edit label { + cursor: default; +} +#vrednost_edit label.bottom4 { + margin-bottom: 4px; +} +#vrednost_edit .setting_holder { + margin-bottom: 16px; + display: flex; + flex-direction: column; + width: 565px; +} +#vrednost_edit .setting_holder:first-of-type { + margin-top: 0; +} +#vrednost_edit .setting_holder:last-of-type { + margin-bottom: 0; +} +#vrednost_edit .button_holder { + justify-content: start; +} button.ui-datepicker-trigger { cursor: pointer; diff --git a/resources/sass/admin_new/basic/icons/icons.scss b/resources/sass/admin_new/basic/icons/icons.scss index f0e81c4d8..63658f9db 100644 --- a/resources/sass/admin_new/basic/icons/icons.scss +++ b/resources/sass/admin_new/basic/icons/icons.scss @@ -41,6 +41,9 @@ a.faicon{ &.blue { color: $blue; } + &.red { + color: $red; + } //STACKING &.fa-stack { diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss index fc4cdc44c..3762e5de5 100644 --- a/resources/sass/admin_new/basic/icons/standard.scss +++ b/resources/sass/admin_new/basic/icons/standard.scss @@ -356,7 +356,7 @@ span.faicon.test::before{ content: "\f492"; } @mixin icon_if_add() { - font-size: 12px; + font-size: 10px; font-family: $font_family; font-weight: 400; &:before{ @@ -379,8 +379,6 @@ span.faicon.if_add{ @include icon_if_add(); } span.faicon.text_file::before{ - font-size: 24px; - font-weight: 400; content: "\f15c"; } span.faicon.text_file_small { diff --git a/resources/sass/admin_new/basic/typography.scss b/resources/sass/admin_new/basic/typography.scss index ba77d019c..d30c0e05f 100644 --- a/resources/sass/admin_new/basic/typography.scss +++ b/resources/sass/admin_new/basic/typography.scss @@ -14,6 +14,10 @@ p,span { color: $blue; } +.gray { + color: $dark-gray; +} + .italic { font-style: italic; } diff --git a/resources/sass/admin_new/components/popup/other.scss b/resources/sass/admin_new/components/popup/other.scss index b318ea5b4..29127c266 100644 --- a/resources/sass/admin_new/components/popup/other.scss +++ b/resources/sass/admin_new/components/popup/other.scss @@ -87,10 +87,7 @@ span.active-editors { margin-right: 5px; } } -.alert_authors { - display: block; - text-indent: 12px; -} + .alert_textarea { border: 1px solid silver; background-color: $gray; 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 69b5b7d98..feb37c55f 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 @@ -27,18 +27,68 @@ fieldset{ } } - } - - //Box z emaili za dodatne prejemnike - spremeniti v class, ko se redizajna ostale strani za obveščanje @TG - .setting_holder.alert_other_emails { - margin-left: 24px; - } - textarea.alert_other_emails{ - width: 538px; - height: 100px; - } - + label{ + cursor: default; + //Label nad editorjem besedila + &.bottom4 { + margin-bottom: 4px; + } + } + + } + + .setting_holder{ + + //Manjši margin za note/IF ikone ob prejemnikih + &.alert_prejemniki{ + + .alert_authors { + display: block; + text-indent: 12px; + } + + .setting_item { + label{ + margin-right: 8px; + } + + &.respondent_jeziki { + margin-left: 24px; + } + + } + + span.faicon { + vertical-align: middle; + text-indent: 0; + } + } + + //Box z emaili za dodatne prejemnike + .alert_other_emails { + margin-left: 24px; + label{ + cursor: default; + } + } + + textarea.alert_other_emails{ + width: 538px; + height: 100px; + margin-left: 0; + } + } +} + +span.faicon.respondent_iconwithlink{ + margin-left: 16px; + margin-right: 4px; +} + +//Popup za custom message +#vrednost_edit { + label{ cursor: default; @@ -48,4 +98,22 @@ fieldset{ } } + .setting_holder { + margin-bottom: 16px; + display: flex; + flex-direction: column; + + width: 565px; + + &:first-of-type{ + margin-top: 0; + } + &:last-of-type { + margin-bottom: 0; + } + } + + .button_holder { + justify-content: start; + } } \ No newline at end of file