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

Fix style

Browse Source
This commit is contained in:
Laurent Destailleur 2015-05-30 20:07:44 +02:00
parent 36b7f1dcf3
commit 9b4ab63c7d
5 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/main.inc.php
View File

@ -1459,9 +1459,6 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
} }
else $toprightmenu.=$result; // For backward compatibility else $toprightmenu.=$result; // For backward compatibility
// Logout link
$toprightmenu.=$form->textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
// Link to print main content area // Link to print main content area
if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone)) if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone))
{ {
@ -1472,7 +1469,11 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
$text.='</a>'; $text.='</a>';
$toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2); $toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
} }
$toprightmenu.='</div>';
// Logout link
$toprightmenu.=$form->textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
$toprightmenu.='</div>';
print $toprightmenu; print $toprightmenu;

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

@ -544,8 +544,8 @@ div.ficheaddleft {
else print "margin-top: 10px;\n"; ?> else print "margin-top: 10px;\n"; ?>
} }
.containercenter { .containercenter {
display : table; display : table;
margin : 0px auto; margin : 0px auto;
} }
#pictotitle { #pictotitle {
@ -559,6 +559,12 @@ margin : 0px auto;
.pictowarning { .pictowarning {
padding-left: 3px; padding-left: 3px;
} }
.colorthumb {
padding-left: 1px !important;
padding-right: 1px;
padding-top: 1px;
padding-bottom: 1px;
}
/* ============================================================================== */ /* ============================================================================== */

2
htdocs/user/card.php
View File

@ -1377,7 +1377,7 @@ else
{ {
print '<tr><td>'.$langs->trans("ColorUser").'</td>'; print '<tr><td>'.$langs->trans("ColorUser").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
if ($object->color) print '<input type="text" disabled style="padding: 0; margin-top: 0; margin-bottom: 0; width: 36px; background-color: #'.$object->color.'" value="'.$object->color.'">'; if ($object->color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; width: 36px; background-color: #'.$object->color.'" value="'.$object->color.'">';
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
} }

2
htdocs/user/class/user.class.php
View File

@ -1795,6 +1795,8 @@ class User extends CommonObject
{ {
global $form; global $form;
if (! is_object($form)) $form=new Form($this->db);
$result=''; $result='';
$result.='<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">'; $result.='<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';

16
htdocs/user/note.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -131,22 +131,22 @@ if ($id)
print "</table>"; print "</table>";
dol_fiche_end();
if ($action == 'edit') if ($action == 'edit')
{ {
print '<br><div class="center">'; print '<div class="center">';
print '<input type="submit" class="button" name="update" value="'.$langs->trans("Save").'">'; print '<input type="submit" class="button" name="update" value="'.$langs->trans("Save").'">';
print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'; print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">'; print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
print '</div>'; print '</div>';
} }
print "</form>\n";
/*
* Actions
*/
/*
* Actions
*/
print '</div>';
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($user->rights->user->user->creer && $action != 'edit') if ($user->rights->user->user->creer && $action != 'edit')
@ -156,7 +156,7 @@ if ($id)
print "</div>"; print "</div>";
print "</form>\n";
} }
$db->close(); $db->close();