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 82c8beeea69d0378811ed9021ce0c56a74b7652b Author: kaufmann <kaufmann@codelutin.com> Date: Tue Dec 19 17:39:18 2017 +0100 Refonte de l'UI: Remplacement du header par un menu latéral --- bow-ui/src/main/less/base/_sidebar.less | 49 ++++++++ bow-ui/src/main/webapp/WEB-INF/jsp/inc/sidebar.jsp | 136 +++++++++++++++++++++ 2 files changed, 185 insertions(+) diff --git a/bow-ui/src/main/less/base/_sidebar.less b/bow-ui/src/main/less/base/_sidebar.less new file mode 100644 index 0000000..d69ff2b --- /dev/null +++ b/bow-ui/src/main/less/base/_sidebar.less @@ -0,0 +1,49 @@ +#sidebar { + position: fixed; + left: 0; + + width: @default-sidebar-width; + height: 100%; + /* TMP */ overflow: hidden; +} + +.sidebar-logo { + position: fixed; + + width: @default-sidebar-width; + height: @default-sidebar-width; + padding: 20px; + + text-align: center; + + color: @color-text-on-color; + background-color: @color-main; + + font-size: 36px; +} + +.sidebar-menu { + display: flex; + flex-direction: column; + + height: 100%; + padding-top: @default-sidebar-width; + + background-color: @color-sidebar-background; +} + +.sidebar-menu-link { + flex: 1; + + padding-top: @default-marge--medium; + + text-align: center; + + .icon { + font-size: 30px; + color: @color-menu-link; + } + &:hover .icon { + color: @color-menu-link-hover; + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..be87bff --- /dev/null +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/sidebar.jsp @@ -0,0 +1,136 @@ +<%-- +#%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="sidebar" + 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:if> + + <div class="sidebar-logo"> + <span class="icon icon-bow_letter_b"></span> + </div> + + <div class="sidebar-menu"> + + <s:if test="!bowSession.user.extensionNames.contains('BowSharedUser')"> + <s:url var="editBookmark" action="editBookmark" escapeAmp="true"> + <s:param name="tagLine"><s:property value="%{tagLine}" /></s:param> + <s:param name="fullTextLine"><s:property value="%{fullTextLine}" /></s:param> + <s:param name="order" value="%{order}"/> + <s:param name="first" value="%{first}"/> + </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> + </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> + </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> + </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> + </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> + </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> + </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> + </s:a> + </div> + </s:if> + + <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> + </s:a> + </div> + </s:if> + </div> + + <div id="msg"> + <span id="actionmessageHeader"> + <s:actionmessage /> + </span> + <span id="actionerrorHeader"> + <s:actionerror /> + </span> + </div> +</div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.