From 34001ed658b5d46db759486a2f8a6dd264b99cf2 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 17 Mar 2022 00:30:40 +0100 Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20-=20Urejanje=20-->=20Oblika?= =?UTF-8?q?=20-->=20Nalo=C5=BEite=20lasten=20CSS=20-=20v1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- admin/survey/classes/class.SurveyTheme.php | 20 ++++++++++++++----- admin/survey/classes/tracking/CrossRoad.php | 2 ++ lang/1.php | 3 ++- lang/2.php | 3 ++- public/css/admin_new.css | 10 ++++++++++ .../pages/my_surveys/oblika_teme.scss | 19 ++++++++++++++++++ 7 files changed, 52 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 0d614e8dc..5af547d65 100644 --- a/.gitignore +++ b/.gitignore @@ -48,4 +48,5 @@ docker /composer.bat /composer.phar /composer.lock -/.favorites.json \ No newline at end of file +/.favorites.json +main/survey/skins/1045_test.css diff --git a/admin/survey/classes/class.SurveyTheme.php b/admin/survey/classes/class.SurveyTheme.php index 3f33621c7..2018756c8 100644 --- a/admin/survey/classes/class.SurveyTheme.php +++ b/admin/survey/classes/class.SurveyTheme.php @@ -950,18 +950,28 @@ class SurveyTheme { $default = 'Default'; $skin = ($row['skin'] == '') ? $default : $row['skin']; + + echo '
'.$lang['srv_themes_upload_css'].''; + + $sql = sisplet_query("SELECT name FROM srv_theme_profiles".$mobile." WHERE id = '".$_GET['profile']."'"); + $row = mysqli_fetch_array($sql); - echo '
'.$lang['srv_add_theme_upload'].''; + echo '

'.$lang['srv_themes_mod'].': '.$row['name'].'

'; + + echo '

'.$lang['srv_add_theme_upload'].':

'; echo '
'; - echo '

'; echo ''; - echo ' (' . $lang['srv_skintmpl1'] . ' ' . $lang['srv_skintmpl'] . ')'; - echo '

'; + echo ''; + echo '

'.$lang['srv_skintmpl1'] . ' ' . $lang['srv_skintmpl'] . '

'; - echo '

'.$lang['srv_skin_disclamer'].'

'; + echo '

'.$lang['srv_skin_disclamer'].'

'; + + echo '

'.$lang['srv_skin_warning'].'

'; echo ''.$lang['srv_zapri'].''; + + echo '
'; } diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php index 933352e64..cadd6dba2 100644 --- a/admin/survey/classes/tracking/CrossRoad.php +++ b/admin/survey/classes/tracking/CrossRoad.php @@ -163,6 +163,8 @@ class CrossRoad { $second_action = NAVI_UREJANJE_TEMA; $layout_width = 'wide'; + if($_GET['t'] == 'upload') + $layout_width = 'narrow'; $status = 0; diff --git a/lang/1.php b/lang/1.php index 5b80e670b..567e60c25 100644 --- a/lang/1.php +++ b/lang/1.php @@ -5509,7 +5509,8 @@ $lang = array ( "srv_current_theme_general" => 'Splošna tema', "srv_current_theme_mobile" => 'Mobilna tema', "srv_show_all_settings" => "Prikaži napredne nastavitve", - "srv_skin_disclamer" => "Vaše naložene in urejene teme bodo vidne izključno vam. Ostali uporabniki ne morejo uporabljati vaših tem.", + "srv_skin_disclamer" => "Vaše naložene in urejene teme bodo vidne izključno vam in morebitnim urednikom ankete. Ostali uporabniki ne morejo uporabljati vaših tem.", + "srv_skin_warning" => "Opozorilo! Ustvarjanje teme na lastno odgovornost. Ob poseganju v CSS lahko pride do napake in s tem potencialno do napačnega ali nedelujočega prikaza ankete na strani respondenta.", "srv_SN_nagovor_title" => 'Odgovarjate za osebo ', "srv_system_themes" => 'Splošne teme', "srv_mobile_themes" => 'Mobilne teme', diff --git a/lang/2.php b/lang/2.php index f775a9358..d86ac0aae 100644 --- a/lang/2.php +++ b/lang/2.php @@ -5469,7 +5469,8 @@ $lang = array ( "srv_current_theme_general" => 'General theme', "srv_current_theme_mobile" => 'Mobile theme', "srv_show_all_settings" => "Show advanced settings", - "srv_skin_disclamer" => "Only you will be able to see your themes. Other users cannot use your themes.", + "srv_skin_disclamer" => "Your uploaded and edited themes will be visible only to you and any editors of the poll. Other users cannot use your themes.", + "srv_skin_warning" => "Warning! Creating a theme is at your own risk. Interfering with the CSS may result in an error, and thus potentially an incorrect or non-functional display of the survey on the respondent's side.", "srv_SN_nagovor_title" => 'Questions relates to a person ', "srv_system_themes" => 'General themes', "srv_mobile_themes" => 'Mobile themes', diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 6d747a01d..3fbfc4f31 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10707,6 +10707,16 @@ div#theme-edit-wrap div#theme-preview iframe #preview { display: none; } +fieldset#theme-upload h2 { + font-weight: 600; + text-transform: uppercase; + font-size: 16px; + margin-bottom: 16px; +} +fieldset#theme-upload h2 span.name { + text-transform: none; +} + .theme_header { font-weight: 600; font-size: 16px; diff --git a/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss b/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss index fb8bd9f1c..8bb311c52 100644 --- a/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss +++ b/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss @@ -325,6 +325,25 @@ div#theme-edit-wrap{ } +// Oblika - naložite lasten CSS + +fieldset#theme-upload { + + h2 { + font-weight: $semi-bold; + text-transform: uppercase; + font-size: 16px; + + margin-bottom: 16px; + + span.name { + text-transform: none; + } + } + +} + + //////////////////////////////////////////////////////////