';
}
@@ -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 ''.$lang['srv_zapri'].' ';
+ echo ''.$lang['srv_save_and_run_profile'].' ';
+ echo ''.$lang['srv_custom_report_create'].' ';
+ 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