From 3e0608154f97930201acf84d11f77ffaa9740feb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 26 Oct 2008 14:14:37 +0000 Subject: [PATCH] Add link to warehouse and bank account in cashdesk page. --- htdocs/cashdesk/affIndex.php | 64 +++++++++++------------ htdocs/cashdesk/langs/en_US/cashdesk.lang | 5 +- htdocs/cashdesk/langs/fr_FR/cashdesk.lang | 3 ++ htdocs/cashdesk/style.css | 1 - htdocs/cashdesk/templates/menu.tpl.php | 12 ++++- 5 files changed, 49 insertions(+), 36 deletions(-) diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php index 4e3ba04dfc2..73320be788a 100644 --- a/htdocs/cashdesk/affIndex.php +++ b/htdocs/cashdesk/affIndex.php @@ -15,37 +15,41 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - include('../master.inc.php'); - require ('include/environnement.php'); - if ( $_SESSION['uid'] <= 0 ) { - header ('Location: index.php'); - - } +include('../master.inc.php'); +require ('include/environnement.php'); +if ( $_SESSION['uid'] <= 0 ) { + header ('Location: index.php'); + exit; +} ?> - Caisse +Caisse - + - - + + - - + + - - + + - - - - - + + + + + @@ -54,23 +58,17 @@
-

CAISSE

+

CAISSE

-
- -
+
-
- -
+
- - -
+
diff --git a/htdocs/cashdesk/langs/en_US/cashdesk.lang b/htdocs/cashdesk/langs/en_US/cashdesk.lang index 699535e5440..5437c3f1338 100644 --- a/htdocs/cashdesk/langs/en_US/cashdesk.lang +++ b/htdocs/cashdesk/langs/en_US/cashdesk.lang @@ -1,2 +1,5 @@ # Language file - en_US - cashdesk -CashDesk=Cash desk \ No newline at end of file +CashDesk=Cash desk +CashDeskBank=Bank accountre +CashDeskWarehouse=Warehouse +CashDeskThirdParty=Third party \ No newline at end of file diff --git a/htdocs/cashdesk/langs/fr_FR/cashdesk.lang b/htdocs/cashdesk/langs/fr_FR/cashdesk.lang index 428d269e77a..543ec5cb03a 100644 --- a/htdocs/cashdesk/langs/fr_FR/cashdesk.lang +++ b/htdocs/cashdesk/langs/fr_FR/cashdesk.lang @@ -1,2 +1,5 @@ # Language file - fr_FR - cashdesk CashDesk=Caisse +CashDeskBank=Compte bancaire +CashDeskWarehouse=Entrepôt +CashDeskThirdParty=Tiers \ No newline at end of file diff --git a/htdocs/cashdesk/style.css b/htdocs/cashdesk/style.css index abd42ca4469..67522cca944 100644 --- a/htdocs/cashdesk/style.css +++ b/htdocs/cashdesk/style.css @@ -131,7 +131,6 @@ p { color: #333; text-decoration: none; padding-right: 25px; - background: url('images/lock.png') no-repeat top right; } .menu_choix0 a:hover{ diff --git a/htdocs/cashdesk/templates/menu.tpl.php b/htdocs/cashdesk/templates/menu.tpl.php index 903e3d1dc39..6750510fb4b 100644 --- a/htdocs/cashdesk/templates/menu.tpl.php +++ b/htdocs/cashdesk/templates/menu.tpl.php @@ -14,10 +14,20 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --> +load("@cashdesk"); + +$logout=''; +?> +