diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 286ab5f63d1..3ee4206258a 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -245,6 +245,8 @@ function dol_getprefix() */ function dol_include_once($relpath, $classname='') { + global $conf,$langs,$user,$mysoc; // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var'] + $fullpath = dol_buildpath($relpath); if (!file_exists($fullpath)) { diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index d2dc0d4ce00..1be7d8a9a7a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -717,8 +717,10 @@ if (GETPOST('dol_optimize_smallscreen') || ! empty($_SESSION['dol_optimize_small if (GETPOST('dol_no_mouse_hover') || ! empty($_SESSION['dol_no_mouse_hover'])) $conf->dol_no_mouse_hover=1; if (GETPOST('dol_use_jmobile') || ! empty($_SESSION['dol_use_jmobile'])) $conf->dol_use_jmobile=1; if (! empty($conf->browser->phone)) $conf->dol_no_mouse_hover=1; -if ((! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400) - || (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)) +if (! empty($conf->browser->phone) + || (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400) + || (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400) +) { $conf->dol_optimize_smallscreen=1; } diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php index 6dbb6bccca4..b447be4574b 100644 --- a/htdocs/public/test/test_arrays.php +++ b/htdocs/public/test/test_arrays.php @@ -2,6 +2,7 @@ define("NOLOGIN",1); // This means this output page does not require to be logged. define("NOCSRFCHECK",1); // We accept to go on this page from external web site. + require '../../main.inc.php'; if (!empty($conf->global->MAIN_FEATURES_LEVEL)) @@ -9,11 +10,18 @@ if (!empty($conf->global->MAIN_FEATURES_LEVEL)) print "Page available onto dev environment only"; exit; } -?> +$usedolheader=0; // 1 = Test inside a dolibarr page, 0 = Use hard coded header + +// HEADER +//-------- + +if (empty($usedolheader)) +{ + header("Content-type: text/html; charset=UTF8"); +?> - @@ -31,20 +39,33 @@ if (!empty($conf->global->MAIN_FEATURES_LEVEL)) - -
+ + + +
This page is a sample of page using tables. To make test with
- css (edit page to change)
- jmobile (edit page to enable/disable)
- dataTables
- tablednd
-
-Example 0a : Table with div+div+div containg a select that should be overflowed and truncated
+

Example 0a : Table with div+div+div containg a select that should be overflowed and truncated => Use this to align text or form
+ +
@@ -55,7 +76,9 @@ Example 0a : Table with div+div+div containg a select that should be overflowed
-Example 0b: Table with div+form+div containg a select that should be overflowed and truncated
+ +

Example 0b: Table with div+form+div containg a select that should be overflowed and truncated => Use this to align text or form
+
@@ -66,7 +89,9 @@ Example 0b: Table with div+form+div containg a select that should be overflowed
-Example 0c: Table with table+tr+td containg a select that should be overflowed and truncated
+ +

Example 0c: Table with table+tr+td containg a select that should be overflowed and truncated => Use this to align text or form
+
@@ -80,8 +105,9 @@ Example 0c: Table with table+tr+td containg a select that should be overflowed a -
-Example 1 : Table using tags: div.tagtable+div.tagtr+div or div.tagtable+div.tagtr+div.tagtd
+

Example 1 : Table using tags: div.tagtable+div.tagtr+div or div.tagtable+div.tagtr+div.tagtd => Use this for tables that are edited forms

+ +
+

Example 2 : Table using tags: table/thead/tbody/tr/td + dataTable => Use this for long result tables
-Example 2 : Table using tags: table/thead/tbody/tr/td + dataTable
- - +
@@ -249,12 +304,9 @@ $('xxxth').replaceWith(
snake
-

+

Example 3 : Standard table => Use this if you need the drag and drop for lines
- -
-Example 3 : Standard table

+ + + \ No newline at end of file diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 36c2fd81689..8e2ed1da79e 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -2296,6 +2296,11 @@ div.ecmjqft { { text-decoration: underline !important; } +.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled, .paginate_button_disabled { + opacity: .35; + filter: Alpha(Opacity=35); + background-image: none; +} /* ============================================================================== */ diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 66cb23f2451..83e8a14efda 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -384,7 +384,6 @@ div.tmenu { border-left: 0px; padding: 0px; margin: 5px 0px 10px 0px; - font-size: 13px; background-image : url(); background-repeat: no-repeat; background-color: #996644; @@ -408,7 +407,7 @@ div.mainmenu { /* Do not load menu img if hidden to save bandwidth */ - +'name of class for div') @@ -784,6 +783,7 @@ div.blockvmenusearch div.menu_titre { #blockvmenusearch form { clear: both; + margin-bottom: 14px; } div.blockvmenubookmarks @@ -2482,6 +2482,11 @@ div.ecmjqft { { text-decoration: underline !important; } +.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled, .paginate_button_disabled { + opacity: .35; + filter: Alpha(Opacity=35); + background-image: none; +} /* ============================================================================== */ diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 9031ea72895..72d67b1c491 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -859,6 +859,7 @@ div.blockvmenusearch div.menu_titre { #blockvmenusearch form { clear: both; + margin-bottom: 14px; } div.blockvmenubookmarks @@ -2376,7 +2377,11 @@ div.ecmjqft { { text-decoration: underline !important; } - +.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled, .paginate_button_disabled { + opacity: .35; + filter: Alpha(Opacity=35); + background-image: none; +} /* ============================================================================== */ /* JMobile */ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index ccb72fa2f25..043718d4222 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1645,11 +1645,10 @@ table.noborder, table.formdoc, div.noborder { border-bottom-style: solid; margin: 0px 0px 2px 0px; - /*padding: 1px 2px 1px 2px;*/ - -moz-box-shadow: 3px 3px 4px #DDD; - -webkit-box-shadow: 3px 3px 4px #DDD; - box-shadow: 3px 3px 4px #DDD; + -moz-box-shadow: 2px 2px 4px #DDD; + -webkit-box-shadow: 2px 2px 4px #DDD; + box-shadow: 2px 2px 4px #DDD; -moz-border-radius: 0.2em; -webkit-border-radius: 0.2em; @@ -2703,6 +2702,12 @@ div.dolEventError h1, div.dolEventError h2 { /* Disable this. It breaks wrapping of boxes .ui-corner-all { white-space: nowrap; } */ +.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled, .paginate_button_disabled { + opacity: .35; + filter: Alpha(Opacity=35); + background-image: none; +} + /* ============================================================================== */ /* JMobile */