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

Fix look and feel v7

Browse Source
This commit is contained in:
Laurent Destailleur 2017-12-04 20:17:07 +01:00
parent c1791b87b4
commit 78c4b7f912
8 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.formactions.class.php
View File

@ -196,7 +196,7 @@ class FormActions
$buttontoaddnewevent.= '</a>';
print '<!-- formactions->showactions -->'."\n";
print load_fiche_titre($title, $morehtmlright, '', 0, 0, '', $buttontoaddnewevent);
print load_fiche_titre($title, $buttontoaddnewevent, '', 0, 0, '', $morehtmlright);
$page=0; $param='';

10
htdocs/core/lib/company.lib.php
View File

@ -632,9 +632,10 @@ function isInEEC($object)
* @param Object $object Third party object
* @param string $backtopage Url to go once contact is created
* @param int $nocreatelink 1=Hide create project link
* @param string $morehtmlright More html on right of title
* @return void
*/
function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelink=0)
function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelink=0, $morehtmlright='')
{
global $user;
global $bc;
@ -655,7 +656,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
}
print "\n";
print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"),$buttoncreate,'');
print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"), $buttoncreate.$morehtmlright, '');
print '<div class="div-table-responsive">';
print "\n".'<table class="noborder" width=100%>';
@ -803,16 +804,15 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
{
$addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
$buttoncreate='<a class="addnewrecord" href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage).'">'.$addcontact;
if (empty($conf->dol_optimize_smallscreen)) $buttoncreate.=' '.img_picto($addcontact,'filenew');
$buttoncreate.='</a>'."\n";
}
print "\n";
$title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ContactsForCompany") : $langs->trans("ContactsAddressesForCompany"));
print load_fiche_titre($title,$buttoncreate,'');
print load_fiche_titre($title, $buttoncreate,'');
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
print '<input type="hidden" name="socid" value="'.$object->id.'">';
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';

2
htdocs/projet/info.php
View File

@ -180,7 +180,7 @@ if (!empty($object->id))
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
print_barre_liste($langs->trans("ActionsOnProject"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $morehtmlcenter, 0, -1, '', '', '', '', 0, 1, 1);
print_barre_liste($langs->trans("ActionsOnProject"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
// List of all actions
$filters=array();

2
htdocs/societe/agenda.php
View File

@ -180,7 +180,7 @@ if ($socid > 0)
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $morehtmlcenter, 0, -1, '', '', '', '', 0, 1, 1);
print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
// List of all actions
$filters=array();

8
htdocs/societe/notify/card.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2017 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
*
@ -210,12 +210,14 @@ if ($result > 0)
print "\n";
// Help
print '<br>'.$langs->trans("NotificationsDesc");
print '<div class="opacitymedium">';
print $langs->trans("NotificationsDesc");
print '<br>'.$langs->trans("NotificationsDescUser");
print '<br>'.$langs->trans("NotificationsDescContact");
print '<br>'.$langs->trans("NotificationsDescGlobal");
print '</div>';
print '<br><br><br>'."\n";
print '<br><br>'."\n";
// Add notification form

15
htdocs/societe/project.php
View File

@ -124,28 +124,27 @@ if ($socid)
* Barre d'action
*/
print '<div class="tabsAction">';
/*print '<div class="tabsAction">';
if (! empty($conf->projet->enabled))
{
if (! empty($conf->projet->enabled) && ! empty($user->rights->projet->creer))
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$object->id.'&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject").'</a>';
}
{*/
$addbutton = '<a href="'.DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$object->id.'&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject").'</a>';
/* }
else
{
print '<a class="butActionRefused" href="#">'.$langs->trans("AddProject").'</a>';
}
}
print '</div>';
print '</div>'; */
print '<br>';
// Projects list
$result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1);
// Projects list
$result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton);
}

16
htdocs/societe/rib.php
View File

@ -455,11 +455,11 @@ if ($socid && $action != 'edit' && $action != "create")
print '<br>';
/*
* List of bank accounts
*/
// List of bank accounts
print load_fiche_titre($langs->trans("AllRIB"), '', '');
$morehtmlright='<a href="rib.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
print load_fiche_titre($langs->trans("AllRIB"), $morehtmlright, '');
$rib_list = $object->get_all_rib();
$var = false;
@ -654,12 +654,10 @@ if ($socid && $action != 'edit' && $action != "create")
dol_fiche_end();
/*
if ($socid && $action != 'edit' && $action != 'create')
{
/*
* Barre d'actions
*/
// Barre d'actions
print '<div class="tabsAction">';
if ($user->rights->societe->creer)
@ -669,7 +667,7 @@ if ($socid && $action != 'edit' && $action != "create")
print '</div>';
}
*/

2
htdocs/societe/website.php
View File

@ -325,7 +325,7 @@ print '<input type="hidden" name="page" value="'.$page.'">';
print '<input type="hidden" name="id" value="'.$id.'">';
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton.' '.$morehtmlcenter, $num, $nbtotalofrecords, '', 0, '', '', $limit);
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $morehtmlcenter, '', $limit);
$topicmail="Information";
$modelmail="websiteaccount";