From 5efdaddb921f540e447bb710463f5b3e268b485b Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Tue, 7 Jun 2022 06:09:43 +0200 Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20Popupi:=20Analize=20?= =?UTF-8?q?=E2=86=92=20Poro=C4=8Dila=20=E2=86=92=20Poro=C4=8Dila=20po=20me?= =?UTF-8?q?ri=20-=20Edit=20-=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../classes/class.SurveyCustomReport.php | 14 +++--- public/css/admin_new.css | 40 +++++++---------- .../components/popup/page_specific.scss | 44 ++++++++++++------- .../survey_analysis/page_custom_report.scss | 15 ------- 4 files changed, 50 insertions(+), 63 deletions(-) diff --git a/admin/survey/classes/class.SurveyCustomReport.php b/admin/survey/classes/class.SurveyCustomReport.php index 694f9ab1b..20fcbb1d5 100644 --- a/admin/survey/classes/class.SurveyCustomReport.php +++ b/admin/survey/classes/class.SurveyCustomReport.php @@ -1807,19 +1807,17 @@ class SurveyCustomReport { // Preimenuje, brise in share lahko samo za lastna porocila if($this->creportAuthor == $global_user_id){ - echo '
'; - echo ''; + echo '

'.$lang['srv_rename_profile'].'

'; if($this->creportProfile > 0) - echo ''; + echo '

'.$lang['srv_delete_profile'].'

'; - echo ''; + echo '

'.$lang['srv_custom_report_share'].'

'; - echo '
'; } - // Preberemo najkasneje editiran element (cas spreminjanja) + /*/ Preberemo najkasneje editiran element (cas spreminjanja) $sqlt = sisplet_query("SELECT MAX(time_edit) FROM srv_custom_report WHERE ank_id='$this->ank_id' AND usr_id='$this->creportAuthor' AND profile='$this->creportProfile'"); if(mysqli_num_rows($sqlt) > 0){ $rowt = mysqli_fetch_array($sqlt); @@ -1838,7 +1836,7 @@ class SurveyCustomReport { if($time_edit != '' && $time_edit != '0000-00-00 00:00:00'){ $time_edit = strtotime($time_edit); echo '

'.$lang['srv_custom_report_time_edited'].': '.date("d.m.Y H:i", $time_edit).'

'; - } + }*/ echo ''; @@ -1858,7 +1856,7 @@ class SurveyCustomReport { $comment = $row['value']; } - echo '

'.$lang['srv_inv_archive_comment'].':

'; + echo '

'.$lang['srv_inv_archive_comment'].':

'; // Komentar lahko popravlja samo avtor porocila if($this->creportAuthor == $global_user_id) echo ''; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index a09b4bb89..f6d72f493 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -8313,24 +8313,31 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left { width: 50%; } -#creport_profiles { +#div_creport_settings_profiles #creport_profiles { cursor: pointer; width: 99%; height: 140px; display: inline-block; border: 1px solid #E5E5E5; } -#creport_profiles .option { - padding: 1px; +#div_creport_settings_profiles #creport_profiles .option { + padding: 8px; + border: 1px solid #E5E5E5; } -#creport_profiles .active { - background-color: #1E88E5; - color: white; - border-bottom: 1px solid #E5E5E5; +#div_creport_settings_profiles #creport_profiles .active { + background-color: #EAF9FE; + color: #1E88E5; } - -#creport_settings_profiles_comment textarea { +#div_creport_settings_profiles #creport_settings_profiles_comment textarea { width: 100%; + height: 80px; +} +#div_creport_settings_profiles .button_holder { + display: flex; + border-top: 1px solid #E5E5E5; + padding-top: 16px !important; + margin-top: 16px !important; + justify-content: space-between !important; } #newCReportProfile .text, @@ -29888,21 +29895,6 @@ ul.vrednost_sort input[type=text] { width: 98%; height: 30px; } -.subpage_analysis_creport #anketa_custom_report #creport_profiles { - cursor: pointer; - width: 99%; - height: 140px; - display: inline-block; - border: 1px solid #E5E5E5; -} -.subpage_analysis_creport #anketa_custom_report #creport_profiles .option { - padding: 1px; -} -.subpage_analysis_creport #anketa_custom_report #creport_profiles .active { - background-color: #1E88E5; - color: white; - border-bottom: 1px solid #E5E5E5; -} div.reports_holder { display: flex; diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss index cd2b28df2..2b7124639 100644 --- a/resources/sass/admin_new/components/popup/page_specific.scss +++ b/resources/sass/admin_new/components/popup/page_specific.scss @@ -224,26 +224,38 @@ div#div_analiza_archive_name { } //Poročila -#creport_profiles { - cursor: pointer; - width: 99%; - height: 140px; - display: inline-block; - border: 1px solid $gray; - .option { - padding: 1px; +#div_creport_settings_profiles { + #creport_profiles { + cursor: pointer; + width: 99%; + height: 140px; + display: inline-block; + border: 1px solid $gray; + .option { + padding: 8px; + border: 1px solid $gray; + } + .active { + background-color: $light-blue; + color: $blue; + } } - .active { - background-color: $blue; - color: white; - border-bottom: 1px solid $gray; + + #creport_settings_profiles_comment { + textarea { + width: 100%; + height: 80px; + } } -} -#creport_settings_profiles_comment { - textarea { - width: 100%; + .button_holder { + display: flex; + border-top: 1px solid $gray; + padding-top: 16px !important; + margin-top: 16px !important; + justify-content: space-between !important; } + } #newCReportProfile, diff --git a/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss b/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss index 218a0dcd2..7123e64b7 100644 --- a/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss +++ b/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss @@ -504,20 +504,5 @@ } } } - #creport_profiles { - cursor: pointer; - width: 99%; - height: 140px; - display: inline-block; - border: 1px solid $gray; - .option { - padding: 1px; - } - .active { - background-color: $blue; - color: white; - border-bottom: 1px solid $gray; - } - } }