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 0095edc365b58fbae0daf9e2967056344acd8abb Author: kaufmann <kaufmann@codelutin.com> Date: Tue Dec 19 17:44:32 2017 +0100 Refonte de l'UI: Modification des jsp pour adapter le nouveau style --- bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp | 11 +- bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp | 10 +- .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 35 +- bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 68 ++-- bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 41 ++- .../src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 140 ++++--- bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp | 5 +- bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp | 13 +- bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp | 403 +++++++++++---------- .../src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 74 ++-- 10 files changed, 402 insertions(+), 398 deletions(-) diff --git a/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp b/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp index 4743a7c..7aa3459 100644 --- a/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp @@ -52,19 +52,16 @@ <s:url var="jqueryUiCSS" value="/css/jquery-ui-1.8.11.custom.bow.css" /> <s:url var="bowCSS" value="/generated-css/bow.css" /> <link href="${jqueryUiCSS}" rel="stylesheet" type="text/css" media="all" /> + <link href="/bow-ui/css/bricklayer.min.css" rel="stylesheet" type="text/css" media="all" /> <link href="${bowCSS}" rel="stylesheet" type="text/css" media="all" /> <s:url var="bookmarkJS" value="/js/bookmark.js" /> <script type="text/javascript" src="${bookmarkJS}"></script> </head> <body> - <div id="page-wrap"> - <div id="page"> - <%@include file="/WEB-INF/jsp/inc/header.jsp" %> - <div id="page-content"> - <decorator:body /> - </div> - </div> + <%@include file="/WEB-INF/jsp/inc/sidebar.jsp" %> + <div id="bow-main"> + <decorator:body /> </div> <%@include file="/WEB-INF/jsp/inc/footer.jsp" %> </body> 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 77dbc32..115e216 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp @@ -28,12 +28,10 @@ <head> </head> <body> - <div id="content"> - <div class="menu clearfix"> - <h2><s:text name="bow.admin.panel" /></h2> - </div> - <div class="formFrame fond"> - <br /><br /> + <div class="bow-form-wrapper"> + <h1><s:text name="bow.admin.panel" /></h1> + + <div class="bow-form"> <s:if test="#session.BowSession.isAdmin()"> <ul id="adminActions"> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp index 4bf32b9..53f4d34 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp @@ -28,30 +28,37 @@ <head> </head> <body> - <div id="content"> - <div class="menu clearfix"> - <h2><s:text name="popup.addurl.title" /></h2> - </div> - <div class="formFrame fond"> - <s:form id="popupAddUrlForm" cssClass="pretty-form" action="addUrl" method="post"> - <s:hidden name="tagLine" value="%{tagLine}" /> - <s:hidden name="fullTextLine" value="%{fullTextLine}" /> - <s:hidden name="bookmarkId" value="%{bookmark.wikittyId}"/> - <s:hidden name="redirectLink" value="%{redirectLink}"/> + <div class="bow-form-wrapper"> + <s:form id="popupAddUrlForm" cssClass="bow-form" action="addUrl" method="post"> + <s:hidden name="tagLine" value="%{tagLine}" /> + <s:hidden name="fullTextLine" value="%{fullTextLine}" /> + <s:hidden name="bookmarkId" value="%{bookmark.wikittyId}"/> + <s:hidden name="redirectLink" value="%{redirectLink}"/> + <h1><s:text name="popup.addurl.title" /></h1> + + <div class="bow-form-row"> <s:textfield name="link" labelSeparator=" " key="popup.addurl.link" - value="%{bookmark.link}" /> + value="%{bookmark.link}"/> + </div> + <div class="bow-form-row"> <s:textarea name="name" labelSeparator=" " key="popup.addurl.name" value="%{bookmark.description}" /> + </div> + <div class="bow-form-row"> <s:textfield name="tags" labelSeparator=" " key="popup.addurl.tags" value="%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(bookmark)}" /> + </div> + <div class="bow-form-row"> <s:textfield name="privateAlias" labelSeparator=" " key="popup.addurl.alias.private" value="%{bookmark.privateAlias}" /> + </div> + <div class="bow-form-row"> <s:textfield name="publicAlias" labelSeparator=" " key="popup.addurl.alias.public" value="%{bookmark.publicAlias}" /> - <s:submit cssClass="submit-button" key="popup.commons.submit" name="submit" /> - </s:form> - </div> + </div> + <s:submit cssClass="submit-button" key="popup.commons.submit" name="submit" /> + </s:form> </div> </body> </html> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp index 4a55b9d..ad639e3 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp @@ -32,46 +32,44 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <title><s:text name="bow.groupView.title"/></title> </head> <body> -<div id="content"> - <div class="menu clearfix"> - <h2><s:text name="bow.groupView.title"/></h2> - </div> - <s:actionerror/> + <div class="bow-form-wrapper"> + <h1><s:text name="bow.groupView.title"/></h1> + <s:actionerror/> - <div class="formFrame fond"> - <s:a action="groupEdit"><s:text name="bow.group.new" /></s:a> - <ul> - <s:iterator value="groups" var="group"> - <s:set name="group" value="group"/> - <li class="public-${u:isPublicGroup(group)}" title="${group.description}"> - <span class="group-name">${group.name}</span> - <span class="group-members">${group.members.size()} <s:text name="bow.group.members"/></span> + <div class="bow-form"> + <s:a action="groupEdit"><s:text name="bow.group.new" /></s:a> + <ul> + <s:iterator value="groups" var="group"> + <s:set name="group" value="group"/> + <li class="public-${u:isPublicGroup(group)}" title="${group.description}"> + <span class="group-name">${group.name}</span> + <span class="group-members">${group.members.size()} <s:text name="bow.group.members"/></span> - <span class="group-actions"> - <s:url var="groupEdit" action="groupEdit" escapeAmp="true"> - <s:param name="groupId" value="%{#group.wikittyId}" /> - </s:url> - <a class="edit" href="${groupEdit}">edit</a> + <span class="group-actions"> + <s:url var="groupEdit" action="groupEdit" escapeAmp="true"> + <s:param name="groupId" value="%{#group.wikittyId}" /> + </s:url> + <a class="edit" href="${groupEdit}">edit</a> - <s:url var="groupRemoveMe" action="groupRemoveMe" escapeAmp="true"> - <s:param name="groupId" value="%{#group.wikittyId}" /> - <s:param name="user" value="%{bowSession.user.wikittyId}" /> - </s:url> - <a class="removeMe" href="${groupRemoveMe}">removeMe</a> + <s:url var="groupRemoveMe" action="groupRemoveMe" escapeAmp="true"> + <s:param name="groupId" value="%{#group.wikittyId}" /> + <s:param name="user" value="%{bowSession.user.wikittyId}" /> + </s:url> + <a class="removeMe" href="${groupRemoveMe}">removeMe</a> - <s:url var="atom" action="atom" escapeAmp="true"> - <s:param name="token" value="%{bowSession.permanentToken}" /> - <s:param name="tagLine" value="%{'@' + #group.name}" /> - <s:param name="notmine" value="true" /> - </s:url> - <a class="atom" href="${atom}">atom</a> - </span> - </li> - </s:iterator> - </ul> + <s:url var="atom" action="atom" escapeAmp="true"> + <s:param name="token" value="%{bowSession.permanentToken}" /> + <s:param name="tagLine" value="%{'@' + #group.name}" /> + <s:param name="notmine" value="true" /> + </s:url> + <a class="atom" href="${atom}">atom</a> + </span> + </li> + </s:iterator> + </ul> - </div> + </div> -</div> + </div> </body> </html> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp index 5e17aba..a84fd43 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp @@ -30,27 +30,16 @@ </head> <body> <div id="bookmarks-tags"> - <div id="bookmarks-tags-edition"> - <s:set name="bookmarksToDelete" value="%{searchResult.bookmarkCount}" /> - <s:if test="%{#bookmarksToDelete > 0}"> - <s:url var="deleteSearchResults" action="deleteSearchResults" escapeAmp="false"> - <s:param name="tagLine" value="%{tagLine}" /> - <s:param name="fullTextLine" value="%{fullTextLine}" /> - <s:param name="order" value="%{order}"/> - </s:url> - <s:a id="deleteSearchResultsButton" title="delete all" href="" onclick="deleteConfirmation('%{deleteSearchResults}', %{#bookmarksToDelete}); return(false);">Supprimer</s:a> - </s:if> - </div> <jsp:include page="inc/tagsCloud.jsp" flush="true"/> </div> <div id="bookmarks-display-settings" class="menu clearfix"> - <div id="bookmarks-display-mode"> - <i class="icon-grid"></i> - <i class="icon-list"></i> + <div id="bookmarks-display-settings-mode"> + <i class="icon icon-grid"></i> + <i class="icon icon-list"></i> </div> - <div id="bookmarks-display-sort"> + <div id="bookmarks-display-settings-sort"> <s:form action="home" method="get" theme="simple"> <label for="order"><s:text name="bow.search.orderby" /></label> <s:select id="order" name="order" list="possibleOrder"/> @@ -64,7 +53,8 @@ <b><s:property value="%{searchResult.bookmarkCount}"/></b> résultats </div> - <div id="bookmarks" class="bookmarks-grid"> + <div id="bookmarks" class="bookmarks-list"> + <!--div id="bookmarks" class="bookmarks-grid bricklayer"-->> <s:if test="searchResult.bookmarks.empty"> <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> </s:if> @@ -99,5 +89,24 @@ </s:url> </s:if> </div> + + <div id="bookmarks-tags-edition"> + <s:set name="bookmarksToDelete" value="%{searchResult.bookmarkCount}" /> + <s:if test="%{#bookmarksToDelete > 0}"> + <s:url var="deleteSearchResults" action="deleteSearchResults" escapeAmp="false"> + <s:param name="tagLine" value="%{tagLine}" /> + <s:param name="fullTextLine" value="%{fullTextLine}" /> + <s:param name="order" value="%{order}"/> + </s:url> + <s:a id="deleteSearchResultsButton" title="delete all" href="" onclick="deleteConfirmation('%{deleteSearchResults}', %{#bookmarksToDelete}); return(false);">Supprimer</s:a> + </s:if> + </div> + + <script src="/bow-ui/js/bricklayer.min.js"></script> + <script> + $(document).ready(function() { + var bricklayer = new Bricklayer(document.querySelector('.bricklayer')); + }); + </script> </body> </html> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp index ec23078..f0f86bf 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp @@ -31,39 +31,22 @@ <div class="bookmark-screenshot"> <s:a title="%{#bookmark.link}" href="alias/%{#bookmark.wikittyId}.action" target="_blank"> - <div class="screenshot"> - <s:set var="screenshot" value="#bookmark.screenshot"/> - <c:if test="${fn:length(screenshot) > 0}"> - <img src="data:image/png;base64,${u:base64(screenshot)}"/> - </c:if> - </div> + <s:set var="screenshot" value="#bookmark.screenshot"/> + <c:if test="${fn:length(screenshot) > 0}"> + <img src="data:image/png;base64,${u:base64(screenshot)}" class="bookmark-screenshot-image"/> + </c:if> </s:a> </div> <div class="bookmark-content"> - <s:set var="favicon" value="#bookmark.favicon"/> - <c:if test="${fn:length(favicon) > 0}"> - <img class="bookmark-favicon" src="data:image/png;base64,${u:base64(favicon)}"/> - </c:if> - <s:a href="alias/%{#bookmark.wikittyId}.action" cssClass="bookmark-link"><s:property value="%{#bookmark.link}"/></s:a> + <div class="bookmark-title"> + <s:set var="favicon" value="#bookmark.favicon"/> + <c:if test="${fn:length(favicon) > 0}"> + <img class="bookmark-favicon" src="data:image/png;base64,${u:base64(favicon)}"/> + </c:if> - <div class="bookmark-tags"> - <s:iterator value="#bookmark.labels" var="tag"> - <s:url var="search" action="home"> - <s:param name="addTag" value="%{#tag}"/> - <s:param name="tagLine" value="%{tagLine}"/> - <s:param name="fullTextLine" value="%{fullTextLine}"/> - <s:param name="order" value="%{order}"/> - <%-- on ne met pas 'first', il faut repartir de 0 --%> - </s:url> - <s:a href="%{search}" cssClass="tag"><s:property value="%{#tag}"/></s:a> - </s:iterator> - </div> - - <div class="bookmark-infos"> - - <div class="bookmark-alias"> + <div class="bookmark-alias left"> <s:if test="%{!#bookmark.privateAlias.empty}"> <s:a cssClass="alias" href="%{config.aliasUrl + #bookmark.wikittyId}.action" title="%{#bookmark.link}" target="_blank"> @@ -78,12 +61,30 @@ </s:a> </s:if> </div> + + <s:a href="alias/%{#bookmark.wikittyId}.action" cssClass="bookmark-link"><s:property value="%{#bookmark.link}"/></s:a> + </div> + + <div class="bookmark-metadata"> <span class="bookmark-creation-date"><s:property value="#bookmark.creationDate"/></span> - <div class="bookmark-nb-click"><s:property value="%{#bookmark.click}" /></div> + <span class="bookmark-tags"> + <s:iterator value="#bookmark.labels" var="tag"> + <s:url var="search" action="home"> + <s:param name="addTag" value="%{#tag}"/> + <s:param name="tagLine" value="%{tagLine}"/> + <s:param name="fullTextLine" value="%{fullTextLine}"/> + <s:param name="order" value="%{order}"/> + <%-- on ne met pas 'first', il faut repartir de 0 --%> + </s:url> + <s:a href="%{search}" cssClass="tag"><s:property value="%{#tag}"/></s:a> + </s:iterator> + </span> + + <span class="bookmark-nb-click"><s:property value="%{#bookmark.click}" /></span> </div> - <div class="bookmark-description"> + <div class="bookmark-description clear"> ${u:toHtml(bookmark.description)} </div> @@ -109,51 +110,42 @@ </s:if> </s:iterator> </div> + </div> - <div class="bookmark-actions"> - <div class="centered-wrapper"> - <span> - <s:url var="editBookmark" action="editBookmark" escapeAmp="true"> - <s:param name="id" value="%{#bookmark.wikittyId}" /> - <s:param name="tagLine" value="%{tagLine}" /> - <s:param name="fullTextLine" value="%{fullTextLine}" /> - <s:param name="order" value="%{order}"/> - <s:param name="first" value="%{first}"/> - </s:url> - <s:a cssClass="edit" href="%{editBookmark}">Éditer</s:a> - </span> - <span> - <s:url var="screenshotBookmark" action="screenshotBookmark" escapeAmp="true"> - <s:param name="id" value="%{#bookmark.wikittyId}" /> - <s:param name="tagLine" value="%{tagLine}" /> - <s:param name="fullTextLine" value="%{fullTextLine}" /> - <s:param name="order" value="%{order}"/> - <s:param name="first" value="%{first}"/> - </s:url> - <s:a cssClass="screenshotLink" href="%{screenshotBookmark}">Screenshot</s:a> - </span> - <span> - <s:url var="authenticationEdit" action="authenticationEdit" escapeAmp="true"> - <s:param name="bookmarkId" value="%{#bookmark.wikittyId}" /> - <s:param name="tagLine" value="%{tagLine}" /> - <s:param name="fullTextLine" value="%{fullTextLine}" /> - <s:param name="order" value="%{order}"/> - <s:param name="first" value="%{first}"/> - </s:url> - <s:a cssClass="edit-authentication" href="%{authenticationEdit}">Authentification</s:a> - </span> - <span> - <s:url var="removeBookmark" action="removeBookmark" escapeAmp="true"> - <s:param name="bookmarkId" value="%{#bookmark.wikittyId}" /> - <s:param name="tagLine" value="%{tagLine}" /> - <s:param name="fullTextLine" value="%{fullTextLine}" /> - <s:param name="order" value="%{order}"/> - <s:param name="first" value="%{first}"/> - </s:url> - <s:a cssClass="supprim" href="%{removeBookmark}" - onclick="return deleteConfirmation('%{#removeBookmark}','%{#bookmark.link}');">Supprimer</s:a> - </span> - </div> - </div> + <!--i class="icon icon-menu bookmark-actions-menu"></i--> + <div class="bookmark-actions"> + <s:url var="editBookmark" action="editBookmark" escapeAmp="true"> + <s:param name="id" value="%{#bookmark.wikittyId}" /> + <s:param name="tagLine" value="%{tagLine}" /> + <s:param name="fullTextLine" value="%{fullTextLine}" /> + <s:param name="order" value="%{order}"/> + <s:param name="first" value="%{first}"/> + </s:url> + <s:a cssClass="edit" href="%{editBookmark}"><i class="icon-pencil icon"></i> Éditer</s:a> + <s:url var="screenshotBookmark" action="screenshotBookmark" escapeAmp="true"> + <s:param name="id" value="%{#bookmark.wikittyId}" /> + <s:param name="tagLine" value="%{tagLine}" /> + <s:param name="fullTextLine" value="%{fullTextLine}" /> + <s:param name="order" value="%{order}"/> + <s:param name="first" value="%{first}"/> + </s:url> + <s:a cssClass="screenshotLink" href="%{screenshotBookmark}"><i class="icon-camera icon"></i> Screenshot</s:a> + <s:url var="authenticationEdit" action="authenticationEdit" escapeAmp="true"> + <s:param name="bookmarkId" value="%{#bookmark.wikittyId}" /> + <s:param name="tagLine" value="%{tagLine}" /> + <s:param name="fullTextLine" value="%{fullTextLine}" /> + <s:param name="order" value="%{order}"/> + <s:param name="first" value="%{first}"/> + </s:url> + <s:a cssClass="edit-authentication" href="%{authenticationEdit}"><i class="icon-lock icon"></i> Authentification</s:a> + <s:url var="removeBookmark" action="removeBookmark" escapeAmp="true"> + <s:param name="bookmarkId" value="%{#bookmark.wikittyId}" /> + <s:param name="tagLine" value="%{tagLine}" /> + <s:param name="fullTextLine" value="%{fullTextLine}" /> + <s:param name="order" value="%{order}"/> + <s:param name="first" value="%{first}"/> + </s:url> + <s:a cssClass="supprim" href="%{removeBookmark}" + onclick="return deleteConfirmation('%{#removeBookmark}','%{#bookmark.link}');"><i class="icon-trashcan icon"></i> Supprimer</s:a> </div> </div> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp index 7f4a24a..476b27d 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp @@ -25,11 +25,14 @@ xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> <p> + Fait avec <i class="icon icon-heart"></i> par + <a shape="rect" href="http://www.codelutin.com" title="Code Lutin"><i class="icon icon-lutin"></i></a> + </p> + <p> <a shape="rect" href="http://www.chorem.org/projects/bow">bow</a> <a shape="rect" href="http://www.chorem.org/projects/bow/files"></a> - <a shape="rect" href="http://www.gnu.org/licenses/agpl.html"><s:text name="bow.footer.license" /></a> - <span title="Copyright">©2010-2017</span> - <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> - <a shape="rect" href="http://www.chorem.org/projects/bow/issues"><s:text name="bow.footer.bugreport" /></a> - <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users"><s:text name="bow.footer.userSupport" /></a> - <s:url var="localeEN"> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp index 46df375..8d79f53 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp @@ -24,16 +24,17 @@ <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> <head> - <title><s:text name="bow.login.title" /></title> - <s:url var="css" value="/css/connexion.css" /> + <s:url var="css" value="/generated-css/components/connexion.css" /> <link href="${css}" rel="stylesheet" type="text/css" /> </head> + <title><s:text name="bow.login.title" /></title> <body> - <div id="content"> - <div id="formFrame" class="fond"> + <div id="bow-login"> + <div id="bow-login-header"> + </div> + + <div class="centered-wrapper"> <h1><s:text name="bow.login.title" /></h1> - <br/> - <br/> <s:actionerror /> <s:form action="login"> <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp index a227e2b..ee5709a 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp @@ -27,238 +27,239 @@ <title><s:text name="bow.preferences.title"/></title> </head> <body> -<div id="content"> - <div class="menu clearfix"> - <h2><s:text name="bow.preferences.title"/></h2> - </div> +<div class="bow-form-wrapper"> + <h1><s:text name="bow.preferences.title"/></h1> <s:actionerror/> - <div class="formFrame fond"> - <s:set var="bowUrl" value="config.bowUrl" /> - <s:set var="permanentToken" value="bowSession.getPermanentToken()" /> - <s:set var="temporaryToken" value="bowSession.getTemporaryToken()" /> - <ul> - <li> - <s:a title="%{getText('bow.temporary.link.searchDescription')}" - href="openSearchResult.action?token=%{temporaryToken}&q={searchTerms}"> - <s:text name="bow.temporary.link.search" /> - </s:a> - </li> - <li> - <s:a title="%{getText('bow.permanent.link.searchDescription')}" - href="openSearchResult.action?token=%{permanentToken}&q={searchTerms}"> - <s:text name="bow.permanent.link.search" /> - </s:a> - </li> - <li> - <s:a title="%{getText('bow.temporary.link.suggestionDescription')}" - href="openSearchSuggestion.action?token=%{temporaryToken}&q={searchTerms}"> - <s:text name="bow.temporary.link.suggestion" /> - </s:a> - </li> - <li> - <s:a title="%{getText('bow.permanent.link.suggestionDescription')}" - href="openSearchSuggestion.action?token=%{permanentToken}&q={searchTerms}"> - <s:text name="bow.permanent.link.suggestion" /> - </s:a> - </li> - <li> - <s:text name="bow.rightMenu.bookmark.temporaryLink" /> - <a href="${u:scriptletAdd(bowUrl, temporaryToken)}">BowAddTemp</a> - </li> - <li> - <s:text name="bow.rightMenu.bookmark.permanentLink" /> - <a href="${u:scriptletAdd(bowUrl, permanentToken)}">BowAdd</a> - </li> - <li> - <a href="extensions/bow4chromium.crx"> - <img src="img/chromium.png" alt="Chromium" class="extensionIcon" /> - <s:text name="bow.rightMenu.chromiumExtension" /> - </a> - </li> - <li> - <strong><s:text name="bow.rightMenu.token.permanent"/> :</strong> - <s:property value="%{#permanentToken}"/> - </li> - <li> - <strong><s:text name="bow.rightMenu.token.temporary"/> :</strong> - <s:property value="%{#temporaryToken}"/> - </li> - </ul> - - <s:url var="regenPermToken" action="generateToken"/> - <s:a href="%{regenPermToken}" id="regenPermToken"> - <s:text name="bow.preferences.regenPermToken"/> - </s:a> + <div class="bow-form"> + <div class="bow-form-row"> + <s:set var="bowUrl" value="config.bowUrl" /> + <s:set var="permanentToken" value="bowSession.getPermanentToken()" /> + <s:set var="temporaryToken" value="bowSession.getTemporaryToken()" /> + <ul> + <li> + <s:a title="%{getText('bow.temporary.link.searchDescription')}" + href="openSearchResult.action?token=%{temporaryToken}&q={searchTerms}"> + <s:text name="bow.temporary.link.search" /> + </s:a> + </li> + <li> + <s:a title="%{getText('bow.permanent.link.searchDescription')}" + href="openSearchResult.action?token=%{permanentToken}&q={searchTerms}"> + <s:text name="bow.permanent.link.search" /> + </s:a> + </li> + <li> + <s:a title="%{getText('bow.temporary.link.suggestionDescription')}" + href="openSearchSuggestion.action?token=%{temporaryToken}&q={searchTerms}"> + <s:text name="bow.temporary.link.suggestion" /> + </s:a> + </li> + <li> + <s:a title="%{getText('bow.permanent.link.suggestionDescription')}" + href="openSearchSuggestion.action?token=%{permanentToken}&q={searchTerms}"> + <s:text name="bow.permanent.link.suggestion" /> + </s:a> + </li> + <li> + <s:text name="bow.rightMenu.bookmark.temporaryLink" /> + <a href="${u:scriptletAdd(bowUrl, temporaryToken)}">BowAddTemp</a> + </li> + <li> + <s:text name="bow.rightMenu.bookmark.permanentLink" /> + <a href="${u:scriptletAdd(bowUrl, permanentToken)}">BowAdd</a> + </li> + <li> + <a href="extensions/bow4chromium.crx"> + <img src="img/chromium.png" alt="Chromium" class="extensionIcon" /> + <s:text name="bow.rightMenu.chromiumExtension" /> + </a> + </li> + <li> + <strong><s:text name="bow.rightMenu.token.permanent"/> :</strong> + <s:property value="%{#permanentToken}"/> + </li> + <li> + <strong><s:text name="bow.rightMenu.token.temporary"/> :</strong> + <s:property value="%{#temporaryToken}"/> + </li> + <li> + <s:url var="regenPermToken" action="generateToken"/> + <s:a href="%{regenPermToken}" id="regenPermToken"> + <s:text name="bow.preferences.regenPermToken"/> + </s:a> + </li> + </ul> + </div> </div> - <div class="formFrame fond"> - <h3><s:text name="bow.preferences.userInfo"/></h3> - <br/> - <s:form action="updateUserPref" theme="simple"> - <s:text name="bow.login.email"/><br/> + <s:form action="updateUserPref" cssClass="bow-form" theme="simple"> + <h2><s:text name="bow.preferences.userInfo"/></h2> + + <div class="bow-form-row"> + <label><s:text name="bow.login.email"/></label> <s:textfield name="email" - labelposition="top"/><br/> + labelposition="top"/> + </div> - <s:text name="bow.preferences.currentPassword"/><br/> + <div class="bow-form-row"> + <label><s:text name="bow.preferences.currentPassword"/></label> <s:password name="currentPassword" - labelposition="top"/><br/> + labelposition="top"/> + </div> - <s:text name="bow.preferences.newPassword"/><br/> + <div class="bow-form-row"> + <label><s:text name="bow.preferences.newPassword"/></label> <s:password name="newPassword" - labelposition="top"/><br/> + labelposition="top"/> + </div> - <s:text name="bow.preferences.confirmNewPassword"/><br/> + <div class="bow-form-row"> + <label><s:text name="bow.preferences.confirmNewPassword"/></label> <s:password name="confirmNewPassword" - labelposition="top"/><br/> - <s:hidden name="update" value="user"/> - <s:submit key="bow.preferences.submit" name="submit"/> - </s:form> - </div> - - <div class="formFrame fond"> - <h3> - <s:text name="bow.preferences.authentication"/> - <a class="scriptlet" href="${u:scriptletPassword(bowAuth)}">BowPwd</a> - <a class="script" href="${u:scriptPassword(bowAuth)}" download="BowPwd.sh">BowPwd.sh</a> - </h3> - <br/> - <s:form action="updateAuthenticationPref" cssClass="pretty-form" method="post"> + labelposition="top"/> + </div> + <s:hidden name="update" value="user"/> + <s:submit key="bow.preferences.submit" name="submit"/> + </s:form> + + <s:form action="updateAuthenticationPref" cssClass="bow-form" method="post"> + <h2><s:text name="bow.preferences.authentication"/></h2> + + <a class="scriptlet" href="${u:scriptletPassword(bowAuth)}">BowPwd</a> + <a class="script" href="${u:scriptPassword(bowAuth)}" download="BowPwd.sh">BowPwd.sh</a> + + <div class="bow-form-row"> <s:textarea name="bowAuth.description" key="bow.authenticationEdit.description" labelposition="top" tooltip="bow.authenticationEdit.description.tooltip"/> - + </div> + <div class="bow-form-row"> <s:textfield name="bowAuth.login" key="bow.authenticationEdit.login" labelposition="top" tooltip="bow.authenticationEdit.login.tooltip"/> - + </div> + <div class="bow-form-row"> <s:textfield name="bowAuth.maxLength" key="bow.authenticationEdit.maxLength" labelposition="top" tooltip="bow.authenticationEdit.maxLength.tooltip"/> - + </div> + <div class="bow-form-row"> <s:textfield name="bowAuth.include" key="bow.authenticationEdit.include" labelposition="top" tooltip="bow.authenticationEdit.include.tooltip"/> - + </div> + <div class="bow-form-row"> <s:textfield name="bowAuth.exclude" key="bow.authenticationEdit.exclude" labelposition="top" tooltip="bow.authenticationEdit.exclude.tooltip"/> - + </div> + <div class="bow-form-row"> <s:textfield name="bowAuth.prefix" key="bow.authenticationEdit.prefix" labelposition="top" tooltip="bow.authenticationEdit.prefix.tooltip"/> - + </div> + <div class="bow-form-row"> <s:textfield name="bowAuth.suffix" key="bow.authenticationEdit.suffix" labelposition="top" tooltip="bow.authenticationEdit.suffix.tooltip"/> - - <s:hidden name="update" value="authentication"/> - <s:submit key="bow.preferences.submit" name="submit"/> - </s:form> - </div> - - - <div class="formFrame fond"> - <h3><s:text name="bow.preferences.siteLook"/></h3> - <br/> - - <script type="text/javascript"> - function setRemoveIndex(removeIndex) { - $('input[name="removedPrefix"]').val(removeIndex); - document.updateSitePref.submit(); - return false; - } - </script> - - <s:form name="updateSitePref" action="updateSitePref" theme="simple"> - <s:hidden name="removedPrefix" value="-1"/> - - <s:text name="bow.preferences.screenshot"/><br/> - <s:checkbox name="screenshot" labelposition="left"/><br/> - - <s:text name="bow.preferences.favicon"/><br/> - <s:checkbox name="favicon" labelposition="left"/><br/> - - <s:text name="bow.preferences.tagsNb"/><br/> - <s:textfield name="tagsNb" labelposition="top"/><br/> - - <s:text name="bow.preferences.bookmarksHomePage"/><br/> - <s:textfield name="bookmarksHomePage" labelposition="top"/><br/> - - <table> - <tr> - <th><s:text name="bow.preferences.opensearch.prefix"/></th> - <th><s:text name="bow.preferences.opensearch.value"/></th> - <th><s:text name="bow.preferences.searchEngineUrlSuggestions"/></th> - </tr> - - <s:iterator value="searchPrefix" status="stat"> - <tr> - <td><s:textfield name="searchPrefix[%{#stat.index}].prefix" value="%{prefix}"/></td> - <td><s:textfield name="searchPrefix[%{#stat.index}].search" value="%{search}"/></td> - <td><s:textfield name="searchPrefix[%{#stat.index}].suggestion" value="%{suggestion}"/></td> - <td><s:submit action="removePrefix" value="X" onclick="return setRemoveIndex(%{#stat.index})"></s:submit></td> - </tr> - </s:iterator> - </table> - <s:submit action="addPrefix" value="add prefix"></s:submit> - - <s:hidden name="update" value="site"/> - <s:submit key="bow.preferences.submit" name="submit"/> - </s:form> - </div> - - <div class="menu clearfix"> + </div> + + <s:hidden name="update" value="authentication"/> + <s:submit key="bow.preferences.submit" name="submit"/> + </s:form> + + <script type="text/javascript"> + function setRemoveIndex(removeIndex) { + $('input[name="removedPrefix"]').val(removeIndex); + document.updateSitePref.submit(); + return false; + } + </script> + + <s:form name="updateSitePref" action="updateSitePref" cssClass="bow-form" theme="simple"> + <s:hidden name="removedPrefix" value="-1"/> + + <h2><s:text name="bow.preferences.siteLook"/></h2> + + <div class="bow-form-row"> + <label><s:text name="bow.preferences.screenshot"/></label> + <s:checkbox name="screenshot" labelposition="left"/> + </div> + <div class="bow-form-row"> + <label><s:text name="bow.preferences.favicon"/></label> + <s:checkbox name="favicon" labelposition="left"/> + </div> + <div class="bow-form-row"> + <label><s:text name="bow.preferences.tagsNb"/></label> + <s:textfield name="tagsNb" labelposition="top"/> + </div> + <div class="bow-form-row"> + <label><s:text name="bow.preferences.bookmarksHomePage"/></label> + <s:textfield name="bookmarksHomePage" labelposition="top"/> + </div> + + <table> + <tr> + <th><s:text name="bow.preferences.opensearch.prefix"/></th> + <th><s:text name="bow.preferences.opensearch.value"/></th> + <th><s:text name="bow.preferences.searchEngineUrlSuggestions"/></th> + </tr> + + <s:iterator value="searchPrefix" status="stat"> + <tr> + <td><s:textfield name="searchPrefix[%{#stat.index}].prefix" value="%{prefix}"/></td> + <td><s:textfield name="searchPrefix[%{#stat.index}].search" value="%{search}"/></td> + <td><s:textfield name="searchPrefix[%{#stat.index}].suggestion" value="%{suggestion}"/></td> + <td><s:submit action="removePrefix" value="X" onclick="return setRemoveIndex(%{#stat.index})"></s:submit></td> + </tr> + </s:iterator> + </table> + <s:submit action="addPrefix" value="add prefix"></s:submit> + + <s:hidden name="update" value="site"/> + <s:submit key="bow.preferences.submit" name="submit"/> + </s:form> + + <s:form id="labelsForm" action="adminlabels" method="post" cssClass="bow-form" theme="simple"> <h2><s:text name="bow.preferences.tagsManagement"/></h2> - </div> - - <div class="formFrame fond"> <h3><s:text name="bow.preferences.labels"/>(<s:property value="labels.size()"/>)</h3> - <br/> - <s:form id="labelsForm" action="adminlabels" method="post" theme="simple"> - <div class="list"> - <s:checkboxlist name="selectedLabels" list="labels" - listKey="topicName" listValue="%{topicName+'('+count+')'}"/> - </div> - <div class="action"> - <s:text name="bow.preferences.labels.name.field"/><s:textfield name="newLabel" /> - <s:submit name="rename" key="bow.preferences.labels.rename.submit" /> - <s:submit name="delete" key="bow.preferences.labels.delete.submit" /> - </div> - </s:form> - </div> - - <div class="menu clearfix"> + + <div class="list"> + <s:checkboxlist name="selectedLabels" list="labels" + listKey="topicName" listValue="%{topicName+'('+count+')'}"/> + </div> + <div class="action"> + <s:text name="bow.preferences.labels.name.field"/><s:textfield name="newLabel" /> + <s:submit name="rename" key="bow.preferences.labels.rename.submit" /> + <s:submit name="delete" key="bow.preferences.labels.delete.submit" /> + </div> + </s:form> + + <s:form action="importBookmarks" method="post" enctype="multipart/form-data" theme="simple"> <h2><s:text name="bow.preferences.importExport"/></h2> - </div> - - <div class="formFrame fond"> <s:a action="exportBookmarks"><s:text name="bow.preferences.export.bookmarks"/></s:a> - <br/> - + <h3><s:text name="bow.preferences.import.bookmarks"/></h3> - <br/> - <s:form action="importBookmarks" method="post" enctype="multipart/form-data" theme="simple"> - <s:file name="upfile" labelSeparator=""/> - <s:hidden name="tagLine" value="%{tagLine}"/> - <s:hidden name="fullTextLine" value="%{fullTextLine}"/> - <s:submit key="bow.preferences.import.submit" name="submit"/> - </s:form> - <br/><br/> - <s:if test="bookmarksImportDate != null"> - <s:iterator value="bookmarksImportDate"> - <s:set name="date" value="%{key}"/> - <s:set name="nb" value="%{value}"/> - <s:date name="%{stringToDate(#date)}" var="dateString"/> - <div class="deleteImport"> - <span><s:property value="dateString"/> (<s:property value="#nb"/> bookmarks)</span> - <s:url var="deleteImport" action="deleteImport"> - <s:param name="date" value="#date"/> - </s:url> - <s:a cssClass="deleteImportButton" href="%{deleteImport}" - onclick="return deleteConfirmation('%{deleteImport}','%{nb}','%{dateString}');"> - </s:a> - </div> - </s:iterator> - </s:if> - <s:else> - <span><s:text name="bow.preferences.noImportedBookmarks"/></span> - </s:else> - </div> + <s:file name="upfile" labelSeparator=""/> + <s:hidden name="tagLine" value="%{tagLine}"/> + <s:hidden name="fullTextLine" value="%{fullTextLine}"/> + <s:submit key="bow.preferences.import.submit" name="submit"/> + </s:form> + + <s:if test="bookmarksImportDate != null"> + <s:iterator value="bookmarksImportDate"> + <s:set name="date" value="%{key}"/> + <s:set name="nb" value="%{value}"/> + <s:date name="%{stringToDate(#date)}" var="dateString"/> + <div class="deleteImport"> + <span><s:property value="dateString"/> (<s:property value="#nb"/> bookmarks)</span> + <s:url var="deleteImport" action="deleteImport"> + <s:param name="date" value="#date"/> + </s:url> + <s:a cssClass="deleteImportButton" href="%{deleteImport}" + onclick="return deleteConfirmation('%{deleteImport}','%{nb}','%{dateString}');"> + </s:a> + </div> + </s:iterator> + </s:if> + <s:else> + <span><s:text name="bow.preferences.noImportedBookmarks"/></span> + </s:else> </div> </body> 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 bc4eec3..44e9638 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp @@ -33,49 +33,47 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <title><s:text name="bow.sharedUserView.title"/></title> </head> <body> -<div id="content"> - <div class="menu clearfix"> - <h2><s:text name="bow.sharedUserView.title"/></h2> - </div> - <s:actionerror/> - <div class="formFrame fond"> - <div class="documentation"><s:text name="bow.sharedUserView.documentation"/></div> - <s:a action="sharedUserEdit"><s:text name="bow.sharedUser.new" /></s:a> - <ul> - <s:iterator value="sharedUsers" var="sharedUser"> - <s:set name="sharedUser" value="sharedUser"/> - <li title="${sharedUser.description}"> - <span class="sharedUser-name">${sharedUser.login}</span> + <div class="bow-form-wrapper"> + <h1><s:text name="bow.sharedUserView.title"/></h1> + <s:actionerror/> + <div class="bow-form"> + <div class="documentation"><s:text name="bow.sharedUserView.documentation"/></div> + <s:a action="sharedUserEdit"><s:text name="bow.sharedUser.new" /></s:a> + <ul> + <s:iterator value="sharedUsers" var="sharedUser"> + <s:set name="sharedUser" value="sharedUser"/> + <li title="${sharedUser.description}"> + <span class="sharedUser-name">${sharedUser.login}</span> - <span class="sharedUser-actions"> - <s:url var="sharedUserEdit" action="sharedUserEdit" escapeAmp="true"> - <s:param name="sharedUserId" value="%{#sharedUser.wikittyId}" /> - </s:url> - <a class="edit" href="${sharedUserEdit}">edit</a> + <span class="sharedUser-actions"> + <s:url var="sharedUserEdit" action="sharedUserEdit" escapeAmp="true"> + <s:param name="sharedUserId" value="%{#sharedUser.wikittyId}" /> + </s:url> + <a class="edit" href="${sharedUserEdit}">edit</a> - <s:url var="sharedUserDelete" action="sharedUserDelete" escapeAmp="true"> - <s:param name="sharedUserId" value="%{#sharedUser.wikittyId}" /> - </s:url> - <a class="delete" href="${sharedUserDelete}">delete</a> + <s:url var="sharedUserDelete" action="sharedUserDelete" escapeAmp="true"> + <s:param name="sharedUserId" value="%{#sharedUser.wikittyId}" /> + </s:url> + <a class="delete" href="${sharedUserDelete}">delete</a> - <s:url var="atom" action="atom" escapeAmp="true"> - <s:param name="token" value="%{#sharedUser.permanentToken}" /> - <s:param name="tagLine" value="%{'#' + #sharedUser.login}" /> - </s:url> - <a class="atom" href="${atom}">atom</a> + <s:url var="atom" action="atom" escapeAmp="true"> + <s:param name="token" value="%{#sharedUser.permanentToken}" /> + <s:param name="tagLine" value="%{'#' + #sharedUser.login}" /> + </s:url> + <a class="atom" href="${atom}">atom</a> - <s:url var="web" action="home" escapeAmp="true"> - <s:param name="token" value="%{#sharedUser.permanentToken}" /> - <s:param name="tagLine" value="%{'#' + #sharedUser.login}" /> - </s:url> - <a class="web" href="${web}">web</a> - </span> - </li> - </s:iterator> - </ul> + <s:url var="web" action="home" escapeAmp="true"> + <s:param name="token" value="%{#sharedUser.permanentToken}" /> + <s:param name="tagLine" value="%{'#' + #sharedUser.login}" /> + </s:url> + <a class="web" href="${web}">web</a> + </span> + </li> + </s:iterator> + </ul> - </div> + </div> -</div> + </div> </body> </html> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.