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

Look and feel v6

Browse Source
This commit is contained in:
Laurent Destailleur 2017-05-26 00:02:41 +02:00
parent ca08f814c1
commit 7a1480d362
5 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
htdocs/bookmarks/bookmarks.lib.php
View File

@ -41,29 +41,15 @@ function printBookmarksList($aDb, $aLangs)
$langs->load("bookmarks"); $langs->load("bookmarks");
$url= $_SERVER["PHP_SELF"].(! empty($_SERVER["QUERY_STRING"])?'?'.$_SERVER["QUERY_STRING"]:''); $url= $_SERVER["PHP_SELF"].(! empty($_SERVER["QUERY_STRING"])?'?'.$_SERVER["QUERY_STRING"]:'');
// TODO Add post param to $url
$ret = ''; $ret = '';
// Menu bookmark // Menu bookmark
/*
$ret.= '<div class="menu_titre">';
$ret.= '<table class="nobordernopadding" width="100%" summary="bookmarkstable"><tr><td>';
$ret.= '<a class="vmenu" href="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</a>';
$ret.= '</td><td align="right">';
if ($user->rights->bookmark->creer)
{
$ret.= '<a class="vsmenu addbookmarkpicto" href="'.DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url).'">';
$ret.=img_object($langs->trans('AddThisPageToBookmarks'),'bookmark');
$ret.= '</a>';
}
$ret.= '</td></tr></table>';
$ret.= '</div>';
*/
$ret.= '<div class="menu_top"></div>'."\n"; $ret.= '<div class="menu_top"></div>'."\n";
$ret.= '<!-- form with POST method by default --><form id="actionbookmark" name="actionbookmark" method="POST" action="">'; $ret.= '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n";
$ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo">'; $ret.= '<form id="actionbookmark" name="actionbookmark" method="POST" action="">';
$ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo" alt="Bookmarks">';
$ret.= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>'; $ret.= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
$ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'">'.dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>'; $ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'">'.dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
// Url to go on create new bookmark page // Url to go on create new bookmark page
@ -77,19 +63,18 @@ function printBookmarksList($aDb, $aLangs)
{ {
$sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark"; $sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
$sql.= " WHERE (fk_user = ".$user->id." OR fk_user is NULL OR fk_user = 0)"; $sql.= " WHERE (fk_user = ".$user->id." OR fk_user is NULL OR fk_user = 0)";
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity IN (".getEntity('bookmarks',1).")";
$sql.= " ORDER BY position"; $sql.= " ORDER BY position";
if ($resql = $db->query($sql) ) if ($resql = $db->query($sql) )
{ {
$i=0; $i=0;
while ($i < $conf->global->BOOKMARKS_SHOW_IN_MENU && $obj = $db->fetch_object($resql)) while ($i < $conf->global->BOOKMARKS_SHOW_IN_MENU && $obj = $db->fetch_object($resql))
{ {
//$ret.='<div class="menu_contenu">'; $ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_htmltag($obj->url).'">';
$ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_htmltag($obj->url).'">'.img_picto('','object_bookmark').' '.$obj->title.'</option>'; //$ret.='<span class="fa fa-print">aa</span>';
/*$ret.='<a class="vsmenu" title="'.$obj->title.'" href="'.$obj->url.'"'.($obj->target == 1?' target="_blank"':'').'>'; $ret.=img_picto('','object_bookmark').' ';
if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $ret.=' '.img_object('','bookmark').' '; $ret.=$obj->title;
$ret.= dol_trunc($obj->title, 20).'</a><br>';*/ $ret.='</option>';
//$ret.='</div>';
$i++; $i++;
} }
} }

29
htdocs/install/default.css
View File

@ -289,11 +289,11 @@ div.comment {
} }
h3 { h3 {
margin-top: 10px; margin-top: 20px;
font-size:16px; font-size:16px;
font-weight: normal; font-weight: normal;
color: #4965B3; color: rgb(100,60,20);
text-shadow: 1px 1px 1px #c0c0c0; /* text-shadow: 1px 1px 1px #c0c0c0; */
} }
tr.bg1 { tr.bg1 {
@ -345,15 +345,15 @@ ul {
.button { .button {
background: #fcfcfc; background: #fcfcfc;
border: 1px solid #d0d0d0; border: 1px solid #e0e0e0;
padding: 0.3em 0.7em; padding: 0.3em 0.7em;
margin: 0 0.5em; margin: 0 0.5em;
-moz-border-radius:0 5px 0 5px; -moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius:0 5px 0 5px; -webkit-border-radius: 5px 5px 5px 5px;
border-radius:0 5px 0 5px; border-radius: 5px 5px 5px 5px;
-moz-box-shadow: 2px 2px 3px #CCC; -moz-box-shadow: 2px 2px 3px #ddd;
-webkit-box-shadow: 2px 2px 3px #CCC; -webkit-box-shadow: 2px 2px 3px #ddd;
box-shadow: 2px 2px 3px #CCC; box-shadow: 2px 2px 3px #ddd;
} }
a.button:hover { a.button:hover {
text-decoration:none; text-decoration:none;
@ -368,3 +368,12 @@ a.button:hover {
.center { .center {
text-align: center; text-align: center;
} }
.valignmiddle {
vertical-align: middle;
}
.valigntextbottom {
vertical-align: text-bottom;
}

12
htdocs/install/fileconf.php
View File

@ -109,8 +109,8 @@ if (! empty($force_install_message))
<table class="nobordernopadding<?php if ($force_install_noedit) print ' hidewhennoedit'; ?>"> <table class="nobordernopadding<?php if ($force_install_noedit) print ' hidewhennoedit'; ?>">
<tr> <tr>
<td colspan="3" class="label" align="center"> <td colspan="3" class="label">
<h3><?php echo $langs->trans("WebServer"); ?></h3> <h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/globe.svg" width="20" alt="webserver"> <?php echo $langs->trans("WebServer"); ?></h3>
</td> </td>
</tr> </tr>
@ -232,8 +232,8 @@ if (! empty($force_install_message))
<!-- Dolibarr database --> <!-- Dolibarr database -->
<tr> <tr>
<td colspan="3" class="label" align="center"><br> <td colspan="3" class="label"><br>
<h3><?php echo $langs->trans("DolibarrDatabase"); ?></h3> <h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/database.svg" width="20" alt="webserver"> <?php echo $langs->trans("DolibarrDatabase"); ?></h3>
</td> </td>
</tr> </tr>
@ -466,8 +466,8 @@ if (! empty($force_install_message))
$force_install_databaserootpass = parse_database_pass($force_install_databaserootpass); $force_install_databaserootpass = parse_database_pass($force_install_databaserootpass);
?> ?>
<tr class="hidesqlite hideroot"> <tr class="hidesqlite hideroot">
<td colspan="3" class="label" align="center"><br> <td colspan="3" class="label"><br>
<h3><?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3> <h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/shield.svg" width="20" alt="webserver"> <?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3>
</td> </td>
</tr> </tr>

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

@ -1782,7 +1782,7 @@ font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php p
a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; } a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; } font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; }
a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; } a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; text-decoration: none; }
.vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone, .vmenu div.blockvmenubookmarks .vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone, .vmenu div.blockvmenubookmarks
{ {
@ -1815,6 +1815,7 @@ div.blockvmenusearchphone
} }
div.blockvmenubookmarks div.blockvmenubookmarks
{ {
padding-top: 10px !important;
padding-bottom: 16px !important; padding-bottom: 16px !important;
} }
div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend

2
htdocs/theme/md/style.css.php
View File

@ -1805,7 +1805,7 @@ font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php p
a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; } a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; } font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; } a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #999; text-decoration: none; }
div.blockvmenulogo div.blockvmenulogo
{ {