Skip to content
Snippets Groups Projects
Commit abec6349 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Look: Better support for jmobile

parent 3f89f27a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
htdocs/societe/soc.php
+ 11
− 9
View file @ abec6349
......@@ -52,6 +52,7 @@ $action = (GETPOST('action') ? GETPOST('action') : 'view');
$confirm = GETPOST('confirm');
$socid = GETPOST('socid','int');
if ($user->societe_id) $socid=$user->societe_id;
if (empty($socid) && $action = 'view') $action='create';
$object = new Societe($db);
$extrafields = new ExtraFields($db);
......@@ -736,9 +737,10 @@ else
});';
print '</script>'."\n";
print "<br>\n";
print '<div id="selectthirdpartytype">';
print $langs->trans("ThirdPartyType").': &nbsp; ';
print '<div class="hideonsmartphone float">';
print $langs->trans("ThirdPartyType").': &nbsp; &nbsp; ';
print '</div>';
print '<input type="radio" id="radiocompany" class="flat" name="private" value="0"'.($private?'':' checked="checked"');
print '> '.$langs->trans("Company/Fundation");
print ' &nbsp; &nbsp; ';
......@@ -774,7 +776,7 @@ else
print '</tr>';
}
else
{
{
print '<tr><td><span span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').'</span></td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'><input type="text" size="30" maxlength="60" name="nom" value="'.$object->name.'"></td>';
if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
{
......@@ -793,7 +795,7 @@ else
}
// Prospect/Customer
print '<tr><td width="25%"><span class="fieldrequired">'.$langs->trans('ProspectCustomer').'</span></td><td width="25%"><select class="flat" name="client">';
print '<tr><td width="25%"><span class="fieldrequired">'.$langs->trans('ProspectCustomer').'</span></td><td width="25%" class="maxwidthonsmartphone"><select class="flat" name="client">';
$selected=isset($_POST['client'])?GETPOST('client'):$object->client;
if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($selected==2?' selected="selected"':'').'>'.$langs->trans('Prospect').'</option>';
if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="3"'.($selected==3?' selected="selected"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
......@@ -857,7 +859,7 @@ else
print '</td></tr>';
// Country
print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3">';
print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3" class="maxwidthonsmartphone">';
print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
print '</td></tr>';
......@@ -865,7 +867,7 @@ else
// State
if (empty($conf->global->SOCIETE_DISABLE_STATE))
{
print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
print '<tr><td>'.$langs->trans('State').'</td><td colspan="3" class="maxwidthonsmartphone">';
if ($object->country_id) print $formcompany->select_state($object->state_id,$object->country_code,'state_id');
else print $countrynotdefined;
print '</td></tr>';
......@@ -956,7 +958,7 @@ else
// Legal Form
print '<tr><td>'.$langs->trans('JuridicalStatus').'</td>';
print '<td colspan="3">';
print '<td colspan="3" class="maxwidthonsmartphone">';
if ($object->country_id)
{
$formcompany->select_forme_juridique($object->forme_juridique_code,$object->country_code);
......@@ -1003,7 +1005,7 @@ else
}
if (! empty($conf->global->MAIN_MULTILANGS))
{
print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'."\n";
print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
print $formadmin->select_language(($object->default_lang?$object->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1);
print '</td>';
print '</tr>';
......@@ -1014,7 +1016,7 @@ else
// Assign a Name
print '<tr>';
print '<td>'.$langs->trans("AllocateCommercial").'</td>';
print '<td colspan="3">';
print '<td colspan="3" class="maxwidthonsmartphone">';
$form->select_users((! empty($object->commercial_id)?$object->commercial_id:$user->id),'commercial_id',1); // Add current user by default
print '</td></tr>';
}
......
htdocs/theme/amarok/style.css.php
+ 1
− 0
View file @ abec6349
......@@ -361,6 +361,7 @@ center .error { padding:8px !important; padding-left:26px !important; padding-ri
<?php if (! empty($dol_optimize_smallscreen)) { ?>
.hideonsmartphone { display: none; }
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
.maxwidthonsmartphone { max-width: 100px; }
<?php } ?>
.linkobject { cursor:pointer; }
......
htdocs/theme/auguria/style.css.php
+ 1
− 0
View file @ abec6349
......@@ -243,6 +243,7 @@ div.inline-block
<?php if (! empty($dol_optimize_smallscreen)) { ?>
.hideonsmartphone { display: none; }
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
.maxwidthonsmartphone { max-width: 100px; }
<?php } ?>
.linkobject { cursor: pointer; }
......
htdocs/theme/bureau2crea/style.css.php
+ 1
− 0
View file @ abec6349
......@@ -267,6 +267,7 @@ div.inline-block
<?php if (! empty($dol_optimize_smallscreen)) { ?>
.hideonsmartphone { display: none; }
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
.maxwidthonsmartphone { max-width: 100px; }
<?php } ?>
.linkobject { cursor: pointer; }
......
htdocs/theme/cameleo/style.css.php
+ 1
− 0
View file @ abec6349
......@@ -242,6 +242,7 @@ div.inline-block
<?php if (! empty($dol_optimize_smallscreen)) { ?>
.hideonsmartphone { display: none; }
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
.maxwidthonsmartphone { max-width: 100px; }
<?php } ?>
.linkobject { cursor: pointer; }
......
htdocs/theme/eldy/style.css.php
+ 12
− 10
View file @ abec6349
......@@ -222,7 +222,7 @@ if (! empty($conf->dol_optimize_smallscreen)) $fontsize=11;
body {
<?php if (GETPOST("optioncss") == 'print' || ! empty($conf->dol_optimize_smallscreen)) { ?>
<?php if (GETPOST("optioncss") == 'print') { ?>
background-color: #FFFFFF;
<?php } else { ?>
background: <?php print $colorbackbody; ?>;
......@@ -254,10 +254,8 @@ input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
font-family: <?php print $fontlist ?>;
background: #FDFDFD;
border: 1px solid #C0C0C0;
<?php if (empty($dol_use_jmobile)) { ?>
/*padding: 1px 1px 1px 1px; */
margin: 0px 0px 0px 0px;
<?php } ?>
}
input, textarea, select {
......@@ -265,7 +263,7 @@ input, textarea, select {
border:solid 1px rgba(0,0,0,.3);
border-top:solid 1px rgba(0,0,0,.3);
border-bottom:solid 1px rgba(0,0,0,.2);
box-shadow: 1px 1px 2px rgba(0,0,0,.2) inset;
/* box-shadow: 1px 1px 1px rgba(0,0,0,.2) inset;*/
padding:2px;
margin-left:1px;
margin-bottom:1px;
......@@ -411,6 +409,7 @@ th .button {
<?php if (! empty($dol_optimize_smallscreen)) { ?>
.hideonsmartphone { display: none; }
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
.maxwidthonsmartphone { max-width: 100px; }
<?php } ?>
.linkobject { cursor: pointer; }
......@@ -2060,6 +2059,7 @@ div.titre {
color: rgb(<?php print $colortext; ?>);
text-decoration: none;
text-shadow: 1px 1px 2px #FFFFFF;
<?php print (empty($conf->dol_optimize_smallscreen)?'':'margin-top: 4px;'); ?>
}
#dolpaymenttable { width: 600px; font-size: 13px; }
......@@ -2751,10 +2751,6 @@ a.tab span.ui-btn-inner
padding: 0;
}
.ui-body-c {
border: 1px solid #CCC;
text-shadow: none;
}
.ui-link {
color: rgb(<?php print $colortext; ?>) !important;
}
......@@ -2829,8 +2825,14 @@ ul.ulmenu {
color: #<?php echo $colortexttitle; ?> !important;
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
}
.ui-body-c, .ui-btn-up-c, .ui-btn-hover-c {
border: none !important;
.ui-body-c {
border: 1px solid #ccc;
text-shadow: none;
}
.ui-btn-up-c, .ui-btn-hover-c {
border: 1px solid #ccc;
text-shadow: none;
}
.ui-btn-up-c .vsmenudisabled {
color: #<?php echo $colorshadowtitle; ?> !important;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment