From 9a2b72f8f8f9ea3aa92bebd114b8d3c92862b63b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@destailleur.fr> Date: Wed, 24 Apr 2013 15:49:43 +0200 Subject: [PATCH] Compatibility with jmobile --- htdocs/core/class/html.form.class.php | 6 ++++-- htdocs/theme/amarok/style.css.php | 6 ++++++ htdocs/theme/auguria/style.css.php | 15 ++++++++++++++ htdocs/theme/bureau2crea/style.css.php | 16 +++++++++++++-- htdocs/theme/cameleo/style.css.php | 28 ++++++++++++++++++++++++++ 5 files changed, 67 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 97658572831..49f7268b875 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3775,14 +3775,16 @@ class Form */ function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid',$fieldref='ref',$morehtmlref='',$moreparam='') { + global $langs,$conf; + $ret=''; if (empty($fieldid)) $fieldid='rowid'; if (empty($fieldref)) $fieldref='ref'; //print "paramid=$paramid,morehtml=$morehtml,shownav=$shownav,$fieldid,$fieldref,$morehtmlref,$moreparam"; $object->load_previous_next_ref((isset($object->next_prev_filter)?$object->next_prev_filter:''),$fieldid); - $previous_ref = $object->ref_previous?'<a href="'.$_SERVER["PHP_SELF"].'?'.$paramid.'='.urlencode($object->ref_previous).$moreparam.'">'.img_previous().'</a>':''; - $next_ref = $object->ref_next?'<a href="'.$_SERVER["PHP_SELF"].'?'.$paramid.'='.urlencode($object->ref_next).$moreparam.'">'.img_next().'</a>':''; + $previous_ref = $object->ref_previous?'<a data-role="button" data-icon="arrow-l" data-iconpos="left" href="'.$_SERVER["PHP_SELF"].'?'.$paramid.'='.urlencode($object->ref_previous).$moreparam.'">'.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Previous"),'previous.png'):' ').'</a>':''; + $next_ref = $object->ref_next?'<a data-role="button" data-icon="arrow-r" data-iconpos="right" href="'.$_SERVER["PHP_SELF"].'?'.$paramid.'='.urlencode($object->ref_next).$moreparam.'">'.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Next"),'next.png'):' ').'</a>':''; //print "xx".$previous_ref."x".$next_ref; if ($previous_ref || $next_ref || $morehtml) { diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index deb5485aa39..b54ed11fc69 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -2071,6 +2071,12 @@ div.tabsElem a.ui-btn-corner-all { border-bottom-right-radius: 0px; } +.ui-btn-icon-left .ui-icon { + left: 8px; +} +.ui-btn-icon-right .ui-icon { + right: 8px; +} <?php if (is_object($db)) $db->close(); diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index bf9b9c7aeee..f6c6e177696 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -2212,6 +2212,21 @@ div.ecmjqft { text-shadow: none; } +div.tabsElem a.ui-btn-corner-all { + -webkit-border-bottom-left-radius: 0px; + -moz-border-radius-bottomleft: 0px; + border-bottom-left-radius: 0px; + -webkit-border-bottom-right-radius: 0px; + -moz-border-radius-bottomright: 0px; + border-bottom-right-radius: 0px; +} + +.ui-btn-icon-left .ui-icon { + left: 8px; +} +.ui-btn-icon-right .ui-icon { + right: 8px; +} <?php if (is_object($db)) $db->close(); diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 5bf68effb41..15ad13654e3 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -2430,9 +2430,15 @@ div.ecmjqft { white-space: normal; } +div.ui-controlgroup +{ + height: auto; + background-image: none; +} + div.ui-controlgroup-controls div.tabsElem, div.ui-controlgroup-controls div.tabsElem a.tab { - height: 22px; + height: auto; } a.tab span.ui-btn-inner @@ -2443,7 +2449,7 @@ a.tab span.ui-btn-inner div.tabs a.tab#active span.ui-btn-inner, div.tabs a.tab#active span.ui-btn-text, div.tabs a.tab span.ui-btn-inner, div.tabs a.tab span.ui-btn-text { background-image: none; color: #D45416; - height: 22px + height: auto; } .ui-body-c { @@ -2451,6 +2457,12 @@ div.tabs a.tab#active span.ui-btn-inner, div.tabs a.tab#active span.ui-btn-text, text-shadow: none; } +.ui-btn-icon-left .ui-icon { + left: 8px; +} +.ui-btn-icon-right .ui-icon { + right: 8px; +} <?php if (is_object($db)) $db->close(); diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index a1e3e7a44c9..74f5bc86278 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -2257,6 +2257,34 @@ div.ecmjqft { text-shadow: none; } +div.ui-controlgroup +{ + height: auto; + background-image: none; +} + +div.ui-controlgroup-controls div.tabsElem, div.ui-controlgroup-controls div.tabsElem a.tab +{ + height: auto; +} + +a.tab span.ui-btn-inner +{ + border: none; + padding: 0; +} +div.tabs a.tab#active span.ui-btn-inner, div.tabs a.tab#active span.ui-btn-text, div.tabs a.tab span.ui-btn-inner, div.tabs a.tab span.ui-btn-text { + background-image: none; + color: #D45416; + height: auto; +} + +.ui-btn-icon-left .ui-icon { + left: 8px; +} +.ui-btn-icon-right .ui-icon { + right: 8px; +} <?php if (is_object($db)) $db->close(); -- GitLab