diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 3200513d11db81234fc289daf78a7ea4e476ced9..e9e11b656b9f97e1db7fb8974a60cd44178db556 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -621,8 +621,17 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1) if ($typeid == 3) $title = $langs->trans("MembersCategoriesShort"); if ($typeid == 4) $title = $langs->trans("ContactCategoriesShort"); + $linktocreate=''; + if ($showclassifyform && $user->rights->categorie->creer) + { + $linktocreate='<a href="'.DOL_URL_ROOT.'/categories/card.php?action=create&origin='.$object->id.'&type='.$typeid.'&urlfrom='.urlencode($_SERVER["PHP_SELF"].'?'.(($typeid==1||$typeid==2)?'socid':'id').'='.$object->id.'&type='.$typeid).'">'; + $linktocreate.=$langs->trans("CreateCat").' '; + $linktocreate.=img_picto($langs->trans("Create"),'filenew'); + $linktocreate.="</a>"; + } + print '<br>'; - print_fiche_titre($title,'',''); + print_fiche_titre($title,$linktocreate,''); // Form to add record into a category if ($showclassifyform) @@ -636,17 +645,8 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1) print '<tr class="liste_titre"><td width="40%">'; print '<span class="hideonsmartphone">'.$langs->trans("ClassifyInCategory").' </span>'; print $form->select_all_categories($typeid,'auto'); - print '</td><td>'; - print '<input type="submit" class="button" value="'.$langs->trans("Classify").'"></td>'; - if ($user->rights->categorie->creer) - { - print '<td align="right">'; - print '<a href="'.DOL_URL_ROOT.'/categories/card.php?action=create&origin='.$object->id.'&type='.$typeid.'&urlfrom='.urlencode($_SERVER["PHP_SELF"].'?'.(($typeid==1||$typeid==2)?'socid':'id').'='.$object->id.'&type='.$typeid).'">'; - print $langs->trans("CreateCat").' '; - print img_picto($langs->trans("Create"),'filenew'); - print "</a>"; - print '</td>'; - } + print '</td>'; + print '<td><input type="submit" class="button" value="'.$langs->trans("Classify").'"></td>'; print '</tr>'; print '</table>'; print '</form>'; @@ -679,10 +679,7 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1) print "<tr ".$bc[$var].">"; // Categorie - print "<td>"; - //$c->id=; - //print $c->getNomUrl(1); - print img_object('','category').' '.$way."</td>"; + print "<td>".img_object('','category').' '.$way."</td>"; // Link to delete from category print '<td align="right">'; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3d2e138dd7376c5fa30b9dec431d7d2092e9dfdb..8dde34aa10578d1ce8566a21a2b1deb1e471a60d 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -832,9 +832,9 @@ foreach($mainmenuusedarray as $val) .bodylogin { background: #f0f0f0; - -moz-box-shadow: inset 0 0 10px #000000; + /*-moz-box-shadow: inset 0 0 10px #000000; -webkit-box-shadow: inset 0 0 10px #000000; - box-shadow: inset 0 0 10px #000000; + box-shadow: inset 0 0 10px #000000;*/ } .login_vertical_align { padding: 10px;