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 c5c3f5752bcce9f22a3fb984c337e37d89b0e4f6 Author: kaufmann <kaufmann@codelutin.com> Date: Tue Feb 4 15:21:51 2020 +0100 Suppression de la lib bricklayer pour l'affichage en grille --- bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp | 1 - bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 18 +++++++----------- bow-ui/src/main/webapp/css/bricklayer.min.css | 1 - bow-ui/src/main/webapp/js/bricklayer.min.js | 1 - 4 files changed, 7 insertions(+), 14 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 82d73d2..1e85270 100644 --- a/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp @@ -52,7 +52,6 @@ <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" /> 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 a51de34..af4c52f 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp @@ -45,7 +45,7 @@ <div id="bookmarks-display-settings-mode"> <i class="icon icon-list" onclick="document.getElementById('bookmarks').className = 'bookmarks-list';"></i> - <i class="icon icon-grid" onclick="document.getElementById('bookmarks').className = 'bookmarks-grid bricklayer';"></i> + <i class="icon icon-grid" onclick="document.getElementById('bookmarks').className = 'bookmarks-grid';"></i> </div> <div class="bookmarks-count"> @@ -57,7 +57,7 @@ <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"/> - <s:submit key="bow.search.submit" name="submit" /> + <s:submit type="button" key="bow.search.submit" name="submit" cssClass="button"/> <s:hidden name="tagLine" value="%{tagLine}" /> <s:hidden name="fullTextLine" value="%{fullTextLine}" /> <s:hidden name="first" value="%{first}" /> @@ -86,7 +86,9 @@ <s:a href="%{prev}"><<</s:a> </s:if> - <s:property value="%{first+1}"/>-<s:property value="%{first + bowSession.user.bookmarks}"/> + <span class="current"> + <s:property value="%{first+1}"/>-<s:property value="%{first + bowSession.user.bookmarks}"/> + </span> <s:if test="first + bowSession.user.bookmarks < searchResult.bookmarkCount"> <s:url var="next" action="home"> @@ -95,6 +97,7 @@ <s:param name="order" value="%{order}"/> <s:param name="first" value="%{first + bowSession.user.bookmarks}"/> </s:url> + <s:a href="%{next}">>></s:a> </s:if> </div> @@ -106,15 +109,8 @@ <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:a id="deleteSearchResultsButton" title="delete all" href="" onclick="deleteConfirmation('%{deleteSearchResults}', %{#bookmarksToDelete}); return(false);" cssClass="button">Tout 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/css/bricklayer.min.css b/bow-ui/src/main/webapp/css/bricklayer.min.css deleted file mode 100644 index f62e047..0000000 --- a/bow-ui/src/main/webapp/css/bricklayer.min.css +++ /dev/null @@ -1 +0,0 @@ -.bricklayer{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.bricklayer-column-sizer{width:100%;display:none}@media screen and (min-width:640px){.bricklayer-column-sizer{width:50%}}@media screen and (min-width:9 [...] \ No newline at end of file diff --git a/bow-ui/src/main/webapp/js/bricklayer.min.js b/bow-ui/src/main/webapp/js/bricklayer.min.js deleted file mode 100644 index 5451c46..0000000 --- a/bow-ui/src/main/webapp/js/bricklayer.min.js +++ /dev/null @@ -1 +0,0 @@ -!function t(e,n,r){function o(s,u){if(!n[s]){if(!e[s]){var l="function"==typeof require&&require;if(!u&&l)return l(s,!0);if(i)return i(s,!0);var a=new Error("Cannot find module '"+s+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[s]={exports:{}};e[s][0].call(p.exports,function(t){var n=e[s][1][t];return o(n?n:t)},p,p.exports,t,e,n,r)}return n[s].exports}for(var i="function"==typeof require&&require,s=0;s<r.length;s++)o(r[s]);return o}({1:[function(t,e,n){var r,o=this&&this.__extends||func [...] \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.