From 858fdcf85fd51ae88fdaec9fb3a7e4dd2d347711 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 6 Oct 2009 15:56:03 +0000 Subject: [PATCH] Minor enhancements for usage with smartphones --- htdocs/lib/functions.lib.php | 2 +- htdocs/lib/security.lib.php | 2 +- htdocs/theme/auguria/auguria.css.php | 14 ++--- htdocs/theme/bluelagoon/bluelagoon.css.php | 15 +++--- htdocs/theme/eldy/eldy.css.php | 59 ++++++++++++---------- htdocs/theme/freelug/freelug.css.php | 11 ++-- htdocs/theme/rodolphe/rodolphe.css.php | 15 +++--- htdocs/theme/yellow/yellow.css.php | 15 +++--- 8 files changed, 75 insertions(+), 58 deletions(-) diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index ee43cb2e8ab..854711dd84f 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -1983,7 +1983,7 @@ function print_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpat print "\n"; print ''; - if ($picto && $titre) print ''; + if ($picto && $titre) print ''; print ''; diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php index 275d1c8e601..25f796f1a39 100644 --- a/htdocs/lib/security.lib.php +++ b/htdocs/lib/security.lib.php @@ -272,7 +272,7 @@ function dol_loginfunction($langs,$conf,$mysoc) // Message if (! empty($_SESSION["dol_loginmesg"])) { - print '
'.img_picto('',$picto, '', $pictoisfullpath).''.img_picto('',$picto, 'id="pictotitle"', $pictoisfullpath).''; print '
'.$titre.'
'; print '
'; + print '
'; print $_SESSION["dol_loginmesg"]; $_SESSION["dol_loginmesg"]=""; print '
'."\n"; diff --git a/htdocs/theme/auguria/auguria.css.php b/htdocs/theme/auguria/auguria.css.php index 4b36bc80681..4ebca9e0b75 100644 --- a/htdocs/theme/auguria/auguria.css.php +++ b/htdocs/theme/auguria/auguria.css.php @@ -932,18 +932,20 @@ a.impayee:active { font-weight: bold; color: #550000; } a.impayee:hover { font-weight: bold; color: #550000; } -td.small { - font-size: 10px; - } - /* - * Lignes titre espace + * Other */ + +#pictotitle { + browser->phone)?'display: none;':''; ?> +} + div.titre { font-weight: bold; color: #57A2CA; - text-decoration: none } + text-decoration: none +} /* ============================================================================== */ diff --git a/htdocs/theme/bluelagoon/bluelagoon.css.php b/htdocs/theme/bluelagoon/bluelagoon.css.php index 20e14c38b48..fe9e0170de9 100644 --- a/htdocs/theme/bluelagoon/bluelagoon.css.php +++ b/htdocs/theme/bluelagoon/bluelagoon.css.php @@ -614,14 +614,21 @@ a.impayee:hover { font-weight: bold; color: #550000; } /* - * Lignes titre espace + * Other */ + +#pictotitle { + browser->phone)?'display: none;':''; ?> +} + div.titre { font-family: Helvetica, Verdana; font-size: 0.9em; font-weight: bold; color: #336666; - text-decoration: none } + text-decoration: none +} + /* * Tableaux @@ -696,10 +703,6 @@ td.valid { font-weight: bold; } -td.small { - font-size: 0.8em; - } - /* ============================================================================== */ /* Formulaire confirmation (AJAX) */ diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php index 838b2d2b1b3..d2490e3909a 100644 --- a/htdocs/theme/eldy/eldy.css.php +++ b/htdocs/theme/eldy/eldy.css.php @@ -48,6 +48,8 @@ if (! empty($_GET["lang"])) $langs->setDefaultLang($_GET["lang"]); // If languag $langs->load("main",0,1); $right=($langs->direction=='rtl'?'left':'right'); $left=($langs->direction=='rtl'?'right':'left'); +$fontsize=empty($conf->browser->phone)?'12':'9'; +$fontsizesmaller=empty($conf->browser->phone)?'11':'9'; ?> /* ============================================================================== */ @@ -61,7 +63,7 @@ body { background: #f9f9f9 url() 0 0 no-repeat; color: #101010; - font-size: browser->phone)?'12':'9'; ?>px; + font-size: px; font-family: arial,tahoma,verdana,helvetica; margin-top: 0; margin-bottom: 0; @@ -76,7 +78,7 @@ a:active { font-family: helvetica, verdana, arial, sans-serif; font-weight: bol a:hover { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; } input { - font-size: browser->phone)?'12':'9'; ?>px; + font-size: px; font-family: helvetica, verdana, arial, sans-serif; background: #FDFDFD; border: 1px solid #ACBCBB; @@ -85,7 +87,7 @@ input } input.flat { - font-size: browser->phone)?'12':'9'; ?>px; + font-size: px; font-family: helvetica, verdana, arial, sans-serif; background: #FDFDFD; border: 1px solid #ACBCBB; @@ -93,7 +95,7 @@ input.flat margin: 0px 0px 0px 0px; } textarea { - font-size: browser->phone)?'12':'9'; ?>px; + font-size: px; font-family: helvetica, verdana, arial, sans-serif; background: #FDFDFD; border: 1px solid #ACBCBB; @@ -102,7 +104,7 @@ textarea { } textarea.flat { - font-size: browser->phone)?'12':'9'; ?>px; + font-size: px; font-family: helvetica, verdana, arial, sans-serif; background: #FDFDFD; border: 1px solid #ACBCBB; @@ -111,7 +113,7 @@ textarea.flat } select.flat { - font-size: browser->phone)?'12':'9'; ?>px; + font-size: px; font-family: helvetica, verdana, arial, sans-serif; font-weight: normal; border: 1px solid #ACBCBB; @@ -398,26 +400,26 @@ img.printer .vmenu { - display:none; + display: none; } -a.vmenu:link { font-size:browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: bold; } -a.vmenu:visited { font-size:browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: bold; } -a.vmenu:active { font-size:browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: bold; } -a.vmenu:hover { font-size:browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: bold; } -font.vmenudisabled { font-size:browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: bold; color: #93a5aa; } +a.vmenu:link { font-size:px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: bold; } +a.vmenu:visited { font-size:px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: bold; } +a.vmenu:active { font-size:px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: bold; } +a.vmenu:hover { font-size:px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: bold; } +font.vmenudisabled { font-size:px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: bold; color: #93a5aa; } -a.vsmenu:link { font-size:browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } -a.vsmenu:visited { font-size:browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } -a.vsmenu:active { font-size:browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } -a.vsmenu:hover { font-size:browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } -font.vsmenudisabled { font-size:browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; color: #93a5aa; margin: 1px 1px 1px 6px; } +a.vsmenu:link { font-size:px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } +a.vsmenu:visited { font-size:px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } +a.vsmenu:active { font-size:px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } +a.vsmenu:hover { font-size:px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } +font.vsmenudisabled { font-size:px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; color: #93a5aa; margin: 1px 1px 1px 6px; } -a.help:link { font-size:browser->phone)?'11':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; } -a.help:visited { font-size:browser->phone)?'11':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; } -a.help:active { font-size:browser->phone)?'11':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; } -a.help:hover { font-size:browser->phone)?'11':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; } +a.help:link { font-size:px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; } +a.help:visited { font-size:px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; } +a.help:active { font-size:px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; } +a.help:hover { font-size:px; font-family: helvetica, verdana, arial, sans-serif; text-align: ; font-weight: normal; } div.blockvmenupair @@ -981,19 +983,20 @@ a.impayee:hover { font-weight: bold; color: #550000; } -td.small { - font-size: browser->phone)?'10':'9'; ?>px; +/* + * Other + */ + +#pictotitle { + browser->phone)?'display: none;':''; ?> } - -/* - * Lignes titre espace - */ div.titre { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #336666; - text-decoration: none } + text-decoration: none +} /* ============================================================================== */ diff --git a/htdocs/theme/freelug/freelug.css.php b/htdocs/theme/freelug/freelug.css.php index 15ed6305d4c..b30b0ed5d8f 100644 --- a/htdocs/theme/freelug/freelug.css.php +++ b/htdocs/theme/freelug/freelug.css.php @@ -716,8 +716,13 @@ a.impayee:hover { font-weight: bold; color: #550000; } /* - * Lignes titre espace + * Other */ + +#pictotitle { + browser->phone)?'display: none;':''; ?> +} + div.titre { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; @@ -726,6 +731,7 @@ div.titre { } + input.liste_titre { background: #777799; border: 0px; @@ -819,9 +825,6 @@ td.delete { font-weight: bold; } -td.small { - font-size: browser->phone)?'10':'9'; ?>px; -} /* ============================================================================== */ diff --git a/htdocs/theme/rodolphe/rodolphe.css.php b/htdocs/theme/rodolphe/rodolphe.css.php index 0ce0a513a2d..31ebca8d7de 100644 --- a/htdocs/theme/rodolphe/rodolphe.css.php +++ b/htdocs/theme/rodolphe/rodolphe.css.php @@ -642,13 +642,20 @@ a.impayee:hover { font-weight: bold; color: #550000; } /* - * ??? + * Other */ + +#pictotitle { + browser->phone)?'display: none;':''; ?> +} + div.titre { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #666633; - text-decoration: none } + text-decoration: none +} + /* * Tableaux @@ -766,10 +773,6 @@ td.valid { font-weight: bold; } -td.small { - font-size: 10px; - } - /* ============================================================================== */ /* Formulaire confirmation (HTML) */ diff --git a/htdocs/theme/yellow/yellow.css.php b/htdocs/theme/yellow/yellow.css.php index 507c2638e8f..e9580536988 100644 --- a/htdocs/theme/yellow/yellow.css.php +++ b/htdocs/theme/yellow/yellow.css.php @@ -706,13 +706,20 @@ a.impayee:hover { font-weight: bold; color: #550000; } /* - * ??? + * Other */ + +#pictotitle { + browser->phone)?'display: none;':''; ?> +} + div.titre { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #666633; - text-decoration: none } + text-decoration: none +} + /* * Tableaux @@ -811,10 +818,6 @@ td.delete { font-weight: bold; } -td.small { - font-size: 10px; - } - /* ============================================================================== */ /* Formulaire confirmation (HTML) */