From 09ea4f71a2eff3fbd3a2b5b2f181b7290c4b63aa Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sat, 23 Jun 2012 00:45:16 +0000
Subject: [PATCH] 0000577: Remplacer FICHE par PRINTCARD

---
 html/js/card.js              |  2 +-
 html/style.css               |  4 ++--
 include/ajax_get_profile.php | 13 ++++++++++++-
 include/fiche.inc.php        |  2 +-
 sql/upgrade.sql              | 11 ++++++-----
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/html/js/card.js b/html/js/card.js
index 43cca1158..219566eca 100644
--- a/html/js/card.js
+++ b/html/js/card.js
@@ -470,7 +470,7 @@ function dis_blank_card(obj)
     if ( obj.elements &&  obj.elements['ref'] )
     {
         ref='&ref';
-    }
+    } 
     var content='div_new_card';
     var nTop=posY-40;
     var nLeft=posX-20;
diff --git a/html/style.css b/html/style.css
index 76ff0ff1d..423e16e43 100644
--- a/html/style.css
+++ b/html/style.css
@@ -125,7 +125,7 @@ div.u_tmenu div.u_tool {
 div.u_tool {
 	float:left;
 	width:  100%;
-	padding-bottom: 7px;
+	padding-bottom: 20px;
 	}
 div.u_tool div.name {
        float:left;
@@ -834,7 +834,7 @@ a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:hover  {
 	border-style:  inset ;
 	color:red;
 	margin:1 2 1 2;
-        
+
 	}
 	td.tool {
 	border: solid 1px gray;
diff --git a/include/ajax_get_profile.php b/include/ajax_get_profile.php
index af9682770..111761837 100644
--- a/include/ajax_get_profile.php
+++ b/include/ajax_get_profile.php
@@ -35,11 +35,13 @@ $add_one=HtmlInput::button("add", "Ajout Menu","onclick=\"add_menu({dossier:$gDo
 ?>
 <hr>
 <h1>Profil <?=$profile->p_name?></h1>
+<? if ($p_id > 0 ) : ?>
 <a href="javascript:void(0)" class="line" onclick="profile_show('profile_gen_div')"><?=_('Nom')?></a>&nbsp;
 <a href="javascript:void(0)" class="line" onclick="profile_show('profile_menu_div')"><?=_('Détail Menus')?></a>&nbsp;
 <a href="javascript:void(0)" class="line" onclick="profile_show('profile_print_div')"><?=_('Détail Impressions')?></a>&nbsp;
 <a href="javascript:void(0)" class="line" style="" onclick="profile_show('profile_gestion_div')"><?=_('Action Gestion')?> </a>&nbsp;
 <a href="javascript:void(0)" class="line" onclick="profile_show('profile_repo_div')"><?=_('Dépôts')?></a>&nbsp;
+<? endif; ?>
 
 <?
 $id=HtmlInput::hidden('p_id',$profile->p_id);
@@ -50,7 +52,16 @@ $with_calc->set_check($profile->with_calc);
 
 $with_direct_form=new ICheckBox("with_direct_form","t");
 $with_direct_form->set_check($profile->with_direct_form);
-echo '<div style="display:none" id="profile_gen_div">';
+
+// If $p_id == -1 it is a new profile
+if ( $p_id > 0 )
+{
+	echo '<div style="display:none" id="profile_gen_div">';
+}
+else
+{
+	echo '<div  id="profile_gen_div">';
+}
 echo '<form method="POST" onsubmit="return confirm (\'vous confirmez\')">';
 echo HtmlInput::hidden('tab','profile_gen_div');
 echo HtmlInput::hidden('p_id',$profile->p_id);
diff --git a/include/fiche.inc.php b/include/fiche.inc.php
index 715fb472f..01748d77f 100644
--- a/include/fiche.inc.php
+++ b/include/fiche.inc.php
@@ -99,7 +99,7 @@ $array = Fiche::get_fiche_def($cn, $_GET['cat'], 'name_asc');
 
 $h_add_card_b = new IButton('add_card');
 $h_add_card_b->label = _('Créer une nouvelle fiche');
-$h_add_card_b->javascript = "dis_blank_card({gDossier:$gDossier,fd_id:$fd_id})";
+$h_add_card_b->javascript = "dis_blank_card({gDossier:$gDossier,fd_id:$fd_id,ref:2})";
 $str_add_card = ($g_user->check_action(FICADD) == 1) ? $h_add_card_b->input() : "";
 
 /*
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 1bf2e2186..e754fd241 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -472,8 +472,9 @@ CREATE INDEX quant_sold_jrn_fki
 create sequence uos_pk_seq;
 create table tool_uos (  uos_value bigint default nextval ('uos_pk_seq') primary key );
 
--- update menu_ref set me_code='CFGCARD',me_file='cfgfiche.inc.php' where me_code='CARD';
--- update menu_ref set me_code='CARD',me_file='fiche.inc.php' where me_code='PRINTCARD';
--- update profile_menu set me_code='CARD' where me_code='CFGCARD';
--- update profile_menu set me_code='CFGCARD' , me_code_dep='PARAM' where me_code='CARD' and me_code_dep='PRINT';
--- update menu_ref set me_menu='Fiche',me_description='Liste,Balance,Historique par fiche' where me_code='CARD'
+update menu_ref set me_code='CFGCARD',me_file='cfgfiche.inc.php' where me_code='CARD';
+update menu_ref set me_code='CARD',me_file='fiche.inc.php' where me_code='PRINTCARD';
+update profile_menu set me_code='CARD' where me_code='CFGCARD';
+update profile_menu set me_code='CFGCARD' , me_code_dep='PARAM' where me_code='CARD' and me_code_dep='PRINT';
+update menu_ref set me_menu='Fiche',me_description='Liste,Balance,Historique par fiche' where me_code='CARD';
+update menu_ref set me_menu='Fiche',me_description='Configuration de catégorie de fiches' where me_code='CFGCARD';