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

branch refonteUI-2017 updated (a67fafc -> fe470c7)
by chorem.org scm 06 Feb '20

06 Feb '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 a67fafc Modifications d'affichage des écrans comportant des formulaires new b0e2796 Ajout d'animations et améliorations de dispositions des éléments et des marges new fe470c7 Améliorations d'affichage des titres de page The 2 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 fe470c7718beb5661db7c841c426ba50289c3701 Author: kaufmann <kaufmann(a)codelutin.com> Date: Thu Feb 6 16:21:36 2020 +0100 Améliorations d'affichage des titres de page commit b0e2796ed9b8aaae411c0cc04295f1b4affc91f1 Author: kaufmann <kaufmann(a)codelutin.com> Date: Thu Feb 6 16:08:33 2020 +0100 Ajout d'animations et améliorations de dispositions des éléments et des marges Summary of changes: bow-ui/src/main/less/base/_header.less | 1 + bow-ui/src/main/less/base/_layout.less | 12 +++++++++++ bow-ui/src/main/less/bow.less | 1 + bow-ui/src/main/less/common/_animation.less | 10 ++++++++++ bow-ui/src/main/less/common/_bookmark-grid.less | 4 ++++ bow-ui/src/main/less/common/_bookmark-list.less | 14 +++++++++++++ bow-ui/src/main/less/common/_bookmark.less | 23 ++++++++++++++-------- bow-ui/src/main/less/common/_form.less | 7 ++++++- bow-ui/src/main/less/components/connexion.less | 1 + bow-ui/src/main/less/variables/_colors.less | 3 +++ .../main/resources/i18n/bow-ui_en_GB.properties | 3 ++- .../main/resources/i18n/bow-ui_fr_FR.properties | 3 ++- bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp | 3 ++- .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 4 ++-- bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp | 17 ++++++++-------- bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 3 ++- bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp | 3 ++- .../src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp | 3 ++- .../src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 3 ++- 19 files changed, 91 insertions(+), 27 deletions(-) create mode 100644 bow-ui/src/main/less/common/_animation.less -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

branch refonteUI-2017 updated (adecbe3 -> a67fafc)
by chorem.org scm 05 Feb '20

05 Feb '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 adecbe3 Modification de l'affichage de la liste des bookmarks new c5c3f57 Suppression de la lib bricklayer pour l'affichage en grille new 807ce17 Génération de la police d'icônes par script new 5e1b9a1 Mise à jour des icônes Liste et Grille new b723264 Modification de l'affichage des bookmarks new 61fa6d6 Modification de l'affichage des formulaire de création et modification new bb444cf Modification de l'affichage de l'écran de connexion new 2a19c0f Modifications générales d'affichage new 355c967 Fusion des champs de recherche en un seul. Fonctionnement temporaire à améliorer new 56f6617 Changement de police principale pour Fira Sans new 3b4e267 Modification de l'affichage de l'écran de connexion, finalisation new d33bb6e Modifications d'affichage générales new a67fafc Modifications d'affichage des écrans comportant des formulaires The 12 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 a67fafcdb1a02ac574a5610fb39a78a0d3a594fa Author: kaufmann <kaufmann(a)codelutin.com> Date: Wed Feb 5 17:32:55 2020 +0100 Modifications d'affichage des écrans comportant des formulaires commit d33bb6e2f7c80c1b699cdc988b178db40daa4955 Author: kaufmann <kaufmann(a)codelutin.com> Date: Wed Feb 5 17:32:27 2020 +0100 Modifications d'affichage générales commit 3b4e267aaca304da597de620bd2f91a1d7a5ba73 Author: kaufmann <kaufmann(a)codelutin.com> Date: Wed Feb 5 15:47:27 2020 +0100 Modification de l'affichage de l'écran de connexion, finalisation commit 56f6617d635f7b4c09f400070e8ddeac9640fb76 Author: kaufmann <kaufmann(a)codelutin.com> Date: Wed Feb 5 15:41:42 2020 +0100 Changement de police principale pour Fira Sans commit 355c96782683e15abc6dc73ff65ea5905e78ee5c Author: kaufmann <kaufmann(a)codelutin.com> Date: Wed Feb 5 11:25:09 2020 +0100 Fusion des champs de recherche en un seul. Fonctionnement temporaire à améliorer commit 2a19c0fa740e3a36b79d0420d3e329228b37bf33 Author: kaufmann <kaufmann(a)codelutin.com> Date: Wed Feb 5 11:24:16 2020 +0100 Modifications générales d'affichage commit bb444cf58aa630f5db52ccad1dda35bbd205b283 Author: kaufmann <kaufmann(a)codelutin.com> Date: Wed Feb 5 11:22:45 2020 +0100 Modification de l'affichage de l'écran de connexion commit 61fa6d6fcfa6fb93f6ba21d26c6d0de2a82890e6 Author: kaufmann <kaufmann(a)codelutin.com> Date: Wed Feb 5 11:22:16 2020 +0100 Modification de l'affichage des formulaire de création et modification commit b723264e2abe1c39e22cebd187b06d13540a1cae Author: kaufmann <kaufmann(a)codelutin.com> Date: Wed Feb 5 11:19:53 2020 +0100 Modification de l'affichage des bookmarks commit 5e1b9a1c12d06f3a16c49c9a90e91e43453a634f Author: kaufmann <kaufmann(a)codelutin.com> Date: Wed Feb 5 11:15:41 2020 +0100 Mise à jour des icônes Liste et Grille commit 807ce172453e5d8d7ba2d82b6ef1d60799d8bf81 Author: kaufmann <kaufmann(a)codelutin.com> Date: Tue Feb 4 15:23:02 2020 +0100 Génération de la police d'icônes par script 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 Summary of changes: .gitignore | 2 + bow-ui/pom.xml | 1 + .../main/java/org/chorem/bow/BowSearchResult.java | 6 +- bow-ui/src/main/less/base/_footer.less | 25 ++- bow-ui/src/main/less/base/_header.less | 43 ++++- bow-ui/src/main/less/base/_layout.less | 4 + bow-ui/src/main/less/base/_sidebar.less | 21 ++- bow-ui/src/main/less/bow.less | 1 + bow-ui/src/main/less/common/_bookmark-grid.less | 87 +++++----- bow-ui/src/main/less/common/_bookmark-list.less | 31 +++- bow-ui/src/main/less/common/_bookmark.less | 47 +++++- bow-ui/src/main/less/common/_button.less | 72 ++++++++- bow-ui/src/main/less/common/_font.less | 14 +- bow-ui/src/main/less/common/_form.less | 35 +++- bow-ui/src/main/less/common/_icons.less | 179 ++++++++------------- bow-ui/src/main/less/common/_list.less | 28 ++++ bow-ui/src/main/less/common/_modal.less | 3 - bow-ui/src/main/less/common/_notifications.less | 30 ++-- bow-ui/src/main/less/common/_tabs.less | 44 ++++- bow-ui/src/main/less/common/_tools.less | 7 - bow-ui/src/main/less/components/connexion.less | 82 +++++++++- bow-ui/src/main/less/variables/_colors.less | 44 +++-- bow-ui/src/main/less/variables/_globals.less | 11 +- .../main/resources/i18n/bow-ui_en_GB.properties | 7 + .../main/resources/i18n/bow-ui_fr_FR.properties | 7 + bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp | 3 +- bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp | 2 + .../main/webapp/WEB-INF/jsp/authenticationEdit.jsp | 101 +++++++----- .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/forgotPassword.jsp | 30 ++-- bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp | 47 ++++-- bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 20 ++- bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 91 +++++------ .../src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 76 ++++----- .../{CallStatistic.jsp => inc/header-empty.jsp} | 17 +- bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp | 65 ++++---- bow-ui/src/main/webapp/WEB-INF/jsp/inc/sidebar.jsp | 60 +------ bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp | 40 +++-- bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp | 43 +++-- bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp | 45 ++++-- .../src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp | 48 +++--- .../src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 24 +-- bow-ui/src/main/webapp/css/bricklayer.min.css | 1 - bow-ui/src/main/webapp/font/FiraSans-Light.otf | Bin 0 -> 359048 bytes bow-ui/src/main/webapp/font/FiraSans-Medium.otf | Bin 0 -> 366052 bytes bow-ui/src/main/webapp/font/FiraSans-Regular.otf | Bin 0 -> 357996 bytes bow-ui/src/main/webapp/font/Titillium-Bold.otf | Bin 55568 -> 0 bytes bow-ui/src/main/webapp/font/Titillium-Light.otf | Bin 57068 -> 0 bytes bow-ui/src/main/webapp/font/Titillium-Regular.otf | Bin 57460 -> 0 bytes bow-ui/src/main/webapp/font/bow-icons.eot | Bin 8200 -> 5314 bytes bow-ui/src/main/webapp/font/bow-icons.svg | 158 +++++++++++++----- bow-ui/src/main/webapp/font/bow-icons.ttf | Bin 8028 -> 5136 bytes bow-ui/src/main/webapp/font/bow-icons.woff | Bin 8104 -> 3368 bytes bow-ui/src/main/webapp/js/bricklayer.min.js | 1 - .../LogoutAction.java => webapp/js/search.js} | 30 ++-- doc/icons/Readme.md | 8 + doc/icons/flag.svg | 10 ++ doc/icons/fontcustom.sh | 16 ++ doc/icons/fontcustom.yml | 96 +++++++++++ doc/icons/gear.svg | 12 ++ doc/icons/graph.svg | 15 ++ doc/icons/grid.svg | 50 ++++++ doc/icons/heart.svg | 52 ++++++ doc/icons/help.svg | 16 ++ doc/icons/list.svg | 62 +++++++ doc/icons/lock.svg | 12 ++ doc/icons/logout.svg | 65 ++++++++ doc/icons/lutin.svg | 60 +++++++ doc/icons/pencil.svg | 13 ++ doc/icons/photo.svg | 13 ++ doc/icons/preferences.svg | 15 ++ doc/icons/search.svg | 12 ++ doc/icons/settings.svg | 14 ++ doc/icons/share.svg | 11 ++ doc/icons/square-plus.svg | 11 ++ doc/icons/trashcan.svg | 13 ++ doc/icons/user-group.svg | 106 ++++++++++++ doc/icons/user.svg | 67 ++++++++ doc/icons/world.svg | 14 ++ 79 files changed, 1861 insertions(+), 641 deletions(-) create mode 100644 bow-ui/src/main/less/common/_list.less copy bow-ui/src/main/webapp/WEB-INF/jsp/{CallStatistic.jsp => inc/header-empty.jsp} (73%) delete mode 100644 bow-ui/src/main/webapp/css/bricklayer.min.css create mode 100644 bow-ui/src/main/webapp/font/FiraSans-Light.otf create mode 100644 bow-ui/src/main/webapp/font/FiraSans-Medium.otf create mode 100644 bow-ui/src/main/webapp/font/FiraSans-Regular.otf delete mode 100755 bow-ui/src/main/webapp/font/Titillium-Bold.otf delete mode 100755 bow-ui/src/main/webapp/font/Titillium-Light.otf delete mode 100755 bow-ui/src/main/webapp/font/Titillium-Regular.otf delete mode 100644 bow-ui/src/main/webapp/js/bricklayer.min.js copy bow-ui/src/main/{java/org/chorem/bow/action/login/LogoutAction.java => webapp/js/search.js} (50%) create mode 100644 doc/icons/Readme.md create mode 100644 doc/icons/flag.svg create mode 100755 doc/icons/fontcustom.sh create mode 100644 doc/icons/fontcustom.yml create mode 100644 doc/icons/gear.svg create mode 100644 doc/icons/graph.svg create mode 100644 doc/icons/grid.svg create mode 100644 doc/icons/heart.svg create mode 100644 doc/icons/help.svg create mode 100644 doc/icons/list.svg create mode 100644 doc/icons/lock.svg create mode 100644 doc/icons/logout.svg create mode 100644 doc/icons/lutin.svg create mode 100644 doc/icons/pencil.svg create mode 100644 doc/icons/photo.svg create mode 100644 doc/icons/preferences.svg create mode 100644 doc/icons/search.svg create mode 100644 doc/icons/settings.svg create mode 100644 doc/icons/share.svg create mode 100644 doc/icons/square-plus.svg create mode 100644 doc/icons/trashcan.svg create mode 100644 doc/icons/user-group.svg create mode 100644 doc/icons/user.svg create mode 100644 doc/icons/world.svg -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 10

03/12: Mise à jour des icônes Liste et 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 5e1b9a1c12d06f3a16c49c9a90e91e43453a634f Author: kaufmann <kaufmann(a)codelutin.com> Date: Wed Feb 5 11:15:41 2020 +0100 Mise à jour des icônes Liste et Grille --- bow-ui/src/main/webapp/font/bow-icons.eot | Bin 5406 -> 5314 bytes bow-ui/src/main/webapp/font/bow-icons.svg | 10 ++++---- bow-ui/src/main/webapp/font/bow-icons.ttf | Bin 5228 -> 5136 bytes bow-ui/src/main/webapp/font/bow-icons.woff | Bin 3380 -> 3368 bytes doc/icons/grid.svg | 16 +++++++------ doc/icons/list.svg | 37 +++++++++++++++++++---------- 6 files changed, 38 insertions(+), 25 deletions(-) diff --git a/bow-ui/src/main/webapp/font/bow-icons.eot b/bow-ui/src/main/webapp/font/bow-icons.eot index 7528065..3eda446 100644 Binary files a/bow-ui/src/main/webapp/font/bow-icons.eot and b/bow-ui/src/main/webapp/font/bow-icons.eot differ diff --git a/bow-ui/src/main/webapp/font/bow-icons.svg b/bow-ui/src/main/webapp/font/bow-icons.svg index 25df599..c083c05 100644 --- a/bow-ui/src/main/webapp/font/bow-icons.svg +++ b/bow-ui/src/main/webapp/font/bow-icons.svg @@ -1,11 +1,11 @@ <?xml version="1.0" standalone="no"?> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >  <svg xmlns="http://www.w3.org/2000/svg"> <metadata> -Created by FontForge 20110222 at Wed Jan 29 10:41:19 2020 +Created by FontForge 20110222 at Tue Feb 4 14:37:41 2020 By root Created by root with FontForge 2.0 (http://fontforge.sf.net) </metadata> @@ -75,12 +75,12 @@ l24.832 24.832l94.1367 -56.4883l-25.585 -25.584l97.1523 -97.1523l59.5361 60.4326 M58.0723 398.76l39.5117 -65.8555l33.5117 33.5117l-65.8555 39.5117zM75.4561 -12.7598l273.271 268.76h35.2725c44.3203 0 68.376 26.6396 71.6162 79.2402l-57.3926 -26.8965l-39.6953 40.9365l25.1357 57.8877c-53.5762 -3 -79.6641 -26.3682 -79.6641 -71.168v-35.2803 l-268.88 -272.903l-12.0645 -41.3525l10.2559 -9.65625zM456 -28.6875l36.6875 36.6875l-140.688 140.688l-36.6875 -36.6875z" /> <glyph glyph-name="uniF106" unicode="" -d="M53.5 334.984h405v-13.9688h-405v13.9688zM53.5 244.312h405v-13.9688h-405v13.9688zM53.5 153.656h405v-13.9688h-405v13.9688zM53.5 62.9844h405v-13.9688h-405v13.9688z" /> +d="M36 234.626h440v-85.252h-440v85.252zM36 412h440v-85.252h-440v85.252zM36 57.252h440v-85.252h-440v85.252z" /> <glyph glyph-name="uniF100" unicode="" d="M64 448h-16v-512h16v512zM232 368l29.5898 25.8281l-10.1797 12.3438l-51.4102 -42.4004v-203.771h268.944l-52 104l52 104h-236.944zM216 352h227.056l-44 -88l44 -88h-227.056v176zM208 200v16h-144v176h184v-32h16v48h-216v-208h160z" /> <glyph glyph-name="uniF103" unicode="" -d="M92 356h40v-40h-40v40zM188 356h40v-40h-40v40zM284 356h40v-40h-40v40zM380 356h40v-40h-40v40zM92 260h40v-40h-40v40zM188 260h40v-40h-40v40zM284 260h40v-40h-40v40zM380 260h40v-40h-40v40zM92 164h40v-40h-40v40zM188 164h40v-40h-40v40zM284 164h40v-40h-40v40z -M380 164h40v-40h-40v40zM92 68h40v-40h-40v40zM188 68h40v-40h-40v40zM284 68h40v-40h-40v40zM380 68h40v-40h-40v40z" /> +d="M36 412h98.3984v-98.3984h-98.3984v98.3984zM206.801 412h98.3984v-98.3984h-98.3984v98.3984zM377.602 412h98.3984v-98.3984h-98.3984v98.3984zM36 241.199h98.3984v-98.3984h-98.3984v98.3984zM206.801 241.199h98.3984v-98.3984h-98.3984v98.3984zM377.602 241.199 +h98.3984v-98.3984h-98.3984v98.3984zM36 70.3984h98.3984v-98.3984h-98.3984v98.3984zM206.801 70.3984h98.3984v-98.3984h-98.3984v98.3984zM377.602 70.3984h98.3984v-98.3984h-98.3984v98.3984z" /> <glyph glyph-name="uniF112" unicode="" d="M326.64 293.281c-3.44043 -58.4404 -41.3633 -116.86 -49.7646 -123.337l-0.724609 -0.424805c-15.1553 -8.88086 -26.5918 -11.3584 -39.2031 -0.774414l-1.3252 1.1123c-7.70605 2.15039 6.62109 -1.84766 -1.08398 0.302734 c-8.73828 7.06738 -50.2832 67.4717 -49.1807 122.743c0.866211 43.376 32.2598 77.2373 70.6426 77.2373c38.4629 0 70.4619 -34.1455 70.6396 -76.8594zM342.641 293.096c-0.210938 50.8232 -38.2285 93.0449 -86.6406 93.0449 diff --git a/bow-ui/src/main/webapp/font/bow-icons.ttf b/bow-ui/src/main/webapp/font/bow-icons.ttf index a401714..47ac111 100644 Binary files a/bow-ui/src/main/webapp/font/bow-icons.ttf and b/bow-ui/src/main/webapp/font/bow-icons.ttf differ diff --git a/bow-ui/src/main/webapp/font/bow-icons.woff b/bow-ui/src/main/webapp/font/bow-icons.woff index d7fde40..1622984 100644 Binary files a/bow-ui/src/main/webapp/font/bow-icons.woff and b/bow-ui/src/main/webapp/font/bow-icons.woff differ diff --git a/doc/icons/grid.svg b/doc/icons/grid.svg index 84ea067..7b8c339 100644 --- a/doc/icons/grid.svg +++ b/doc/icons/grid.svg @@ -19,7 +19,7 @@ enable-background="new 0 0 64 64" xml:space="preserve" sodipodi:docname="grid.svg" - inkscape:version="0.92.2 5c3e80d, 2017-08-06"><metadata + inkscape:version="0.92.4 5da689c313, 2019-01-14"><metadata id="metadata11"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs @@ -33,16 +33,18 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" - inkscape:window-height="1019" + inkscape:window-height="1031" id="namedview7" showgrid="false" inkscape:zoom="5.2149125" - inkscape:cx="-6.2556754" + inkscape:cx="-44.511351" inkscape:cy="42.546677" inkscape:window-x="0" - inkscape:window-y="34" + inkscape:window-y="25" inkscape:window-maximized="1" inkscape:current-layer="Layer_1" /><path - style="fill:#000000;fill-opacity:1;stroke-width:0.66857851" - d="M 11.5 11.5 L 11.5 16.5 L 16.5 16.5 L 16.5 11.5 L 11.5 11.5 z M 23.5 11.5 L 23.5 16.5 L 28.5 16.5 L 28.5 11.5 L 23.5 11.5 z M 35.5 11.5 L 35.5 16.5 L 40.5 16.5 L 40.5 11.5 L 35.5 11.5 z M 47.5 11.5 L 47.5 16.5 L 52.5 16.5 L 52.5 11.5 L 47.5 11.5 z M 11.5 23.5 L 11.5 28.5 L 16.5 28.5 L 16.5 23.5 L 11.5 23.5 z M 23.5 23.5 L 23.5 28.5 L 28.5 28.5 L 28.5 23.5 L 23.5 23.5 z M 35.5 23.5 L 35.5 28.5 L 40.5 28.5 L 40.5 23.5 L 35.5 23.5 z M 47.5 23.5 L 47.5 28.5 L 52.5 28.5 L 52.5 23.5 L [...] - id="rect849" /></svg> \ No newline at end of file + style="fill:#000000;fill-opacity:1;stroke-width:1.64467728" + d="M 4.5,4.5 V 16.799806 H 16.799806 V 4.5 Z m 21.350096,0 V 16.799806 H 38.149904 V 4.5 Z m 21.350098,0 V 16.799806 H 59.5 V 4.5 Z M 4.5,25.850096 V 38.149904 H 16.799806 V 25.850096 Z m 21.350096,0 V 38.149904 H 38.149904 V 25.850096 Z m 21.350098,0 V 38.149904 H 59.5 V 25.850096 Z M 4.5,47.200194 V 59.5 H 16.799806 V 47.200194 Z m 21.350096,0 V 59.5 H 38.149904 V 47.200194 Z m 21.350098,0 V 59.5 H 59.5 V 47.200194 Z" + id="rect849" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccc" /></svg> \ No newline at end of file diff --git a/doc/icons/list.svg b/doc/icons/list.svg index a3f2f8d..93e8c14 100644 --- a/doc/icons/list.svg +++ b/doc/icons/list.svg @@ -19,10 +19,10 @@ enable-background="new 0 0 64 64" xml:space="preserve" sodipodi:docname="list.svg" - inkscape:version="0.92.2 5c3e80d, 2017-08-06"><metadata + inkscape:version="0.92.4 5da689c313, 2019-01-14"><metadata id="metadata11"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs id="defs9" /><sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,19 +33,30 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" - inkscape:window-height="1019" + inkscape:window-height="1031" id="namedview7" showgrid="false" - inkscape:zoom="5.2149125" - inkscape:cx="-6.2556754" - inkscape:cy="42.546677" + inkscape:zoom="1.84375" + inkscape:cx="91.25609" + inkscape:cy="65.876738" inkscape:window-x="0" - inkscape:window-y="34" + inkscape:window-y="25" inkscape:window-maximized="1" inkscape:current-layer="Layer_1" /><g - id="g822" - transform="translate(0,1.7493495)"><path - style="stroke-width:2.1290617" - d="M 6.6875 14.126953 L 6.6875 15.873047 L 57.3125 15.873047 L 57.3125 14.126953 L 6.6875 14.126953 z M 6.6875 25.460938 L 6.6875 27.207031 L 57.3125 27.207031 L 57.3125 25.460938 L 6.6875 25.460938 z M 6.6875 36.792969 L 6.6875 38.539062 L 57.3125 38.539062 L 57.3125 36.792969 L 6.6875 36.792969 z M 6.6875 48.126953 L 6.6875 49.873047 L 57.3125 49.873047 L 57.3125 48.126953 L 6.6875 48.126953 z " - transform="translate(0,-1.7493495)" - id="path2" /></g></svg> \ No newline at end of file + id="g1050" + transform="matrix(1,0,0,1.0656553,9.9999998e-8,3.6955867)"><path + sodipodi:nodetypes="ccccc" + style="stroke-width:5.31071854" + d="m 4.499999,21.56057 v 10 h 55.000002 v -10 z" + id="path2" + inkscape:connector-curvature="0" /><path + inkscape:connector-curvature="0" + id="path1043" + d="m 4.499999,0.754853 v 10 h 55.000002 v -10 z" + style="stroke-width:5.31071854" + sodipodi:nodetypes="ccccc" /><path + sodipodi:nodetypes="ccccc" + style="stroke-width:5.31071854" + d="m 4.4999988,42.366289 v 10 H 59.500001 v -10 z" + id="path1045" + inkscape:connector-curvature="0" /></g></svg> \ 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

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