Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 19:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Uniformize code, order of fiels in card and language files.

Browse Source
This commit is contained in:
Laurent Destailleur
2013-04-28 01:12:40 +02:00
parent 757473cf86
commit 2e81fa342e
20 changed files with 84 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/categories/categorie.php
View File

@@ -261,20 +261,20 @@ if ($socid)
print '</td></tr>'; print '</td></tr>';
} }
// EMail
print '<tr><td>'.$langs->trans('EMail').'</td><td colspan="3">';
print dol_print_email($soc->email,0,$soc->id,'AC_EMAIL');
print '</td></tr>';
// Web
print '<tr><td>'.$langs->trans('Web').'</td><td colspan="3">';
print dol_print_url($soc->url);
print '</td></tr>';
// Phone // Phone
print '<tr><td>'.$langs->trans('Phone').'</td><td>'.dol_print_phone($soc->tel,$soc->country_code,0,$soc->id,'AC_TEL').'</td>'; print '<tr><td>'.$langs->trans('Phone').'</td><td>'.dol_print_phone($soc->tel,$soc->country_code,0,$soc->id,'AC_TEL').'</td>';
print '<td>'.$langs->trans('Fax').'</td><td>'.dol_print_phone($soc->fax,$soc->country_code,0,$soc->id,'AC_FAX').'</td></tr>'; print '<td>'.$langs->trans('Fax').'</td><td>'.dol_print_phone($soc->fax,$soc->country_code,0,$soc->id,'AC_FAX').'</td></tr>';
// EMail
print '<tr><td>'.$langs->trans('EMail').'</td><td>';
print dol_print_email($soc->email,0,$soc->id,'AC_EMAIL');
print '</td>';
// Web
print '<td>'.$langs->trans('Web').'</td><td>';
print dol_print_url($soc->url);
print '</td></tr>';
// Assujeti a TVA ou pas // Assujeti a TVA ou pas
print '<tr>'; print '<tr>';
print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">'; print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">';

7
htdocs/categories/class/categorie.class.php
View File

@@ -241,11 +241,8 @@ class Categorie
$this->db->begin(); $this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."categorie"; $sql = "UPDATE ".MAIN_DB_PREFIX."categorie";
$sql.= " SET label = '".$this->db->escape($this->label)."'"; $sql.= " SET label = '".$this->db->escape($this->label)."',";
if (! empty($this->description)) $sql.= " description = '".$this->db->escape($this->description)."'";
{
$sql .= ", description = '".$this->db->escape($this->description)."'";
}
if (! empty($conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER)) if (! empty($conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER))
{ {
$sql .= ", fk_soc = ".($this->socid != -1 ? $this->socid : 'null'); $sql .= ", fk_soc = ".($this->socid != -1 ? $this->socid : 'null');

3
htdocs/categories/edit.php
View File

@@ -27,6 +27,7 @@
require '../main.inc.php'; require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$langs->load("categories");
$id=GETPOST('id','int'); $id=GETPOST('id','int');
$ref=GETPOST('ref'); $ref=GETPOST('ref');
@@ -62,7 +63,7 @@ if ($action == 'update' && $user->rights->categorie->creer)
$result=$categorie->fetch($id); $result=$categorie->fetch($id);
$categorie->label = $nom; $categorie->label = $nom;
$categorie->description = $description; $categorie->description = dol_htmlcleanlastbr($description);
$categorie->socid = ($socid ? $socid : 'null'); $categorie->socid = ($socid ? $socid : 'null');
$categorie->visible = $visible; $categorie->visible = $visible;

2
htdocs/categories/fiche.php
View File

@@ -108,7 +108,7 @@ if ($action == 'add' && $user->rights->categorie->creer)
$object = new Categorie($db); $object = new Categorie($db);
$object->label = $label; $object->label = $label;
$object->description = $description; $object->description = dol_htmlcleanlastbr($description);
$object->socid = ($socid ? $socid : 'null'); $object->socid = ($socid ? $socid : 'null');
$object->visible = $visible; $object->visible = $visible;
$object->type = $type; $object->type = $type;

12
htdocs/comm/fiche.php
View File

@@ -247,18 +247,18 @@ if ($id > 0)
else print ($img?$img.' ':'').$object->country; else print ($img?$img.' ':'').$object->country;
print '</td></tr>'; print '</td></tr>';
// Phone
print '<tr><td>'.$langs->trans('Phone').'</td><td style="min-width: 25%;">'.dol_print_phone($object->tel,$object->country_code,0,$object->id,'AC_TEL').'</td>';
// Fax
print '<td>'.$langs->trans('Fax').'</td><td style="min-width: 25%;">'.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'</td></tr>';
// EMail // EMail
print '<td>'.$langs->trans('EMail').'</td><td colspan="3">'.dol_print_email($object->email,0,$object->id,'AC_EMAIL').'</td></tr>'; print '<td>'.$langs->trans('EMail').'</td><td colspan="3">'.dol_print_email($object->email,0,$object->id,'AC_EMAIL').'</td></tr>';
// Web // Web
print '<tr><td>'.$langs->trans("Web").'</td><td colspan="3">'.dol_print_url($object->url,'_blank').'</td></tr>'; print '<tr><td>'.$langs->trans("Web").'</td><td colspan="3">'.dol_print_url($object->url,'_blank').'</td></tr>';
// Phone
print '<tr><td>'.$langs->trans('Phone').'</td><td style="min-width: 25%;">'.dol_print_phone($object->tel,$object->country_code,0,$object->id,'AC_TEL').'</td>';
// Fax
print '<td>'.$langs->trans('Fax').'</td><td style="min-width: 25%;">'.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'</td></tr>';
// Assujeti a TVA ou pas // Assujeti a TVA ou pas
print '<tr>'; print '<tr>';
print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">'; print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">';

2
htdocs/contact/list.php
View File

@@ -369,7 +369,7 @@ if ($result)
print '<td align="right">'; print '<td align="right">';
print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&amp;backtopage=1&amp;contactid='.$obj->cidp.'&amp;socid='.$obj->socid.'">'.img_object($langs->trans("AddAction"),"action").'</a>'; print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&amp;backtopage=1&amp;contactid='.$obj->cidp.'&amp;socid='.$obj->socid.'">'.img_object($langs->trans("AddAction"),"action").'</a>';
print ' &nbsp; '; print ' &nbsp; ';
print '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$obj->cidp.'">'; print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$obj->cidp.'">';
print img_picto($langs->trans("VCard"),'vcard.png').' '; print img_picto($langs->trans("VCard"),'vcard.png').' ';
print '</a></td>'; print '</a></td>';

6
htdocs/core/class/html.formfile.class.php
View File

@@ -391,11 +391,11 @@ class FormFile
<option value="" data-placeholder="true">Choose One...</option> <option value="" data-placeholder="true">Choose One...</option>
<option value="option1">Option #1</option> <option value="option1">Option #1</option>
<option value="option2">Option #2</option> <option value="option2">Option #2</option>
<option value="option3">Option #3 - This is a really really really really really long label.</option> <option value="option3">Option #3 - This is a really f fsd f gdfgdgd gd gd gd fgd gd gd fgd fgfdreally really really really long label.</option>
</select> </select>
</form> </form>
'; ';*/
*/
if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">'; if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
$out.= '<input type="hidden" name="action" value="builddoc">'; $out.= '<input type="hidden" name="action" value="builddoc">';
$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

2
htdocs/core/get_menudiv.php
View File

@@ -48,6 +48,8 @@ $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
// URL http://mydolibarr/core/get_menudiv.php?dol_use_jmobile=1 can be used for tests // URL http://mydolibarr/core/get_menudiv.php?dol_use_jmobile=1 can be used for tests
$arrayofjs=array(); $arrayofjs=array();
$arrayofcss=array(); $arrayofcss=array();
$arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
$arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
print '<body>'."\n"; print '<body>'."\n";

2
htdocs/core/lib/functions.lib.php
View File

@@ -1149,7 +1149,7 @@ function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid=
if (! empty($addlink)) if (! empty($addlink))
{ {
$newemail='<a href="'; $newemail='<a style="text-overflow: ellipsis;" href="';
if (! preg_match('/^mailto:/i',$email)) $newemail.='mailto:'; if (! preg_match('/^mailto:/i',$email)) $newemail.='mailto:';
$newemail.=$email; $newemail.=$email;
$newemail.='">'; $newemail.='">';

2
htdocs/core/search_page.php
View File

@@ -99,7 +99,7 @@ $reshook=$hookmanager->executeHooks('printSearchForm',$parameters);
if (empty($reshook)) $searchform.=$hookmanager->resPrint; if (empty($reshook)) $searchform.=$hookmanager->resPrint;
else $searchform=$hookmanager->resPrint; else $searchform=$hookmanager->resPrint;
print '<style>.menu_titre { padding-top: 10px; }</style>'; print '<style>.menu_titre { padding-top: 6px; }</style>';
print "\n"; print "\n";
print "<!-- Begin SearchForm -->\n"; print "<!-- Begin SearchForm -->\n";

12
htdocs/fourn/fiche.php
View File

@@ -134,18 +134,18 @@ if ($object->fetch($id))
else print ($img?$img.' ':'').$object->country; else print ($img?$img.' ':'').$object->country;
print '</td></tr>'; print '</td></tr>';
// EMail
print '<td>'.$langs->trans('EMail').'</td><td colspan="3">'.dol_print_email($object->email,0,$object->id,'AC_EMAIL').'</td></tr>';
// Web
print '<tr><td>'.$langs->trans("Web").'</td><td colspan="3">'.dol_print_url($object->url).'</td></tr>';
// Phone // Phone
print '<tr><td>'.$langs->trans("Phone").'</td><td style="min-width: 25%;">'.dol_print_phone($object->tel,$object->country_code,0,$object->id,'AC_TEL').'</td>'; print '<tr><td>'.$langs->trans("Phone").'</td><td style="min-width: 25%;">'.dol_print_phone($object->tel,$object->country_code,0,$object->id,'AC_TEL').'</td>';
// Fax // Fax
print '<td>'.$langs->trans("Fax").'</td><td style="min-width: 25%;">'.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'</td></tr>'; print '<td>'.$langs->trans("Fax").'</td><td style="min-width: 25%;">'.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'</td></tr>';
// EMail
print '<td>'.$langs->trans('EMail').'</td><td colspan="3">'.dol_print_email($object->email,0,$object->id,'AC_EMAIL').'</td></tr>';
// Web
print '<tr><td>'.$langs->trans("Web")."</td><td colspan=\"3\">".dol_print_url($object->url)."</td></tr>";
// Assujetti a TVA ou pas // Assujetti a TVA ou pas
print '<tr>'; print '<tr>';
print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">'; print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">';

2
htdocs/langs/en_US/categories.lang
View File

@@ -96,7 +96,7 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories CatMemberLinks=Links between members and categories
# Imports
CatProdLinks=Products CatProdLinks=Products
CatCusLinks=Customer/Prospects CatCusLinks=Customer/Prospects
CatSupLinks=Suppliers CatSupLinks=Suppliers
DeleteFromCat=Remove from category

2
htdocs/langs/en_US/main.lang
View File

@@ -644,6 +644,8 @@ NoResults=No results
ModulesSystemTools=Modules tools ModulesSystemTools=Modules tools
Test=Test Test=Test
Element=Element Element=Element
NoPhotoYet=No pictures available yet
HomeDashboard=Home summary
# Week day # Week day
Monday=Monday Monday=Monday

2
htdocs/langs/en_US/products.lang
View File

@@ -91,14 +91,12 @@ AddToOtherBills=Add to other bills
CorrectStock=Correct stock CorrectStock=Correct stock
AddPhoto=Add photo AddPhoto=Add photo
ListOfStockMovements=List of stock movements ListOfStockMovements=List of stock movements
NoPhotoYet=No pictures available yet
BuiingPrice=Buying price BuiingPrice=Buying price
SupplierCard=Supplier card SupplierCard=Supplier card
CommercialCard=Commercial card CommercialCard=Commercial card
AllWays=Path to find your product in stock AllWays=Path to find your product in stock
NoCat=Your product is not in any category NoCat=Your product is not in any category
PrimaryWay=Primary path PrimaryWay=Primary path
DeleteFromCat=Remove from category
PriceRemoved=Price removed PriceRemoved=Price removed
BarCode=Barcode BarCode=Barcode
BarcodeType=Barcode type BarcodeType=Barcode type

2
htdocs/langs/fr_FR/categories.lang
View File

@@ -96,7 +96,7 @@ CatSupLinks=Liens entre les fournisseurs et les catégories
CatCusLinks=Liens entre les clients/prospects et les catégories CatCusLinks=Liens entre les clients/prospects et les catégories
CatProdLinks=Liens entre les produits/services et les catégories CatProdLinks=Liens entre les produits/services et les catégories
CatMemberLinks=Links entre les adhérents et les catégories CatMemberLinks=Links entre les adhérents et les catégories
# Imports
CatProdLinks=Produits CatProdLinks=Produits
CatCusLinks=Clients/Prospects CatCusLinks=Clients/Prospects
CatSupLinks=Fournisseurs CatSupLinks=Fournisseurs
DeleteFromCat=Supprimer de la catégorie

2
htdocs/langs/fr_FR/main.lang
View File

@@ -648,6 +648,8 @@ ModulesSystemTools=Outils Modules
View=Voir View=Voir
Test=Test Test=Test
Element=Élément Element=Élément
NoPhotoYet=Pas de photo disponible pour l'instant
HomeDashboard=Synthèse accueil
# Week day # Week day
Monday=Lundi Monday=Lundi

2
htdocs/langs/fr_FR/products.lang
View File

@@ -91,14 +91,12 @@ AddToOtherBills=Ajouter aux autres factures
CorrectStock=Corriger stock CorrectStock=Corriger stock
AddPhoto=Ajouter une photo AddPhoto=Ajouter une photo
ListOfStockMovements=Liste des mouvements de stock ListOfStockMovements=Liste des mouvements de stock
NoPhotoYet=Pas de photo disponible pour l'instant
BuiingPrice=Prix d'achat BuiingPrice=Prix d'achat
SupplierCard=Fiche fournisseur SupplierCard=Fiche fournisseur
CommercialCard=Fiche commerciale CommercialCard=Fiche commerciale
AllWays=Chemin pour trouver votre produit dans le stock AllWays=Chemin pour trouver votre produit dans le stock
NoCat=Votre produit n'appartient à aucune catégorie NoCat=Votre produit n'appartient à aucune catégorie
PrimaryWay=Chemin Primaire: PrimaryWay=Chemin Primaire:
DeleteFromCat=Supprimer de la catégorie
PriceRemoved=Prix supprimé PriceRemoved=Prix supprimé
BarCode=Code-barres BarCode=Code-barres
BarcodeType=Type de code-barres BarcodeType=Type de code-barres

13
htdocs/societe/agenda.php
View File

@@ -131,19 +131,20 @@ if ($socid)
print '</td></tr>'; print '</td></tr>';
} }
print '<tr><td>'.$langs->trans('Phone').'</td><td>'.dol_print_phone($soc->tel,$soc->country_code,0,$soc->id,'AC_TEL').'</td>';
print '<td>'.$langs->trans('Fax').'</td><td>'.dol_print_phone($soc->fax,$soc->country_code,0,$soc->id,'AC_FAX').'</td></tr>';
// EMail // EMail
print '<tr><td>'.$langs->trans('EMail').'</td><td>'; print '<tr><td>'.$langs->trans('EMail').'</td><td colspan="3">';
print dol_print_email($soc->email,0,$soc->id,'AC_EMAIL'); print dol_print_email($soc->email,0,$soc->id,'AC_EMAIL');
print '</td>'; print '</td></tr>';
// Web // Web
print '<td>'.$langs->trans('Web').'</td><td>'; print '<tr><td>'.$langs->trans('Web').'</td><td colspan="3">';
print dol_print_url($soc->url); print dol_print_url($soc->url);
print '</td></tr>'; print '</td></tr>';
// Phone / Fax
print '<tr><td>'.$langs->trans('Phone').'</td><td>'.dol_print_phone($soc->tel,$soc->country_code,0,$soc->id,'AC_TEL').'</td>';
print '<td>'.$langs->trans('Fax').'</td><td>'.dol_print_phone($soc->fax,$soc->country_code,0,$soc->id,'AC_FAX').'</td></tr>';
print '</table>'; print '</table>';
print '</div>'; print '</div>';

28
htdocs/societe/soc.php
View File

@@ -832,13 +832,14 @@ else
print '</td></tr>'; print '</td></tr>';
} }
// Email web
print '<tr><td>'.$langs->trans('EMail').(! empty($conf->global->SOCIETE_MAIL_REQUIRED)?'*':'').'</td><td colspan="3"><input type="text" name="email" size="32" value="'.$object->email.'"></td></tr>';
print '<tr><td>'.$langs->trans('Web').'</td><td colspan="3"><input type="text" name="url" size="32" value="'.$object->url.'"></td></tr>';
// Phone / Fax // Phone / Fax
print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="phone" value="'.$object->phone.'"></td>'; print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="phone" value="'.$object->phone.'"></td>';
print '<td>'.$langs->trans('Fax').'</td><td><input type="text" name="fax" value="'.$object->fax.'"></td></tr>'; print '<td>'.$langs->trans('Fax').'</td><td><input type="text" name="fax" value="'.$object->fax.'"></td></tr>';
print '<tr><td>'.$langs->trans('EMail').(! empty($conf->global->SOCIETE_MAIL_REQUIRED)?'*':'').'</td><td><input type="text" name="email" size="32" value="'.$object->email.'"></td>';
print '<td>'.$langs->trans('Web').'</td><td><input type="text" name="url" size="32" value="'.$object->url.'"></td></tr>';
// Prof ids // Prof ids
$i=1; $j=0; $i=1; $j=0;
while ($i <= 6) while ($i <= 6)
@@ -1257,14 +1258,14 @@ else
print '</td></tr>'; print '</td></tr>';
} }
// EMail / Web
print '<tr><td>'.$langs->trans('EMail').(! empty($conf->global->SOCIETE_MAIL_REQUIRED)?'*':'').'</td><td colspan="3"><input type="text" name="email" size="32" value="'.$object->email.'"></td></tr>';
print '<tr><td>'.$langs->trans('Web').'</td><td colspan="3"><input type="text" name="url" size="32" value="'.$object->url.'"></td></tr>';
// Phone / Fax // Phone / Fax
print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="phone" value="'.$object->phone.'"></td>'; print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="phone" value="'.$object->phone.'"></td>';
print '<td>'.$langs->trans('Fax').'</td><td><input type="text" name="fax" value="'.$object->fax.'"></td></tr>'; print '<td>'.$langs->trans('Fax').'</td><td><input type="text" name="fax" value="'.$object->fax.'"></td></tr>';
// EMail / Web
print '<tr><td>'.$langs->trans('EMail').(! empty($conf->global->SOCIETE_MAIL_REQUIRED)?'*':'').'</td><td><input type="text" name="email" size="32" value="'.$object->email.'"></td>';
print '<td>'.$langs->trans('Web').'</td><td><input type="text" name="url" size="32" value="'.$object->url.'"></td></tr>';
// Prof ids // Prof ids
$i=1; $j=0; $i=1; $j=0;
while ($i <= 6) while ($i <= 6)
@@ -1558,19 +1559,20 @@ else
// State // State
if (empty($conf->global->SOCIETE_DISABLE_STATE)) print '<tr><td>'.$langs->trans('State').'</td><td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'">'.$object->state.'</td>'; if (empty($conf->global->SOCIETE_DISABLE_STATE)) print '<tr><td>'.$langs->trans('State').'</td><td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'">'.$object->state.'</td>';
print '<tr><td>'.$langs->trans('Phone').'</td><td style="min-width: 25%;">'.dol_print_phone($object->phone,$object->country_code,0,$object->id,'AC_TEL').'</td>';
print '<td>'.$langs->trans('Fax').'</td><td style="min-width: 25%;">'.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'</td></tr>';
// EMail // EMail
print '<tr><td>'.$langs->trans('EMail').'</td><td width="25%">'; print '<tr><td>'.$langs->trans('EMail').'</td><td colspan="3">';
print dol_print_email($object->email,0,$object->id,'AC_EMAIL'); print dol_print_email($object->email,0,$object->id,'AC_EMAIL');
print '</td>'; print '</td></tr>';
// Web // Web
print '<td>'.$langs->trans('Web').'</td><td>'; print '<tr><td>'.$langs->trans('Web').'</td><td colspan="3">';
print dol_print_url($object->url); print dol_print_url($object->url);
print '</td></tr>'; print '</td></tr>';
// Phone / Fax
print '<tr><td>'.$langs->trans('Phone').'</td><td style="min-width: 25%;">'.dol_print_phone($object->phone,$object->country_code,0,$object->id,'AC_TEL').'</td>';
print '<td>'.$langs->trans('Fax').'</td><td style="min-width: 25%;">'.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'</td></tr>';
// Prof ids // Prof ids
$i=1; $j=0; $i=1; $j=0;
while ($i <= 6) while ($i <= 6)

20
htdocs/theme/eldy/style.css.php
View File

@@ -137,8 +137,9 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_TEXT='50,50,130'; $conf->global->THEME_ELDY_TEXT='50,50,130';
if ($dol_use_jmobile) if ($dol_use_jmobile)
{ {
$conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; // topmenu $conf->global->THEME_ELDY_BACKTABCARD1='245,245,245'; // topmenu
$conf->global->THEME_ELDY_BACKTABCARD2='255,255,255'; $conf->global->THEME_ELDY_BACKTABCARD2='245,245,245';
$conf->global->THEME_ELDY_BACKTABACTIVE='245,245,245';
} }
} }
@@ -236,8 +237,10 @@ input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
background: #FDFDFD; background: #FDFDFD;
border: 1px solid #C0C0C0; border: 1px solid #C0C0C0;
<?php if (empty($dol_use_jmobile)) { ?>
padding: 1px 1px 1px 1px; padding: 1px 1px 1px 1px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
<?php } ?>
} }
input, textarea, select { input, textarea, select {
border-radius:4px; border-radius:4px;
@@ -767,7 +770,7 @@ foreach($mainmenuusedarray as $val)
/* Login */ /* Login */
form#login { form#login {
margin-top: 60px; margin-top: <?php echo $dol_optimize_smallscreen?'30':'60' ?>px;
margin-bottom: 30px; margin-bottom: 30px;
font-size: 13px; font-size: 13px;
vertical-align: middle; vertical-align: middle;
@@ -1311,7 +1314,7 @@ div.tabBar {
border-bottom: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC;
border-left: 1px solid #D0D0D0; border-left: 1px solid #D0D0D0;
border-top: 1px solid #D8D8D8; border-top: 1px solid #D8D8D8;
width: auto;
<?php if ($usecss3) { ?> <?php if ($usecss3) { ?>
background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%); background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%);
background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%); background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%);
@@ -2581,9 +2584,10 @@ div.dolEventError h1, div.dolEventError h2 {
li.ui-li-divider .ui-link { li.ui-li-divider .ui-link {
color: #FFF !important; color: #FFF !important;
} }
a.ui-link, a.ui-link:hover { a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-inner:hover {
text-decoration: none; text-decoration: none !important;
} }
.ui-btn-inner { .ui-btn-inner {
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
@@ -2634,9 +2638,9 @@ a.ui-link {
} }
/* Warning: setting this make screen not beeing refreshed after a combo selection */ /* Warning: setting this make screen not beeing refreshed after a combo selection */
/*.ui-body-c { .ui-body-c {
background: #fff; background: #fff;
}*/ }
<?php <?php