diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index afbc82ab39108f071c9d4d9b091484a2240fd2fa..39d4d7aac6044f56a95caca4608946fde51a28e9 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -284,14 +284,14 @@ class Contrat extends CommonObject
global $langs, $conf;
$error=0;
-
+
// Definition du nom de module de numerotation de commande
$soc = new Societe($this->db);
$soc->fetch($this->socid);
-
+
// Class of company linked to order
$result=$soc->set_as_client();
-
+
// Define new ref
if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref)))
{
@@ -552,8 +552,8 @@ class Contrat extends CommonObject
$line->libelle = $objp->description;
$line->desc = $objp->description;
$line->qty = $objp->qty;
- $line->statut = $objp->statut;
- $line->ref = $objp->ref;
+ $line->statut = $objp->statut;
+ $line->ref = '';
$line->tva_tx = $objp->tva_tx;
$line->localtax1_tx = $objp->localtax1_tx;
$line->localtax2_tx = $objp->localtax2_tx;
@@ -667,7 +667,7 @@ class Contrat extends CommonObject
$error=0;
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."contrat");
-
+
// Mise a jour ref
$sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id;
if ($this->db->query($sql))
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 695b6deb2c118cced96d6b8191d570e3acba422c..a684046b180b0fc27b53ca0cd886a4779bc2d5ed 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -491,7 +491,7 @@ function show_projects($conf,$langs,$db,$object,$backtopage='')
*/
function show_contacts($conf,$langs,$db,$object,$backtopage='')
{
- global $user;
+ global $user,$conf;
global $bc;
$i=-1;
@@ -507,7 +507,9 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
if ($user->rights->societe->contact->creer)
{
$addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
- $buttoncreate='<a class="addnewrecord" href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$object->id.'&action=create&backtopage='.urlencode($backtopage).'">'.$addcontact.' '.img_picto($addcontact,'filenew').'</a>'."\n";
+ $buttoncreate='<a class="addnewrecord" href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$object->id.'&action=create&backtopage='.urlencode($backtopage).'">'.$addcontact;
+ if (empty($conf->dol_optimize_smallscreen)) $buttoncreate.=' '.img_picto($addcontact,'filenew');
+ $buttoncreate.='</a>'."\n";
}
print "\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b2c2998a4624262f92f36714545c0c6af9c65bc7..47af55726f93ea4422ea91ae1065e805d0e44389 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -590,7 +590,7 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
{
global $conf;
- $out="\n".'<div class="tabs">'."\n";
+ $out="\n".'<div class="tabs" data-role="controlgroup" data-type="horizontal">'."\n";
// Show title
$showtitle=1;
@@ -615,15 +615,16 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
// Show tabs
for ($i = 0 ; $i <= $maxkey ; $i++)
{
+ $out.='<div class="inline-block tabsElem">';
if (isset($links[$i][2]) && $links[$i][2] == 'image')
{
if (!empty($links[$i][0]))
{
- $out.='<a class="tabimage" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
+ $out.='<a data-role="button" class="tabimage" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
}
else
{
- $out.='<span class="tabspan">'.$links[$i][1].'</span>'."\n";
+ $out.='<span data-role="button" class="tabspan">'.$links[$i][1].'</span>'."\n";
}
}
else if (! empty($links[$i][1]))
@@ -632,13 +633,14 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
if ((is_numeric($active) && $i == $active)
|| (! is_numeric($active) && $active == $links[$i][2]))
{
- $out.='<a id="active" class="tab" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
+ $out.='<a data-role="button" id="active" class="tab" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
}
else
{
- $out.='<a'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="tab" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
+ $out.='<a data-role="button"'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="tab" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
}
}
+ $out.='</div>';
}
$out.="</div>\n";
@@ -815,7 +817,7 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
if (! is_object($outputlangs)) $outputlangs=$langs;
if (! $format) $format='daytextshort';
$reduceformat=(! empty($conf->dol_optimize_smallscreen) && in_array($format,array('day','hour')))?1:0;
-
+
// Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.
if ($format == 'day') $format=($outputlangs->trans("FormatDateShort")!="FormatDateShort"?$outputlangs->trans("FormatDateShort"):$conf->format_date_short);
else if ($format == 'hour') $format=($outputlangs->trans("FormatHourShort")!="FormatHourShort"?$outputlangs->trans("FormatHourShort"):$conf->format_hour_short);
@@ -840,7 +842,7 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
$format=str_replace('%Y','%y',$format);
$format=str_replace('yyyy','yy',$format);
}
-
+
// If date undefined or "", we return ""
if (dol_strlen($time) == 0) return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)
@@ -1081,9 +1083,9 @@ function dol_print_size($size,$shortvalue=0,$shortunit=0)
{
global $conf,$langs;
$level=1024;
-
+
if (! empty($conf->dol_optimize_smallscreen)) $shortunit=1;
-
+
// Set value text
if (empty($shortvalue) || $size < ($level*10))
{
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 18c6d541505eb7f70eaeb82399374e1d7787a32d..56b9a3513fd6e092a7c03cddf0b74c9557fab0e0 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -75,7 +75,9 @@ NoRecordedProducts=No recorded products/services
NoRecordedProspects=No recorded prospects
NoContractedProducts=No products/services contracted
NoRecordedContracts=No recorded contracts
-# Latest supplier orders
BoxLatestSupplierOrders=Latest supplier orders
BoxTitleLatestSupplierOrders=%s latest supplier orders
NoSupplierOrder=No recorded supplier order
+BoxInvoicesPerMonth=Invoices per month
+BoxOrdersPerMonth=Orders per month
+BoxProposalsPerMonth=Proposals per month
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index cd61aa64d936c1ac80a6529229f6ea0867ee6104..3bd974ca4615aff23d53ca20a8d7043e11b12c1b 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -75,7 +75,9 @@ NoRecordedProducts=Pas de produit/service enregistré
NoRecordedProspects=Pas de prospect enregistré
NoContractedProducts=Pas de produit/service contracté
NoRecordedContracts=Pas de contrat enregistré
-# Dernières commandes fournisseur
BoxLatestSupplierOrders=Dernières commandes fournisseur
BoxTitleLatestSupplierOrders=Les %s dernières commandes fournisseur enregistrées
NoSupplierOrder=Pas de commandes fournisseur enregistrées
+BoxInvoicesPerMonth=Factures par mois
+BoxOrdersPerMonth=Commandes par mois
+BoxProposalsPerMonth=Proposition par mois
\ No newline at end of file
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index eb22a97a41ba94acc10ff9fadf4d67a4c95032ce..f67f39cac28e2c0ac812a532061ee0019903463e 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -887,7 +887,7 @@ else
print "}\n";
print '</script>';
print "\n";
- $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+ $s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
$s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
}
else
@@ -923,7 +923,8 @@ else
print '</td></tr>';
// Capital
- print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$object->capital.'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
+ print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$object->capital.'"> ';
+ print '<span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
// Local Taxes
//TODO: Place into a function to control showing by country or study better option
@@ -982,7 +983,7 @@ else
}
// Ajout du logo
- print '<tr>';
+ print '<tr class="hideonsmartphone">';
print '<td>'.$langs->trans("Logo").'</td>';
print '<td colspan="3">';
print '<input class="flat" type="file" name="photo" id="photoinput" />';
diff --git a/htdocs/theme/amarok/img/warning.png b/htdocs/theme/amarok/img/warning.png
index 7c2c5f117f8d08b1bb627e27eff0762188f419ed..ae8e35e781d8ecc65ee5aa4805d657a875349be1 100755
Binary files a/htdocs/theme/amarok/img/warning.png and b/htdocs/theme/amarok/img/warning.png differ
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index ef50c010fec05fead24eefd08e900d9c267a47c1..8f190c664e09a2fa376bfaadd866fc3c12663871 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -116,6 +116,66 @@ $colortext='40,40,40';
$fontsize=empty($conf->dol_optimize_smallscreen)?'12':'14';
$fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'14';
+$colorback1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorback1:$conf->global->THEME_ELDY_TOPMENU_BACK1) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorback1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
+$colorback2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK2)?$colorback2:$conf->global->THEME_ELDY_TOPMENU_BACK2) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK2)?$colorback2:$user->conf->THEME_ELDY_TOPMENU_BACK2);
+$colorbacktab1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbacktab1:$conf->global->THEME_ELDY_VERMENU_BACK1) :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbacktab1:$user->conf->THEME_ELDY_VERMENU_BACK1);
+$colorbacktab1b =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1b)?$colorbacktab1:$conf->global->THEME_ELDY_VERMENU_BACK1b) :(empty($user->conf->THEME_ELDY_VERMENU_BACK1b)?$colorbacktab1b:$user->conf->THEME_ELDY_VERMENU_BACK1b);
+$colorbacktab2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK2)?$colorbacktab2:$conf->global->THEME_ELDY_VERMENU_BACK2) :(empty($user->conf->THEME_ELDY_VERMENU_BACK2)?$colorbacktab2:$user->conf->THEME_ELDY_VERMENU_BACK2);
+$colorbacktitle1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE1) ?$colorbacktitle1:$conf->global->THEME_ELDY_BACKTITLE1) :(empty($user->conf->THEME_ELDY_BACKTITLE1)?$colorbacktitle1:$user->conf->THEME_ELDY_BACKTITLE1);
+$colorbacktitle2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE2) ?$colorbacktitle2:$conf->global->THEME_ELDY_BACKTITLE2) :(empty($user->conf->THEME_ELDY_BACKTITLE2)?$colorbacktitle2:$user->conf->THEME_ELDY_BACKTITLE2);
+$colorbacktabcard1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD1) ?$colorbacktabcard1:$conf->global->THEME_ELDY_BACKTABCARD1) :(empty($user->conf->THEME_ELDY_BACKTABCARD1)?$colorbacktabcard1:$user->conf->THEME_ELDY_BACKTABCARD1);
+$colorbacktabcard2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD2) ?$colorbacktabcard2:$conf->global->THEME_ELDY_BACKTABCARD2) :(empty($user->conf->THEME_ELDY_BACKTABCARD2)?$colorbacktabcard2:$user->conf->THEME_ELDY_BACKTABCARD2);
+$colorbacktabactive =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$conf->global->THEME_ELDY_BACKTABACTIVE):(empty($user->conf->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$user->conf->THEME_ELDY_BACKTABACTIVE);
+$colorbacklineimpair1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR1) ?$colorbacklineimpair1:$conf->global->THEME_ELDY_LINEIMPAIR1):(empty($user->conf->THEME_ELDY_LINEIMPAIR1)?$colorbacklineimpair1:$user->conf->THEME_ELDY_LINEIMPAIR1);
+$colorbacklineimpair2=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR2) ?$colorbacklineimpair2:$conf->global->THEME_ELDY_LINEIMPAIR2):(empty($user->conf->THEME_ELDY_LINEIMPAIR2)?$colorbacklineimpair2:$user->conf->THEME_ELDY_LINEIMPAIR2);
+$colorbacklineimpairhover=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIRHOVER) ?$colorbacklineimpairhover:$conf->global->THEME_ELDY_LINEIMPAIRHOVER):(empty($user->conf->THEME_ELDY_LINEIMPAIRHOVER)?$colorbacklineimpairhover:$user->conf->THEME_ELDY_LINEIMPAIRHOVER);
+$colorbacklinepair1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR1) ?$colorbacklinepair1:$conf->global->THEME_ELDY_LINEPAIR1) :(empty($user->conf->THEME_ELDY_LINEPAIR1)?$colorbacklinepair1:$user->conf->THEME_ELDY_LINEPAIR1);
+$colorbacklinepair2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR2) ?$colorbacklinepair2:$conf->global->THEME_ELDY_LINEPAIR2) :(empty($user->conf->THEME_ELDY_LINEPAIR2)?$colorbacklinepair2:$user->conf->THEME_ELDY_LINEPAIR2);
+$colorbacklinepairhover =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIRHOVER) ?$colorbacklinepairhover:$conf->global->THEME_ELDY_LINEPAIRHOVER) :(empty($user->conf->THEME_ELDY_LINEPAIRHOVER)?$colorbacklinepairhover:$user->conf->THEME_ELDY_LINEPAIRHOVER);
+$colorbackbody =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY) ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY) :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY);
+$colortext =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXT) ?$colortext:$conf->global->THEME_ELDY_TEXT) :(empty($user->conf->THEME_ELDY_TEXT)?$colortext:$user->conf->THEME_ELDY_TEXT);
+$fontsize =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1) ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1) :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1);
+$fontsizesmaller =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2) ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2) :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2);
+// No hover by default, we keep only if we set var THEME_ELDY_USE_HOVER
+if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf->THEME_ELDY_USE_HOVER))
+ || (empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($conf->global->THEME_ELDY_USE_HOVER)))
+{
+ $colorbacklineimpairhover='';
+ $colorbacklinepairhover='';
+}
+
+// Set text color to black or white
+$tmppart=explode(',',$colorback1);
+$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '');
+$tmpval+=(! empty($tmppart[2]) ? $tmppart[2] : '');
+$tmpval+=(! empty($tmppart[3]) ? $tmppart[3] : '');
+//print $tmpval;
+if ($tmpval < 340) $colortextmain='FFFFFF';
+else $colortextmain='101010';
+
+$usecss3=true;
+if ($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10) $usecss3=false;
+elseif ($conf->browser->name == 'iceweasel') $usecss3=false;
+elseif ($conf->browser->name == 'epiphany') $usecss3=false;
+
+print '/*'."\n";
+print 'colred='.$colred.' colgreen='.$colgreen.' colblue='.$colblue."\n";
+print 'isred='.$isred.' isgreen='.$isgreen.' isblue='.$isblue."\n";
+print 'colorbacklineimpair1='.$colorbacklineimpair1."\n";
+print 'colorbacklineimpair2='.$colorbacklineimpair2."\n";
+print 'colorbacklineimpairhover='.$colorbacklineimpairhover."\n";
+print 'colorbacklinepair1='.$colorbacklinepair1."\n";
+print 'colorbacklinepair2='.$colorbacklinepair2."\n";
+print 'colorbacklinepairhover='.$colorbacklinepairhover."\n";
+print 'usecss3='.$usecss3."\n";
+print 'dol_hide_topmenu='.$dol_hide_topmenu."\n";
+print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n";
+print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n";
+print 'dol_no_mouse_hover='.$dol_no_mouse_hover."\n";
+print 'dol_use_jmobile='.$dol_use_jmobile."\n";
+print '*/'."\n";
+
+if (! empty($conf->dol_optimize_smallscreen)) $fontsize=11;
?>
@@ -352,7 +412,6 @@ div.tmenu ul li a.tmenusel {/* texte du menu principal sélectionné */
body.body center { color:white; margin-top: 100px; }
form#login {
- display:block;
border:solid 1px rgba(0,0,0,.4);
border-top:solid 1px #ffffff;
background-color:#c7d0db;
@@ -372,7 +431,7 @@ form#login {
margin-right:auto;
margin-bottom:25px;
padding:20px 20px 10px;
- width:500px;
+ max-width:500px;
border-radius:12px;
box-shadow:0 0 16px rgba(0,0,0,.8);
}
@@ -509,9 +568,9 @@ div.vmenu {
display:none;
<?php } else {?>
width:170px;
- -moz-box-shadow: 4px 4px 4px #CCC;
- -webkit-box-shadow: 4px 4px 4px #CCC;
- box-shadow: 4px 4px 4px #CCC;
+ -moz-box-shadow: 3px 0px 6px #CCC;
+ -webkit-box-shadow: 3px 0px 6px #CCC;
+ box-shadow: 3px 0px 6px #CCC;
<?php } ?>
}
@@ -541,7 +600,7 @@ div.vmenu {
.menu_contenu {
background-color:#ffffff;
- padding-left:12px;
+ padding-left:6px;
border-top:solid 1px rgba(0,0,0,.05);
}
@@ -561,7 +620,7 @@ div.vmenu {
.blockvmenusearch .menu_titre {
margin-top:6px;
text-align:left;
- padding-left:18px;
+ padding-left:0px;
}
#blockvmenuhelp {
@@ -818,13 +877,17 @@ a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print
/* ============================================================================== */
div.tabs {
- margin-top:8px;
+ margin: 0px 0px 0px 6px;
+ padding: 0px 6px 3px 0px;
+ clear:both;
+ height:100%;
}
+div.tabsElem { margin-top: 10px; } /* To avoid overlap of tabs when not browser */
div.tabBar {
background-color:#ffffff;
padding:6px;
- margin:3px 0px 14px 0px;
+ margin:0px 0px 14px 0px;
border:1px solid #bbbbbb;
-moz-box-shadow: 4px 4px 4px #DDD;
-webkit-box-shadow: 4px 4px 4px #DDD;
@@ -849,16 +912,12 @@ a.tabTitle {
}
a.tabTitle img {
- vertical-align:top;
- margin-top:-1px;
+ vertical-align:middle;
}
-.tab {
- margin-left:2px;
- margin-right:2px;
- padding:3px 0px 4px;
- padding-left:8px;
- padding-right:8px;
+a.tab {
+ padding: 5px 12px 5px;
+ margin: 0em 0.2em;
background-color:rgba(0,0,0,.2);
color:#666666;
border:solid 1px rgba(0,0,0,.3);
@@ -867,14 +926,14 @@ a.tabTitle img {
-webkit-border-top-right-radius:6px;
}
-.tab#active {
+a.tab#active {
color:#232323;
font-weight:bold;
background-color:#ffffff;
- border-bottom:solid 1px #ffffff;
+ <?php echo $dol_use_jmobile?'':'border-bottom:solid 1px #ffffff;'; ?>
}
-.tab:hover {color:#333333;}
+a.tab:hover {color:#333333;}
/* ============================================================================== */
@@ -892,8 +951,8 @@ td.vmenu {
div.fiche {
padding:8px 6px 10px;
- margin-<?php print $left; ?>: <?php print (empty($conf->dol_optimize_smallscreen) || empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?'16':'24'; ?>px;
- margin-<?php print $right; ?>: <?php print empty($conf->dol_optimize_smallscreen)?'12':'6'; ?>px;
+ margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'16'):'24')); ?>px;
+ margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'12':'4')); ?>px;
}
div.fichecenter {
@@ -1942,7 +2001,7 @@ div.ecmjqft {
bottom: 4px !important;
<?php } ?>
text-align: center;
- min-width: 500px;
+ min-width: <?php echo $dol_optimize_smallscreen?'200':'480'; ?>px;
width: auto;
padding-left: 10px !important;
padding-right: 10px !important;
@@ -1956,3 +2015,63 @@ div.jnotify-background {
box-shadow: 4px 4px 4px #AAA !important;
}
+
+/* ============================================================================== */
+/* JMobile */
+/* ============================================================================== */
+
+li.ui-li-divider .ui-link {
+ color: #FFF !important;
+}
+.ui-btn-inner {
+ padding-left: 10px;
+ padding-right: 10px;
+ white-space: normal;
+}
+.ui-select .ui-btn-icon-right .ui-btn-inner {
+ padding-right: 36px;
+}
+.fiche .ui-controlgroup {
+ margin: 0px;
+ padding-bottom: 0px;
+}
+div.ui-controlgroup-controls div.tabsElem
+{
+ margin-top: 2px;
+ margin-right: 8px;
+}
+div.ui-controlgroup-controls div.tabsElem a
+{
+ -moz-box-shadow: 0 -3px 6px rgba(0,0,0,.2);
+ -webkit-box-shadow: 0 -3px 6px rgba(0,0,0,.2);
+ box-shadow: 0 -3px 6px rgba(0,0,0,.2);
+ border: none;
+}
+div.ui-controlgroup-horizontal
+
+a.tab span.ui-btn-inner, a.tab span.ui-btn-inner span.ui-btn-text
+{
+ border: none;
+ padding: 0;
+}
+
+.ui-body-c {
+ border: none;
+ text-shadow: none;
+}
+.ui-link {
+ color: rgb(<?php print $colortext; ?>) !important;
+}
+
+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;
+}
+
+<?php
+if (is_object($db)) $db->close();
+?>
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 6068aebf38576f076066bf493d4c1e260192f730..38129cbb0f80dd6669dae18850d749225890b139 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -253,7 +253,7 @@ div.fichehalfright {
<?php if (empty($conf->dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?>
}
div.ficheaddleft {
- <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; }
+ <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; }
else print "margin-top: 10px;\n"; ?>
}
@@ -2186,7 +2186,7 @@ div.ecmjqft {
bottom: 4px !important;
<?php } ?>
text-align: center;
- min-width: 500px;
+ min-width: <?php echo $dol_optimize_smallscreen?'200':'480'; ?>px;
width: auto;
padding-left: 10px !important;
padding-right: 10px !important;
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index ea565c5d1f49e6465c099278ee6d8369bc3318a7..0becc3f023422f810b58eac4b4b1e690c1ac8ba1 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -298,7 +298,7 @@ div.fichehalfright {
<?php if (empty($conf->dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?>
}
div.ficheaddleft {
- <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; }
+ <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; }
else print "margin-top: 10px;\n"; ?>
}
@@ -2414,7 +2414,7 @@ div.ecmjqft {
bottom: 4px !important;
<?php } ?>
text-align: center;
- min-width: 500px;
+ min-width: <?php echo $dol_optimize_smallscreen?'200':'480'; ?>px;
width: auto;
padding-left: 10px !important;
padding-right: 10px !important;
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index ddc88ac61d9e9d209d9105aa5211ff351a7103fa..fad419cf9228fdf6b41bbcfd16533724fc1b83b1 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -263,7 +263,7 @@ div.fichehalfright {
<?php if (empty($conf->dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?>
}
div.ficheaddleft {
- <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; }
+ <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; }
else print "margin-top: 10px;\n"; ?>
}
@@ -2240,7 +2240,7 @@ div.ecmjqft {
bottom: 4px !important;
<?php } ?>
text-align: center;
- min-width: 500px;
+ min-width: <?php echo $dol_optimize_smallscreen?'200':'480'; ?>px;
width: auto;
padding-left: 10px !important;
padding-right: 10px !important;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index de15a44705ff0153594870e30b1e6e05589d3f9b..0d2b18a39f5b6531d5151df6884dcc8c77e94086 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -116,16 +116,16 @@ $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'14';
// Eldy colors
if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
{
- $conf->global->THEME_ELDY_TOPMENU_BACK1='180,196,216'; // topmenu
- $conf->global->THEME_ELDY_TOPMENU_BACK2='190,206,226';
- $conf->global->THEME_ELDY_VERMENU_BACK1='253,253,253'; // vmenu
- $conf->global->THEME_ELDY_VERMENU_BACK1b='226,228,230'; // vmenu (not menu)
- $conf->global->THEME_ELDY_VERMENU_BACK2='232,234,236';
+ $conf->global->THEME_ELDY_TOPMENU_BACK1='200,216,246'; // topmenu
+ $conf->global->THEME_ELDY_TOPMENU_BACK2='190,206,236';
+ $conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu
+ $conf->global->THEME_ELDY_VERMENU_BACK1b='230,232,232'; // vmenu (not menu)
+ $conf->global->THEME_ELDY_VERMENU_BACK2='240,240,240';
$conf->global->THEME_ELDY_BACKTITLE1='140,160,185'; // title of arrays
$conf->global->THEME_ELDY_BACKTITLE2='210,220,235';
- $conf->global->THEME_ELDY_BACKTABCARD1='231,232,235'; // card
- $conf->global->THEME_ELDY_BACKTABCARD2='220,224,227';
- $conf->global->THEME_ELDY_BACKTABACTIVE='220,224,227';
+ $conf->global->THEME_ELDY_BACKTABCARD1='240,240,240'; // card
+ $conf->global->THEME_ELDY_BACKTABCARD2='234,234,234';
+ $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
$conf->global->THEME_ELDY_BACKBODY='#ffffff url('.$img_head.') 0 0 no-repeat;';
$conf->global->THEME_ELDY_LINEIMPAIR1='242,242,242';
$conf->global->THEME_ELDY_LINEIMPAIR2='248,248,248';
@@ -134,7 +134,12 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_LINEPAIR2='255,255,255';
$conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
$conf->global->THEME_ELDY_BACKBODY='#ffffff url('.$img_head.') 0 0 no-repeat;';
- $conf->global->THEME_ELDY_TEXT='48,102,102';
+ $conf->global->THEME_ELDY_TEXT='50,50,160';
+ if ($dol_use_jmobile)
+ {
+ $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; // topmenu
+ $conf->global->THEME_ELDY_BACKTABCARD2='255,255,255';
+ }
}
$colorback1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorback1:$conf->global->THEME_ELDY_TOPMENU_BACK1) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorback1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
@@ -274,9 +279,9 @@ input[type=image] { background-color: transparent; border: none; box-shadow: non
-moz-border-radius:0px 5px 0px 5px;
-webkit-border-radius:0px 5px 0px 5px;
border-radius:0px 5px 0px 5px;
- -moz-box-shadow: 2px 2px 3px #CCC;
- -webkit-box-shadow: 2px 2px 3px #CCC;
- box-shadow: 2px 2px 3px #CCC;
+ -moz-box-shadow: 2px 2px 3px #DDD;
+ -webkit-box-shadow: 2px 2px 3px #DDD;
+ box-shadow: 2px 2px 3px #DDD;
}
.button:focus {
font-family: <?php print $fontlist ?>;
@@ -301,9 +306,9 @@ input[type=image] { background-color: transparent; border: none; box-shadow: non
-moz-border-radius:0px 5px 0px 5px;
-webkit-border-radius:0px 5px 0px 5px;
border-radius:0px 5px 0px 5px;
- -moz-box-shadow: 4px 4px 4px #CCC;
- -webkit-box-shadow: 4px 4px 4px #CCC;
- box-shadow: 4px 4px 4px #CCC;
+ -moz-box-shadow: 4px 4px 4px #DDD;
+ -webkit-box-shadow: 4px 4px 4px #DDD;
+ box-shadow: 4px 4px 4px #DDD;
}
form {
padding:0px;
@@ -463,20 +468,25 @@ div.tmenudiv {
height: <?php print ($heightmenu+1); ?>px;
<?php if ($usecss3) { ?>
- /* background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */
- /* background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/
- /* background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 40%, rgb(<?php echo $colorback2; ?>) 60%, rgb(<?php echo $colorback1; ?>) 100%);*/
- /* background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/
- /* background-image: linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */
- background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0% repeat-x;
- border-bottom: 1px solid rgb(<?php echo $colorback2; ?>);
+background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) );
+
+/*background-image: rgb(<?php echo $colorback1; ?>);
+
+ background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);
+ background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);
+ background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 40%, rgb(<?php echo $colorback2; ?>) 60%, rgb(<?php echo $colorback1; ?>) 100%);
+ background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);
+ background-image: linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/
box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important;
<?php } else { ?>
- border-bottom: 1px solid #DDDDDD;
- background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tmenu2.jpg',1); ?>);
- background-position:top;
- background-repeat:repeat-x;
+ background-image: rgb(<?php echo $colorback1; ?>);
<?php } ?>
+
color: #000000;
text-decoration: none;
<?php } ?>
@@ -533,7 +543,6 @@ ul.tmenu { /* t r b l */
margin: 0px 0px 0px 0px;
list-style: none;
height: <?php print $heightmenu; ?>px;
- background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 0 0 repeat-x !important;
}
li.tmenu, li.tmenusel {
<?php print $minwidthtmenu?'min-width: '.$minwidthtmenu.'px;':''; ?>
@@ -772,9 +781,9 @@ form#login {
border: 1px solid #C0C0C0;
background-color: #E0E0E0;
- -moz-box-shadow: 4px 4px 4px #CCC;
- -webkit-box-shadow: 4px 4px 4px #CCC;
- box-shadow: 4px 4px 4px #CCC;
+ -moz-box-shadow: 4px 4px 4px #DDD;
+ -webkit-box-shadow: 4px 4px 4px #DDD;
+ box-shadow: 4px 4px 4px #DDD;
border-radius: 8px;
border:solid 1px rgba(168,168,168,.4);
@@ -899,14 +908,14 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks
background-repeat:repeat-x;
<?php } ?>
border-left: 1px solid #CCCCCC;
- border-right: 1px solid #BBBBBB;
- border-bottom: 1px solid #BBBBBB;
+ border-right: 1px solid #DDDDDD;
+ border-bottom: 1px solid #DDDDDD;
border-top: 1px solid #DDDDDD;
border-radius: 5px;
-moz-border-radius: 5px;
- -moz-box-shadow: 4px 4px 4px #CCC;
- -webkit-box-shadow: 4px 4px 4px #CCC;
- box-shadow: 4px 4px 4px #CCC;
+ -moz-box-shadow: 4px 4px 4px #DDD;
+ -webkit-box-shadow: 4px 4px 4px #DDD;
+ box-shadow: 4px 4px 4px #DDD;
}
div.blockvmenusearch
@@ -936,9 +945,9 @@ div.blockvmenusearch
border-bottom: 1px solid #BBBBBB;
border-radius: 5px;
-moz-border-radius: 5px;
- -moz-box-shadow: 4px 4px 4px #CCC;
- -webkit-box-shadow: 4px 4px 4px #CCC;
- box-shadow: 4px 4px 4px #CCC;
+ -moz-box-shadow: 4px 4px 4px #DDD;
+ -webkit-box-shadow: 4px 4px 4px #DDD;
+ box-shadow: 4px 4px 4px #DDD;
}
div.blockvmenubookmarksold
@@ -970,9 +979,9 @@ div.blockvmenubookmarksold
border-bottom: 1px solid #BBBBBB;
border-radius: 5px;
-moz-border-radius: 5px;
- -moz-box-shadow: 4px 4px 4px #CCC;
- -webkit-box-shadow: 4px 4px 4px #CCC;
- box-shadow: 4px 4px 4px #CCC;
+ -moz-box-shadow: 4px 4px 4px #DDD;
+ -webkit-box-shadow: 4px 4px 4px #DDD;
+ box-shadow: 4px 4px 4px #DDD;
}
div.blockvmenuhelp
@@ -1272,13 +1281,15 @@ img.toolbarbutton {
/* ============================================================================== */
/* Onglets */
/* ============================================================================== */
-
div.tabs {
- top: 20px;
- margin: 1px 0px 2px 0px;
- padding: 0px 6px 0px 0px;
+ margin: 0px 0px 2px 6px;
+ padding: 0px 6px 3px 0px;
text-align: <?php print $left; ?>;
+
+ clear:both;
+ height:100%;
}
+div.tabsElem { margin-top: 8px; } /* To avoid overlap of tabs when not browser */
div.tabBar {
color: #<?php echo $colortextmain; ?>;
@@ -1305,9 +1316,9 @@ div.tabBar {
background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tab_background.png',1); ?>) repeat-x;
<?php } ?>
<?php if (empty($dol_optimize_smallscreen)) { ?>
- -moz-box-shadow: 4px 4px 4px #CCC;
- -webkit-box-shadow: 4px 4px 4px #CCC;
- box-shadow: 4px 4px 4px #CCC;
+ -moz-box-shadow: 4px 4px 4px #DDD;
+ -webkit-box-shadow: 4px 4px 4px #DDD;
+ box-shadow: 4px 4px 4px #DDD;
<?php } ?>
}
@@ -1334,17 +1345,24 @@ a.tabTitle {
a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
font-family: <?php print $fontlist ?>;
- padding: 4px 6px 2px 6px;
+ padding: 5px 12px 5px;
+ /* padding: 3px 6px 2px 6px;*/
margin: 0em 0.2em;
text-decoration: none;
white-space: nowrap;
+
-moz-border-radius:6px 6px 0px 0px;
-webkit-border-radius:6px 6px 0px 0px;
border-radius:6px 6px 0px 0px;
- border-<?php print $right; ?>: 1px solid #555555;
- border-<?php print $left; ?>: 1px solid #D8D8D8;
- border-top: 1px solid #D8D8D8;
+ -moz-box-shadow: 0 -1px 4px rgba(0,0,0,.1);
+ -webkit-box-shadow: 0 -1px 4px rgba(0,0,0,.1);
+ box-shadow: 0 -1px 4px rgba(0,0,0,.1);
+
+ border-bottom: none;
+ border-right: 1px solid #CCCCCC;
+ border-left: 1px solid #D0D0D0;
+ border-top: 1px solid #D8D8D8;
<?php if ($usecss3) { ?>
background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
@@ -1352,6 +1370,8 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
+
+ background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x;
<?php } else { ?>
background: #dee7ec;
<?php } ?>
@@ -1371,7 +1391,10 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active
color: #<?php echo $colortextmain; ?>;
/* font-weight: normal !important; */
}
-
+a.tab:hover
+{
+ background: #EEEEEE url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x;
+}
a.tabimage {
color: #434956;
font-family: <?php print $fontlist ?>;
@@ -1419,9 +1442,9 @@ div.divButAction { margin-bottom: 1.4em; }
-moz-border-radius:0px 5px 0px 5px;
-webkit-border-radius:0px 5px 0px 5px;
border-radius:0px 5px 0px 5px;
- -moz-box-shadow: 2px 2px 3px #CCC;
- -webkit-box-shadow: 2px 2px 3px #CCC;
- box-shadow: 2px 2px 3px #CCC;
+ -moz-box-shadow: 2px 2px 3px #DDD;
+ -webkit-box-shadow: 2px 2px 3px #DDD;
+ box-shadow: 2px 2px 3px #DDD;
}
.butAction:hover {
@@ -1450,9 +1473,9 @@ div.divButAction { margin-bottom: 1.4em; }
-moz-border-radius:0px 5px 0px 5px;
-webkit-border-radius:0px 5px 0px 5px;
border-radius:0px 5px 0px 5px;
- -moz-box-shadow: 4px 4px 4px #CCC;
- -webkit-box-shadow: 4px 4px 4px #CCC;
- box-shadow: 4px 4px 4px #CCC;
+ -moz-box-shadow: 4px 4px 4px #DDD;
+ -webkit-box-shadow: 4px 4px 4px #DDD;
+ box-shadow: 4px 4px 4px #DDD;
}
<?php if (! empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) { ?>
@@ -1556,9 +1579,9 @@ table.noborder, table.formdoc {
margin: 0px 0px 2px 0px;
/*padding: 1px 2px 1px 2px;*/
- -moz-box-shadow: 4px 4px 4px #CCC;
- -webkit-box-shadow: 4px 4px 4px #CCC;
- box-shadow: 4px 4px 4px #CCC;
+ -moz-box-shadow: 4px 4px 4px #DDD;
+ -webkit-box-shadow: 4px 4px 4px #DDD;
+ box-shadow: 4px 4px 4px #DDD;
-moz-border-radius: 0.2em;
-webkit-border-radius: 0.2em;
@@ -1617,9 +1640,9 @@ table.liste {
margin-bottom: 2px;
margin-top: 0px;
- -moz-box-shadow: 4px 4px 4px #CCC;
- -webkit-box-shadow: 4px 4px 4px #CCC;
- box-shadow: 4px 4px 4px #CCC;
+ -moz-box-shadow: 4px 4px 4px #DDD;
+ -webkit-box-shadow: 4px 4px 4px #DDD;
+ box-shadow: 4px 4px 4px #DDD;
}
table.liste td {
padding-right: 2px;
@@ -1628,18 +1651,15 @@ table.liste td {
div.liste_titre, tr.liste_titre, tr.liste_titre_sel
{
height: 20px !important;
- background: #7699A9;
+ background: rgb(<?php echo $colorbacktitle1; ?>);
background-repeat: repeat-x;
-
-<?php if ($usecss3) { ?>
+ <?php if ($usecss3) { ?>
background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
-<?php } else { ?>
- background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/liste_titre2.png',1); ?>);
-<?php } ?>
+ <?php } ?>
color: #<?php echo $colortextmain; ?>;
font-family: <?php print $fontlist ?>;
font-weight: normal;
@@ -1730,15 +1750,15 @@ tr.liste_total td {
/* Disable shadows */
.noshadow {
- -moz-box-shadow: 0px 0px 0px #CCC !important;
- -webkit-box-shadow: 0px 0px 0px #CCC !important;
- box-shadow: 0px 0px 0px #CCC !important;
+ -moz-box-shadow: 0px 0px 0px #DDD !important;
+ -webkit-box-shadow: 0px 0px 0px #DDD !important;
+ box-shadow: 0px 0px 0px #DDD !important;
}
div.tabBar .noborder {
- -moz-box-shadow: 0px 0px 0px #CCC !important;
- -webkit-box-shadow: 0px 0px 0px #CCC !important;
- box-shadow: 0px 0px 0px #CCC !important;
+ -moz-box-shadow: 0px 0px 0px #DDD !important;
+ -webkit-box-shadow: 0px 0px 0px #DDD !important;
+ box-shadow: 0px 0px 0px #DDD !important;
}
@@ -1747,9 +1767,9 @@ div.tabBar .noborder {
*/
.boxtable {
- -moz-box-shadow: 4px 4px 4px #CCC;
- -webkit-box-shadow: 4px 4px 4px #CCC;
- box-shadow: 4px 4px 4px #CCC;
+ -moz-box-shadow: 4px 4px 4px #DDD;
+ -webkit-box-shadow: 4px 4px 4px #DDD;
+ box-shadow: 4px 4px 4px #DDD;
margin-bottom: 8px !important;
}
@@ -1762,18 +1782,15 @@ div.tabBar .noborder {
tr.box_titre {
height: 20px;
- background: #7699A9;
-
-<?php if ($usecss3) { ?>
+ background: rgb(<?php echo $colorbacktitle1; ?>);
+ background-repeat: repeat-x;
+ <?php if ($usecss3) { ?>
background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
-<?php } else { ?>
- background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/liste_titre2.png',1); ?>);
-<?php } ?>
- background-repeat: repeat-x;
+ <?php } ?>
color: #<?php echo $colortextmain; ?>;
font-family: <?php print $fontlist ?>, sans-serif;
font-weight: normal;
@@ -2371,9 +2388,9 @@ a.cke_dialog_ui_button
-moz-border-radius:0px 5px 0px 5px !important;
-webkit-border-radius:0px 5px 0px 5px !important;
border-radius:0px 5px 0px 5px !important;
- -moz-box-shadow: 4px 4px 4px #CCC !important;
- -webkit-box-shadow: 4px 4px 4px #CCC !important;
- box-shadow: 4px 4px 4px #CCC !important;
+ -moz-box-shadow: 4px 4px 4px #DDD !important;
+ -webkit-box-shadow: 4px 4px 4px #DDD !important;
+ box-shadow: 4px 4px 4px #DDD !important;
}
.cke_dialog_ui_hbox_last
{
@@ -2556,11 +2573,43 @@ li.ui-li-divider .ui-link {
color: #FFF !important;
}
.ui-btn-inner {
- padding-left: 12px;
+ padding-left: 10px;
+ padding-right: 10px;
+ white-space: normal;
}
.ui-select .ui-btn-icon-right .ui-btn-inner {
padding-right: 36px;
}
+.fiche .ui-controlgroup {
+ margin: 0px;
+ padding-bottom: 0px;
+}
+div.ui-controlgroup-controls div.tabsElem
+{
+ margin-top: 2px;
+}
+div.ui-controlgroup-controls div.tabsElem a
+{
+ -moz-box-shadow: 0 -3px 6px rgba(0,0,0,.2);
+ -webkit-box-shadow: 0 -3px 6px rgba(0,0,0,.2);
+ box-shadow: 0 -3px 6px rgba(0,0,0,.2);
+ border: none;
+}
+a.tab span.ui-btn-inner
+{
+ border: none;
+ padding: 0;
+}
+
+.ui-body-c {
+ border: none;
+ text-shadow: none;
+}
+.ui-link {
+ color: rgb(<?php print $colortext; ?>) !important;
+}
+
+
/* Warning: setting this make screen not beeing refreshed after a combo selection */
/*.ui-body-c {
background: #fff;
@@ -2570,7 +2619,7 @@ li.ui-li-divider .ui-link {
background: #eee !important;
}
.ui-bar-b {
- border: 1px solid #ccc !important;
+ border: 1px solid #CCC !important;
background: #aaa !important;
font-weight: bold !important;
color: #444 !important;
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 892d5fc4ac3386e5cbcd4dc04d1212fa7d3f0c98..98d3e85d343d37b30767c8f72793386f65cf2db5 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -1545,7 +1545,7 @@ else
if ($caneditfield)
{
if ($object->photo) print "<br>\n";
- print '<table class="nobordernopadding">';
+ print '<table class="nobordernopadding hideonsmartphone">';
if ($object->photo) print '<tr><td align="center"><input type="checkbox" class="flat" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index a779894d1db3ffad0bbb944fb33c548b7ef2fb30..7d4f11a2fddd2ccf6c04a59d846b78d07b105d49 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -119,6 +119,16 @@ llxHeader();
$head = user_prepare_head($fuser);
$title = $langs->trans("User");
+
+if ($action == 'edit')
+{
+ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+ print '<input type="hidden" name="action" value="update">';
+ print '<input type="hidden" name="id" value="'.$id.'">';
+}
+
+
dol_fiche_head($head, 'guisetup', $title, 0, 'user');
@@ -158,11 +168,6 @@ if ($action == 'edit')
});
</script>';
- print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
- print '<input type="hidden" name="action" value="update">';
- print '<input type="hidden" name="id" value="'.$id.'">';
-
clearstatcache();
$var=true;
@@ -198,13 +203,15 @@ if ($action == 'edit')
// Theme
show_theme($fuser,(($user->admin || empty($dolibarr_main_demo))?1:0),true);
- print '</div>';
+ dol_fiche_end();
+
print '<center>';
print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
print ' ';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
print '</center>';
+
print '</form>';
}
@@ -241,7 +248,8 @@ else
// Skin
show_theme($fuser,0,true);
- print '</div>';
+ dol_fiche_end();
+
print '<div class="tabsAction">';
if (empty($user->admin) && ! empty($dolibarr_main_demo))