From 3c29c7ecc3f177d2eecb76485b8502a4ad67a6fe Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 28 May 2012 01:13:57 +0000 Subject: [PATCH] cosmetic : third name in action --- html/style.css | 5 +++-- include/category_card.inc.php | 5 +---- include/class_follow_up.php | 3 ++- include/template/detail-action.php | 4 +++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/html/style.css b/html/style.css index c50e297dc..ea56d3be3 100644 --- a/html/style.css +++ b/html/style.css @@ -866,8 +866,8 @@ div.welcome { } div.gest_name { - float:right; - margin-right:150; + float:left; + margin-left:150; margin-top:15 } h2.gest_name { @@ -876,6 +876,7 @@ h2.gest_name { border-top:1px solid #b4bbc2; border-right:1px solid #b4bbc2; padding: 5px; + width: 30%; } body.op_detail_frame,div.op_detail_frame { background-color:#e4e7ed; diff --git a/include/category_card.inc.php b/include/category_card.inc.php index b3f5c0163..e4df39a00 100644 --- a/include/category_card.inc.php +++ b/include/category_card.inc.php @@ -71,10 +71,7 @@ echo ShowItem(array( 'H',"mtitle","mtitle",$def,' '); echo ''; echo '
'; -echo '
'; -echo '

'.$f->get_quick_code()." ".$f->strAttribut(ATTR_DEF_NAME).'

'; -echo '
'; -echo '
'; + //--------------------------------------------------------------------------- // Show Detail of a card and category diff --git a/include/class_follow_up.php b/include/class_follow_up.php index f1b9099c3..cfe572ac3 100644 --- a/include/class_follow_up.php +++ b/include/class_follow_up.php @@ -163,7 +163,8 @@ class Follow_Up ); // List opération liées - $operation=$this->db->get_array("select ago_id,j.jr_id,j.jr_internal,j.jr_comment from jrn as j join action_gestion_operation as ago on (j.jr_id=ago.jr_id)"); + $operation=$this->db->get_array("select ago_id,j.jr_id,j.jr_internal,j.jr_comment from jrn as j join action_gestion_operation as ago on (j.jr_id=ago.jr_id) + where ag_id=$1",array($this->ag_id)); $iconcerned=new IConcerned('operation'); // state // Retrieve the value diff --git a/include/template/detail-action.php b/include/template/detail-action.php index 9cb29c262..365f27292 100644 --- a/include/template/detail-action.php +++ b/include/template/detail-action.php @@ -1,3 +1,4 @@ +
@@ -6,8 +7,9 @@ +

input(); ?>

- input(); ?> +