diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index 7d73202eb79..66c7000d853 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -225,9 +225,9 @@ if ($resql) print ''; print ''; - $htmlbuttonadd = '' . $langs->trans("Addanaccount") . ''; + $newcardbutton = '' . $langs->trans("Addanaccount") . ''; - print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $htmlbuttonadd, '', $limit); + print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit); // Box to select active chart of account print $langs->trans("Selectchartofaccounts") . " : "; diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php index 927bd22f7fa..64c4c3e09fc 100644 --- a/htdocs/adherents/agenda.php +++ b/htdocs/adherents/agenda.php @@ -148,10 +148,10 @@ if ($object->id > 0) //print ''; - $createbutton = ''; + $newcardbutton = ''; if (! empty($conf->agenda->enabled)) { - $createbutton.=''.$langs->trans("AddAction").''; + $newcardbutton.=''.$langs->trans("AddAction").''; } if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) )) @@ -162,7 +162,7 @@ if ($object->id > 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("ActionsOnMember"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', '', $createbutton, '', 0, 1, 1); + print_barre_liste($langs->trans("ActionsOnMember"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', '', $newcardbutton, '', 0, 1, 1); // List of all actions $filters=array(); diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index f254fe44b9d..9f58a61aaa6 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -197,7 +197,7 @@ class FormActions $buttontoaddnewevent=''; if (! empty($conf->agenda->enabled)) { - $buttontoaddnewevent = ''; + $buttontoaddnewevent = ''; $buttontoaddnewevent.= $langs->trans("AddEvent"); $buttontoaddnewevent.= ''; } diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 7bca10ff883..803337dcb6c 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -334,14 +334,14 @@ print ''; // Line with explanation and button new job if (! $user->rights->cron->create) { - $buttontoshow.=''.$langs->trans("CronCreateJob").''; + $newcardbutton.=''.$langs->trans("CronCreateJob").''; } else { - $buttontoshow.=''.$langs->trans("CronCreateJob").''; + $newcardbutton.=''.$langs->trans("CronCreateJob").''; } -print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_setup', 0, $buttontoshow, '', $limit); +print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_setup', 0, $newcardbutton, '', $limit); print $langs->trans('CronInfo').'
'; diff --git a/htdocs/public/ticketsup/list.php b/htdocs/public/ticketsup/list.php index d4d8b16a743..2b8f3d821d2 100644 --- a/htdocs/public/ticketsup/list.php +++ b/htdocs/public/ticketsup/list.php @@ -350,7 +350,7 @@ if ($action == "view_ticketlist") { $resql = $db->query($sql); if ($resql) { $num = $db->num_rows($resql); - print_barre_liste($langs->trans('TicketList'), $page, 'public/list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticketsup-32@ticketsup'); + print_barre_liste($langs->trans('TicketList'), $page, 'public/list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticketsup'); /* * Search bar diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index c286ec7e6f7..63aa9873204 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -177,7 +177,7 @@ if ($socid > 0) if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; print load_fiche_titre($langs->trans("ActionsOnCompany"), $buttoncreate, ''); - //print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $buttoncreate, '', 0, 1, 1); + //print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 1); // List of all actions $filters=array(); diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php index 1f3e69a674c..4b2e02a303e 100644 --- a/htdocs/societe/website.php +++ b/htdocs/societe/website.php @@ -220,12 +220,12 @@ print ''; dol_fiche_end(); -$morehtmlcenter = ''; +$newcardbutton = ''; if (! empty($conf->website->enabled)) { if (! empty($user->rights->societe->lire)) { - $morehtmlcenter .= '' . $langs->trans("AddWebsiteAccount") . ''; + $newcardbutton .= '' . $langs->trans("AddWebsiteAccount") . ''; } else { - $morehtmlcenter .= '' . $langs->trans("AddAction") . ''; + $newcardbutton .= '' . $langs->trans("AddAction") . ''; } } @@ -322,7 +322,7 @@ print ''; print ''; print ''; -print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $morehtmlcenter, '', $limit); +print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); $topicmail="Information"; $modelmail="websiteaccount"; diff --git a/htdocs/theme/eldy/img/menus/ticketsup.png b/htdocs/theme/eldy/img/menus/ticketsup.png index 03354cc98e0..98a482c4701 100644 Binary files a/htdocs/theme/eldy/img/menus/ticketsup.png and b/htdocs/theme/eldy/img/menus/ticketsup.png differ diff --git a/htdocs/theme/eldy/img/menus/ticketsup_over.png b/htdocs/theme/eldy/img/menus/ticketsup_over.png index 03354cc98e0..246b638e71f 100644 Binary files a/htdocs/theme/eldy/img/menus/ticketsup_over.png and b/htdocs/theme/eldy/img/menus/ticketsup_over.png differ diff --git a/htdocs/theme/eldy/img/menus_black/ticketsup.png b/htdocs/theme/eldy/img/menus_black/ticketsup.png index 3ec332075e6..132888161e7 100644 Binary files a/htdocs/theme/eldy/img/menus_black/ticketsup.png and b/htdocs/theme/eldy/img/menus_black/ticketsup.png differ diff --git a/htdocs/theme/eldy/img/menus_black/ticketsup_over.png b/htdocs/theme/eldy/img/menus_black/ticketsup_over.png index 3ec332075e6..5012d189410 100644 Binary files a/htdocs/theme/eldy/img/menus_black/ticketsup_over.png and b/htdocs/theme/eldy/img/menus_black/ticketsup_over.png differ diff --git a/htdocs/theme/eldy/img/object_ticketsup.png b/htdocs/theme/eldy/img/object_ticketsup.png index 8ece94fbefc..38df927744e 100644 Binary files a/htdocs/theme/eldy/img/object_ticketsup.png and b/htdocs/theme/eldy/img/object_ticketsup.png differ diff --git a/htdocs/theme/eldy/img/title_ticketsup.png b/htdocs/theme/eldy/img/title_ticketsup.png index 3ec332075e6..b1cf5df0e75 100644 Binary files a/htdocs/theme/eldy/img/title_ticketsup.png and b/htdocs/theme/eldy/img/title_ticketsup.png differ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index e1bb49ae46e..83e0f5ed7ea 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2394,8 +2394,28 @@ span.butAction, span.butActionDelete { border-top-left-radius: 0 !important; border-bottom-left-radius: 0 !important; } +.butActionNew, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active { + text-decoration: none; + margin: 0em 0.3em 0 0.3em !important; + padding: 0.2em em; + font-family: ; + 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); + display: inline-block; + text-align: center; + cursor: pointer; + color: #fff !important; + background: rgb(); + border: 1px solid rgb(); -.butAction:hover { + border-top-right-radius: 0 !important; + border-bottom-right-radius: 0 !important; + border-top-left-radius: 0 !important; + border-bottom-left-radius: 0 !important; +} + +.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); box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); } @@ -2696,6 +2716,12 @@ div.pagination { div.pagination a { font-weight: normal; } +/*div.pagination a.butAction, div.fichehalfright a.butAction { + margin-right: 0px !important; +} +div.tabsAction a.butActionDelete:last-child, div.tabsAction a.butAction:last-child { + margin-right: 0px !important; +}*/ div.pagination ul { list-style: none; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 86646fe2c78..221c2c9a705 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2373,6 +2373,31 @@ span.butAction, span.butActionDelete { -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } +.butActionNew, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active { + text-decoration: none; + border-color: #c5c5c5; + border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); + display: inline-block; + padding: 0.2em em; + margin: 0em em; + line-height: 20px; + text-align: center; + vertical-align: middle; + cursor: pointer; + color: #ffffff !important; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #006dcc; + background-image: -moz-linear-gradient(top, #0088cc, #0044cc); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); + background-image: -o-linear-gradient(top, #0088cc, #0044cc); + background-image: linear-gradient(to bottom, #0088cc, #0044cc); + background-repeat: repeat-x; + -webkit-border-radius: 2px; + border-radius: 2px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); +} .button, .butAction { color: #ffffff !important; @@ -2427,7 +2452,7 @@ a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active { a.butAction:hover, a.butActionDelete:hover, a.butActionRefused:hover { text-decoration: none; } -a.butAction:hover, a.butActionDelete:hover { +a.butAction:hover, a.butActionNew:hover, a.butActionDelete:hover { opacity: 0.9; } diff --git a/htdocs/ticketsup/img/ticketsup.png b/htdocs/ticketsup/img/ticketsup.png index ce4b71ca624..b1cf5df0e75 100644 Binary files a/htdocs/ticketsup/img/ticketsup.png and b/htdocs/ticketsup/img/ticketsup.png differ diff --git a/htdocs/ticketsup/list.php b/htdocs/ticketsup/list.php index 4f7cd955852..871bd010a81 100644 --- a/htdocs/ticketsup/list.php +++ b/htdocs/ticketsup/list.php @@ -160,7 +160,7 @@ if (empty($reshook)) { $massaction=''; // Protection to avoid mass action if we force a new search during a mass action confirmation } - + // Mass actions $objectclass='Ticketsup'; $objectlabel='Ticketsup'; @@ -437,9 +437,9 @@ print ''; if ($socid) print ''; if ($projectid) print ''; -$buttontocreate = '' . $langs->trans('NewTicket') . ''; +$newcardbutton = '' . $langs->trans('NewTicket') . ''; -print_barre_liste($langs->trans('TicketList'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_ticketsup', 0, $buttontocreate, '', $limit); +print_barre_liste($langs->trans('TicketList'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_ticketsup', 0, $newcardbutton, '', $limit); if ($mode == 'my_assign') { print '
' . $langs->trans('TicketAssignedToMeInfos') . '

'; @@ -676,18 +676,18 @@ if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nb { $hidegeneratedfilelistifempty=1; if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0; - + require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'); $formfile = new FormFile($db); - + // Show list of available documents $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder; $urlsource.=str_replace('&','&',$param); - + $filedir=$diroutputmassaction; $genallowed=$user->rights->ticketsup->read; $delallowed=$user->rights->ticketsup->write; - + print $formfile->showdocuments('massfilesarea_ticketsup','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty); }