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>.