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

Uniformize code

Browse Source
This commit is contained in:
Laurent Destailleur 2016-08-23 15:43:48 +02:00
parent e22e243bc5
commit 87c49366d8
5 changed files with 110 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/comm/propal/list.php
View File

@ -738,30 +738,37 @@ if ($resql)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$var=!$var; $var=!$var;
$objectstatic->id=$obj->rowid;
$objectstatic->ref=$obj->ref;
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
if (! empty($arrayfields['p.ref']['checked'])) if (! empty($arrayfields['p.ref']['checked']))
{ {
print '<td class="nowrap">'; print '<td class="nowrap">';
$objectstatic->id=$obj->rowid;
$objectstatic->ref=$obj->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">';
// Picto + Ref // Picto + Ref
print '<td class="nobordernopadding nowrap">'; print '<td class="nobordernopadding nowrap">';
print $objectstatic->getNomUrl(1); print $objectstatic->getNomUrl(1);
print '</td>'; print '</td>';
// Warning // Warning
print '<td style="min-width: 20px" class="nobordernopadding nowrap">'; $warnornote='';
if ($obj->fk_statut == 1 && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); if ($obj->fk_statut == 1 && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) $warnornote.=img_warning($langs->trans("Late"));
if (! empty($obj->note_private)) if (! empty($obj->note_private))
{ {
print ' <span class="note">'; $warnornote.=($warnornote?' ':'');
print '<a href="'.DOL_URL_ROOT.'/comm/propal/note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>'; $warnornote.= '<span class="note">';
print '</span>'; $warnornote.= '<a href="note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
$warnornote.= '</span>';
}
if ($warnornote)
{
print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
print $warnornote;
print '</td>';
} }
print '</td>';
// Other picto tool // Other picto tool
print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">'; print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
$filename=dol_sanitizeFileName($obj->ref); $filename=dol_sanitizeFileName($obj->ref);

47
htdocs/fichinter/list.php
View File

@ -27,6 +27,7 @@
*/ */
require '../main.inc.php'; require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@ -134,13 +135,14 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
*/ */
$form = new Form($db); $form = new Form($db);
$interventionstatic=new Fichinter($db); $formfile = new FormFile($db);
$objectstatic=new Fichinter($db);
llxHeader('', $langs->trans("Intervention")); llxHeader('', $langs->trans("Intervention"));
$sql = "SELECT"; $sql = "SELECT";
$sql.= " f.ref, f.rowid as fichid, f.fk_statut, f.description, f.datec as date_creation, f.tms as date_update,"; $sql.= " f.ref, f.rowid, f.fk_statut, f.description, f.datec as date_creation, f.tms as date_update, f.note_private,";
if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) $sql.= " fd.description as descriptiondetail, fd.date as dp, fd.duree,"; if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) $sql.= " fd.description as descriptiondetail, fd.date as dp, fd.duree,";
$sql.= " s.nom as name, s.rowid as socid, s.client"; $sql.= " s.nom as name, s.rowid as socid, s.client";
// Add fields from extrafields // Add fields from extrafields
@ -352,7 +354,7 @@ if ($result)
if (! empty($arrayfields['f.fk_statut']['checked'])) if (! empty($arrayfields['f.fk_statut']['checked']))
{ {
print '<td class="liste_titre" align="right">'; print '<td class="liste_titre" align="right">';
$liststatus=$interventionstatic->statuts_short; $liststatus=$objectstatic->statuts_short;
print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1); print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1);
print '</td>'; print '</td>';
} }
@ -372,16 +374,45 @@ if ($result)
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$interventionstatic->id=$obj->fichid; $objectstatic->id=$obj->rowid;
$interventionstatic->ref=$obj->ref; $objectstatic->ref=$obj->ref;
$interventionstatic->statut=$obj->fk_statut; $objectstatic->statut=$obj->fk_statut;
$var=!$var; $var=!$var;
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
if (! empty($arrayfields['f.ref']['checked'])) if (! empty($arrayfields['f.ref']['checked']))
{ {
print "<td>"; print "<td>";
print $interventionstatic->getNomUrl(1);
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
// Picto + Ref
print '<td class="nobordernopadding nowrap">';
print $objectstatic->getNomUrl(1);
print '</td>';
// Warning
$warnornote='';
//if ($obj->fk_statut == 1 && $db->jdate($obj->dfv) < ($now - $conf->fichinter->warning_delay)) $warnornote.=img_warning($langs->trans("Late"));
if (! empty($obj->note_private))
{
$warnornote.=($warnornote?' ':'');
$warnornote.= '<span class="note">';
$warnornote.= '<a href="note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
$warnornote.= '</span>';
}
if ($warnornote)
{
print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
print $warnornote;
print '</td>';
}
// Other picto tool
print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->fichinter->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
print '</td></tr></table>';
print "</td>\n"; print "</td>\n";
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;
} }
@ -460,7 +491,7 @@ if ($result)
// Status // Status
if (! empty($arrayfields['f.fk_statut']['checked'])) if (! empty($arrayfields['f.fk_statut']['checked']))
{ {
print '<td align="right">'.$interventionstatic->LibStatut($obj->fk_statut,5).'</td>'; print '<td align="right">'.$objectstatic->LibStatut($obj->fk_statut,5).'</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;
} }
// Action column // Action column

71
htdocs/supplier_proposal/list.php
View File

@ -195,8 +195,8 @@ $companystatic=new Societe($db);
$now=dol_now(); $now=dol_now();
$sql = 'SELECT s.rowid, s.nom as name, s.town, s.client, s.code_client,'; $sql = 'SELECT s.rowid as socid, s.nom as name, s.town, s.client, s.code_client,';
$sql.= ' p.rowid as supplier_proposalid, p.note_private, p.total_ht, p.ref, p.fk_statut, p.fk_user_author, p.date_valid, p.date_livraison as dp,'; $sql.= ' p.rowid, p.note_private, p.total_ht, p.ref, p.fk_statut, p.fk_user_author, p.date_valid, p.date_livraison as dp,';
if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,";
$sql.= ' u.login'; $sql.= ' u.login';
$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'supplier_proposal as p'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'supplier_proposal as p';
@ -402,78 +402,85 @@ if ($result)
while ($i < min($num,$limit)) while ($i < min($num,$limit))
{ {
$objp = $db->fetch_object($result); $obj = $db->fetch_object($result);
$now = dol_now(); $now = dol_now();
$var=!$var; $var=!$var;
$objectstatic->id=$obj->rowid;
$objectstatic->ref=$obj->ref;
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td class="nowrap">'; print '<td class="nowrap">';
$objectstatic->id=$objp->supplier_proposalid;
$objectstatic->ref=$objp->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">';
// Picto + Ref
print '<td class="nobordernopadding nowrap">'; print '<td class="nobordernopadding nowrap">';
print $objectstatic->getNomUrl(1); print $objectstatic->getNomUrl(1);
print '</td>'; print '</td>';
// Warning
print '<td style="min-width: 20px" class="nobordernopadding nowrap">'; $warnornote='';
if ($objp->fk_statut == 1 && $db->jdate($objp->dfv) < ($now - $conf->supplier_proposal->cloture->warning_delay)) print img_warning($langs->trans("Late")); if ($obj->fk_statut == 1 && $db->jdate($obj->date_valid) < ($now - $conf->supplier_proposal->warning_delay)) $warnornote.=img_warning($langs->trans("Late"));
if (! empty($objp->note_private)) if (! empty($obj->note_private))
{ {
print ' <span class="note">'; $warnornote.=($warnornote?' ':'');
print '<a href="'.DOL_URL_ROOT.'/supplier_proposal/note.php?id='.$objp->supplier_proposalid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>'; $warnornote.= '<span class="note">';
print '</span>'; $warnornote.= '<a href="note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
$warnornote.= '</span>';
} }
print '</td>'; if ($warnornote)
{
// Ref print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
print $warnornote;
print '</td>';
}
// Other picto tool
print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">'; print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
$filename=dol_sanitizeFileName($objp->ref); $filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($objp->ref); $filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->supplier_proposalid; $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir); print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
print '</td></tr></table>'; print '</td></tr></table>';
print "</td>\n"; print "</td>\n";
$url = DOL_URL_ROOT.'/comm/card.php?socid='.$objp->rowid; $url = DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid;
// Company // Company
$companystatic->id=$objp->rowid; $companystatic->id=$obj->socid;
$companystatic->name=$objp->name; $companystatic->name=$obj->name;
$companystatic->client=$objp->client; $companystatic->client=$obj->client;
$companystatic->code_client=$objp->code_client; $companystatic->code_client=$obj->code_client;
print '<td>'; print '<td>';
print $companystatic->getNomUrl(1,'customer'); print $companystatic->getNomUrl(1,'customer');
print '</td>'; print '</td>';
// Date // Date
print '<td align="center">'; print '<td align="center">';
print dol_print_date($db->jdate($objp->date_valid), 'day'); print dol_print_date($db->jdate($obj->date_valid), 'day');
print "</td>\n"; print "</td>\n";
// Date delivery // Date delivery
print '<td align="center">'; print '<td align="center">';
print dol_print_date($db->jdate($objp->dp), 'day'); print dol_print_date($db->jdate($obj->dp), 'day');
print "</td>\n"; print "</td>\n";
print '<td align="right">'.price($objp->total_ht)."</td>\n"; print '<td align="right">'.price($obj->total_ht)."</td>\n";
$userstatic->id=$objp->fk_user_author; $userstatic->id=$obj->fk_user_author;
$userstatic->login=$objp->login; $userstatic->login=$obj->login;
print '<td align="center">'; print '<td align="center">';
if ($userstatic->id) print $userstatic->getLoginUrl(1); if ($userstatic->id) print $userstatic->getLoginUrl(1);
else print '&nbsp;'; else print '&nbsp;';
print "</td>\n"; print "</td>\n";
print '<td align="right">'.$objectstatic->LibStatut($objp->fk_statut,5)."</td>\n"; print '<td align="right">'.$objectstatic->LibStatut($obj->fk_statut,5)."</td>\n";
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
$total += $objp->total_ht; $total += $obj->total_ht;
$subtotal += $objp->total_ht; $subtotal += $obj->total_ht;
$i++; $i++;
} }

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

@ -1911,12 +1911,11 @@ div.tabsAction > a {
a.tabTitle { a.tabTitle {
color:rgba(0,0,0,.5) !important; color:rgba(0,0,0,.5) !important;
margin-right:10px;
text-shadow:1px 1px 1px #ffffff; text-shadow:1px 1px 1px #ffffff;
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
font-weight: normal !important; font-weight: normal !important;
padding: 4px 6px 2px 6px; padding: 4px 6px 2px 0px;
margin: 0px 6px; margin-right: 10px;
text-decoration: none; text-decoration: none;
white-space: nowrap; white-space: nowrap;
} }
@ -2829,7 +2828,7 @@ div.tabBar .noborder {
margin-bottom: 8px !important;*/ margin-bottom: 8px !important;*/
border: 1px solid #CCC; border: 1px solid #CCC;
text-align: center; text-align: center;
border-radius: 4px; border-radius: 2px;
} }
.boxstats:hover { .boxstats:hover {
box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.20); box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.20);
@ -3364,9 +3363,6 @@ li.cal_event { border: none; list-style-type: none; }
.cal_event_busy { } .cal_event_busy { }
.cal_peruserviewname { max-width: 100px; height: 22px; } .cal_peruserviewname { max-width: 100px; height: 22px; }
.topmenuimage {
background-size: 28px auto;
}
/* ============================================================================== */ /* ============================================================================== */
/* Ajax - Liste deroulante de l'autocompletion */ /* Ajax - Liste deroulante de l'autocompletion */
@ -4094,10 +4090,13 @@ dl.dropdown {
.dropdown dd ul li input[type="checkbox"] { .dropdown dd ul li input[type="checkbox"] {
margin-right: 3px; margin-right: 3px;
} }
.dropdown dd ul li a { .dropdown dd ul li a, .dropdown dd ul li span {
padding:5px; padding:5px;
display:block; display:block;
} }
.dropdown dd ul li span {
color: #888;
}
.dropdown dd ul li a:hover { .dropdown dd ul li a:hover {
background-color:#fff; background-color:#fff;
} }
@ -4378,6 +4377,10 @@ img.demothumb {
/* CSS style used for small screen */ /* CSS style used for small screen */
/* ============================================================================== */ /* ============================================================================== */
.topmenuimage {
background-size: 22px auto;
top: 2px;
}
.imgopensurveywizard .imgopensurveywizard
{ {
padding: 0 4px 0 4px; padding: 0 4px 0 4px;
@ -4415,7 +4418,7 @@ img.demothumb {
font-size: 10px; font-size: 10px;
} }
.topmenuimage { .topmenuimage {
background-size: 26px auto; background-size: 22px auto;
margin-top: 0px; margin-top: 0px;
} }

5
htdocs/theme/md/style.css.php
View File

@ -3990,10 +3990,13 @@ dl.dropdown {
.dropdown dd ul li input[type="checkbox"] { .dropdown dd ul li input[type="checkbox"] {
margin-right: 3px; margin-right: 3px;
} }
.dropdown dd ul li a { .dropdown dd ul li a, .dropdown dd ul li span {
padding:5px; padding:5px;
display:block; display:block;
} }
.dropdown dd ul li span {
color: #888;
}
.dropdown dd ul li a:hover { .dropdown dd ul li a:hover {
background-color:#fff; background-color:#fff;
} }