From d5fa91f7ba22595dc7a26fd5501fc0d65629bcc5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 2 Jan 2016 20:48:19 +0100 Subject: [PATCH] Fix several bugs in css and in jmobile usage --- htdocs/core/class/doleditor.class.php | 2 +- htdocs/core/class/html.form.class.php | 2 ++ htdocs/core/tpl/contacts.tpl.php | 8 ++++---- htdocs/expensereport/card.php | 8 ++++---- htdocs/main.inc.php | 28 +++++++++++++++++--------- htdocs/theme/eldy/style.css.php | 21 +++++++++---------- htdocs/theme/md/img/searchclear.png | Bin 143 -> 356 bytes htdocs/theme/md/style.css.php | 9 +++++---- 8 files changed, 45 insertions(+), 33 deletions(-) diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index 60d24558d86..35c3b3909ef 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -60,7 +60,7 @@ class DolEditor * @param int $uselocalbrowser Enabled to add links to local object with local browser. If false, only external images can be added in content. * @param int $okforextendededitor True=Allow usage of extended editor tool (like fckeditor) * @param int $rows Size of rows for textarea tool - * @param int $cols Size of cols for textarea tool (textarea number of cols or %) + * @param string $cols Size of cols for textarea tool (textarea number of cols '70' or percent 'x%') * @param int $readonly 0=Read/Edit, 1=Read only */ function __construct($htmlname,$content,$width='',$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false,$uselocalbrowser=true,$okforextendededitor=true,$rows=0,$cols=0,$readonly=0) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 05c190e3bfc..dc3166f274d 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4248,6 +4248,7 @@ class Form // Show date with combo selects else { + //$retstring.='
'; // Day $retstring.=''; @@ -4293,6 +4294,7 @@ class Form } $retstring.="\n"; } + //$retstring.='
'; } } diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index 405571ef98e..638d54a62ef 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -50,7 +50,7 @@ $userstatic=new User($db);
trans("Source"); ?>
-
trans("Company"); ?>
+
trans("ThirdParty"); ?>
trans("Contacts"); ?>
trans("ContactType"); ?>
 
@@ -102,10 +102,10 @@ $userstatic=new User($db); socid; ?> dol_use_jmobile)) { $companystatic->fetch($selectedCompany); - echo $companystatic->getNomUrl(2); + echo $companystatic->getNomUrl(2, '', 0, 1); } ?> selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0); ?> @@ -130,7 +130,7 @@ $userstatic=new User($db);
trans("Source"); ?>
-
trans("Company"); ?>
+
trans("ThirdParty"); ?>
trans("Contacts"); ?>
trans("ContactType"); ?>
trans("Status"); ?>
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index 30642ad09c5..a14e006fd7c 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -1153,7 +1153,7 @@ if ($action == 'create') print '' . $langs->trans('NotePublic') . ''; print ''; - $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70); + $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%'); print $doleditor->Create(1); print ''; @@ -1163,7 +1163,7 @@ if ($action == 'create') print '' . $langs->trans('NotePrivate') . ''; print ''; - $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70); + $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%'); print $doleditor->Create(1); print ''; } @@ -1303,7 +1303,7 @@ else print '' . $langs->trans('NotePublic') . ''; print ''; - $doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70); + $doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%'); print $doleditor->Create(1); print ''; @@ -1313,7 +1313,7 @@ else print '' . $langs->trans('NotePrivate') . ''; print ''; - $doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70); + $doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%'); print $doleditor->Create(1); print ''; } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1da5fa8f864..eaa2e3142e3 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1220,15 +1220,25 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs if (empty($conf->dol_use_jmobile) || ($conf->dol_use_jmobile != 2 && $conf->dol_use_jmobile != 3)) { print ''; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 6592e5e4116..0fa9357bd78 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -193,8 +193,6 @@ $colortexttitle=join(',',colorStringToArray($colortexttitle)); $colortext=join(',',colorStringToArray($colortext)); $colortextlink=join(',',colorStringToArray($colortextlink)); -if (! empty($conf->dol_optimize_smallscreen)) $fontsize=11; - $nbtopmenuentries=$menumanager->showmenu('topnb'); print '/*'."\n"; @@ -584,8 +582,8 @@ td.showDragHandle { div.fiche { - margin-: global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'20'):'24')); ?>px; - margin-: dol_optimize_smallscreen)?'12':'4')); ?>px; + margin-: global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'8':'20'):'24')); ?>px; + margin-: dol_optimize_smallscreen)?'12':'8')); ?>px; dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?> } @@ -1626,13 +1624,11 @@ div.tabsAction > a { } a.tabTitle { -/* background: #657090; - color: white;*/ - color:rgba(0,0,0,.5); + color:rgba(0,0,0,.5) !important; margin-right:10px; text-shadow:1px 1px 1px #ffffff; font-family: ; - font-weight: normal; + font-weight: normal !important; padding: 4px 6px 2px 6px; margin: 0px 6px; text-decoration: none; @@ -2142,7 +2138,7 @@ table.listwithfilterbefore { /* Pagination */ div.refidpadding { - padding-top: dol_use_jmobile)?'3':'14'; ?>px; + padding-top: dol_use_jmobile)?'3':'7'; ?>px; } div.refid { font-weight: bold; @@ -3758,6 +3754,9 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i .ui-select .ui-btn-icon-left .ui-btn-inner { padding-left: 38px; } +.ui-select { + display: inline-block; +} .fiche .ui-controlgroup { margin: 0px; padding-bottom: 0px; @@ -3841,7 +3840,7 @@ ul.ulmenu { /* Style for first level menu with jmobile */ .ui-bar-b, .lilevel0 { - border: 1px solid #5f5f7a !important; + border: 1px solid #888 !important; background: rgb(); background-repeat: repeat-x; @@ -3870,7 +3869,7 @@ ul.ulmenu { text-shadow: none; } .ui-body-c .ui-link, .ui-body-c .ui-link:visited, .ui-body-c .ui-link:hover { - color: rgb(); + color: rgb(); } .ui-btn-up-c .vsmenudisabled { color: # !important; diff --git a/htdocs/theme/md/img/searchclear.png b/htdocs/theme/md/img/searchclear.png index 5715b64beed38049a6f48d0aed63fc5016d46290..12437f848238b68f5e1b716b5f56a7a5fe076df1 100644 GIT binary patch delta 329 zcmV-P0k-~+0ptRZB!2;OQb$4nuFf3k00002VoOIv0RM-N%)bBt010qNS#tmY3ljhU z3ljkVnw%H_000McNliru-vtgA1Qi!sXafKM0O(0XK~yNumC_+k!f_DB@y|~u#YS*5 zndpLvra_Z$fLSzHtwbyoj6^W_3J8oq(&9#8V-6ElHiC)C#D7isS=>PWPV{NF``+EN zyW{_z>g_{DR7ga2Sucx;RdF%UWWfb3|9i=bz`%z z4=B-xR|#CQAE5+~GKdn&6hSTO0g^pdol_optimize_smallscreen)) $fontsize=11; - $nbtopmenuentries=$menumanager->showmenu('topnb'); print '/*'."\n"; @@ -213,6 +211,7 @@ print 'dol_no_mouse_hover='.$dol_no_mouse_hover."\n"; print 'dol_use_jmobile='.$dol_use_jmobile."\n"; print 'dol_screenwidth='.$_SESSION['dol_screenwidth']."\n"; print 'dol_screenheight='.$_SESSION['dol_screenheight']."\n"; +print 'fontsize='.$fontsize."\n"; print 'nbtopmenuentries='.$nbtopmenuentries."\n"; print '*/'."\n"; @@ -1755,11 +1754,13 @@ span.butAction, span.butActionDelete { color: #ffffff !important; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #006dcc; + dol_use_jmobile)) { ?> background-image: -moz-linear-gradient(top, #0088cc, #0044cc); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); background-image: -o-linear-gradient(top, #0088cc, #0044cc); background-image: linear-gradient(to bottom, #0088cc, #0044cc); + background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); border-color: #0044cc #0044cc #002a80; @@ -3683,7 +3684,7 @@ ul.ulmenu { /* Style for first level menu with jmobile */ .ui-bar-b, .lilevel0 { - border: 1px solid #5f5f7a !important; + border: 1px solid #888 !important; background: rgb(); background-repeat: repeat-x; @@ -3712,7 +3713,7 @@ ul.ulmenu { text-shadow: none; } .ui-body-c .ui-link, .ui-body-c .ui-link:visited, .ui-body-c .ui-link:hover { - color: rgb(); + color: rgb(); } .ui-btn-up-c .vsmenudisabled { color: # !important;