From 2fb58dd1fceeffef3d91fca35143139cf541b7b2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 31 Aug 2011 21:27:43 +0000 Subject: [PATCH] Trans --- htdocs/main.inc.php | 7 +-- htdocs/theme/eldy/style.css.php | 50 +++++++++---------- .../smartphone/theme/default/default.css.php | 29 +++-------- htdocs/user/param_ihm.php | 4 +- 4 files changed, 38 insertions(+), 52 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index b2897fc840d..6da4b2937d8 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -168,6 +168,9 @@ if (isset($_SERVER["HTTP_USER_AGENT"])) // Other if (in_array($conf->browser->name,array('firefox','iceweasel'))) $conf->browser->firefox=1; //$conf->browser->phone='android'; + + // Force usage of left menu when smartphone is used + if ($conf->browser->phone && ! empty($conf->global->MAIN_MENU_FORCE_USE_JQUERY_LAYOUT)) $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT='forced'; } @@ -640,8 +643,6 @@ if (! defined('NOLOGIN')) $conf->theme=$user->conf->MAIN_THEME; $conf->css = "/theme/".$conf->theme."/style.css.php"; } - // If theme support flip-hide left menu and we use a smartphone, we force it - if ($conf->browser->phone && $conf->theme == 'eldy') $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT='forced'; // Set javascript option if (! GETPOST('nojs')) // If javascript was not disabled on URL { @@ -1112,7 +1113,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a //togglerLength_open: 0, // effect defaults - overridden on some panes //slideTrigger_open: "mouseover", - initClosed: '.(empty($conf->browser->phone)?'false':'true').', + //initClosed: true, fxName: "drop", fxSpeed: "fast", fxSettings: { easing: "" } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 848a86e427d..cb22aff6921 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -54,8 +54,8 @@ if (GETPOST('theme')) $conf->theme=GETPOST('theme'); // If theme was forced on $langs->load("main",0,1); $right=($langs->trans("DIRECTION")=='rtl'?'left':'right'); $left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); -$fontsize=empty($conf->browser->phone)?'12':'14'; -$fontsizesmaller=empty($conf->browser->phone)?'11':'14'; +$fontsize=empty($conf->browser->phone)?'12':'12'; +$fontsizesmaller=empty($conf->browser->phone)?'11':'11'; $path=''; // This value may be used in future for external module to overwrite theme @@ -217,7 +217,7 @@ td.showDragHandle { /* ============================================================================== */ div.fiche { - margin-: browser->phone)?'10':'24'; ?>px; + margin-: browser->phone)?'10':'2'; ?>px; margin-: browser->phone)?'8':''; ?>px; } @@ -226,25 +226,23 @@ div.fichecenter { clear: both; /* This is to have div fichecenter that are true rectangles */ } div.fichethirdleft { - browser->phone)) { print "float: ".$left.";\n"; } ?> - browser->phone)) { print "width: 35%;\n"; } ?> - browser->phone)) { print "padding-bottom: 4px;\n"; } ?> + browser->phone)) { print "float: ".$left.";\n"; } ?> + browser->phone)) { print "width: 35%;\n"; } ?> } div.fichetwothirdright { - browser->phone)) { print "float: ".$left.";\n"; } ?> - browser->phone)) { print "width: 65%;\n"; } ?> - browser->phone)) { print "padding-bottom: 4px\n"; } ?> + browser->phone)) { print "float: ".$left.";\n"; } ?> + browser->phone)) { print "width: 65%;\n"; } ?> } div.fichehalfleft { - browser->phone)) { print "float: ".$left.";\n"; } ?> - browser->phone)) { print "width: 50%;\n"; } ?> + browser->phone)) { print "float: ".$left.";\n"; } ?> + browser->phone)) { print "width: 50%;\n"; } ?> } div.fichehalfright { - browser->phone)) { print "float: ".$left.";\n"; } ?> - browser->phone)) { print "width: 50%;\n"; } ?> + browser->phone)) { print "float: ".$left.";\n"; } ?> + browser->phone)) { print "width: 50%;\n"; } ?> } div.ficheaddleft { - browser->phone)) { print "padding-left: 10px;\n"; } ?> + browser->phone)) { print "padding-left: 10px;\n"; } ?> } @@ -708,7 +706,7 @@ td.photo { /* ============================================================================== */ .toolbar { - background-image: url(theme.'/img/tmenu2.jpg',1) ?>) !important; + background-image: url(theme.'/img/tmenu2.png',1) ?>) !important; background-repeat: repeat-x !important; border: 1px solid #BBB !important; } @@ -759,7 +757,7 @@ td.photo { * RESIZER-BARS */ .ui-layout-resizer { /* all 'resizer-bars' */ - width: browser->phone)?'8':'24'); ?>px !important; + width: 8px !important; } .ui-layout-resizer-hover { /* affects both open and closed states */ } @@ -768,7 +766,7 @@ td.photo { /*.ui-layout-resizer-open-hover ,*/ /* hover-color to 'resize' */ .ui-layout-resizer-dragging { /* resizer beging 'dragging' */ background: #DDD; - width: browser->phone)?'8':'24'); ?>px; + width: 8px; } .ui-layout-resizer-dragging { /* CLONED resizer being dragged */ border-left: 1px solid #BBB; @@ -784,13 +782,13 @@ td.photo { .ui-layout-resizer-sliding { /* resizer when pane is 'slid open' */ opacity: .10; /* show only a slight shadow */ filter: alpha(opacity=10); -} -.ui-layout-resizer-sliding-hover { /* sliding resizer - hover */ - opacity: 1.00; /* on-hover, show the resizer-bar normally */ - filter: alpha(opacity=100); -} -/* sliding resizer - add 'outside-border' to resizer on-hover */ -/* this sample illustrates how to target specific panes and states */ + } + .ui-layout-resizer-sliding-hover { /* sliding resizer - hover */ + opacity: 1.00; /* on-hover, show the resizer-bar normally */ + filter: alpha(opacity=100); + } +/* sliding resizer - add 'outside-border' to resizer on-hover + * this sample illustrates how to target specific panes and states */ .ui-layout-resizer-north-sliding-hover { border-bottom-width: 1px; } .ui-layout-resizer-south-sliding-hover { border-top-width: 1px; } .ui-layout-resizer-west-sliding-hover { border-right-width: 1px; } @@ -808,14 +806,14 @@ td.photo { } .ui-layout-toggler-open { height: 48px !important; - width: browser->phone)?'7':'22'); ?>px !important; + width: 5px !important; -moz-border-radius:0px 10px 10px 0px; -webkit-border-radius:0px 10px 10px 0px; border-radius:0px 10px 10px 0px; } .ui-layout-toggler-closed { height: 48px !important; - width: browser->phone)?'7':'22'); ?>px !important; + width: 5px !important; -moz-border-radius:0px 10px 10px 0px; -webkit-border-radius:0px 10px 10px 0px; border-radius:0px 10px 10px 0px; diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index 89048687034..111aa3e7616 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -20,21 +20,17 @@ * \brief Fichier de style CSS du theme Smartphone default */ -//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language -//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled to increase speed. Language code is found on url. -if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); -//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled cause need to do translations -if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1); -if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); -if (! defined('NOLOGIN')) define('NOLOGIN',1); -if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1); -if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); -if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); +if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal +if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); +if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); +if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); +if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); +//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // We need to use translation files to know direction +if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); session_cache_limiter( FALSE ); -require_once("../../../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); +require_once("../../../../../master.inc.php"); // Define css type header('Content-type: text/css'); @@ -43,15 +39,6 @@ header('Content-type: text/css'); if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate'); else header('Cache-Control: no-cache'); -// On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1. -if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); } - -if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang')); // If language was forced on URL -if (GETPOST('theme')) $conf->theme=GETPOST('theme'); // If theme was forced on URL -$langs->load("main",0,1); -$right=($langs->trans("DIRECTION")=='rtl'?'left':'right'); -$left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); - ?> .ui-mobile-viewport { /*width:600px; diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index b510800f754..c7a1e8fea53 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2010 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -235,7 +235,7 @@ else print ''; print '
'; - if (empty($user->admin) && ! empty($dolibarr_main_demo)) + if (! empty($dolibarr_main_demo)) { print "trans("FeatureDisabledInDemo")."\" href=\"#\">".$langs->trans("Modify").""; }