This is an automated email from the git hooks/post-receive script. New commit to branch refonteUI-2017 in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit 2a19c0fa740e3a36b79d0420d3e329228b37bf33 Author: kaufmann <kaufmann@codelutin.com> Date: Wed Feb 5 11:24:16 2020 +0100 Modifications générales d'affichage --- bow-ui/src/main/less/base/_footer.less | 25 +++++++- bow-ui/src/main/less/base/_header.less | 31 +++++++++- bow-ui/src/main/less/base/_layout.less | 2 + bow-ui/src/main/less/base/_sidebar.less | 14 ++++- bow-ui/src/main/less/common/_button.less | 71 +++++++++++++++++++++- bow-ui/src/main/less/common/_modal.less | 3 - bow-ui/src/main/less/variables/_colors.less | 21 +++++-- bow-ui/src/main/less/variables/_globals.less | 6 +- bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp | 2 + .../main/webapp/WEB-INF/jsp/inc/header-empty.jsp | 25 ++++++++ bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp | 65 +++++++++----------- bow-ui/src/main/webapp/WEB-INF/jsp/inc/sidebar.jsp | 51 +++------------- .../src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 2 + 13 files changed, 219 insertions(+), 99 deletions(-) diff --git a/bow-ui/src/main/less/base/_footer.less b/bow-ui/src/main/less/base/_footer.less index 806b396..f91efd6 100644 --- a/bow-ui/src/main/less/base/_footer.less +++ b/bow-ui/src/main/less/base/_footer.less @@ -1,11 +1,30 @@ #footer{ - margin-top: -@default-footer-height; height: @default-footer-height; + + padding: @default-marge--small; + margin-top: -@default-footer-height; + text-align: center; color: #CCC; - + + p { + margin-top: @default-marge--small; + } + a { - color: #BBB; + color: inherit; + + &:hover { + color: @color-link-hover; + } + } + + .icon { + margin-left: @default-marge--tiny; + margin-right: @default-marge--tiny; + } + .icon-lutin { + font-size: 140%; } } diff --git a/bow-ui/src/main/less/base/_header.less b/bow-ui/src/main/less/base/_header.less index 3fad4b5..5656a9a 100644 --- a/bow-ui/src/main/less/base/_header.less +++ b/bow-ui/src/main/less/base/_header.less @@ -8,17 +8,44 @@ & > a, & > div { flex: 1; + + height: 100%; + } + + &.empty { + height: @default-sidebar-width; + + background-color: @color-sidebar-background; } } .header-logo { + padding: @default-marge--medium; + text-align: left; } #header-search { - text-align: center; + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + + border-left: 1px solid #EEE; + border-right: 1px solid #EEE; + + & > * { + margin: @default-marge--small; + } } #header-user-infos { - text-align: right; + display: flex; + flex-direction: row; + align-items: center; + justify-content: right; + + & > * { + margin: @default-marge--small; + } } \ No newline at end of file diff --git a/bow-ui/src/main/less/base/_layout.less b/bow-ui/src/main/less/base/_layout.less index a203f09..0974156 100644 --- a/bow-ui/src/main/less/base/_layout.less +++ b/bow-ui/src/main/less/base/_layout.less @@ -16,7 +16,9 @@ body{ } #bow-main { + width: calc(100vw - @default-sidebar-width); min-height: 100vh; + padding-bottom: @default-footer-height; } diff --git a/bow-ui/src/main/less/base/_sidebar.less b/bow-ui/src/main/less/base/_sidebar.less index 64f12a2..2c66ca1 100644 --- a/bow-ui/src/main/less/base/_sidebar.less +++ b/bow-ui/src/main/less/base/_sidebar.less @@ -43,6 +43,7 @@ position: relative; flex: 1; + max-height: 150px; text-align: center; @@ -50,12 +51,19 @@ font-size: 30px; color: @color-menu-link; } - a { + a, + span { z-index: 10; width: 100%; } + a { + display: flex; + height: 100%; + align-items: center; + justify-content: center; + } &:hover .icon { - color: @color-menu-link-hover; + color: #FFF; } &:before{ content: ''; @@ -64,7 +72,7 @@ left: 0; height: 100%; width: 0; - background-color: #FFF2; + background-color: @color-menu-link-hover;// #FFF2; opacity: 0; transition: width 0.4s ease-in-out, opacity 0.4s ease-in-out; } diff --git a/bow-ui/src/main/less/common/_button.less b/bow-ui/src/main/less/common/_button.less index a100b91..b84d228 100644 --- a/bow-ui/src/main/less/common/_button.less +++ b/bow-ui/src/main/less/common/_button.less @@ -1,18 +1,83 @@ a { + position: relative; color: @color-link; text-decoration: none; + &::after { + content: ''; + position: absolute; + bottom: -3px; + left: 50%; + width: 0px; + height: 1px; + // border-radius: 50%; + background-color: @color-link-hover; + opacity: 0; + transform: translate3d(-50%, 0, 0); + transition: all 0.2s ease; + } + &:hover { color: @color-link-hover; + + &::after { + width: 50%; + opacity: 1; + } } } -.buttton, +button, +.button, .submit-button { + position: relative; + + padding: @default-marge--small / 2 @default-marge--small; + background-color: transparent; border: 2px solid @color-main; + border-right-color: @color-button-border-2; + border-top-color: @color-button-border-2; + border-radius: 2px; color: @color-main; + cursor: pointer; + // font-size: 110%; + outline: none; - - padding: @default-marge--small / 2 @default-marge--small; + + transition: color 0.3s ease , border 1s ease ; + + &::after { + content: ''; + position: absolute; + bottom: 0px; + left: 50%; + width: 50%; + height: 1px; + // border-radius: 50%; + background-color: @color-link-hover; + opacity: 0; + transform: translate3d(-50%, 0, 0); + transition: all 0.2s ease; + } + + &:hover { + border-color: @color-link-hover; + // border-style: dashed; + color: @color-link-hover; + &::after { + bottom: -6px; + width: 100%; + opacity: 1 + } + } +} + + +.buttons-group { + button, + .button, + .submit-button { + margin: @default-marge--small; + } } \ No newline at end of file diff --git a/bow-ui/src/main/less/common/_modal.less b/bow-ui/src/main/less/common/_modal.less index 7d4484d..e69de29 100644 --- a/bow-ui/src/main/less/common/_modal.less +++ b/bow-ui/src/main/less/common/_modal.less @@ -1,3 +0,0 @@ -.fullscreen-modal { - display: none; -} \ No newline at end of file diff --git a/bow-ui/src/main/less/variables/_colors.less b/bow-ui/src/main/less/variables/_colors.less index 68e21e8..ead63c1 100644 --- a/bow-ui/src/main/less/variables/_colors.less +++ b/bow-ui/src/main/less/variables/_colors.less @@ -1,37 +1,46 @@ @color-green : #079992; +@color-green-2 : #057974; @color-red : #b71540; @color-black : #1e2a2f; @color-grey : #999; +@color-blue : #0a3d62; +@color-blue-pale : #E9F2F5; @col-purple : #804561; @col-purple-bright : #f390bf; @col-blue : #7DBED2; @col-blue-dark : darken(@col-blue, 25%); -@col-blue-pale : #E9F2F5; @col-grey-medium : #DDD; @col-grey-pale : #f9f5f7; @color-background : #FFF; -@color-background-tag-cloud : @color-main; +@color-background-tag-cloud : @color-blue; +@color-background-list-odd : @color-blue-pale; +@color-background-list-even : darken(@color-blue-pale, 5%); @color-main : @color-green; @color-sidebar-background : @color-black; -@color-menu-link : @color-grey; +@color-menu-link : #FFF;//@color-grey; @color-menu-link-hover : @color-red; -@color-link : @color-green; -@color-link-hover : darken(@color-green, 25%); +@color-link : @color-main; +@color-link-hover : @color-red; //darken(@color-green, 25%); +@color-link-active : darken(@color-red, 25%); +@color-button-border-1 : @color-main; +@color-button-border-2 : @color-green-2; + @color-form-label : @color-black; @color-separation-border : @color-grey; +@color-text : @color-black; @color-text-on-color : #FFF; -@color-bookmark-header-background : mix(#FFF, @color-main, 90%); +@color-bookmark-header-background : #083f6729; @color-bookmark-background : mix(#FFF, @color-main, 95%); @color-bookmark-title : @color-black; @color-bookmark-shadow : @color-black; diff --git a/bow-ui/src/main/less/variables/_globals.less b/bow-ui/src/main/less/variables/_globals.less index 74eb9d0..1a30234 100644 --- a/bow-ui/src/main/less/variables/_globals.less +++ b/bow-ui/src/main/less/variables/_globals.less @@ -1,6 +1,7 @@ @default-footer-height: 100px; @default-sidebar-width: 75px; +@default-marge--tiny: 5px; @default-marge--small: 10px; @default-marge--medium: 30px; @default-marge--large: 50px; @@ -8,4 +9,7 @@ @default-font: Titillium; @defaut-font-size: 16px; -@default-bookmark-radius: 3px; \ No newline at end of file +@default-bookmark-radius: 3px; + +@screen-desktop-low : 984px; +@screen-desktop-large : 1200px; \ No newline at end of file diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp index 115e216..a388f76 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp @@ -28,6 +28,8 @@ <head> </head> <body> + <jsp:include page="inc/header.jsp" flush="true"/> + <div class="bow-form-wrapper"> <h1><s:text name="bow.admin.panel" /></h1> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header-empty.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header-empty.jsp new file mode 100644 index 0000000..005524e --- /dev/null +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header-empty.jsp @@ -0,0 +1,25 @@ +<%-- +#%L + BOW UI + %% + Copyright (C) 2010 - 2011 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% +--%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> + +<div id="header" class="empty"> +</div> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp index 9b74131..eedde19 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp @@ -25,56 +25,51 @@ xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> - <s:if test="%{#session.BowSession.user != null}"> - <s:url var="homeToken" action="home"> - <s:param name="token" value="%{#session.BowSession.getPermanentToken()}" /> - </s:url> - <s:a cssClass="header-logo" action="home"> - <img src="img/logos/bow-text.svg" alt="Bow" /> - </s:a> - </s:if> - <s:else> - <s:a cssClass="header-logo" action="home"> - <img src="img/logos/bow-text.svg" alt="Bow" /> - </s:a> - </s:else> + <div class="header-logo"> + <s:if test="%{#session.BowSession.user != null}"> + <s:url var="homeToken" action="home"> + <s:param name="token" value="%{#session.BowSession.getPermanentToken()}" /> + </s:url> + <s:a action="home"> + <img src="img/logos/bow-text.svg" alt="Bow" /> + </s:a> + </s:if> + <s:else> + <s:a action="home"> + <img src="img/logos/bow-text.svg" alt="Bow" /> + </s:a> + </s:else> + </div> <div id="header-search"> <span class="header-search-label"> - <i class="icon-search icon"></i> Recherche + <i class="icon-search icon"></i> </span> - <select> - <option value="tag">Par tag</option> - <option value="fulltext">Full text</option> + + <select id="searchType"> + <option value="tagLine">Par tag</option> + <option value="fullTextLine">Full text</option> + <option value="q">Web</option> </select> - <s:form action="home" theme="simple"> - <s:textfield name="tagLine" labelSeparator="" /> + + <s:form id="searchForm" action="home" theme="simple"> + <s:textfield name="searchInput" labelSeparator="" /> + <s:hidden name="tagLine" value=""/> + <s:hidden name="fullTextLine" value=""/> + <s:hidden name="q" value=""/> <s:hidden name="order" value="%{order}"/> <s:hidden name="token" value="%{#session.BowSession.getPermanentToken()}"/> </s:form> - <!-- <s:form action="home" theme="simple"> - <s:textfield name="fullTextLine" labelSeparator="" /> - <s:hidden name="order" value="%{order}"/> - <s:hidden name="token" value="%{#session.BowSession.getPermanentToken()}"/> - </s:form> --> - <!--div class="search-tag"> - <s:form action="openSearchResult" theme="simple"> - <s:hidden name="token" value="%{#session.BowSession.getPermanentToken()}"/> - <s:textfield name="q" labelSeparator="" /> - <s:submit key="bow.rightMenu.externSearchEngine" name="submit" /> - </s:form> - </div--> + + <s:a href="#" type="button" onclick="searchBookmarks()" cssClass="button">Rechercher</s:a> </div> <s:if test="%{#session.BowSession.user != null}"> <div id="header-user-infos"> <s:if test="!bowSession.user.extensionNames.contains('BowSharedUser')"> <s:a action="preferences" cssClass="header-link">${bowSession.user.login}</s:a> - <s:form action="logout" theme="simple" class="logout"> - <s:submit key="bow.rightMenu.logout" name="submit" cssClass="icon-logout" /> - </s:form> - <s:a href="" class="header-link"> + <s:a action="logout" class="header-link"> <i class="icon-logout icon"></i> </s:a> </s:if> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/sidebar.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/sidebar.jsp index a59ff6a..1cd71e9 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/sidebar.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/sidebar.jsp @@ -46,73 +46,47 @@ </s:url> <s:text var="addUrlLabel" name="bow.rightMenu.addUrl.link" /> <s:a href="%{editBookmark}" class="sidebar-menu-link" title="%{addUrlLabel}"> - <span class="icon icon-bookmark-plus"></span> + <span class="icon icon-square-plus"></span> </s:a> - <div class="sidebar-menu-link"> - <span class="header-search-label" title="Recherche"> - <i class="icon-search icon"></i> - </span> - - <div class="fullscreen-modal"> - <s:form action="home" theme="simple"> - <s:textfield name="tagLine" labelSeparator="" /> - <s:hidden name="order" value="%{order}"/> - <s:hidden name="token" value="%{#session.BowSession.getPermanentToken()}"/> - </s:form> - - <s:form action="home" theme="simple"> - <s:textfield name="fullTextLine" labelSeparator="" /> - <s:hidden name="order" value="%{order}"/> - <s:hidden name="token" value="%{#session.BowSession.getPermanentToken()}"/> - </s:form> - - <s:form action="openSearchResult" theme="simple"> - <s:hidden name="token" value="%{#session.BowSession.getPermanentToken()}"/> - <s:textfield name="q" labelSeparator="" /> - <s:submit key="bow.rightMenu.externSearchEngine" name="submit" /> - </s:form> - </div> - </div> - <div class="sidebar-menu-link"> <s:text var="groupLabel" name="bow.groupView.title" /> <s:a action="groupView" title="%{groupLabel}"> - <i class="icon-bookmark-group icon"></i> + <i class="icon-user-group icon"></i> </s:a> </div> <div class="sidebar-menu-link"> <s:text var="sharedUserLabel" name="bow.sharedUserView.title" /> <s:a action="sharedUserView" title="%{sharedUserLabel}"> - <i class="icon-group icon"></i> + <i class="icon-share icon"></i> </s:a> </div> </s:if> <div class="sidebar-menu-link"> <a href="http://maven-site.chorem.org/bow/" class="help" target="_blank" title="<s:text name='bow.rightMenu.help' />"> - <i class="icon-signs icon"></i> + <i class="icon-help icon"></i> </a> </div> <s:if test="!bowSession.user.extensionNames.contains('BowSharedUser')"> <div class="sidebar-menu-link"> <s:a action="preferences"> - <i class="icon-settings icon"></i> + <i class="icon-preferences icon"></i> </s:a> </div> <s:if test="bowSession.admin"> <div class="sidebar-menu-link"> <s:a action="fragment/callStatistic" title="CallStatistic"> - <i class="icon-stats icon"></i> + <i class="icon-graph icon"></i> </s:a> </div> <div class="sidebar-menu-link"> <s:text var="adminLabel" name="bow.rightMenu.admin" /> <s:a action="admin" title="%{adminLabel}"> - <i class="icon-admin icon"></i> + <i class="icon-settings icon"></i> </s:a> </div> </s:if> @@ -120,18 +94,9 @@ <div class="sidebar-menu-link"> <s:url var="logout" action="logout" escapeAmp="true" /> <s:a href="%{logout}" class="sidebar-menu-link" title="Deconnexion"> - <span class="icon icon-exit"></span> + <span class="icon icon-logout"></span> </s:a> </div> </s:if> </div> - - <div id="msg"> - <span id="actionmessageHeader"> - <s:actionmessage /> - </span> - <span id="actionerrorHeader"> - <s:actionerror /> - </span> - </div> </div> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp index 44e9638..0629c50 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp @@ -33,6 +33,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <title><s:text name="bow.sharedUserView.title"/></title> </head> <body> + <jsp:include page="inc/header.jsp" flush="true"/> + <div class="bow-form-wrapper"> <h1><s:text name="bow.sharedUserView.title"/></h1> <s:actionerror/> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.