branch refonteUI-2017 updated (a67fafc -> fe470c7)
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@codelutin.com> Date: Thu Feb 6 16:21:36 2020 +0100 Améliorations d'affichage des titres de page commit b0e2796ed9b8aaae411c0cc04295f1b4affc91f1 Author: kaufmann <kaufmann@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@chorem.org>.
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 b0e2796ed9b8aaae411c0cc04295f1b4affc91f1 Author: kaufmann <kaufmann@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 --- bow-ui/src/main/less/base/_header.less | 1 + 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/components/connexion.less | 1 + bow-ui/src/main/less/variables/_colors.less | 1 + 8 files changed, 47 insertions(+), 8 deletions(-) diff --git a/bow-ui/src/main/less/base/_header.less b/bow-ui/src/main/less/base/_header.less index 8811943..d5b1177 100644 --- a/bow-ui/src/main/less/base/_header.less +++ b/bow-ui/src/main/less/base/_header.less @@ -23,6 +23,7 @@ .header-logo { text-align: center; + animation: reveal-down 1s ease; img { filter: brightness(0) invert(1); diff --git a/bow-ui/src/main/less/bow.less b/bow-ui/src/main/less/bow.less index 55e5143..2396f8b 100644 --- a/bow-ui/src/main/less/bow.less +++ b/bow-ui/src/main/less/bow.less @@ -17,6 +17,7 @@ @import "base/_layout"; @import "base/_sidebar"; +@import "common/_animation"; @import "common/_bookmark"; @import "common/_bookmark-list"; @import "common/_bookmark-grid"; diff --git a/bow-ui/src/main/less/common/_animation.less b/bow-ui/src/main/less/common/_animation.less new file mode 100644 index 0000000..4d4c729 --- /dev/null +++ b/bow-ui/src/main/less/common/_animation.less @@ -0,0 +1,10 @@ +@keyframes reveal-down { + 0% { + opacity: 0; + margin-top: -30px; + } + 100% { + opacity: 1; + margin-top: 0; + } +} \ No newline at end of file diff --git a/bow-ui/src/main/less/common/_bookmark-grid.less b/bow-ui/src/main/less/common/_bookmark-grid.less index bde4607..c4ad2c0 100644 --- a/bow-ui/src/main/less/common/_bookmark-grid.less +++ b/bow-ui/src/main/less/common/_bookmark-grid.less @@ -88,6 +88,10 @@ display: block; } } + + .pagination { + width: 100%; + } } @media screen and (min-width: @screen-desktop-low) { diff --git a/bow-ui/src/main/less/common/_bookmark-list.less b/bow-ui/src/main/less/common/_bookmark-list.less index a152af0..6cc4e51 100644 --- a/bow-ui/src/main/less/common/_bookmark-list.less +++ b/bow-ui/src/main/less/common/_bookmark-list.less @@ -22,7 +22,21 @@ .bookmark-favicon { } + .bookmark-link { + display: inline-block; + + margin-bottom: @default-marge--small; + } + .bookmark-description { + padding-top: @default-marge--small; + + color: @color-text-secondary; + } + + .bookmark-creation-date, + .bookmark-nb-click { + color: @color-text-secondary; } .bookmark-icon { diff --git a/bow-ui/src/main/less/common/_bookmark.less b/bow-ui/src/main/less/common/_bookmark.less index d6b85b4..84fc861 100644 --- a/bow-ui/src/main/less/common/_bookmark.less +++ b/bow-ui/src/main/less/common/_bookmark.less @@ -91,7 +91,6 @@ .bookmark-title { color: @color-bookmark-title; - font-size: 120%; } .bookmark-link { @@ -110,14 +109,22 @@ font-size: 90%; } -.bookmark-description { - padding: @default-marge--small 0; -} - .bookmark-tags .tag { - color: inherit; - padding: @default-marge--small / 3 @default-marge--small / 4; - background: rgba(255,255,255,0.1); + display: inline-block; + + margin-bottom: @default-marge--tiny; + padding: @default-marge--tiny @default-marge--small; + + background: @color-background-tag-cloud; + border-radius: 10px; + color: #FFF; + font-weight: normal; + + transition: background 0.3s ease; + + &:hover { + background: @color-link-hover; + } } diff --git a/bow-ui/src/main/less/components/connexion.less b/bow-ui/src/main/less/components/connexion.less index c7837e9..d17c831 100644 --- a/bow-ui/src/main/less/components/connexion.less +++ b/bow-ui/src/main/less/components/connexion.less @@ -63,6 +63,7 @@ border-radius: 10px 10px 0 0; box-shadow: 0 -16px 23px #0001; + animation: reveal-down 1s ease; } } diff --git a/bow-ui/src/main/less/variables/_colors.less b/bow-ui/src/main/less/variables/_colors.less index c5e7f27..52c62c2 100644 --- a/bow-ui/src/main/less/variables/_colors.less +++ b/bow-ui/src/main/less/variables/_colors.less @@ -32,4 +32,5 @@ @color-separation-border : #EEE; @color-text : @color-black; +@color-text-secondary : @color-grey; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 fe470c7718beb5661db7c841c426ba50289c3701 Author: kaufmann <kaufmann@codelutin.com> Date: Thu Feb 6 16:21:36 2020 +0100 Améliorations d'affichage des titres de page --- bow-ui/src/main/less/base/_layout.less | 12 ++++++++++++ bow-ui/src/main/less/common/_form.less | 7 ++++++- bow-ui/src/main/less/variables/_colors.less | 2 ++ bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties | 3 ++- bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties | 3 ++- bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp | 3 ++- bow-ui/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 ++- bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp | 3 ++- bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 3 ++- 12 files changed, 44 insertions(+), 19 deletions(-) diff --git a/bow-ui/src/main/less/base/_layout.less b/bow-ui/src/main/less/base/_layout.less index f19adf8..d9b70ff 100644 --- a/bow-ui/src/main/less/base/_layout.less +++ b/bow-ui/src/main/less/base/_layout.less @@ -26,4 +26,16 @@ h1 { margin-bottom: @default-marge--medium; margin-top: @default-marge--small; color: @color-main; + + &.list-title, + &.form-title { + margin-top: 0; + margin-bottom: @default-marge--small; + padding: @default-marge--large; + + text-align: center; + } + &.form-title { + background-color: @color-background-title; + } } \ No newline at end of file diff --git a/bow-ui/src/main/less/common/_form.less b/bow-ui/src/main/less/common/_form.less index 8636b0d..4cff0a0 100644 --- a/bow-ui/src/main/less/common/_form.less +++ b/bow-ui/src/main/less/common/_form.less @@ -1,6 +1,5 @@ .bow-form-wrapper { text-align: center; - padding-top: @default-marge--large; } .bow-form { @@ -56,4 +55,10 @@ select { border: 1px solid @color-main; border-right-color: @color-button-border-2; border-top-color: @color-button-border-2; +} + +@media screen and (min-width: @screen-desktop-low) { + .bow-form-row { + min-width: 400px; + } } \ No newline at end of file diff --git a/bow-ui/src/main/less/variables/_colors.less b/bow-ui/src/main/less/variables/_colors.less index 52c62c2..b57c3c6 100644 --- a/bow-ui/src/main/less/variables/_colors.less +++ b/bow-ui/src/main/less/variables/_colors.less @@ -3,6 +3,7 @@ @color-red : #b71540; @color-black : #1e2a2f; @color-grey : #999; +@color-grey-pale : #f4f4f4; @color-blue : #0a3d62; @color-blue-pale : #E9F2F5; @@ -14,6 +15,7 @@ @color-background-tag-cloud : @color-blue; @color-background-list-odd : @color-blue-pale; @color-background-list-even : darken(@color-blue-pale, 5%); +@color-background-title : @color-grey-pale; @color-menu-link : #FFF; @color-menu-link-hover : @color-red; diff --git a/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties b/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties index 58469e6..407ca5d 100644 --- a/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties +++ b/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties @@ -42,6 +42,7 @@ bow.bookmarks.noBookmarks=No bookmarks bow.common.edit=Edit bow.common.remove=Remove bow.common.rss=RSS Feed +bow.common.web=Web bow.config.alias.url.description=Web server alias URL bow.config.application.version.description=application version bow.config.bow.addressFrom.description=mail from address @@ -111,7 +112,7 @@ bow.permanent.link.searchDescription=Permalink to use Bow as search engine in yo bow.permanent.link.suggestion=Permanent suggest URL bow.permanent.link.suggestionDescription=Permalink to use Bow as suggest engine in your browser bow.preference.opensearch.prefix.separator=OpenSeach prefix separator -bow.preferences.authentication= +bow.preferences.authentication=Authentication bow.preferences.badCurrentPassword=Your current password is incorrect bow.preferences.bookmarksHomePage=Number of bookmarks displayed on the home page bow.preferences.colors=Site color diff --git a/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties b/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties index 35f59ea..de14cb2 100644 --- a/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties +++ b/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties @@ -42,6 +42,7 @@ bow.bookmarks.noBookmarks=Pas de marque-page bow.common.edit=Modifier bow.common.remove=Supprimer bow.common.rss=Flux RSS +bow.common.web=Web bow.config.alias.url.description=Url public du serveur d'alias bow.config.application.version.description=Version de l'application bow.config.bow.addressFrom.description=Adresse expediteur des emails @@ -111,7 +112,7 @@ bow.permanent.link.searchDescription=Lien permanent pour utiliser Bow comme mote bow.permanent.link.suggestion=URL de suggesion permanente bow.permanent.link.suggestionDescription=Lien permanent pour utiliser Bow comme moteur de suggestion dans votre navigateur bow.preference.opensearch.prefix.separator=Separateur de préfix -bow.preferences.authentication= +bow.preferences.authentication=Authentification bow.preferences.badCurrentPassword=Votre mot de passe actuel est incorrect bow.preferences.bookmarksHomePage=Nombre de marque-pages affichés bow.preferences.colors=Couleur du site 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 a388f76..c095c05 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp @@ -30,8 +30,9 @@ <body> <jsp:include page="inc/header.jsp" flush="true"/> + <h1 class="form-title"><s:text name="bow.admin.panel" /></h1> + <div class="bow-form-wrapper"> - <h1><s:text name="bow.admin.panel" /></h1> <div class="bow-form"> 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 86e56ab..8a2a3f8 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp @@ -30,6 +30,8 @@ <body> <jsp:include page="inc/header.jsp" flush="true"/> + <h1 class="form-title"><s:text name="popup.addurl.title" /></h1> + <div class="bow-form-wrapper"> <s:form id="popupAddUrlForm" cssClass="bow-form" action="addUrl" method="post"> <s:hidden name="tagLine" value="%{tagLine}" /> @@ -37,8 +39,6 @@ <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}"/> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp index f44b4db..0783a98 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp @@ -81,6 +81,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <jsp:include page="inc/header.jsp" flush="true"/> <div id="content"> + <h1 class="form-title"><s:text name="bow.groupEdit.title" /></h1> + <div class="bow-form-wrapper"> <s:form id="groupEditForm" cssClass="bow-form" action="groupSave" method="post" onsubmit="prepareSendMembers()"> @@ -88,15 +90,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <s:hidden name="fullTextLine" value="%{fullTextLine}" /> <s:hidden name="groupId" value="%{groupId}"/> - <h1><s:text name="bow.groupEdit.title" /></h1> - - - <div class="bow-form-row"> - <s:if test="config.allowPublicGroup"> - <s:checkbox labelposition="left" name="public" labelSeparator=" " key="bow.groupEdit.public" - value="%{public}" /> - </s:if> - </div> + <s:if test="config.allowPublicGroup"> + <div class="bow-form-row"> + <s:checkbox labelposition="left" name="public" labelSeparator=" " key="bow.groupEdit.public" + value="%{public}" /> + </div> + </s:if> <div class="bow-form-row"> <s:textfield disabled="%{groupId != null}" name="group.name" labelSeparator=" " key="bow.groupEdit.name" 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 2cc9ea5..49c8836 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp @@ -34,8 +34,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <body> <jsp:include page="inc/header.jsp" flush="true"/> + <h1 class="list-title"><s:text name="bow.groupView.title"/></h1> + <div class="bow-form-wrapper"> - <h1><s:text name="bow.groupView.title"/></h1> <s:actionerror/> <div> 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 3819bfe..db0f362 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp @@ -30,8 +30,9 @@ <jsp:include page="inc/header.jsp" flush="true"/> +<h1 class="form-title"><s:text name="bow.preferences.title"/></h1> + <div class="bow-form-wrapper"> - <h1><s:text name="bow.preferences.title"/></h1> <s:actionerror/> <input checked="checked" id="tab-1" type="radio" name="pct" class="tabs-input" /> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp index 849f4a7..a43d9cb 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp @@ -33,6 +33,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <body> <jsp:include page="inc/header.jsp" flush="true"/> + <h1 class="form-title"><s:text name="bow.sharedUserEdit.title" /></h1> + <div class="bow-form-wrapper"> <s:form id="sharedUserEditForm" cssClass="bow-form" action="sharedUserSave" method="post"> @@ -40,7 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <s:hidden name="fullTextLine" /> <s:hidden name="sharedUserId"/> - <h1><s:text name="bow.sharedUserEdit.title" /></h1> <div class="bow-form-row"> <s:textfield disabled="%{sharedUserId != null}" 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 c5544d3..032ae77 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp @@ -35,8 +35,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <body> <jsp:include page="inc/header.jsp" flush="true"/> + <h1 class="list-title"><s:text name="bow.sharedUserView.title"/></h1> + <div class="bow-form-wrapper"> - <h1><s:text name="bow.sharedUserView.title"/></h1> <s:actionerror/> <div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm