lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look: Minor look enhancements

Browse Source
This commit is contained in:
Laurent Destailleur 2011-08-13 00:47:59 +00:00
parent b27125023c
commit 22eae6fae7
8 changed files with 135 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/admin/system/index.php
View File

@ -20,7 +20,7 @@
/**
* \file htdocs/admin/system/index.php
* \brief Home page of system information
* \version $Id: index.php,v 1.49 2011/07/31 22:23:14 eldy Exp $
* \version $Id: index.php,v 1.50 2011/08/13 00:48:00 eldy Exp $
*/
require("../../main.inc.php");
@ -101,9 +101,9 @@ if ($db->type == 'pgsql')
if ($paramarray['standard_conforming_strings'] != 'on' && $paramarray['standard_conforming_strings'] != 1)
{
$langs->load("errors");
print '<div class="error">'.$langs->trans("ErrorDatabaseParameterWrong",'standard_conforming_strings','on').'</div>';
//print '<div class="error">'.$langs->trans("ErrorDatabaseParameterWrong",'standard_conforming_strings','on').'</div>';
}
// Check option standard_conforming_strings is on
// Check option backslash_quote is on
/*$paramarray=$db->getServerParametersValues('backslash_quote');
if ($paramarray['backslash_quote'] != 'on' && $paramarray['backslash_quote'] != 1)
{
@ -126,5 +126,5 @@ print '<br>';
print info_admin($langs->trans("SystemInfoDesc")).'<br>';
llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.49 $');
llxFooter('$Date: 2011/08/13 00:48:00 $ - $Revision: 1.50 $');
?>

17
htdocs/comm/addpropal.php
View File

@ -23,7 +23,7 @@
* \file htdocs/comm/addpropal.php
* \ingroup propal
* \brief Page to add a new commercial proposal
* \version $Id: addpropal.php,v 1.131 2011/08/03 00:46:26 eldy Exp $
* \version $Id: addpropal.php,v 1.132 2011/08/13 00:47:59 eldy Exp $
*/
require("../main.inc.php");
@ -240,12 +240,13 @@ if ($_GET["action"] == 'create')
* Combobox pour la fonction de copie
*/
print '<table>';
if (empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE))
{
print '<tr><td colspan="3"><input type="hidden" name="createmode" value="empty"></td></tr>';
print '<input type="hidden" name="createmode" value="empty">';
}
else
print '<table>';
if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE))
{
// For backward compatibility
print '<tr>';
@ -289,7 +290,7 @@ if ($_GET["action"] == 'create')
print '<td valign="top" colspan="2">'.$langs->trans("CreateEmptyPropal").'</td></tr>';
}
if ($conf->global->PRODUCT_SHOW_WHEN_CREATE)
if (! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE))
{
print '<tr><td colspan="3">';
if ($conf->product->enabled || $conf->service->enabled)
@ -319,10 +320,6 @@ if ($_GET["action"] == 'create')
print "</table>";
}
else
{
print '&nbsp;';
}
print '</td></tr>';
}
print '</table>';
@ -338,5 +335,5 @@ if ($_GET["action"] == 'create')
$db->close();
llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.131 $');
llxFooter('$Date: 2011/08/13 00:47:59 $ - $Revision: 1.132 $');
?>

4
htdocs/compta/bank/class/account.class.php
View File

@ -23,7 +23,7 @@
* \file htdocs/compta/bank/class/account.class.php
* \ingroup banque
* \brief File of class to manage bank accounts
* \version $Id: account.class.php,v 1.34 2011/08/05 21:05:19 eldy Exp $
* \version $Id: account.class.php,v 1.35 2011/08/13 00:48:00 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
@ -976,7 +976,7 @@ class Account extends CommonObject
* Return if a bank account is defined with detailed information (bank code, desk code, number and key)
* @return int 0=Use only an account number
* 1=Need Bank, Desk, Number and Key (France, Spain, ...)
* 2=Neek Bank onyl (BSB for Australia)
* 2=Neek Bank only (BSB for Australia)
*/
function useDetailedBBAN()
{

6
htdocs/contact/fiche.php
View File

@ -23,7 +23,7 @@
* \file htdocs/contact/fiche.php
* \ingroup societe
* \brief Card of a contact
* \version $Id: fiche.php,v 1.224 2011/08/10 22:47:34 eldy Exp $
* \version $Id: fiche.php,v 1.225 2011/08/13 00:48:00 eldy Exp $
*/
require("../main.inc.php");
@ -544,7 +544,7 @@ else
}
print '</tr>';
print "</table><br>";
print "</table><br><br>";
print '<center>';
@ -949,5 +949,5 @@ else
$db->close();
llxFooter('$Date: 2011/08/10 22:47:34 $ - $Revision: 1.224 $');
llxFooter('$Date: 2011/08/13 00:48:00 $ - $Revision: 1.225 $');
?>

60
htdocs/societe/lien.php
View File

@ -21,11 +21,12 @@
* \file htdocs/societe/lien.php
* \ingroup societe
* \brief Page of links to other third parties
* \version $Id: lien.php,v 1.38 2011/07/31 23:22:57 eldy Exp $
* \version $Id: lien.php,v 1.39 2011/08/13 00:48:00 eldy Exp $
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
$langs->load("companies");
$langs->load("customers");
@ -43,7 +44,7 @@ $result = restrictedArea($user, 'societe','','');
*/
// Positionne companie parente
if($_GET["socid"] && $_GET["select"])
if ($socid && $_GET["select"])
{
if ($user->rights->societe->creer)
{
@ -63,7 +64,7 @@ if($_GET["socid"] && $_GET["select"])
}
// Supprime companie parente
if($_GET["socid"] && $_GET["delsocid"])
if ($socid && $_GET["delsocid"])
{
if ($user->rights->societe->creer)
{
@ -92,13 +93,13 @@ $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('',$langs->trans("ThirdParty"),$help_url);
$form = new Form($db);
$formcompany = new FormCompany($db);
if($_GET["socid"])
if ($socid)
{
$soc = new Societe($db);
$soc->id = $_GET["socid"];
$soc->fetch($_GET["socid"]);
$soc->fetch($socid);
$head=societe_prepare_head2($soc);
@ -140,11 +141,50 @@ if($_GET["socid"])
if ($soc->url) { print '<a href="http://'.$soc->url.'">http://'.$soc->url.'</a>'; }
print '</td></tr>';
print '<tr><td>'.$langs->transcountry('ProfId1',$soc->pays_code).'</td><td><a target="_blank" href="http://www.societe.com/cgi-bin/recherche?rncs='.$soc->siren.'">'.$soc->siren.'</a>&nbsp;</td>';
$object=$soc;
print '<tr>';
// IdProf1 (SIREN for France)
$idprof=$langs->transcountry('ProfId1',$object->pays_code);
if ($idprof!='-')
{
print '<td>'.$idprof.'</td><td>';
print $formcompany->get_input_id_prof(1,'idprof1',$object->siren,$object->pays_code);
print '</td>';
}
else print '<td>&nbsp;</td><td>&nbsp;</td>';
// IdProf2 (SIRET for France)
$idprof=$langs->transcountry('ProfId2',$object->pays_code);
if ($idprof!='-')
{
print '<td>'.$idprof.'</td><td>';
print $formcompany->get_input_id_prof(2,'idprof2',$object->siret,$object->pays_code);
print '</td>';
}
else print '<td>&nbsp;</td><td>&nbsp;</td>';
print '</tr>';
print '<tr>';
// IdProf3 (APE for France)
$idprof=$langs->transcountry('ProfId3',$object->pays_code);
if ($idprof!='-')
{
print '<td>'.$idprof.'</td><td>';
print $formcompany->get_input_id_prof(3,'idprof3',$object->ape,$object->pays_code);
print '</td>';
}
else print '<td>&nbsp;</td><td>&nbsp;</td>';
// IdProf4 (NU for France)
$idprof=$langs->transcountry('ProfId4',$object->pays_code);
if ($idprof!='-')
{
print '<td>'.$idprof.'</td><td>';
print $formcompany->get_input_id_prof(4,'idprof4',$object->idprof4,$object->pays_code);
print '</td>';
}
else print '<td>&nbsp;</td><td>&nbsp;</td>';
print '</tr>';
print '<td>'.$langs->transcountry('ProfId2',$soc->pays_code).'</td><td>'.$soc->siret.'</td></tr>';
print '<tr><td>'.$langs->transcountry('ProfId3',$soc->pays_code).'</td><td>'.$soc->ape.'</td><td colspan="2">&nbsp;</td></tr>';
// Capital
print '<tr><td>'.$langs->trans("Capital").'</td><td colspan="3">'.$soc->capital.' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
// Societe mere
@ -294,5 +334,5 @@ if($_GET["socid"])
$db->close();
llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.38 $');
llxFooter('$Date: 2011/08/13 00:48:00 $ - $Revision: 1.39 $');
?>

19
htdocs/societe/rib.php
View File

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
*
* This program is free software; you can redistribute it and/or modify
@ -22,7 +22,7 @@
* \file htdocs/societe/rib.php
* \ingroup societe
* \brief BAN tab for companies
* \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $
* \version $Id: rib.php,v 1.38 2011/08/13 00:48:00 eldy Exp $
*/
require("../main.inc.php");
@ -115,7 +115,7 @@ if ($_GET["socid"] && $_GET["action"] != 'edit')
print '<table class="border" width="100%">';
print '<tr><td valign="top">'.$langs->trans("Bank").'</td>';
print '<tr><td valign="top" width="35%">'.$langs->trans("Bank").'</td>';
print '<td colspan="4">'.$account->bank.'</td></tr>';
if ($account->useDetailedBBAN() == 1)
@ -172,7 +172,6 @@ if ($_GET["socid"] && $_GET["action"] != 'edit')
/*
* Barre d'actions
*
*/
print '<div class="tabsAction">';
@ -205,7 +204,7 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer
print '<table class="border" width="100%">';
print '<tr><td valign="top">'.$langs->trans("Bank").'</td>';
print '<tr><td valign="top" width="35%">'.$langs->trans("Bank").'</td>';
print '<td colspan="4"><input size="30" type="text" name="bank" value="'.$account->bank.'"></td></tr>';
// BBAN
@ -258,18 +257,20 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer
print $account->adresse_proprio;
print "</textarea></td></tr>";
print '<tr><td align="center" colspan="5"><input class="button" value="'.$langs->trans("Modify").'" type="submit">';
print '</table><br>';
print '<center><input class="button" value="'.$langs->trans("Modify").'" type="submit">';
print ' &nbsp; <input name="cancel" class="button" value="'.$langs->trans("Cancel").'" type="submit">';
print '</td></tr>';
print '</center>';
print '</form>';
print '</table>';
}
dol_fiche_end();
$db->close();
llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $');
llxFooter('$Date: 2011/08/13 00:48:00 $ - $Revision: 1.38 $');
?>

13
htdocs/societe/soc.php
View File

@ -25,7 +25,7 @@
* \file htdocs/societe/soc.php
* \ingroup societe
* \brief Third party card page
* \version $Id: soc.php,v 1.134 2011/08/12 06:55:47 simnandez Exp $
* \version $Id: soc.php,v 1.135 2011/08/13 00:48:00 eldy Exp $
*/
require("../main.inc.php");
@ -1034,11 +1034,12 @@ else
print '</td>';
print '</tr>';
print '<tr><td colspan="4" align="center">';
print '<input type="submit" class="button" value="'.$langs->trans('AddThirdParty').'">';
print '</td></tr>'."\n";
print '</table>'."\n";
print '<br><center>';
print '<input type="submit" class="button" value="'.$langs->trans('AddThirdParty').'">';
print '</center>'."\n";
print '</form>'."\n";
}
elseif ($action == 'edit')
@ -1972,5 +1973,5 @@ else
$db->close();
llxFooter('$Date: 2011/08/12 06:55:47 $ - $Revision: 1.134 $');
llxFooter('$Date: 2011/08/13 00:48:00 $ - $Revision: 1.135 $');
?>

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

@ -21,7 +21,7 @@
/**
* \file htdocs/theme/eldy/style.css.php
* \brief Fichier de style CSS du theme Eldy
* \version $Id: style.css.php,v 1.98 2011/08/08 15:39:08 eldy Exp $
* \version $Id: style.css.php,v 1.99 2011/08/13 00:48:01 eldy Exp $
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
@ -85,17 +85,16 @@ body {
a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: bold; color: #000000; text-decoration: none; }
/*
input:focus, textarea:focus, button:focus, select:focus {
box-shadow: 0 0 4px #8091BF;
}
*/
input {
font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>;
background: #FDFDFD;
border: 1px solid #ACBCBB;
padding: 0px 0px 0px 0px;
padding: 1px 1px 1px 1px;
margin: 0px 0px 0px 0px;
}
input.flat {
@ -103,18 +102,18 @@ input.flat {
font-family: <?php print $fontlist ?>;
background: #FDFDFD;
border: 1px solid #ACBCBB;
padding: 0px 0px 0px 0px;
padding: 1px 1px 1px 1px;
margin: 0px 0px 0px 0px;
}
input:disabled {
background:#ddd;
background:#ddd;
}
textarea {
font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>;
background: #FDFDFD;
border: 1px solid #ACBCBB;
padding: 0px 0px 0px 0px;
padding: 1px 1px 1px 1px;
margin: 0px 0px 0px 0px;
}
textarea.flat {
@ -122,11 +121,11 @@ textarea.flat {
font-family: <?php print $fontlist ?>;
background: #FDFDFD;
border: 1px solid #ACBCBB;
padding: 0px 0px 0px 0px;
padding: 1px 1px 1px 1px;
margin: 0px 0px 0px 0px;
}
textarea:disabled {
background:#ddd;
background:#ddd;
}
select.flat {
background: #FDFDFD;
@ -134,7 +133,7 @@ select.flat {
font-family: <?php print $fontlist ?>;
font-weight: normal;
border: 1px solid #ACBCBB;
padding: 0px 0px 0px 0px;
padding: 1px 1px 1px 1px;
margin: 0px 0px 0px 0px;
}
.button {
@ -142,8 +141,14 @@ select.flat {
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/button_bg.png' ?>);
background-position: bottom;
border: 1px solid #ACBCBB;
padding: 0px 2px 0px 2px;
margin: 0px 0px 0px 0px;
padding: 0.2em 0.7em;
margin: 0em 0.5em;
-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;
}
.button:focus {
font-family: <?php print $fontlist ?>;
@ -151,16 +156,25 @@ select.flat {
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/button_bg.png' ?>);
background-position: bottom;
border: 1px solid #ACBCBB;
padding: 0px 2px 0px 2px;
margin: 0px 0px 0px 0px;
padding: 0.2em 0.7em;
margin: 0em 0.5em;
}
.button:hover {
background: #dee7ec;
}
.buttonajax {
font-family: <?php print $fontlist ?>;
border: 0px;
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/button_bg.png' ?>);
background-position: bottom;
padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px;
padding: 0.2em 0.7em;
margin: 0em 0.5em;
-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;
}
form {
padding: 0em 0em 0em 0em;
@ -820,7 +834,7 @@ div.tabBar {
padding-left: 8px;
padding-right: 8px;
padding-bottom: 8px;
margin: 0px 0px 10px 0px;
margin: 0px 0px 14px 0px;
-moz-border-radius:6px;
-webkit-border-radius: 6px;
border-radius: 6px;
@ -950,18 +964,22 @@ span.tabspan {
/* Boutons actions */
/* ============================================================================== */
/* Nouvelle syntaxe a utiliser */
.butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
font-family: <?php print $fontlist ?>;
font-weight: bold;
background: white;
border: 1px solid #8CACBB;
color: #434956;
padding: 0em 0.7em;
margin: 0em 0.5em;
text-decoration: none;
white-space: nowrap;
padding: 0.4em 0.7em;
margin: 0em 0.7em;
-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;
}
.butAction:hover {
@ -982,11 +1000,17 @@ span.tabspan {
background: white !important;
border: 1px solid #AAAAAA !important;
color: #AAAAAA !important;
padding: 0em 0.7em !important;
margin: 0em 0.5em !important;
text-decoration: none !important;
white-space: nowrap !important;
cursor: not-allowed;
padding: 0.4em 0.7em;
margin: 0em 0.7em;
-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;
}
span.butAction, span.butActionDelete {
@ -1038,7 +1062,7 @@ border-collapse: collapse;
}
table.border td {
padding: 1px 2px;
padding: 1px 2px 1px 1px;
border: 1px solid #9CACBB;
border-collapse: collapse;
}
@ -1085,7 +1109,7 @@ height: 18px;
}
table.noborder td {
padding: 1px 2px 0px 1px; /* t r b l */
padding: 1px 2px 1px 1px; /* t r b l */
}
table.nobordernopadding {
@ -1189,6 +1213,7 @@ white-space: nowrap;
background: #eaeaea;
font-family: <?php print $fontlist ?>;
border: 0px;
margin-bottom: 1px;
}
/*
.impair:hover {
@ -1202,6 +1227,7 @@ border: 0px;
background: #ffffff;
font-family: <?php print $fontlist ?>;
border: 0px;
margin-bottom: 1px;
}
/*
.pair:hover {
@ -1296,7 +1322,7 @@ div.error {
/* Info admin */
div.info {
color: #707070;
color: #A0A050;
padding: 0.2em 0.2em 0.2em 0.2em;
margin: 0.5em 0em 0.5em 0em;
border: 1px solid #DFDFA0;