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 a67fafcdb1a02ac574a5610fb39a78a0d3a594fa Author: kaufmann <kaufmann@codelutin.com> Date: Wed Feb 5 17:32:55 2020 +0100 Modifications d'affichage des écrans comportant des formulaires --- .../main/java/org/chorem/bow/BowSearchResult.java | 6 +- bow-ui/src/main/less/bow.less | 1 + bow-ui/src/main/less/common/_list.less | 28 ++++++ .../main/resources/i18n/bow-ui_en_GB.properties | 3 + .../main/resources/i18n/bow-ui_fr_FR.properties | 3 + .../main/webapp/WEB-INF/jsp/authenticationEdit.jsp | 101 +++++++++++++-------- .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 4 +- bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp | 95 +++++++++---------- bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 10 +- .../src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp | 48 +++++----- .../src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 22 +++-- 11 files changed, 196 insertions(+), 125 deletions(-) diff --git a/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java b/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java index cc77710..b7574f5 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java @@ -140,10 +140,10 @@ public class BowSearchResult { public int getFont(int ti) { int font = 1; if (tmax > tmin) { - font = 30 * (ti - tmin) / (tmax - tmin); // get the font size for a tag frequency + font = 40 * (ti - tmin) / (tmax - tmin); // get the font size for a tag frequency } - if (font < 10) { - font = 10; + if (font < 14) { + font = 14; } return font; } diff --git a/bow-ui/src/main/less/bow.less b/bow-ui/src/main/less/bow.less index cabb6aa..55e5143 100644 --- a/bow-ui/src/main/less/bow.less +++ b/bow-ui/src/main/less/bow.less @@ -23,6 +23,7 @@ @import "common/_button"; @import "common/_form"; @import "common/_icons"; +@import "common/_list"; @import "common/_modal"; @import "common/_notifications"; @import "common/_tabs"; diff --git a/bow-ui/src/main/less/common/_list.less b/bow-ui/src/main/less/common/_list.less new file mode 100644 index 0000000..184a3c5 --- /dev/null +++ b/bow-ui/src/main/less/common/_list.less @@ -0,0 +1,28 @@ +ul { + list-style: none; +} + +.items-list { + list-style: none; + margin-bottom: @default-marge--medium; + margin-top: @default-marge--medium; + + li { + padding: (@default-marge--small * 2 ) @default-marge--medium; + + background-color: @color-background-list-odd; + + &:nth-child(2n) { + background-color: @color-background-list-even; + } + } +} + +.list-item-name { + margin-right: @default-marge--medium; + + font-weight: 600; +} +.list-item-description { + margin-right: @default-marge--medium; +} \ No newline at end of file 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 49d7fa7..58469e6 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 @@ -39,6 +39,9 @@ bow.bookmark.tag.selected=Tags selected bow.bookmark.tags=Tags bow.bookmark.update.successful=The bookmark was updated successfully bow.bookmarks.noBookmarks=No bookmarks +bow.common.edit=Edit +bow.common.remove=Remove +bow.common.rss=RSS Feed bow.config.alias.url.description=Web server alias URL bow.config.application.version.description=application version bow.config.bow.addressFrom.description=mail from address 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 cd9df4c..35f59ea 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 @@ -39,6 +39,9 @@ bow.bookmark.tag.selected=Tags sélectionnés bow.bookmark.tags=Tags bow.bookmark.update.successful=Le marque-page a été mis à jour avec succès bow.bookmarks.noBookmarks=Pas de marque-page +bow.common.edit=Modifier +bow.common.remove=Supprimer +bow.common.rss=Flux RSS 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 diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/authenticationEdit.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/authenticationEdit.jsp index 5200c5e..b4f1124 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/authenticationEdit.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/authenticationEdit.jsp @@ -31,49 +31,70 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <title><s:text name="bow.authenticationEdit.title"/></title> </head> <body> - <div id="content"> - <div class="menu clearfix"> - <h2><s:text name="bow.authenticationEdit.title" /></h2> - </div> - <div class="formFrame fond"> - <s:form id="authenticationEditForm" cssClass="pretty-form" action="authenticationSave" - method="post"> - <s:hidden name="tagLine" /> - <s:hidden name="fullTextLine" /> - <s:hidden name="bookmarkId"/> - <%-- struts2/ognl problem, try to use setter with wikitty argument - and not setter with String argument :( - fortunately we don't need it any more - <s:hidden name="authentication.target"/> - --%> - <s:checkbox key="bow.authenticationEdit.shareSecurity" labelposition="left" labelSeparator=" " - name="shareSecurity" /> + <jsp:include page="inc/header.jsp" flush="true"/> + + <div id="content" class="bow-form-wrapper"> + <s:form id="authenticationEditForm" cssClass="bow-form" action="authenticationSave" + method="post"> + <s:hidden name="tagLine" /> + <s:hidden name="fullTextLine" /> + <s:hidden name="bookmarkId"/> + <%-- struts2/ognl problem, try to use setter with wikitty argument + and not setter with String argument :( + fortunately we don't need it any more + <s:hidden name="authentication.target"/> + --%> + <h1><s:text name="bow.authenticationEdit.title" /></h1> - <s:textarea key="bow.authenticationEdit.description" labelSeparator=" " - name="authentication.description" /> + <div class="bow-form-row"> + <s:checkbox key="bow.authenticationEdit.shareSecurity" labelposition="left" labelSeparator=" " + name="shareSecurity" /> + </div> - <s:textfield key="bow.authenticationEdit.domain" labelSeparator=" " - name="authentication.domain" /> - <s:textfield key="bow.authenticationEdit.login" labelSeparator=" " - name="authentication.login" /> - <s:textfield key="bow.authenticationEdit.maxLength" labelSeparator=" " - name="authentication.maxLength" /> - <s:textfield key="bow.authenticationEdit.include" labelSeparator=" " - name="authentication.include" /> - <s:textfield key="bow.authenticationEdit.exclude" labelSeparator=" " - name="authentication.exclude" /> - <s:textfield key="bow.authenticationEdit.prefix" labelSeparator=" " - name="authentication.prefix" /> - <s:textfield key="bow.authenticationEdit.suffix" labelSeparator=" " - name="authentication.suffix" /> - - <s:textarea key="bow.authenticationEdit.form" labelSeparator=" " - name="authentication.form" /> + <div class="bow-form-row"> + <s:textarea key="bow.authenticationEdit.description" labelSeparator=" " + name="authentication.description" /> + </div> - <s:submit cssClass="submit-button" key="bow.authenticationEdit.save" name="submit" /> - <s:submit cssClass="submit-button" key="bow.authenticationEdit.delete" name="delete" action="authenticationDelete"/> - </s:form> + <div class="bow-form-row"> + <s:textfield key="bow.authenticationEdit.domain" labelSeparator=" " + name="authentication.domain" /> + </div> + <div class="bow-form-row"> + <s:textfield key="bow.authenticationEdit.login" labelSeparator=" " + name="authentication.login" /> + </div> + <div class="bow-form-row"> + <s:textfield key="bow.authenticationEdit.maxLength" labelSeparator=" " + name="authentication.maxLength" /> + </div> + <div class="bow-form-row"> + <s:textfield key="bow.authenticationEdit.include" labelSeparator=" " + name="authentication.include" /> + </div> + <div class="bow-form-row"> + <s:textfield key="bow.authenticationEdit.exclude" labelSeparator=" " + name="authentication.exclude" /> </div> - </div> + <div class="bow-form-row"> + <s:textfield key="bow.authenticationEdit.prefix" labelSeparator=" " + name="authentication.prefix" /> + </div> + <div class="bow-form-row"> + <s:textfield key="bow.authenticationEdit.suffix" labelSeparator=" " + name="authentication.suffix" /> + </div> + <div class="bow-form-row"> + <s:textarea key="bow.authenticationEdit.form" labelSeparator=" " + name="authentication.form" /> + </div> + + <div class="buttons-group"> + <s:submit type="button" key="bow.authenticationEdit.save" name="submit" /> + <s:submit type="button" key="bow.authenticationEdit.delete" name="delete" action="authenticationDelete"/> + </div> + </s:form> + + </div> </body> </html> 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 f3fb4a4..86e56ab 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp @@ -28,6 +28,8 @@ <head> </head> <body> + <jsp:include page="inc/header.jsp" flush="true"/> + <div class="bow-form-wrapper"> <s:form id="popupAddUrlForm" cssClass="bow-form" action="addUrl" method="post"> <s:hidden name="tagLine" value="%{tagLine}" /> @@ -58,7 +60,7 @@ value="%{bookmark.publicAlias}" /> </div> <div class="buttons-group"> - <s:submit cssClass="submit-button" key="popup.commons.submit" name="submit" /> + <s:submit type="button" key="popup.commons.submit" name="submit" /> </div> </s:form> </div> 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 85bb51f..f44b4db 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp @@ -78,52 +78,55 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. </script> </head> <body onload="showAddedMembers()"> - <div id="content"> - - <div class="bow-form-wrapper"> - <s:form id="groupEditForm" cssClass="bow-form" action="groupSave" - method="post" onsubmit="prepareSendMembers()"> - <s:hidden name="tagLine" value="%{tagLine}" /> - <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> - - <div class="bow-form-row"> - <s:textfield disabled="%{groupId != null}" name="group.name" labelSeparator=" " key="bow.groupEdit.name" - value="%{group.name}" /> - </div> - - - <div class="bow-form-row"> - <s:textfield name="group.description" labelSeparator=" " key="bow.groupEdit.description" - value="%{group.description}" /> - </div> - - <div class="bow-form-row"> - <s:select id="members" - list="%{group.getMembers(false)}" listKey="wikittyId" listValue="getFqField('WikittyUser.login')" - multiple="true" size="10" - name="group.members" labelSeparator=" " key="bow.groupEdit.members" /> - <button type='button' name="-" onclick="removeUser()">-</button> - </div> - - <div class="bow-form-row"> - <s:textfield id="userLogin" onkeypress="return addUserEnter(event)"/> <button type='button' name="+" onclick="addUser()">+</button> - </div> - - <s:submit cssClass="submit-button" key="bow.groupEdit.save" name="submit" /> - <s:submit cssClass="submit-button" key="bow.groupEdit.delete" name="delete" action="groupDelete"/> - </s:form> - </div> + <jsp:include page="inc/header.jsp" flush="true"/> + <div id="content"> + + <div class="bow-form-wrapper"> + <s:form id="groupEditForm" cssClass="bow-form" action="groupSave" + method="post" onsubmit="prepareSendMembers()"> + <s:hidden name="tagLine" value="%{tagLine}" /> + <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> + + <div class="bow-form-row"> + <s:textfield disabled="%{groupId != null}" name="group.name" labelSeparator=" " key="bow.groupEdit.name" + value="%{group.name}" /> + </div> + + + <div class="bow-form-row"> + <s:textfield name="group.description" labelSeparator=" " key="bow.groupEdit.description" + value="%{group.description}" /> + </div> + + <div class="bow-form-row"> + <s:select id="members" + list="%{group.getMembers(false)}" listKey="wikittyId" listValue="getFqField('WikittyUser.login')" + multiple="true" size="10" + name="group.members" labelSeparator=" " key="bow.groupEdit.members" /> + <button type='button' name="-" onclick="removeUser()">-</button> + </div> + + <div class="bow-form-row"> + <s:textfield id="userLogin" onkeypress="return addUserEnter(event)"/> <button type='button' name="+" onclick="addUser()">+</button> + </div> + + <div class="buttons-group"> + <s:submit type="button" key="bow.groupEdit.save" name="submit" /> + <s:submit type="button" key="bow.groupEdit.delete" name="delete" action="groupDelete"/> + </div> + </s:form> </div> + </div> </body> </html> 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 3880709..2cc9ea5 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp @@ -43,27 +43,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <s:iterator value="groups" var="group"> <s:set name="group" value="group"/> <li class="public-${u:isPublicGroup(group)}" title="${group.description}"> - <span class="group-name">${group.name}</span> - <span class="group-members">${group.members.size()} <s:text name="bow.group.members"/></span> + <span class="list-item-name">${group.name}</span> + <span class="list-item-description">${group.members.size()} <s:text name="bow.group.members"/></span> <span class="group-actions"> <s:url var="groupEdit" action="groupEdit" escapeAmp="true"> <s:param name="groupId" value="%{#group.wikittyId}" /> </s:url> - <a class="button" href="${groupEdit}">edit</a> + <a class="button" href="${groupEdit}" title="<s:text name='bow.common.edit' />"><s:text name="bow.common.edit" /></a> <s:url var="groupRemoveMe" action="groupRemoveMe" escapeAmp="true"> <s:param name="groupId" value="%{#group.wikittyId}" /> <s:param name="user" value="%{bowSession.user.wikittyId}" /> </s:url> - <a class="button" href="${groupRemoveMe}">removeMe</a> + <a class="button" href="${groupRemoveMe}" title="<s:text name='bow.common.remove' />"><s:text name="bow.common.remove" /></a> <s:url var="atom" action="atom" escapeAmp="true"> <s:param name="token" value="%{bowSession.permanentToken}" /> <s:param name="tagLine" value="%{'@' + #group.name}" /> <s:param name="notmine" value="true" /> </s:url> - <a class="button" href="${atom}">atom</a> + <a class="button" href="${atom}" title="<s:text name='bow.common.rss' />"><s:text name="bow.common.rss" /></a> </span> </li> </s:iterator> 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 28a13d9..849f4a7 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp @@ -31,28 +31,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <title><s:text name="bow.sharedUserEdit.title"/></title> </head> <body> - <div id="content"> - <div class="menu clearfix"> - <h2><s:text name="bow.sharedUserEdit.title" /></h2> + <jsp:include page="inc/header.jsp" flush="true"/> + + <div class="bow-form-wrapper"> + <s:form id="sharedUserEditForm" cssClass="bow-form" action="sharedUserSave" + method="post"> + <s:hidden name="tagLine" /> + <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}" + name="sharedUser.login" + labelSeparator=" " key="bow.sharedUserEdit.name" /> </div> - <div class="formFrame fond"> - <s:form id="sharedUserEditForm" cssClass="pretty-form" action="sharedUserSave" - method="post"> - <s:hidden name="tagLine" /> - <s:hidden name="fullTextLine" /> - <s:hidden name="sharedUserId"/> - - <s:textfield disabled="%{sharedUserId != null}" - name="sharedUser.login" - labelSeparator=" " key="bow.sharedUserEdit.name" /> - - <s:textfield name="sharedUser.description" - labelSeparator=" " key="bow.sharedUserEdit.description" /> - - <s:submit cssClass="submit-button" key="bow.sharedUserEdit.save" name="submit" /> - <s:submit disabled="%{sharedUserId == null}" cssClass="submit-button" key="bow.sharedUserEdit.delete" name="delete" action="sharedUserDelete"/> - </s:form> + + <div class="bow-form-row"> + <s:textfield name="sharedUser.description" + labelSeparator=" " key="bow.sharedUserEdit.description" /> </div> - </div> + + <div class="buttons-group"> + <s:submit type="button" key="bow.sharedUserEdit.save" name="submit" /> + <s:submit disabled="%{sharedUserId == null}" cssClass="button" key="bow.sharedUserEdit.delete" name="delete" action="sharedUserDelete"/> + </div> + </s:form> + + </div> </body> </html> 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 0629c50..c5544d3 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp @@ -38,41 +38,45 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <div class="bow-form-wrapper"> <h1><s:text name="bow.sharedUserView.title"/></h1> <s:actionerror/> - <div class="bow-form"> + + <div> <div class="documentation"><s:text name="bow.sharedUserView.documentation"/></div> - <s:a action="sharedUserEdit"><s:text name="bow.sharedUser.new" /></s:a> - <ul> + + <ul class="items-list"> <s:iterator value="sharedUsers" var="sharedUser"> <s:set name="sharedUser" value="sharedUser"/> <li title="${sharedUser.description}"> - <span class="sharedUser-name">${sharedUser.login}</span> + <span class="list-item-name">${sharedUser.login}</span> <span class="sharedUser-actions"> <s:url var="sharedUserEdit" action="sharedUserEdit" escapeAmp="true"> <s:param name="sharedUserId" value="%{#sharedUser.wikittyId}" /> </s:url> - <a class="edit" href="${sharedUserEdit}">edit</a> + <a class="button" href="${sharedUserEdit}" title="<s:text name='bow.common.edit' />"><s:text name="bow.common.edit" /></a> <s:url var="sharedUserDelete" action="sharedUserDelete" escapeAmp="true"> <s:param name="sharedUserId" value="%{#sharedUser.wikittyId}" /> </s:url> - <a class="delete" href="${sharedUserDelete}">delete</a> + <a class="button" href="${sharedUserDelete}" title="<s:text name='bow.common.remove' />"><s:text name="bow.common.remove" /></a> <s:url var="atom" action="atom" escapeAmp="true"> <s:param name="token" value="%{#sharedUser.permanentToken}" /> <s:param name="tagLine" value="%{'#' + #sharedUser.login}" /> </s:url> - <a class="atom" href="${atom}">atom</a> + <a class="button" href="${atom}" title="<s:text name='bow.common.rss' />"><s:text name="bow.common.rss" /></a> - <s:url var="web" action="home" escapeAmp="true"> + <s:url var="button" action="home" escapeAmp="true"> <s:param name="token" value="%{#sharedUser.permanentToken}" /> <s:param name="tagLine" value="%{'#' + #sharedUser.login}" /> </s:url> - <a class="web" href="${web}">web</a> + <a class="button" href="${web}" title="<s:text name='bow.common.web' />">web</a> </span> </li> </s:iterator> </ul> + <div class="buttons-group"> + <s:a action="sharedUserEdit" cssClass="button"><s:text name="bow.sharedUser.new" /></s:a> + </div> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.