From d260e70f12df694b16d021036a3093627bf25fb5 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 29 Sep 2022 13:40:18 +0200 Subject: [PATCH 1/3] [Redizajn 1KA v2] - Uporabniki --> Dodaj uporabnika v1 --- admin/survey/SurveyAdminSettings.php | 6 +-- public/css/admin_new.css | 52 +++++++------------ .../admin_new/pages/settings/uporabniki.scss | 49 ++++++----------- 3 files changed, 35 insertions(+), 72 deletions(-) diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index ab40db73e..fc6a919ee 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -9161,8 +9161,6 @@ class SurveyAdminSettings { echo '
'; echo '
'; - echo '
'; - echo '
'; echo '
'; echo ''.$lang['name'].':'; @@ -9192,9 +9190,7 @@ class SurveyAdminSettings { echo '
'; echo '
'; - echo '
'; - - echo '
'; + echo '
'; echo ''; echo '
'; echo ''; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index c360c4eb8..d00450472 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -11545,55 +11545,41 @@ div.subpage_uporabniki .data_table_top_holder #end { div.subpage_uporabniki div.users_list_box { padding: 0 12px; } -div.subpage_uporabniki div.add_user { - margin-bottom: 32px; -} -div.subpage_uporabniki div.add_user div#dodajanje_horizontal { - display: flex; - flex-direction: row; - width: fit-content; - align-self: center; -} -div.subpage_uporabniki div.add_user div#dodajanje_horizontal div#dodajanje_left { - padding-right: 32px; - margin-right: 32px; - border-right: 1px solid #E5E5E5; -} -div.subpage_uporabniki div.add_user div#dodajanje_horizontal div.add_user_fields_wrapper { - display: flex; - flex-direction: column; - width: fit-content; - margin-top: 8px; -} -div.subpage_uporabniki div.add_user div#dodajanje_horizontal div.button_holder { - margin: 32px 0 0 0; -} -div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder { +div.subpage_uporabniki .users_list_box #new_user_option .setting_holder, +div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder { margin-bottom: 16px; } -div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder:last-of-type { +div.subpage_uporabniki .users_list_box #new_user_option .setting_holder:last-of-type, +div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder:last-of-type { margin-bottom: 0; } -div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder.horizontal { +div.subpage_uporabniki .users_list_box #new_user_option .setting_holder.horizontal, +div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder.horizontal { display: flex; flex-direction: row; align-items: center; gap: 16px; - margin-bottom: 0; + margin-bottom: 16; } -div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder.horizontal .setting_holder { +div.subpage_uporabniki .users_list_box #new_user_option .setting_holder.horizontal .setting_holder, +div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder.horizontal .setting_holder { display: flex; flex-direction: column; - margin-bottom: 16px; + margin-bottom: 0; } -div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder select.dropdown { +div.subpage_uporabniki .users_list_box #new_user_option .setting_holder select.dropdown, +div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder select.dropdown { width: 500px; } -div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder p.bottom4 { +div.subpage_uporabniki .users_list_box #new_user_option .setting_holder p.bottom4, +div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder p.bottom4 { margin-bottom: 4px; } - -table#unconfirmed_mail_user_list { +div.subpage_uporabniki .users_list_box #new_user_option div.button_holder, +div.subpage_uporabniki .users_list_box #existing_user_option div.button_holder { + margin: 32px 0 0 0; +} +div.subpage_uporabniki table#unconfirmed_mail_user_list { border-left: 1px solid #E5E5E5; border-right: 1px solid #E5E5E5; } diff --git a/resources/sass/admin_new/pages/settings/uporabniki.scss b/resources/sass/admin_new/pages/settings/uporabniki.scss index 0571dfde9..3cdf2fbc5 100644 --- a/resources/sass/admin_new/pages/settings/uporabniki.scss +++ b/resources/sass/admin_new/pages/settings/uporabniki.scss @@ -86,33 +86,11 @@ div.subpage_uporabniki { // Dodajanje - div.add_user { - margin-bottom: 32px; - - div#dodajanje_horizontal { - display: flex; - flex-direction: row; - width: fit-content; - align-self: center; + .users_list_box { - div#dodajanje_left { - padding-right: 32px; - margin-right: 32px; - border-right: 1px solid $gray; - } + #new_user_option, + #existing_user_option { - div.add_user_fields_wrapper { - display: flex; - flex-direction: column; - width: fit-content; - - margin-top: 8px; - } - - div.button_holder { - margin: 32px 0 0 0; - } - .setting_holder { margin-bottom: 16px; @@ -124,30 +102,33 @@ div.subpage_uporabniki { flex-direction: row; align-items: center; gap: 16px; - margin-bottom: 0; + margin-bottom: 16; .setting_holder { display: flex; flex-direction: column; - margin-bottom: 16px; + margin-bottom: 0; } } - + select.dropdown { width: 500px; } - + p.bottom4 { margin-bottom: 4px; } } + + div.button_holder { + margin: 32px 0 0 0; + } } } - -} -table#unconfirmed_mail_user_list { - border-left: 1px solid $gray; - border-right: 1px solid $gray; + table#unconfirmed_mail_user_list { + border-left: 1px solid $gray; + border-right: 1px solid $gray; + } } \ No newline at end of file From 0ebcccb47499aad32027564bbf9fd34f1cef446c Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 29 Sep 2022 14:38:33 +0200 Subject: [PATCH 2/3] [Redizajn 1KA v2] - Urejanje --> Nastavitve --> Osnovne nastavitve popravki --- admin/survey/SurveyAdminSettings.php | 27 ++++++++++++++----- admin/survey/script/script.js | 9 +++++++ lang/1.php | 1 + lang/2.php | 1 + public/css/admin_new.css | 11 +++++++- .../admin_new/components/form/fieldset.scss | 13 ++++++++- 6 files changed, 53 insertions(+), 9 deletions(-) diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index fc6a919ee..5642bed3a 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -117,6 +117,12 @@ class SurveyAdminSettings { echo '
'; echo '
'; + echo ''; + echo ''; + echo ' '; + echo '
'; + + echo '
'; echo ' '; echo ' '; echo ' ' . strlen($row['intro_opomba']) . '/'.ANKETA_NOTE_MAXLENGTH.''; @@ -136,7 +142,13 @@ class SurveyAdminSettings { $sqlF = sisplet_query("SELECT id, naslov FROM srv_mysurvey_folder WHERE usr_id='".$global_user_id."' ORDER BY naslov ASC"); if($show_folders == 1 && mysqli_num_rows($sqlF) > 0){ - echo '
'; + echo '
'; + echo ''; + echo ''; + echo ' '; + echo '
'; + + echo '
'; echo ''; echo ''; - echo '
'; - - // Ta del se v 2. fazi zamenja z gumbom "Večjezične ankete" + // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik $userAccess = UserAccess::getInstance($global_user_id); if($userAccess->checkUserAccess($what='prevajanje')){ $lang_link = 'window.location.href=\'index.php?anketa='.$this->anketa.'&a=prevajanje\'; return false;'; - $color = 'white-blue'; + $color = 'white-black'; } else{ $lang_link = 'popupUserAccess(\'prevajanje\'); return false;'; $color = 'yellow user_access_locked'; } - echo '
'; + echo '
'; echo ''; echo '
'; - + + echo '
'; + echo ''; // Gumb shrani - vmes diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js index b070cbcee..a20a09007 100644 --- a/admin/survey/script/script.js +++ b/admin/survey/script/script.js @@ -5730,4 +5730,13 @@ function toggleCommentPopupInline ($type) { if ($type==1) // dodaj komentar $("#comment_inline_add").toggleClass('displayNone'); +} + +function toggleAnketaOpomba () { + $("#dodaj-opombo").toggleClass('displayNone'); +} + +function toggleAnketaMapa () { + $("#dodaj-v-mapo").toggleClass('displayNone'); + $("#anketa-toggle").toggleClass('bottom0'); } \ No newline at end of file diff --git a/lang/1.php b/lang/1.php index bec34cad4..6a6ed5a32 100644 --- a/lang/1.php +++ b/lang/1.php @@ -1854,6 +1854,7 @@ $lang = array ( "srv_osnovniPodatki" => "Osnovni podatki", "srv_osnovniPodatki2" => "Osnovne nastavitve", "srv_novaanketa_kratkoime" => "Objavljeno ime ankete", + "srv_dodaj_opombo" => "Dodaj opombo na anketo", "srv_novaanketa_kratkoime_info" => "(Akronim ankete, do 40 znakov)", "srv_novaanketa_polnoime" => "Interno ime ankete", "srv_novaanketa_ime_respondenti"=> "Ime ankete za respondente", diff --git a/lang/2.php b/lang/2.php index b09c0de74..c24c62513 100644 --- a/lang/2.php +++ b/lang/2.php @@ -1837,6 +1837,7 @@ $lang = array ( "srv_osnovniPodatki" => "Basic info", "srv_osnovniPodatki2" => "Basic settings", "srv_novaanketa_kratkoime" => "Published survey name", + "srv_dodaj_opombo" => "Dodaj opombo na anketo", "srv_novaanketa_kratkoime_info" => "(40 chars)", "srv_novaanketa_polnoime" => "Internal survey name", "srv_novaanketa_ime_respondenti"=> "Survey name for respondents", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index d00450472..858c5353e 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -9836,9 +9836,18 @@ fieldset legend { fieldset .setting_horizontal_wrapper { display: flex; flex-direction: row; + margin-bottom: 16px; } fieldset .setting_horizontal_wrapper .setting_holder { - margin-right: 17px; + margin-right: 16px; + margin-bottom: 0; +} +fieldset .setting_horizontal_wrapper .button_holder { + height: 40px; + align-self: flex-end; +} +fieldset .setting_horizontal_wrapper:last-of-type { + margin-bottom: 0px; } fieldset .setting_holder { margin-bottom: 16px; diff --git a/resources/sass/admin_new/components/form/fieldset.scss b/resources/sass/admin_new/components/form/fieldset.scss index e82ce1398..3be6bc427 100644 --- a/resources/sass/admin_new/components/form/fieldset.scss +++ b/resources/sass/admin_new/components/form/fieldset.scss @@ -23,7 +23,18 @@ fieldset{ flex-direction: row; .setting_holder { - margin-right: 17px; + margin-right: 16px; + margin-bottom: 0; + } + + .button_holder { + height: 40px; + align-self: flex-end; + } + + margin-bottom: 16px; + &:last-of-type { + margin-bottom: 0px; } } From eebc4aa0a2c5d8f9b7326af677697a3871aeae35 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 29 Sep 2022 15:52:21 +0200 Subject: [PATCH 3/3] =?UTF-8?q?[Redizajn=201KA=20v2]=20Testiranje=20-->=20?= =?UTF-8?q?Komentarji=20-=20test=20survey=20dropdown=20-=20=20switch=20na?= =?UTF-8?q?=C4=8Dina?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../survey/app/Controllers/BodyController.php | 18 +++-- main/survey/js/script.js | 4 +- public/css/main.css | 63 +++++++++++----- resources/sass/main/main/admin.scss | 75 +++++++++++++------ .../sass/main/main/test_survey_comments.scss | 2 + 5 files changed, 111 insertions(+), 51 deletions(-) diff --git a/main/survey/app/Controllers/BodyController.php b/main/survey/app/Controllers/BodyController.php index 38bb26142..ac6d321e9 100644 --- a/main/survey/app/Controllers/BodyController.php +++ b/main/survey/app/Controllers/BodyController.php @@ -2076,6 +2076,16 @@ class BodyController extends Controller echo '
'; + + echo '
'; + + // Preklop na celostranski preview + echo '
'; + echo ''.self::$lang['srv_mode'] . ':'; + echo '' . self::$lang['srv_normal'] . ''; + echo '' . self::$lang['srv_scrolling'] . ''; + echo '
'; + // Gump za odprtje/zaprtje okna echo '
'; @@ -2083,14 +2093,6 @@ class BodyController extends Controller echo ''; echo '
'; - - - // Preklop na celostranski preview - echo '
'; - - echo ''.self::$lang['srv_mode'] . ':'; - echo '' . self::$lang['srv_normal'] . ''; - echo '' . self::$lang['srv_scrolling'] . ''; echo '
'; diff --git a/main/survey/js/script.js b/main/survey/js/script.js index db0ff2df0..ecb220203 100644 --- a/main/survey/js/script.js +++ b/main/survey/js/script.js @@ -1247,7 +1247,7 @@ function return_edit_send (site_url, lang_id) { function preview_popup_close () { - $('#preview-holder, #preview_switch').fadeOut('medium'); + $('#preview-holder, #nacina').fadeOut('medium'); $('#preview-window').addClass('closed'); @@ -1259,7 +1259,7 @@ function preview_popup_close () { function preview_popup_open () { - $('#preview-holder, #preview_switch').fadeIn('medium'); + $('#preview-holder, #nacina').fadeIn('medium'); $('#preview-window').removeClass('closed'); diff --git a/public/css/main.css b/public/css/main.css index 666a8ddd1..a6741706d 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -7295,16 +7295,14 @@ button.ui-datepicker-trigger::before { position: fixed; top: 45px; right: 10px; - width: 270px; + width: 265px; min-height: 32px; - font-size: 11px; + font-size: 12px; background-color: white; - border: 2px #1e88e5 solid; - border-radius: 5px; + box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12); + border-radius: 2px; } #preview-window.closed { - top: 47px; - right: 12px; background-color: transparent; border: 0; } @@ -7358,30 +7356,54 @@ button.ui-datepicker-trigger::before { content: "\f013"; } #preview-window #preview_open { - position: absolute; box-sizing: border-box; - width: 30px; - top: 6px; - right: 8px; text-align: right; + margin-left: auto; } #preview-window #preview_switch { font-family: Open Sans, Arial, Sans-Serif !important; box-sizing: border-box; width: 100%; - padding: 8px 15px; + padding: 21px 16px; font-size: 12px; border-bottom: 1px #1e88e5 solid; + display: flex; + flex-direction: row; + justify-content: space-between; } -#preview-window #preview_switch .active a { - padding-left: 15px; - font-weight: 600; - color: #ffa608; +#preview-window #preview_switch #nacina span.bold { + margin-right: 8px; } -#preview-window #preview_switch .nonactive a { - padding-left: 15px; - font-weight: 600; - color: #1e88e5; +#preview-window #preview_switch #nacina #normalni, +#preview-window #preview_switch #nacina #celostranski { + padding: 4px 8px; + border: 1px solid #E5E5E5; +} +#preview-window #preview_switch #nacina #normalni.active, +#preview-window #preview_switch #nacina #celostranski.active { + background: #EEF7FF; + color: #1E88E5; + border-color: #1E88E5; +} +#preview-window #preview_switch #nacina #normalni a, +#preview-window #preview_switch #nacina #celostranski a { + color: inherit; +} +#preview-window #preview_switch #nacina #normalni { + border-radius: 2px 0 0 2px; + border-right: none; +} +#preview-window #preview_switch #nacina #normalni.active { + border-right: 1px solid; +} +#preview-window #preview_switch #nacina #celostranski { + border-radius: 0 2px 2px 0; +} +#preview-window #preview_switch #nacina #celostranski.active { + border-color: #1E88E5; +} +#preview-window #preview_switch #nacina #celostranski.nonactive { + border-left: none; } #preview-window #preview-holder { font-family: Open Sans, Arial, Sans-Serif !important; @@ -7618,6 +7640,9 @@ span.faicon.empty { border-color: #1E88E5; background-color: #EEF7FF; } +#comments_bottom_line a { + margin-left: auto; +} #comments_bottom_line a #comment_settings { display: flex; flex-direction: row; diff --git a/resources/sass/main/main/admin.scss b/resources/sass/main/main/admin.scss index 7ff48b1bf..4ad78eb29 100644 --- a/resources/sass/main/main/admin.scss +++ b/resources/sass/main/main/admin.scss @@ -122,19 +122,17 @@ top: 45px; right: 10px; - width: 270px; + width: 265px; min-height: 32px; - font-size: 11px; + font-size: 12px; background-color: white; - border: 2px #1e88e5 solid; - border-radius: 5px; + box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12); + border-radius: 2px; &.closed{ - top: 47px; - right: 12px; background-color: transparent; border: 0; @@ -195,14 +193,11 @@ #preview_open { - position: absolute; box-sizing: border-box; - width: 30px; - top: 6px; - right: 8px; + text-align: right; - text-align: right; + margin-left: auto; } #preview_switch { @@ -211,23 +206,59 @@ box-sizing: border-box; width: 100%; - padding: 8px 15px; + padding: 21px 16px; font-size: 12px; border-bottom: 1px #1e88e5 solid; + + display:flex; + flex-direction: row; + justify-content: space-between; - .active a{ - padding-left: 15px; + #nacina { + + span.bold { + margin-right: 8px; + } - font-weight: 600; - color: #ffa608; - } - .nonactive a{ - padding-left: 15px; - - font-weight: 600; - color: #1e88e5; + #normalni, + #celostranski { + padding: 4px 8px; + border: 1px solid #E5E5E5; + &.active{ + background: #EEF7FF; + color: #1E88E5; + border-color: #1E88E5; + } + + a { + color: inherit; + } + } + + + #normalni{ + border-radius: 2px 0 0 2px; + border-right: none; + + &.active{ + border-right: 1px solid; + } + } + + #celostranski{ + border-radius: 0 2px 2px 0; + + &.active{ + border-color: #1E88E5; + } + + &.nonactive { + border-left: none; + } + + } } } diff --git a/resources/sass/main/main/test_survey_comments.scss b/resources/sass/main/main/test_survey_comments.scss index 2d0756724..f6da9f8c4 100644 --- a/resources/sass/main/main/test_survey_comments.scss +++ b/resources/sass/main/main/test_survey_comments.scss @@ -102,6 +102,8 @@ $status-blue: #EAF9FE; } } } + + margin-left: auto; } }