2
0
forked from Wavyzz/dolibarr

Look and feel v8

This commit is contained in:
Laurent Destailleur
2018-04-18 02:10:23 +02:00
parent 963c5c2951
commit 46d28acb44
13 changed files with 26 additions and 21 deletions

View File

@@ -194,16 +194,16 @@ class FormActions
$projectid = $object->fk_project; $projectid = $object->fk_project;
if ($typeelement == 'project') $projectid = $object->id; if ($typeelement == 'project') $projectid = $object->id;
$buttontoaddnewevent=''; $newcardbutton='';
if (! empty($conf->agenda->enabled)) if (! empty($conf->agenda->enabled))
{ {
$buttontoaddnewevent = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:'').($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'">'; $newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:'').($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'">';
$buttontoaddnewevent.= $langs->trans("AddEvent"); $newcardbutton.= $langs->trans("AddEvent");
$buttontoaddnewevent.= '</a>'; $newcardbutton.= '<span class="fa fa-plus-circle"></span></a>';
} }
print '<!-- formactions->showactions -->'."\n"; print '<!-- formactions->showactions -->'."\n";
print load_fiche_titre($title, $buttontoaddnewevent, '', 0, 0, '', $morehtmlright); print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlright);
$page=0; $param=''; $page=0; $param='';

Binary file not shown.

Before

Width:  |  Height:  |  Size: 639 B

After

Width:  |  Height:  |  Size: 736 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 476 B

After

Width:  |  Height:  |  Size: 595 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 873 B

After

Width:  |  Height:  |  Size: 856 B

View File

@@ -2303,7 +2303,7 @@ a.tabunactive {
} }
a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
padding: 12px 9px 12px; padding: 12px 9px 13px;
margin: 0em 0.2em; margin: 0em 0.2em;
text-decoration: none; text-decoration: none;
white-space: nowrap; white-space: nowrap;
@@ -2378,20 +2378,21 @@ span.butAction, span.butActionDelete {
cursor: pointer; cursor: pointer;
} }
.butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active { .butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
text-decoration: none; text-decoration: none;
margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em !important; margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em !important;
padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em; padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
font-weight: normal; font-weight: normal;
border-color: #c5c5c5;
border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
display: inline-block; display: inline-block;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
color: #fff; /* color: #fff; */
background: rgb(<?php echo $colorbackhmenu1 ?>); /* background: rgb(<?php echo $colorbackhmenu1 ?>); */
border: 1px solid rgb(<?php echo $colorbackhmenu1 ?>); color: #000;
text-transform: uppercase;
border: 1px solid #aaa;
border-top-right-radius: 0 !important; border-top-right-radius: 0 !important;
border-bottom-right-radius: 0 !important; border-bottom-right-radius: 0 !important;
@@ -2418,6 +2419,7 @@ span.butAction, span.butActionDelete {
border-top-left-radius: 0 !important; border-top-left-radius: 0 !important;
border-bottom-left-radius: 0 !important; border-bottom-left-radius: 0 !important;
} }
a.butActionNew>span.fa-plus-circle { padding-left: 6px; }
.butAction:hover, .butActionNew:hover { .butAction:hover, .butActionNew:hover {
-webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
@@ -2425,9 +2427,9 @@ span.butAction, span.butActionDelete {
} }
.butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete { .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete {
background: #633; /* background: #633; */
border: 1px solid #633; border: 1px solid #733;
color: #FFF; color: #733;
} }
.butActionDelete:hover { .butActionDelete:hover {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 639 B

After

Width:  |  Height:  |  Size: 736 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 476 B

After

Width:  |  Height:  |  Size: 595 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 873 B

After

Width:  |  Height:  |  Size: 856 B

View File

@@ -1363,7 +1363,7 @@ table.noborder tr.liste_titre td {
.fiche .arearef img.pictoedit, .fiche .arearef span.pictoedit, .fiche .arearef img.pictoedit, .fiche .arearef span.pictoedit,
.fiche .fichecenter img.pictoedit, .fiche .fichecenter span.pictoedit, .fiche .fichecenter img.pictoedit, .fiche .fichecenter span.pictoedit,
.tagtdnote span.pictoedit { .tagtdnote span.pictoedit {
opacity: 0.9; opacity: 0.6;
} }
img.hideonsmartphone.pictoactionview { img.hideonsmartphone.pictoactionview {
vertical-align: bottom; vertical-align: bottom;
@@ -2401,6 +2401,7 @@ span.butAction, span.butActionDelete {
background-image: linear-gradient(to bottom, #0088cc, #0044cc); background-image: linear-gradient(to bottom, #0088cc, #0044cc);
background-repeat: repeat-x; background-repeat: repeat-x;
} }
a.butActionNew>span.fa { padding-right: 6px; }
.button, .butAction { .button, .butAction {
color: #ffffff !important; color: #ffffff !important;
@@ -2535,15 +2536,16 @@ table.border, table.bordernooddeven, table.dataTable, .table-border, .table-bord
table.borderplus { table.borderplus {
border: 1px solid #BBB; border: 1px solid #BBB;
} }
.border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col { .border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
height: 22px; height: 26px;
} }
tr.liste_titre.box_titre td table td, .bordernooddeven tr td { tr.liste_titre.box_titre td table td, .bordernooddeven tr td {
height: 22px; height: 26px;
} }
table.border td, div.border div div.tagtd { table.border td, table.bordernooddeven td, div.border div div.tagtd {
padding: 2px 2px 2px 2px; padding: 2px 4px 2px 4px;
border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
border-collapse: collapse; border-collapse: collapse;
} }

View File

@@ -451,7 +451,7 @@ if ($projectid) print '<input type="hidden" name="projectid" value="' . $project
$newcardbutton=''; $newcardbutton='';
if ($user->rights->ticketsup->write) if ($user->rights->ticketsup->write)
{ {
$newcardbutton = '<a class="butActionNew" href="new.php?action=create_ticket' . ($socid ? '&socid=' . $socid : '') . ($projectid ? '&origin=projet_project&originid=' . $projectid : '') . '">' . $langs->trans('NewTicket') . '</a>'; $newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/ticketsup/new.php?action=create_ticket' . ($socid ? '&socid=' . $socid : '') . ($projectid ? '&origin=projet_project&originid=' . $projectid : '') . '">' . $langs->trans('NewTicket') . '</a>';
} }
print_barre_liste($langs->trans('TicketList'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_ticketsup', 0, $newcardbutton, '', $limit); print_barre_liste($langs->trans('TicketList'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_ticketsup', 0, $newcardbutton, '', $limit);

View File

@@ -60,8 +60,9 @@ llxHeader('', $title);
$newcardbutton=''; $newcardbutton='';
if ($user->rights->produit->creer) if ($user->rights->produit->creer)
{ {
$newcardbutton='<a href="create.php" class="butActionNew">'.$langs->trans('Create').'</a>'; $newcardbutton='<a href="'.DOL_URL_ROOT.'/variants/create.php" class="butActionNew">'.$langs->trans('Create').'</a>';
} }
print load_fiche_titre($title, $newcardbutton, 'title_products'); print load_fiche_titre($title, $newcardbutton, 'title_products');
$forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1; $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;