diff --git a/html/ajax_card.php b/html/ajax_card.php index 46445eb5b..4d9cfd9aa 100644 --- a/html/ajax_card.php +++ b/html/ajax_card.php @@ -126,9 +126,7 @@ case 'rmfa': case 'dc': $f=new Fiche($cn); /* add title + close */ - $html=""; - $html=HtmlInput::anchor_close($ctl); - $html.=h2info('Détail fiche'); + $html=HtmlInput::title_box("Détail fiche", $ctl); if ( $qcode != '') { $f->get_by_qcode($qcode); @@ -180,12 +178,10 @@ case 'dc': case 'bc': if ( $g_user->check_action(FICADD)==1 ) { - $r=''; - $r=HtmlInput::anchor_close($ctl); + $r=HtmlInput::title_box("Nouvelle fiche", $ctl); /* get cat. name */ $cat_name=$cn->get_value('select fd_label from fiche_def where fd_id=$1', array($fd_id)); - $r.=h2info(_('Nouvelle fiche ').$cat_name); $f=new Fiche($cn); $r.='
'; $r.=dossier::hidden(); @@ -261,8 +257,8 @@ case 'st': $sql.=" ".$where." order by fd_label"; $array=$cn->make_array($sql); - $html=HtmlInput::anchor_close('select_card_div'); - $html.=h2info('Choix de la catégorie'); + $html=HtmlInput::title_box("Choix de la catégorie", $ctl); + if ( empty($array)) { $html.=_("Aucune catégorie de fiche ne correspond à". @@ -297,8 +293,7 @@ case 'st': * ----------------------------------------------------------------------*/ case 'sc': - $html=HtmlInput::anchor_close($ctl); - $html.=h2info('Nouvelle fiche'); + $html=HtmlInput::title_box("Choix de la catégorie", $ctl); if ( $g_user->check_action(FICADD)==1 ) { $f=new Fiche($cn); @@ -322,10 +317,7 @@ case 'sc': *----------------------------------------------------------------------*/ case 'fs': require_once('class_acc_ledger.php'); - $r=''; - $r.=HtmlInput::anchor_close('search_card'); - $r.='
'.h2info(_('Recherche de fiche')).'
'; - + $r=HtmlInput::title_box("Détail fiche", $ctl); $r.=''; $q=new IText('query'); $q->value=(isset($query))?$query:''; @@ -491,8 +483,7 @@ case 'scc': } break; case 'upc': - $html=HtmlInput::anchor_close($ctl); - $html.=h2info('Détail fiche'); + $html=HtmlInput::title_box("Détail fiche", $ctl); if ( $g_user->check_action(FICADD)==0 ) { diff --git a/html/style.css b/html/style.css index ed0dcc60e..11df94356 100644 --- a/html/style.css +++ b/html/style.css @@ -82,6 +82,7 @@ h2.info { } + h3.info { background:#879ed4; color:white; @@ -1182,11 +1183,14 @@ h1.title { font-style: italic; } h2.title { - color: blue; - font-size:0.87em; - font-weight:bold; - font-style: italic; - margin-left: 15px; + background-color:#879ed4; + color:white; + font-size:1.34em; + text-align:center; + padding:0.24%; + //margin:0.24%; + border:1px solid darkblue; + } h3.title { color: blue; diff --git a/include/class_html_input.php b/include/class_html_input.php index 9a59a8d39..0e9c6be40 100755 --- a/include/class_html_input.php +++ b/include/class_html_input.php @@ -411,7 +411,7 @@ class HtmlInput static function anchor_close($div) { $r=''; - $r.='
'; + $r.='
'; $r.= 'Fermer'; $r.='
'; return $r; @@ -648,7 +648,7 @@ class HtmlInput { if ($mod=='close') $r=HtmlInput::anchor_close($div); if ($mod=='hide') $r=HtmlInput::anchor_hide(_('Fermer'),"$('$div').hide()"); - $r.=h2info($name); + $r.=h2($name,' class="title" '); return $r; } /** diff --git a/include/fiche.inc.php b/include/fiche.inc.php index 6a9cc2240..23b6883d8 100644 --- a/include/fiche.inc.php +++ b/include/fiche.inc.php @@ -85,7 +85,7 @@ echo ''; $search_card=new IText('card_search'); $search_card_js=sprintf('onclick="boxsearch_card(\'%d\')"',dossier::id()); ?> -
+
:input()?> diff --git a/include/template/category_of_card.php b/include/template/category_of_card.php index 60c64aac7..82c6415de 100644 --- a/include/template/category_of_card.php +++ b/include/template/category_of_card.php @@ -1,7 +1,6 @@ -
diff --git a/include/template/ledger_detail_fin.php b/include/template/ledger_detail_fin.php index cd796a831..d9d60193f 100644 --- a/include/template/ledger_detail_fin.php +++ b/include/template/ledger_detail_fin.php @@ -64,8 +64,8 @@ echo td(_('Pièce')).td($itext->input()); - - +
+
Note diff --git a/include/template/ledger_detail_misc.php b/include/template/ledger_detail_misc.php index e9ff7ebea..45db1dfb8 100644 --- a/include/template/ledger_detail_misc.php +++ b/include/template/ledger_detail_misc.php @@ -49,14 +49,16 @@ require_once ('class_anc_plan.php');
-
- - - - - + + +
- Note -
+ + + + + + + - -
+ Note +
width=25; @@ -65,9 +67,9 @@ require_once ('class_anc_plan.php'); echo $inote->input(); ?> -
+
diff --git a/include/template/ledger_detail_top.php b/include/template/ledger_detail_top.php index 2fa6cc476..99827f65f 100644 --- a/include/template/ledger_detail_top.php +++ b/include/template/ledger_detail_top.php @@ -1,4 +1,4 @@ -
+
- get_name()); ?> + get_name(),'class="title"'); ?>
det->jr_internal); ?>
diff --git a/include/template/ledger_detail_ven.php b/include/template/ledger_detail_ven.php index b7ce0e7e9..31e0423f3 100644 --- a/include/template/ledger_detail_ven.php +++ b/include/template/ledger_detail_ven.php @@ -75,8 +75,8 @@ - - +
+
Note