From 7a1480d362d1fc247f1d0234ec4d254a6a8858ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 May 2017 00:02:41 +0200
Subject: [PATCH] Look and feel v6
---
htdocs/bookmarks/bookmarks.lib.php | 33 ++++++++----------------------
htdocs/install/default.css | 29 +++++++++++++++++---------
htdocs/install/fileconf.php | 12 +++++------
htdocs/theme/eldy/style.css.php | 3 ++-
htdocs/theme/md/style.css.php | 2 +-
5 files changed, 37 insertions(+), 42 deletions(-)
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index c1882ce4bf9..4df9b56979d 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -41,29 +41,15 @@ function printBookmarksList($aDb, $aLangs)
$langs->load("bookmarks");
$url= $_SERVER["PHP_SELF"].(! empty($_SERVER["QUERY_STRING"])?'?'.$_SERVER["QUERY_STRING"]:'');
- // TODO Add post param to $url
$ret = '';
// 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&urlsource='.urlencode($url).'&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.= '<!-- form with POST method by default --><form id="actionbookmark" name="actionbookmark" method="POST" action="">';
- $ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo">';
+ $ret.= '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n";
+ $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 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
@@ -77,19 +63,18 @@ function printBookmarksList($aDb, $aLangs)
{
$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.= " AND entity = ".$conf->entity;
+ $sql.= " AND entity IN (".getEntity('bookmarks',1).")";
$sql.= " ORDER BY position";
if ($resql = $db->query($sql) )
{
$i=0;
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).'">'.img_picto('','object_bookmark').' '.$obj->title.'</option>';
- /*$ret.='<a class="vsmenu" title="'.$obj->title.'" href="'.$obj->url.'"'.($obj->target == 1?' target="_blank"':'').'>';
- if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $ret.=' '.img_object('','bookmark').' ';
- $ret.= dol_trunc($obj->title, 20).'</a><br>';*/
- //$ret.='</div>';
+ $ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_htmltag($obj->url).'">';
+ //$ret.='<span class="fa fa-print">aa</span>';
+ $ret.=img_picto('','object_bookmark').' ';
+ $ret.=$obj->title;
+ $ret.='</option>';
$i++;
}
}
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index b3905e63a49..e23a36ddd21 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -289,11 +289,11 @@ div.comment {
}
h3 {
- margin-top: 10px;
+ margin-top: 20px;
font-size:16px;
font-weight: normal;
- color: #4965B3;
- text-shadow: 1px 1px 1px #c0c0c0;
+ color: rgb(100,60,20);
+ /* text-shadow: 1px 1px 1px #c0c0c0; */
}
tr.bg1 {
@@ -345,15 +345,15 @@ ul {
.button {
background: #fcfcfc;
- border: 1px solid #d0d0d0;
+ border: 1px solid #e0e0e0;
padding: 0.3em 0.7em;
margin: 0 0.5em;
- -moz-border-radius:0 5px 0 5px;
- -webkit-border-radius:0 5px 0 5px;
- border-radius:0 5px 0 5px;
- -moz-box-shadow: 2px 2px 3px #CCC;
- -webkit-box-shadow: 2px 2px 3px #CCC;
- box-shadow: 2px 2px 3px #CCC;
+ -moz-border-radius: 5px 5px 5px 5px;
+ -webkit-border-radius: 5px 5px 5px 5px;
+ border-radius: 5px 5px 5px 5px;
+ -moz-box-shadow: 2px 2px 3px #ddd;
+ -webkit-box-shadow: 2px 2px 3px #ddd;
+ box-shadow: 2px 2px 3px #ddd;
}
a.button:hover {
text-decoration:none;
@@ -368,3 +368,12 @@ a.button:hover {
.center {
text-align: center;
}
+
+.valignmiddle {
+ vertical-align: middle;
+}
+
+.valigntextbottom {
+ vertical-align: text-bottom;
+}
+
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 424126b63b6..c0a3aaf65fd 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -109,8 +109,8 @@ if (! empty($force_install_message))
<table class="nobordernopadding<?php if ($force_install_noedit) print ' hidewhennoedit'; ?>">
<tr>
- <td colspan="3" class="label" align="center">
- <h3><?php echo $langs->trans("WebServer"); ?></h3>
+ <td colspan="3" class="label">
+ <h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/globe.svg" width="20" alt="webserver"> <?php echo $langs->trans("WebServer"); ?></h3>
</td>
</tr>
@@ -232,8 +232,8 @@ if (! empty($force_install_message))
<!-- Dolibarr database -->
<tr>
- <td colspan="3" class="label" align="center"><br>
- <h3><?php echo $langs->trans("DolibarrDatabase"); ?></h3>
+ <td colspan="3" class="label"><br>
+ <h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/database.svg" width="20" alt="webserver"> <?php echo $langs->trans("DolibarrDatabase"); ?></h3>
</td>
</tr>
@@ -466,8 +466,8 @@ if (! empty($force_install_message))
$force_install_databaserootpass = parse_database_pass($force_install_databaserootpass);
?>
<tr class="hidesqlite hideroot">
- <td colspan="3" class="label" align="center"><br>
- <h3><?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3>
+ <td colspan="3" class="label"><br>
+ <h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/shield.svg" width="20" alt="webserver"> <?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3>
</td>
</tr>
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a8eddcd825f..3e995d83c83 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -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; }
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
{
@@ -1815,6 +1815,7 @@ div.blockvmenusearchphone
}
div.blockvmenubookmarks
{
+ padding-top: 10px !important;
padding-bottom: 16px !important;
}
div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 943540fa02f..4fd3d736f04 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -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; }
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
{
--
GitLab