From c52f4644e18122c5302073099b9d65d20d849882 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 13:00:39 +0200
Subject: [PATCH] Look and feel v6
---
htdocs/user/agenda_extsites.php | 2 +-
htdocs/user/bank.php | 24 ++++++++++++++----------
htdocs/user/clicktodial.php | 4 +++-
htdocs/user/param_ihm.php | 2 +-
htdocs/user/perms.php | 2 +-
5 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 0942bbf7ed8..a3288e99c26 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -151,7 +151,7 @@ print '<input type="hidden" name="id" value="'.$id.'">';
$head=user_prepare_head($object);
-dol_fiche_head($head, 'extsites', $langs->trans("User"), 0, 'user');
+dol_fiche_head($head, 'extsites', $langs->trans("User"), -1, 'user');
$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 63cdacf958d..2fe30d6e9f8 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -131,7 +131,7 @@ if ($id && $action == 'create' && $user->rights->user->user->creer)
if ($id && $action != 'edit')
{
$title = $langs->trans("User");
- dol_fiche_head($head, 'bank', $title, 0, 'user');
+ dol_fiche_head($head, 'bank', $title, -1, 'user');
$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
@@ -232,14 +232,14 @@ if ($id && $action == 'edit' && $user->rights->user->user->creer)
$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
- dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin);
+ dol_banner_tab($object, 'id', $linkback,$user->rights->user->user->lire || $user->admin);
- print '<div class="fichecenter">';
+ //print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border centpercent">';
- print '<tr><td valign="top" width="35%" class="fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+ print '<tr><td class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
print '<td colspan="4"><input size="30" type="text" name="label" value="'.$account->label.'"></td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans("BankName").'</td>';
@@ -271,29 +271,29 @@ if ($id && $action == 'edit' && $user->rights->user->user->creer)
}
// IBAN
- print '<tr><td class="tdtop fieldrequired">'.$langs->trans("IBAN").'</td>';
+ print '<tr><td class="fieldrequired">'.$langs->trans("IBAN").'</td>';
print '<td colspan="4"><input size="30" type="text" name="iban" value="'.$account->iban.'"></td></tr>';
- print '<tr><td class="tdtop fieldrequired">'.$langs->trans("BIC").'</td>';
+ print '<tr><td class="fieldrequired">'.$langs->trans("BIC").'</td>';
print '<td colspan="4"><input size="12" type="text" name="bic" value="'.$account->bic.'"></td></tr>';
print '<tr><td class="tdtop">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
- print '<textarea name="domiciliation" rows="4" cols="40">';
+ print '<textarea name="domiciliation" rows="4" class="quatrevingtpercent">';
print $account->domiciliation;
print "</textarea></td></tr>";
- print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwner").'</td>';
+ print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
print '<td colspan="4"><input size="30" type="text" name="proprio" value="'.$account->proprio.'"></td></tr>';
print "</td></tr>\n";
print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
- print "<textarea name=\"owner_address\" rows=\"4\" cols=\"40\">";
+ print '<textarea name="owner_address" rows="4" class="quatrevingtpercent">';
print $account->owner_address;
print "</textarea></td></tr>";
print '</table>';
- print '</div>';
+ //print '</div>';
dol_fiche_end();
@@ -304,6 +304,10 @@ if ($id && $action == 'edit' && $user->rights->user->user->creer)
print '</div>';
}
+if ($id && $action == 'edit' && $user->rights->user->user->creer) print '</form>';
+
+if ($id && $action == 'edit' && $user->rights->user->user->creer) print '</form>';
+
llxFooter();
$db->close();
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index cb1e9f875aa..c7a36777699 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -96,12 +96,13 @@ if ($id > 0)
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="update">';
- dol_fiche_head($head, 'clicktodial', $title, 0, 'user');
+ dol_fiche_head($head, 'clicktodial', $title, -1, 'user');
$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin);
+ print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';
// Edit mode
@@ -193,6 +194,7 @@ if ($id > 0)
print '</div>';
}
+ print '</div>';
print '</form>';
/*
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 0208046c482..0348eb0e288 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -295,7 +295,7 @@ if ($action == 'edit')
}
else
{
- dol_fiche_head($head, 'guisetup', $title, 0, 'user');
+ dol_fiche_head($head, 'guisetup', $title, -1, 'user');
$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 95c3eb6c87f..55bdbbceff7 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -125,7 +125,7 @@ $form=new Form($db);
$head = user_prepare_head($object);
$title = $langs->trans("User");
-dol_fiche_head($head, 'rights', $title, 0, 'user');
+dol_fiche_head($head, 'rights', $title, -1, 'user');
$db->begin();
--
GitLab