diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 1bc7afd9f..1bab69006 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -487,7 +487,7 @@ class SurveyAdmin echo '
'; // Skriti divi za profile - echo '
'; + echo '
'; // Creport echo '
'; diff --git a/admin/survey/classes/class.SurveyCustomReport.php b/admin/survey/classes/class.SurveyCustomReport.php index e339cec37..47a5c1134 100644 --- a/admin/survey/classes/class.SurveyCustomReport.php +++ b/admin/survey/classes/class.SurveyCustomReport.php @@ -1727,7 +1727,8 @@ class SurveyCustomReport { $name = $profile['name']; - echo '

'.$lang['srv_custom_report_profile_title'].'

'; + echo '

'.$lang['srv_custom_report_profile_title'].'

'; + echo ''; echo '
'; @@ -1789,14 +1790,15 @@ class SurveyCustomReport { // Ce je izbran custom profil imamo na dnu gumba brisi in preimenuj, pri default pa samo preimenuj // Preimenuje, brise in share lahko samo za lastna porocila if($this->creportAuthor == $global_user_id){ - echo '
'; - echo ''.$lang['srv_rename_profile'].''."\n"; + + echo '
'; + echo ''; if($this->creportProfile > 0) - echo '
'.$lang['srv_delete_profile'].''."\n"; + echo ''; + + echo ''; - // Deli poročilo z drugimi uredniki - echo '
'.$lang['srv_custom_report_share'].''."\n"; echo '
'; } @@ -1811,15 +1813,15 @@ class SurveyCustomReport { $time_edit = $time_created; // Cas kreirranja in urejanja profila - echo '
'; + echo '
'; if($time_created != '' && $time_created != '0000-00-00 00:00:00'){ $time_created = strtotime($time_created); - echo $lang['srv_custom_report_time_created'].': '.date("d.m.Y H:i", $time_created).'
'; + echo '

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

'; } 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 '

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

'; } echo '
'; @@ -1840,10 +1842,10 @@ 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 ''; + echo ''; else echo ''.$comment.''; @@ -1852,15 +1854,13 @@ class SurveyCustomReport { // cover Div echo '
'."\n"; - - echo ''; - echo '
'; - echo ''; - echo ''; - echo ''; + echo '
'; + echo ''; + echo ''; + echo ''; + echo '
'; - echo '
'; } function displayProfilePopups(){ diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 470d22edf..b21d8bf2a 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -8303,6 +8303,26 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left { width: 50%; } +#creport_profiles { + cursor: pointer; + width: 99%; + height: 140px; + display: inline-block; + border: 1px solid #E5E5E5; +} +#creport_profiles .option { + padding: 1px; +} +#creport_profiles .active { + background-color: #1E88E5; + color: white; + border-bottom: 1px solid #E5E5E5; +} + +#creport_settings_profiles_comment textarea { + width: 100%; +} + .pbLabel { height: 20px; width: 160px; diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss index 58123ea92..3f89bbc95 100644 --- a/resources/sass/admin_new/components/popup/page_specific.scss +++ b/resources/sass/admin_new/components/popup/page_specific.scss @@ -219,6 +219,29 @@ 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; + } + .active { + background-color: $blue; + color: white; + border-bottom: 1px solid $gray; + } +} + +#creport_settings_profiles_comment { + textarea { + width: 100%; + } +} + //// TESTIRANJE ///// //Avtomatski vnosi - progress bar