This is an automated email from the git hooks/post-receive script. New commit to branch refonteUI in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit 5c9bac07e3323707afcef9a4eaeab5b6f0cf0758 Merge: 7aa7e1e 09ec2b9 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Aug 23 15:37:41 2016 +0200 Merge develop into refonteUi bow-ui/README.txt => README.md | 0 bow-extension-chromium/{README.txt => README.md} | 0 bow-extension-chromium/changelog.txt | 0 bow-extension-chromium/pom.xml | 2 +- README.txt => bow-ui/README.md | 0 bow-ui/changelog.txt | 0 bow-ui/pom.xml | 102 +++++- bow-ui/src/license/THIRD-PARTY.properties | 6 +- .../main/java/org/chorem/bow/BookmarkUtils.java | 82 ++++- bow-ui/src/main/java/org/chorem/bow/BowConfig.java | 27 +- .../main/java/org/chorem/bow/BowConfigOption.java | 59 ++-- bow-ui/src/main/java/org/chorem/bow/BowProxy.java | 6 +- .../main/java/org/chorem/bow/BowSearchResult.java | 27 +- .../src/main/java/org/chorem/bow/BowSession.java | 128 +++++++- bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 179 +++++++++- .../java/org/chorem/bow/action/AliasAction.java | 64 ++-- .../java/org/chorem/bow/action/AtomAction.java | 125 +++++++ .../java/org/chorem/bow/action/BowBaseAction.java | 27 ++ .../bow/action/admin/ReIndexationAction.java | 2 +- .../bow/action/bookmark/AddOrUpdateAction.java | 241 +++++++------- .../action/bookmark/AuthenticationEditAction.java | 123 +++++++ .../action/bookmark/DeleteSearchResultsAction.java | 35 +- .../org/chorem/bow/action/bookmark/EditAction.java | 13 +- .../org/chorem/bow/action/bookmark/HomeAction.java | 20 +- .../chorem/bow/action/bookmark/RemoveAction.java | 24 +- .../bow/action/bookmark/ScreenshotAction.java | 6 +- .../chorem/bow/action/group/GroupEditAction.java | 245 ++++++++++++++ .../chorem/bow/action/group/GroupViewAction.java | 85 +++++ .../bow/action/login/ForgotPasswordAction.java | 18 +- .../org/chorem/bow/action/login/LoginAction.java | 10 +- .../chorem/bow/action/login/RegisterAction.java | 22 +- .../action/opensearch/OpenSearchBaseAction.java | 7 +- .../action/opensearch/OpenSearchResultAction.java | 2 +- .../opensearch/OpenSearchSuggestionAction.java | 2 +- .../bow/action/opensearch/SuggestionAction.java | 2 +- .../bow/action/preference/AdminTagAction.java | 36 +- .../bow/action/preference/DeleteImportAction.java | 4 +- .../bow/action/preference/GenerateTokenAction.java | 4 +- .../action/preference/ImportBookmarksAction.java | 10 +- .../action/preference/PreferenceBaseAction.java | 26 +- ...Action.java => UpdateAuthenticationAction.java} | 32 +- .../bow/action/preference/UpdateSiteAction.java | 6 +- .../bow/action/preference/UpdateUserAction.java | 12 +- .../action/sharedUser/SharedUserEditAction.java | 146 +++++++++ .../action/sharedUser/SharedUserViewAction.java | 85 +++++ bow-ui/src/main/resources/bow.properties | 6 +- bow-ui/src/main/resources/bowpwd.sh | 58 ++++ .../main/resources/i18n/bow-ui_en_GB.properties | 79 ++++- .../main/resources/i18n/bow-ui_fr_FR.properties | 195 ++++++----- bow-ui/src/main/resources/struts.xml | 81 ++++- bow-ui/src/main/webapp/WEB-INF/bowutils.tld | 30 ++ bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp | 7 +- bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp | 3 - bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp | 133 ++++++++ .../main/webapp/WEB-INF/jsp/authenticationEdit.jsp | 79 +++++ .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 13 +- bow-ui/src/main/webapp/WEB-INF/jsp/error.jsp | 3 - .../src/main/webapp/WEB-INF/jsp/forgotPassword.jsp | 1 - bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp | 115 +++++++ bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 77 +++++ bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 27 +- .../src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 68 +++- bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp | 42 ++- bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp | 1 - bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp | 53 ++- bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp | 1 - .../src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp | 58 ++++ .../src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 81 +++++ bow-ui/src/main/webapp/css/bookmark.css | 27 ++ bow-ui/src/main/webapp/css/global.css | 49 ++- bow-ui/src/main/webapp/img/cadena.png | Bin 0 -> 647 bytes bow-ui/src/main/webapp/img/scriptlet.png | Bin 0 -> 998 bytes bow-ui/src/main/webapp/img/terminal.png | Bin 0 -> 946 bytes bow-ui/src/main/webapp/js/README | 36 ++ bow-ui/src/main/webapp/js/bowadd.js | 36 ++ bow-ui/src/main/webapp/js/bowpwd.js | 67 ++++ bow-ui/src/main/webapp/js/sha256.js | 363 +++++++++++++++++++++ bow-ui/src/main/xmi/README | 30 +- bow-ui/src/main/xmi/bow-model.properties | 20 ++ bow-ui/src/main/xmi/bow-model.zargo | Bin 9807 -> 11741 bytes changelog.txt | 0 pom.xml | 72 ++-- src/site/resources/images/camera.png | Bin 0 -> 341 bytes src/site/resources/images/croix.jpg | Bin 0 -> 1246 bytes src/site/resources/images/edit.jpg | Bin 0 -> 1077 bytes src/site/rst/user/getStarted.rst | 178 ++++++++++ src/site/rst/user/openSearch.rst | 2 +- src/site/rst/user/search.rst | 2 + src/site/site.xml | 1 + 90 files changed, 3636 insertions(+), 512 deletions(-) diff --cc bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp index 2cd679e,db4b961..39da6c6 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp @@@ -24,19 -24,13 +24,16 @@@ <html xmlns="http://www.w3.org/1999/xhtml" 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.search.title" /></title> - <s:url var="css" value="/css/bookmark.css" /> - <link href="${css}" rel="stylesheet" type="text/css" /> - <s:head /> </head> <body> - <div class="menu clearfix"> - <h2> + <div class="menu content clearfix"> + <div class="left"> + Display mode + </div> + <p class="counter"> <s:if test="first - bowSession.user.bookmarks >= 0"> <s:url var="prev" action="home"> <s:param name="tagLine" value="%{tagLine}" /> @@@ -78,18 -72,17 +75,18 @@@ <s:hidden name="first" value="%{first}" /> </s:form> </div> + <div class="content"> + <s:if test="searchResult.bookmarks.empty"> + <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> + </s:if> + <s:else> + <s:iterator value="searchResult.bookmarks" var="bookmark"> + <s:set name="bookmark" value="bookmark"/> + <s:set name="auths" value="searchResult.getAuthentication(#bookmark)"/> + <jsp:include page="inc/bookmark.jsp" flush="true"/> + </s:iterator> + </s:else> + </div> + - - <div class="content"> - <s:if test="searchResult.bookmarks.empty"> - <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> - </s:if> - <s:else> - <s:iterator value="searchResult.bookmarks" var="bookmark"> - <s:set name="bookmark" value="bookmark"/> - <jsp:include page="inc/bookmark.jsp" flush="true"/> - </s:iterator> - </s:else> - </div> </body> </html> diff --cc bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp index 8b22773,248cc28..08042b4 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp @@@ -131,7 -99,62 +141,63 @@@ onclick="return deleteConfirmation('%{#removeBookmark}','%{#bookmark.link}');"></s:a> </span> </div> + </div> + <div class="bookmarkcontenu"> + <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> + <c:if test="${fn:length(screenshot) <= 0}"> + <img src="img/livreG.jpg"/> + </c:if> + </div> + </s:a> + <div class="click"><s:property value="%{#bookmark.click}" /></div> + <div class="description"> + <p> + <s:a href="alias/%{#bookmark.wikittyId}.action"><s:property value="%{#bookmark.link}"/></s:a> + </p> + <h3><s:text name="bow.bookmark.description" /> :</h3> + <div class="markdown"> + ${u:toHtml(bookmark.description)} + </div> + <s:iterator value="#auths" var="auth"> + <s:set name="auth" value="auth"/> + <s:if test="#auth != null"> + <h3> + <s:text name="bow.bookmark.authentication" /> : + <a class="scriptlet" href="${u:scriptletPassword(auth)}">BowPwd${bookmark.privateAlias}</a> + <a class="script" href="${u:scriptPassword(auth)}" download="BowPwd${bookmark.privateAlias}.sh">BowPwd${bookmark.privateAlias}.sh</a> + </h3> + <s:if test="!#auth.description.empty"> + <div class="markdown"> + ${u:toHtml(auth.description)} + </div> + </s:if> + <s:if test="!#auth.form.empty"> + <div class="markdown"> + ${u:toHtml(auth.form)} + </div> + </s:if> + </s:if> + </s:iterator> + <p class="tags"> + <strong><s:text name="bow.bookmark.tags" /> :</strong> + <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> + </p> + </div> + </div> </div> diff --cc bow-ui/src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp index c50e797,255c79d..bdf884f --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp @@@ -25,20 -25,45 +25,48 @@@ modal="true" autoOpen="false" /> - + <div id="logoutDiv" 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="!bowSession.user.extensionNames.contains('BowSharedUser')"> + ${bowSession.user.login} + <s:form action="logout" theme="simple"> + <div class="input"> + <s:submit key="bow.rightMenu.logout" name="submit" /> + </div> + </s:form> + </s:if> + <a href="http://maven-site.chorem.org/bow/" class="help" target="_blank"> + <s:text name="bow.rightMenu.help" /> + </a> + </div> <div id="side" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> + xmlns:jsp="http://java.sun.com/JSP/Page"><s:a href="%{editBookmark}"> + <s:text name="bow.rightMenu.addUrl.link" /> + </s:a> <div id="colonneD"> <ul class="droite"> - <s:if test="bowSession.admin"> - <li><s:a action="fragment/callStatistic">CallStatistic</s:a></li> - <li><s:a action="admin"><s:text name="bow.rightMenu.admin" /></s:a></li> - </s:if> - <li> - </li> ++ + <s:if test="!bowSession.user.extensionNames.contains('BowSharedUser')"> + <s:if test="bowSession.admin"> + <li><s:a action="fragment/callStatistic">CallStatistic</s:a></li> + <li><s:a action="admin"><s:text name="bow.rightMenu.admin" /></s:a></li> + </s:if> + <li><s:a action="preferences"><s:text name="bow.preferences.title" /></s:a></li> + <li> + <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:a href="%{editBookmark}"> + <s:text name="bow.rightMenu.addUrl.link" /> + </s:a> + </li> + <li><s:a action="groupView"><s:text name="bow.groupView.title" /></s:a></li> + <li><s:a action="sharedUserView"><s:text name="bow.sharedUserView.title" /></s:a></li> + </s:if> </ul> <!--div id="nuage"--> <jsp:include page="tagsCloud.jsp" flush="true"/> diff --cc bow-ui/src/main/webapp/css/bookmark.css index 53f3128,cd3ebc8..d9d9d22 --- a/bow-ui/src/main/webapp/css/bookmark.css +++ b/bow-ui/src/main/webapp/css/bookmark.css @@@ -85,9 -90,33 +85,13 @@@ float:left; } -.bookmark .bookmarkhead{ - width:100%; - height:32px; - background-color:#bf8a9c; - border-bottom: 0 solid #9EDCF8; - position:relative; - clear:both; -} -.bookmark .bookmarkcontenu{ - clear:both; - padding-top:5px; - padding-right: 152px; -} - -.bookmark .bookmarkhead .date{ - color:#fff; - font-size:10px; - float:left; - margin-top:10px; -} .bookmark .bookmarkhead .screenshotLink{ + position:absolute; + margin-top: 10px; + top:0; + right:96px; width:31px; height:32px; background:url('../img/camera.png') no-repeat; @@@ -130,8 -186,24 +143,22 @@@ font-size:12px; position: relative; width: 100%; - top:-80px; - left: 100px; } + .bookmark .description h3 { + color:#88516c; + } + .markdown p { + margin: inherit; + } + + .markdown p, .markdown ul, .markdown ol { + margin-bottom: 5px; + } + + .markdown ul { + margin-left: 20px; + } .bookmark .description .tags{ color:#88516c; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.