diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index d2ce8023a65..cb3752f817c 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2280,15 +2280,16 @@ function img_previous($titlealt = 'default') * * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param int $selected Selected + * @param string $moreclass Add more CSS classes * @return string Return img tag */ -function img_down($titlealt = 'default', $selected = 0) +function img_down($titlealt = 'default', $selected = 0, $moreclass='') { global $conf, $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Down'); - return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown"'); + return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown'.($moreclass?" ".$moreclass:"").'"'); } /** @@ -2296,15 +2297,16 @@ function img_down($titlealt = 'default', $selected = 0) * * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param int $selected Selected + * @param string $moreclass Add more CSS classes * @return string Return img tag */ -function img_up($titlealt = 'default', $selected = 0) +function img_up($titlealt = 'default', $selected = 0, $moreclass='') { global $conf, $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Up'); - return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup"'); + return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup'.($moreclass?" ".$moreclass:"").'"'); } /** @@ -2622,7 +2624,7 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar * Get title line of an array * * @param string $name Label of field - * @param int $thead 0=To use with standard table forat, 1=To use inside , 2=To use with
+ * @param int $thead 0=To use with standard table format, 1=To use inside , 2=To use with
* @param string $file Url used when we click on sort picto * @param string $field Field to use for new sorting. Empty if this field is not sortable. * @param string $begin ("" by defaut) diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php index 27b14d859f3..4b8d82bce40 100644 --- a/htdocs/core/tpl/ajaxrow.tpl.php +++ b/htdocs/core/tpl/ajaxrow.tpl.php @@ -33,8 +33,8 @@ $tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd); if (GETPOST('action') != 'editline' && $nboflines > 1) { ?> diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index 1fd86ed871d..8da915ddd9a 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -203,12 +203,12 @@ if (empty($usemargins)) $usemargins=0; 0) { ?> id; ?>"> - + id; ?>"> - + diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php index cae90530d36..ea0791dc984 100644 --- a/htdocs/public/test/test_arrays.php +++ b/htdocs/public/test/test_arrays.php @@ -1,5 +1,5 @@ - - - - - - -Test page - - - - - - -" /> - - - - - --- - - + ?> + + + + + + + Test page + + + + + + + " /> + + + + + + + + - + -
+
- This page is a sample of page using tables. It is designed to make test with
- css (edit page to change to test another css)
-- jmobile (add parameter dol_use_jmobile=1 to enable view with jmobile)
+- jmobile (add parameter dol_use_jmobile=1&dol_optimize_smallscreen=1 to enable view with jmobile)
- dataTables
- tablednd
@@ -111,7 +113,7 @@ This page is a sample of page using tables. It is designed to make test with
-

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 1 : Table using tags: div.tagtable+div.tagtr+div or div.tagtable+div.tagtr+div.tagtd => Use this for tables that are edited forms (drag and drop of lines does not work for this case, also height of title can't be forced to a minimum)

- + snake trans('zzz'),1,$_SERVER["PHP_SELF"],'','','','align="center" class="tagtd"',$sortfield,$sortorder); ?> @@ -248,62 +250,62 @@ $('xxxth').replaceWith( line1 dfsdf - xxx + xxx line2 dfsdf - xxx + xxx line3 dfsdf - xxx + xxx line4 dfsdf - xxx + xxx line5 dfsdf - xxx + xxx line6 dfsdf - xxx + xxx line7 dfsdf - xxx + xxx line8 dfsdf - xxx + xxx line9 dfsdf - xxx + xxx line10 dfsdf - xxx + xxx line11 dfsdf - xxx + xxx line12 dfsdf - xxx + xxx @@ -313,14 +315,20 @@ $('xxxth').replaceWith(

Example 3 : Standard table => Use this if you need the drag and drop for lines
use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; +$sortfield='aaa'; +$sortorder='ASC'; +$tasksarray=array(1,2,3); // To force having several lines +$tagidfortablednd='tablelines3'; +if (! empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; ?> - - - - +
title1title2
a1b1
a2b2
+ +trans('title1'),0,$_SERVER["PHP_SELF"],'aaa','','','align="left"',$sortfield,$sortorder); ?> +trans('title2'),0,$_SERVER["PHP_SELF"],'bbb','','','align="right"',$sortfield,$sortorder); ?> +trans('title3'),0,$_SERVER["PHP_SELF"],'ccc','','','align="center"',$sortfield,$sortorder); ?> + + +
a1b1c1
a2b2c2

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 42bf78a0745..4744f7b630c 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -443,11 +443,13 @@ textarea.centpercent { .movable { cursor: move; } - .borderrightlight { border-right: 1px solid #DDD; } +#formuserfile_link { + margin-left: 1px; +} /* ============================================================================== */ /* Styles to hide objects */ @@ -1906,7 +1908,12 @@ table.liste td { color: #202020; } - +div.liste_titre .tagtd { + vertical-align: middle; +} +div.liste_titre { + min-height: 26px !important; /* We cant use height because it's a div and it should be higher if content is more. but min-height doe not work either for div */ +} tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr { height: 26px !important; @@ -2921,7 +2928,10 @@ div.dolEventError h1, div.dolEventError h2 { { text-decoration: underline !important; } - +.paginate_button +{ + font-weight: normal !important; +} /* For jquery plugin combobox */ /* Disable this. It breaks wrapping of boxes .ui-corner-all { white-space: nowrap; } */ diff --git a/htdocs/theme/md_dev/style.css.php b/htdocs/theme/md_dev/style.css.php index 4d3e0937e4d..7d171d25c3a 100644 --- a/htdocs/theme/md_dev/style.css.php +++ b/htdocs/theme/md_dev/style.css.php @@ -455,6 +455,10 @@ textarea.centpercent { { border-right: 1px solid #DDD; } +#formuserfile_link { + margin-left: 1px; +} + /* ============================================================================== */ /* Styles to hide objects */ @@ -1990,6 +1994,12 @@ table.liste td { } +div.liste_titre .tagtd { + vertical-align: middle; +} +div.liste_titre { + min-height: 26px !important; +} tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr { height: 26px !important; @@ -3019,6 +3029,10 @@ div.dolEventError h1, div.dolEventError h2 { { text-decoration: underline !important; } +.paginate_button +{ + font-weight: normal !important; +} /* For jquery plugin combobox */ /* Disable this. It breaks wrapping of boxes