- Bow-commits - mailman.cloud.codelutin.com

01/12: Suppression de la lib bricklayer pour l'affichage en grille
by chorem.org scm 05 Feb '20

05 Feb '20

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(a)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(a)chorem.org>.

1 0

branch refonteUI-2017 updated (0095edc -> adecbe3)
by chorem.org scm 28 Jan '20

28 Jan '20

This is an automated email from the git hooks/post-receive script. New change to branch refonteUI-2017 in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 0095edc Refonte de l'UI: Modification des jsp pour adapter le nouveau style adds d428916 fixes #132: Add honey pot adds 6fa6d34 Update struts adds a7af55f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 107b424 [jgitflow-maven-plugin]updating poms for 1.6.2 branch with snapshot versions adds 38b40d8 [jgitflow-maven-plugin]updating poms for branch'release/1.6.2' with non-snapshot versions adds fc93e0e [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 1351179 tout debut pour aurore (rien ne marche) adds 27574e3 Setup .gitlab-ci.yml adds 6e19d09 Disable redmine changes generation adds 8c697f7 Use variables for Sonar build adds bd5f454 Séparation des éléments de menu et de layout entre le header et la sidebar adds 7b06dfb Ajout du nouveau logo et adaptation des couleurs utilisées adds 6317597 Affichage en onglets sur la page Préférences adds adecbe3 Modification de l'affichage de la liste des bookmarks No new revisions were added by this update. Summary of changes: .gitlab-ci.yml | 39 ++ .../src/main/java/org/chorem/bow/BowContext.java | 29 ++ .../main/java/org/chorem/bow/model/Bookmark.java | 31 ++ .../java/org/chorem/bow/model/BowPreference.java | 26 ++ .../java/org/chorem/bow/model/BowSearchPrefix.java | 18 + .../chorem/bow/persistence/BookmarkRepository.java | 14 + .../org/chorem/bow/persistence/BowRepository.java | 24 ++ .../org/chorem/bow/rest/BookmarkResources.java | 25 ++ bow-ui/pom.xml | 39 +- .../chorem/bow/action/login/RegisterAction.java | 20 +- bow-ui/src/main/less/base/_header.less | 24 ++ bow-ui/src/main/less/base/_layout.less | 2 +- bow-ui/src/main/less/base/_sidebar.less | 34 +- bow-ui/src/main/less/bow.less | 4 +- bow-ui/src/main/less/common/_bookmark-list.less | 13 +- bow-ui/src/main/less/common/_bookmark.less | 49 ++- bow-ui/src/main/less/common/_tabs.less | 51 +++ bow-ui/src/main/less/variables/_colors.less | 40 +- bow-ui/src/main/less/variables/_globals.less | 2 +- bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp | 11 +- bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 54 ++- bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp | 3 +- bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp | 70 +--- bow-ui/src/main/webapp/WEB-INF/jsp/inc/sidebar.jsp | 11 +- bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp | 463 +++++++++++---------- bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp | 3 +- bow-ui/src/main/webapp/css/connexion.css | 6 +- bow-ui/src/main/webapp/img/icones/favicon.png | Bin 0 -> 570 bytes bow-ui/src/main/webapp/img/logos/bow-text.svg | 64 +++ bow-ui/src/main/webapp/img/logos/bow.svg | 8 + pom.xml | 6 +- 31 files changed, 831 insertions(+), 352 deletions(-) create mode 100644 .gitlab-ci.yml create mode 100644 bow-api/src/main/java/org/chorem/bow/BowContext.java create mode 100644 bow-api/src/main/java/org/chorem/bow/model/Bookmark.java create mode 100644 bow-api/src/main/java/org/chorem/bow/model/BowPreference.java create mode 100644 bow-api/src/main/java/org/chorem/bow/model/BowSearchPrefix.java create mode 100644 bow-api/src/main/java/org/chorem/bow/persistence/BookmarkRepository.java create mode 100644 bow-api/src/main/java/org/chorem/bow/persistence/BowRepository.java create mode 100644 bow-api/src/main/java/org/chorem/bow/rest/BookmarkResources.java create mode 100644 bow-ui/src/main/less/base/_header.less create mode 100644 bow-ui/src/main/less/common/_tabs.less create mode 100644 bow-ui/src/main/webapp/img/icones/favicon.png create mode 100644 bow-ui/src/main/webapp/img/logos/bow-text.svg create mode 100644 bow-ui/src/main/webapp/img/logos/bow.svg -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch develop updated (b839b9f -> e36a0a2)
by chorem.org scm 23 Sep '19

23 Sep '19

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from b839b9f Disable redmine changes generation new e36a0a2 Use variables for Sonar build The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e36a0a2b962e03ba63f2bac598a5f71ceb6184a5 Author: Arnaud Thimel <thimel(a)codelutin.com> Date: Mon Sep 23 15:38:29 2019 +0200 Use variables for Sonar build Summary of changes: .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (b4cc41d -> b839b9f)
by chorem.org scm 23 Sep '19

23 Sep '19

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from b4cc41d Setup .gitlab-ci.yml new b839b9f Disable redmine changes generation The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b839b9f84595fd342b60c06f1e1a007867f8ad99 Author: Arnaud Thimel <thimel(a)codelutin.com> Date: Mon Sep 23 12:04:36 2019 +0200 Disable redmine changes generation Summary of changes: pom.xml | 4 ++++ 1 file changed, 4 insertions(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (95aca98 -> b4cc41d)
by chorem.org scm 20 Sep '19

20 Sep '19

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 95aca98 tout debut pour aurore (rien ne marche) new b4cc41d Setup .gitlab-ci.yml The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b4cc41de7351ec07f5dc287c9f9e2c4787326ab8 Author: Arnaud Thimel <thimel(a)codelutin.com> Date: Fri Sep 20 21:45:34 2019 +0200 Setup .gitlab-ci.yml Summary of changes: .gitlab-ci.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .gitlab-ci.yml -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch bow-v2 updated (7b2f9e3 -> 846b8a4)
by chorem.org scm 20 Aug '19

20 Aug '19

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2 in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 7b2f9e3 ajout dans le TODO en vrac remise en place des emails utilisateurs new 846b8a4 ajout construction dans la ci The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 846b8a467c7470f8e93194ac9345556e2fa70f68 Author: Benjamin <poussin(a)codelutin.com> Date: Tue Aug 20 16:42:46 2019 +0200 ajout construction dans la ci Summary of changes: .gitlab-ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch bow-v2 updated (0335e59 -> 7b2f9e3)
by chorem.org scm 04 Aug '19

04 Aug '19

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2 in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 0335e59 amelioration pour fusionner les doublons new 7b2f9e3 ajout dans le TODO en vrac remise en place des emails utilisateurs The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7b2f9e3fe4658d53caff71248273c41429ea3ffa Author: Benjamin <poussin(a)codelutin.com> Date: Sun Aug 4 09:41:00 2019 +0200 ajout dans le TODO en vrac remise en place des emails utilisateurs Summary of changes: TODO.md | 87 ++++++++++++++++++++-- conf/application.conf | 7 +- src/main/java/com/chorem/bow/model/BowUser.java | 3 + .../resources/db/migration/V1__init_schema.sql | 4 + 4 files changed, 95 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch bow-v2 updated (4f7430e -> 0335e59)
by chorem.org scm 31 Jul '19

31 Jul '19

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2 in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 4f7430e migration completement fonctionnel new 0335e59 amelioration pour fusionner les doublons The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0335e59f46fa2a467ecb2da152fcd8f2010f9482 Author: Benjamin <poussin(a)codelutin.com> Date: Thu Aug 1 01:49:12 2019 +0200 amelioration pour fusionner les doublons Summary of changes: .../resources/db/migration/V2__migration_data.sql | 46 +++++++++++++++++----- 1 file changed, 37 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch bow-v2 updated (a10748b -> 4f7430e)
by chorem.org scm 30 Jul '19

30 Jul '19

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2 in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from a10748b script de migration fonctionnel new 4f7430e migration completement fonctionnel The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 4f7430eca151df42d6ddb16bcff60102be305693 Author: Benjamin <poussin(a)codelutin.com> Date: Wed Jul 31 00:36:21 2019 +0200 migration completement fonctionnel Summary of changes: src/main/resources/db/migration/V2__migration_data.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch bow-v2 updated (8d2105b -> a10748b)
by chorem.org scm 30 Jul '19

30 Jul '19

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2 in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 8d2105b ajout du README.md new a10748b script de migration fonctionnel The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a10748b308af47c0d4bc3e301cce8eca8860744f Author: Benjamin <poussin(a)codelutin.com> Date: Wed Jul 31 00:00:36 2019 +0200 script de migration fonctionnel Summary of changes: src/main/java/com/chorem/bow/BowApp.java | 2 + src/main/java/com/chorem/bow/BowContext.java | 23 + src/main/java/com/chorem/bow/SortOrder.java | 5 + .../com/chorem/bow/model/AuthenticationInfo.java | 2 + src/main/java/com/chorem/bow/model/BowUser.java | 7 +- src/main/java/com/chorem/bow/model/Token.java | 13 + .../bow/repositories/BookmarkRepository.java | 48 +- .../com/chorem/bow/rest/BookmarkResources.java | 67 +- .../resources/db/migration/V1__init_schema.sql | 20 +- .../resources/db/migration/V2__migration_data.sql | 107 +++ src/main/resources/static/css/global.css | 773 +++++++++++++++++++++ src/main/resources/static/img/favicon.png | Bin 0 -> 4267 bytes src/main/templates/views/editUser.rocker.html | 2 +- src/main/templates/views/layout.rocker.html | 106 +++ src/main/templates/views/listUsers.rocker.html | 2 +- src/main/templates/views/main.rocker.html | 12 - src/main/templates/views/search.rocker.html | 72 ++ ...sourcesTest.java => BookmarkResourcesTest.java} | 67 +- 18 files changed, 1267 insertions(+), 61 deletions(-) create mode 100644 src/main/java/com/chorem/bow/BowContext.java create mode 100644 src/main/java/com/chorem/bow/SortOrder.java create mode 100644 src/main/java/com/chorem/bow/model/Token.java create mode 100644 src/main/resources/db/migration/V2__migration_data.sql create mode 100644 src/main/resources/static/css/global.css create mode 100644 src/main/resources/static/img/favicon.png create mode 100644 src/main/templates/views/layout.rocker.html delete mode 100644 src/main/templates/views/main.rocker.html create mode 100644 src/main/templates/views/search.rocker.html copy src/test/java/com/chorem/bow/rest/{BowUserResourcesTest.java => BookmarkResourcesTest.java} (57%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1