From d8a8c4fbe6d046a96eb673a42d48c74d366fcfb5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 2 Oct 2019 18:36:36 +0200 Subject: [PATCH] Look and feel v11. Picto are fontawesome. --- htdocs/adherents/card.php | 2 +- htdocs/adherents/cartes/carte.php | 2 +- htdocs/adherents/list.php | 3 ++- htdocs/adherents/stats/index.php | 5 +++-- htdocs/adherents/subscription/list.php | 2 +- htdocs/adherents/type.php | 4 ++-- htdocs/core/lib/functions.lib.php | 9 +++++---- htdocs/holiday/month_report.php | 8 +++----- htdocs/langs/en_US/categories.lang | 1 + htdocs/product/list.php | 2 +- htdocs/theme/eldy/theme_vars.inc.php | 2 +- htdocs/user/card.php | 4 ++-- 12 files changed, 23 insertions(+), 21 deletions(-) diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index f6f6294f030..79640cb981c 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -869,7 +869,7 @@ else $adht = new AdherentType($db); - print load_fiche_titre($langs->trans("NewMember")); + print load_fiche_titre($langs->trans("NewMember"), '', 'members'); if ($conf->use_javascript_ajax) { diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index dc1438238a9..d7e0e9215a9 100644 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -248,7 +248,7 @@ $form=new Form($db); llxHeader('', $langs->trans("MembersCards")); -print load_fiche_titre($langs->trans("LinkToGeneratedPages")); +print load_fiche_titre($langs->trans("LinkToGeneratedPages"), '', 'members'); print ''.$langs->trans("LinkToGeneratedPagesDesc").'
'; print '
'; diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 18c248aac3d..52bdba74485 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -39,6 +39,7 @@ $massaction=GETPOST('massaction', 'alpha'); $show_files=GETPOST('show_files', 'int'); $confirm=GETPOST('confirm', 'alpha'); $toselect = GETPOST('toselect', 'array'); +$contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'memberslist'; // To manage different context of search // Security check $result=restrictedArea($user, 'adherent'); @@ -419,7 +420,7 @@ print ''; print ''; print ''; -print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit); +print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit); $topicmail="Information"; $modelmail="member"; diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php index 09b572b600c..2f2c6f33920 100644 --- a/htdocs/adherents/stats/index.php +++ b/htdocs/adherents/stats/index.php @@ -56,9 +56,10 @@ $langs->loadLangs(array("companies","members")); $form=new Form($db); -llxHeader(); +$title = $langs->trans("SubscriptionsStatistics"); +llxHeader('', $title); -print load_fiche_titre($langs->trans("SubscriptionsStatistics"), $mesg); +print load_fiche_titre($title, '', 'members'); $dir=$conf->adherent->dir_temp; diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php index 3deccf3a54e..5d8bbdad08d 100644 --- a/htdocs/adherents/subscription/list.php +++ b/htdocs/adherents/subscription/list.php @@ -262,7 +262,7 @@ print ''; print ''; print ''; -print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit); +print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit); $topicmail="Information"; $modelmail="subscription"; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 221d54b5752..08cd29de5e1 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -248,7 +248,7 @@ if (! $rowid && $action != 'create' && $action != 'edit') print ''; print ''; - print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit); $moreforfilter = ''; @@ -322,7 +322,7 @@ if ($action == 'create') { $object = new AdherentType($db); - print load_fiche_titre($langs->trans("NewMemberType")); + print load_fiche_titre($langs->trans("NewMemberType"), '', 'members'); print '
'; print ''; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 51f6f73ef4c..c3633f63742 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3025,14 +3025,15 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ //if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on'))) if (empty($srconly) && in_array($pictowithouttext, array( + '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected', 'bank', 'building', 'cash-register', 'close_title', 'cubes', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'note', 'object_list','object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize', - 'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected', + 'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'jabber','skype','twitter','facebook','linkedin', 'chevron-left','chevron-right','chevron-down','chevron-top', 'home', 'companies', 'products', 'commercial', 'invoicing', 'accountancy', 'project', 'hrm', 'members', 'ticket', 'generic', - 'title_setup', 'title_accountancy', 'title_bank' + 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm' ) )) { $fa='fa'; @@ -3042,11 +3043,11 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ $arrayconvpictotofa = array( 'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins', 'accountancy'=>'money-check-alt', 'project'=>'sitemap', - 'hrm'=>'umbrella-beach', 'members'=>'user-friends', 'ticket'=>'sticky-note', 'generic'=>'folder-open', + 'hrm'=>'umbrella-beach', 'members'=>'users', 'ticket'=>'sticky-note', 'generic'=>'folder-open', 'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'bank'=>'bank', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil', 'filter'=>'filter', 'split'=>'code-fork', 'object_list'=>'list-alt','object_calendar'=>'calendar-alt', 'object_calendarweek'=>'calendar-week', 'object_calendarmonth'=>'calendar-alt', 'object_calendarday'=>'calendar-day', 'object_calendarperuser'=>'table', - 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'bank' + 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'bank', 'title_hrm'=>'umbrella-beach' ); if ($pictowithouttext == 'switch_off') { diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index e9696496f71..a7efd8616f0 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -48,17 +48,15 @@ $result = restrictedArea($user, 'holiday', $id, ''); * View */ +$html = new Form($db); +$formother = new FormOther($db); $holidaystatic = new Holiday($db); $listhalfday=array('morning'=>$langs->trans("Morning"),"afternoon"=>$langs->trans("Afternoon")); - llxHeader('', $langs->trans('CPTitreMenu')); -print load_fiche_titre($langs->trans('MenuReportMonth')); - -$html = new Form($db); -$formother = new FormOther($db); +print load_fiche_titre($langs->trans('MenuReportMonth'), '', 'title_hrm'); // Selection filter diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index 4e83b2f0620..d5a4ba16bf0 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -90,3 +90,4 @@ ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category StocksCategoriesArea=Warehouses Categories Area +UseOrOperatorForCategories=Use or operator for categories \ No newline at end of file diff --git a/htdocs/product/list.php b/htdocs/product/list.php index dd42e0802fb..7c7ae303a0a 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -537,7 +537,7 @@ if ($resql) $categoriesProductArr = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', '', 64, 0, 1); $categoriesProductArr[-2] = '- ' . $langs->trans('NotCategorized') . ' -'; $moreforfilter.=Form::multiselectarray('search_category_product_list', $categoriesProductArr, $searchCategoryProductList, 0, 0, 'minwidth300'); - $moreforfilter.=' ' . $langs->trans('or'); + $moreforfilter.=' ' . $langs->trans('UseOrOperatorForCategories'); $moreforfilter.=''; } diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php index 0858c74cf62..32fbeb37c1c 100644 --- a/htdocs/theme/eldy/theme_vars.inc.php +++ b/htdocs/theme/eldy/theme_vars.inc.php @@ -65,7 +65,7 @@ $colorbacklinepair1='250,250,250'; // line pair $colorbacklinepair2='250,250,250'; // line pair $colorbacklinepairhover='230,237,244'; // line hover $colorbacklinepairchecked='230,237,244'; // line checked -$colorbacklinebreak='223,218,220'; // line break +$colorbacklinebreak='233,228,230'; // line break $colorbackbody='255,255,255'; $colortexttitlenotab='110,80,20'; $colortexttitle='0,0,0'; diff --git a/htdocs/user/card.php b/htdocs/user/card.php index d47a8bf4f7d..50000aae5ea 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -675,9 +675,9 @@ if ($action == 'create' || $action == 'adduserldap') /* */ /* ************************************************************************** */ - print load_fiche_titre($langs->trans("NewUser")); + print load_fiche_titre($langs->trans("NewUser"), '', 'user'); - print $langs->trans("CreateInternalUserDesc")."
\n"; + print ''.$langs->trans("CreateInternalUserDesc")."
\n"; print "
";