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

Uniformize position of "Create link" on categories.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-10-19 20:37:46 +02:00
parent 3fe4c58e95
commit 8d937d2d36
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/categories/categorie.php
View File

@ -621,8 +621,17 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1)
if ($typeid == 3) $title = $langs->trans("MembersCategoriesShort"); if ($typeid == 3) $title = $langs->trans("MembersCategoriesShort");
if ($typeid == 4) $title = $langs->trans("ContactCategoriesShort"); 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&amp;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 '<br>';
print_fiche_titre($title,'',''); print_fiche_titre($title,$linktocreate,'');
// Form to add record into a category // Form to add record into a category
if ($showclassifyform) if ($showclassifyform)
@ -636,17 +645,8 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1)
print '<tr class="liste_titre"><td width="40%">'; print '<tr class="liste_titre"><td width="40%">';
print '<span class="hideonsmartphone">'.$langs->trans("ClassifyInCategory").' &nbsp;</span>'; print '<span class="hideonsmartphone">'.$langs->trans("ClassifyInCategory").' &nbsp;</span>';
print $form->select_all_categories($typeid,'auto'); print $form->select_all_categories($typeid,'auto');
print '</td><td>'; print '</td>';
print '<input type="submit" class="button" value="'.$langs->trans("Classify").'"></td>'; print '<td><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&amp;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 '</tr>'; print '</tr>';
print '</table>'; print '</table>';
print '</form>'; print '</form>';
@ -679,10 +679,7 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1)
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
// Categorie // Categorie
print "<td>"; print "<td>".img_object('','category').' '.$way."</td>";
//$c->id=;
//print $c->getNomUrl(1);
print img_object('','category').' '.$way."</td>";
// Link to delete from category // Link to delete from category
print '<td align="right">'; print '<td align="right">';

4
htdocs/theme/eldy/style.css.php
View File

@ -832,9 +832,9 @@ foreach($mainmenuusedarray as $val)
.bodylogin .bodylogin
{ {
background: #f0f0f0; 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; -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 { .login_vertical_align {
padding: 10px; padding: 10px;