From 14304f98302fcb562a48d5efe083fffb2e1f10c9 Mon Sep 17 00:00:00 2001 From: sparkyx Date: Thu, 26 Feb 2026 12:19:19 +0100 Subject: [PATCH] FOLLOW-UP: improve appearance --- html/css/style-classic7.css | 35 ++++++++++++++++++++------ include/class/follow_up.class.php | 7 +++--- include/template/follow_up-display.php | 31 +++++++++++++++++------ 3 files changed, 56 insertions(+), 17 deletions(-) diff --git a/html/css/style-classic7.css b/html/css/style-classic7.css index 9ca1b6207..5102f9d0b 100644 --- a/html/css/style-classic7.css +++ b/html/css/style-classic7.css @@ -73,13 +73,15 @@ BODY { --underline-menu:#d7e8ee; --bg-slide:#c5d5e8; --end-level1:#eb7c7e; + --border-color:navy; + --bg-white:white; } input{ font-family: 'OpenSansRegular'; padding : 2px; margin:2px; border:1px solid var(--input-color); - + background-color:var(--bg-white); color:var(--input-color); } @@ -807,8 +809,9 @@ a.document:hover { } .input_text_ro { border:1px solid #0000FF; - background:#EDEDED; - color:#0000FF; + background-color: var(--bg-white); + color:var(--border-color); + border-radius: 5px; margin:1px; } .input_text { @@ -856,9 +859,9 @@ fieldset fieldset legend { color:#888; } select { - border: 1px solid #0000FF; + border: 1px solid var(--border-color); margin:2px; - background-color:#FFFFFF; + background-color:var(--bg-white); border-radius: 3px; padding: 3px; } @@ -2705,7 +2708,7 @@ td.selectedmenu { .field_follow_up { margin-top:1px; - border:1px solid blue; + border:1px solid var(--border-color); min-height: 5rem; } @@ -3786,7 +3789,7 @@ margin:1px; div.concerned_action { height: 11rem; overflow: auto; - background-color: white; + background-color: var(--bg-white); border:navy 1px solid; width: 100%; scroll-padding-right: 20px; @@ -4307,4 +4310,22 @@ span.nb-round { #message1 { text-align: center; padding: 10px; +} + + +.inner_box div.fu_comment_div { + padding-left: 1rem; + padding-right: 1rem; + +} + + +.field_follow_up { + padding: 1rem; + border-radius: 10px; + +} + +.field_follow_up { + background-color: var(--bg-white); } \ No newline at end of file diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php index bf4a978ed..b4232f85d 100644 --- a/include/class/follow_up.class.php +++ b/include/class/follow_up.class.php @@ -283,7 +283,7 @@ class Follow_Up $title->name="ag_title"; $title->value=$this->ag_title; $title->size=60; - $title->style='style="font-size:2rem;font-weight:bold"'; + $title->style='class="input_text" style="font-size:2rem;font-weight:bold"'; $title->css_size="45rem"; @@ -304,7 +304,8 @@ class Follow_Up $ag_hour->name="ag_hour"; $ag_hour->value=$this->ag_hour; $ag_hour->size=6; - $ag_hour->javascript=" onblur=check_hour('ag_hour');"; + if (! $readonly) $ag_hour->javascript=" onblur=check_hour('ag_hour');"; + $str_ag_hour=$ag_hour->input(); // Profile in charged of the action @@ -420,7 +421,7 @@ class Follow_Up $h_agrefid=new IHidden(); $iag_ref=new IText("ag_ref"); $iag_ref->value=$this->ag_ref; - $iag_ref->readOnly=false; + $iag_ref->readOnly=$readonly; $iag_ref->css_size="100%"; $str_ag_ref=$iag_ref->input(); // Preparing the return string diff --git a/include/template/follow_up-display.php b/include/template/follow_up-display.php index 5685138ff..3ae56ddd2 100644 --- a/include/template/follow_up-display.php +++ b/include/template/follow_up-display.php @@ -321,8 +321,13 @@ function small(p_id_textarea){ }

- input(); - ?> + + input(); ?> + + + value; ?> + +

dt_id) == "ONE_EDIT" ) { + echo '
'; if (count($acomment) > 1 ) { echo h2(_("Commentaire")); $comment=new ITextarea("ag_comment_edit"); @@ -451,14 +463,18 @@ function small(p_id_textarea){ } echo ''; } + echo '
'; } - - if ( count($acomment) > 0 + //------------------------------------------------ + // Multiple comments + //------------------------------------------------ + + if ( count($acomment) > 0 && Document_Option::can_add_comment($ag_id) && Document_Option::option_comment($this->dt_id) == "SOME_FIXED") { echo h2(_("Commentaire")); - + echo '
'; for( $c=1;$c'; }