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 61fa6d6fcfa6fb93f6ba21d26c6d0de2a82890e6 Author: kaufmann <kaufmann@codelutin.com> Date: Wed Feb 5 11:22:16 2020 +0100 Modification de l'affichage des formulaire de création et modification --- bow-ui/src/main/less/common/_form.less | 14 +++++- bow-ui/src/main/less/common/_tabs.less | 44 +++++++++++++++-- .../main/resources/i18n/bow-ui_en_GB.properties | 4 ++ .../main/resources/i18n/bow-ui_fr_FR.properties | 4 ++ .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 4 +- bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp | 56 ++++++++++++++-------- bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 16 ++++--- bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp | 43 +++++++++++++---- 8 files changed, 143 insertions(+), 42 deletions(-) diff --git a/bow-ui/src/main/less/common/_form.less b/bow-ui/src/main/less/common/_form.less index 57c370e..c9680c1 100644 --- a/bow-ui/src/main/less/common/_form.less +++ b/bow-ui/src/main/less/common/_form.less @@ -10,11 +10,12 @@ .bow-form-row { text-align: left; - border-bottom: 1px solid @color-separation-border; + // border-bottom: 1px solid @color-separation-border; padding-top: @default-marge--small; padding-bottom: @default-marge--small; display: flex; - + flex-direction: column; + label { display: block; float: left; @@ -35,4 +36,13 @@ border-radius: 3px; padding: @default-marge--small @default-marge--small; } +} + +select { + padding: (@default-marge--small / 2) (2 * @default-marge--small); + + background-color: inherit; + border: 1px solid @color-main; + border-right-color: @color-button-border-2; + border-top-color: @color-button-border-2; } \ No newline at end of file diff --git a/bow-ui/src/main/less/common/_tabs.less b/bow-ui/src/main/less/common/_tabs.less index e0379b8..b2a5bcf 100644 --- a/bow-ui/src/main/less/common/_tabs.less +++ b/bow-ui/src/main/less/common/_tabs.less @@ -7,8 +7,11 @@ justify-content: center; list-style: none; - padding-bottom: @default-marge--medium; + margin-bottom: @default-marge--large; padding-top: @default-marge--medium; + padding-bottom: 6px; + + border-bottom: 1px solid #eee; li { margin: 0 20px; @@ -22,13 +25,27 @@ line-height: 21px; color: @color-black; text-decoration: none; - padding-bottom: 5px; } } } section.tab { display: none; + + h2, h3 { + text-align: center; + } + h3 { + margin-bottom: @default-marge--small; + margin-top: @default-marge--medium; + } + ul { + list-style: none; + + li { + margin-bottom: @default-marge--small; + } + } } #tab-1:checked ~ section.tab-1, @@ -48,4 +65,25 @@ section.tab { #tab-6:checked ~ .tabs .tab-6 { color: @color-main; border-bottom: 3px solid @color-main; -} \ No newline at end of file +} + +@media screen and (max-width: @screen-desktop-large - 1) { + .tabs { + flex-direction: column; + + & li { + margin-bottom: @default-marge--small; + } + } +} + +@media screen and (min-width: @screen-desktop-large) { + .tabs { + + & li { + label { + padding-bottom: @default-marge--small / 2; + } + } + } +} 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 b14f615..49d7fa7 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 @@ -35,6 +35,7 @@ bow.bookmark.import.successful=The bookmarks were imported successfully bow.bookmark.remove.successful=The bookmark was removed successfully bow.bookmark.screenshot.updated.successful=Update screenshot successful bow.bookmark.tag.deleted=The tag was removed successfully +bow.bookmark.tag.selected=Tags selected bow.bookmark.tags=Tags bow.bookmark.update.successful=The bookmark was updated successfully bow.bookmarks.noBookmarks=No bookmarks @@ -158,6 +159,7 @@ bow.register.title=Register bow.requiredstring=${getText(fieldKey)} is required bow.rightMenu.addUrl.link=Add entry bow.rightMenu.admin=Admin +bow.rightMenu.bookmark=Bookmark bow.rightMenu.bookmark.addModify=Add / Modify bow.rightMenu.bookmark.alias=ALIAS bow.rightMenu.bookmark.link=URL @@ -179,6 +181,7 @@ bow.rightMenu.importBookmarks=Import bookmarks bow.rightMenu.logout=Logout bow.rightMenu.search=Search bow.rightMenu.search.tags=by tags +bow.rightMenu.token=Token bow.rightMenu.token.permanent=Permanent token id bow.rightMenu.token.temporary=Session token id bow.search.ascclick=Asc. clicks nb @@ -206,6 +209,7 @@ bow.sharedUserEdit.save=Save bow.sharedUserEdit.title=Shared user edition bow.sharedUserView.documentation=Add tag '\#<user name>' for this user to access the bookmark with this tag bow.sharedUserView.title=Your shared user +bow.temporary.link=Search URL bow.temporary.link.search=Temporary search URL bow.temporary.link.searchDescription=Temporary link (session) to use Bow as search engine in your browser bow.temporary.link.suggestion=Temporary suggest URL 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 ef73f4b..cd9df4c 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 @@ -35,6 +35,7 @@ bow.bookmark.import.successful=Les marque-pages ont été importés avec succès bow.bookmark.remove.successful=Le marque-page a été supprimé avec succès bow.bookmark.screenshot.updated.successful=Mise à jour de la capture d'écran réussi bow.bookmark.tag.deleted=Le tag a été supprimé avec succès +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 @@ -158,6 +159,7 @@ bow.register.title=S'enregistrer bow.requiredstring=${getText(fieldKey)} est obligatoire bow.rightMenu.addUrl.link=Ajouter une entrée bow.rightMenu.admin=Admin +bow.rightMenu.bookmark=Bookmark bow.rightMenu.bookmark.addModify=Ajouter / Modifier bow.rightMenu.bookmark.alias=ALIAS bow.rightMenu.bookmark.link=URL @@ -179,6 +181,7 @@ bow.rightMenu.importBookmarks=Importer des marque-pages bow.rightMenu.logout=Déconnexion bow.rightMenu.search=Recherche bow.rightMenu.search.tags=par tags +bow.rightMenu.token=Token bow.rightMenu.token.permanent=Token permanent bow.rightMenu.token.temporary=Token session bow.search.ascclick=Nb clics asc. @@ -206,6 +209,7 @@ bow.sharedUserEdit.save=Save bow.sharedUserEdit.title=Edition d'un utilisateur de partage bow.sharedUserView.documentation=Ajouter le tag '\#<nom de l'utilisateur>' pour que cet utilisateur puisse accéder au bookmark ayant ce tag bow.sharedUserView.title=Tous vos utilisateurs de partage +bow.temporary.link=URL de recherche bow.temporary.link.search=URL de recherche temporaire bow.temporary.link.searchDescription=Lien temporaire (le temps de la session) pour utiliser Bow comme moteur de recherche dans votre navigateur bow.temporary.link.suggestion=URL de suggesion temporaire 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 53f4d34..f3fb4a4 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp @@ -57,7 +57,9 @@ <s:textfield name="publicAlias" labelSeparator=" " key="popup.addurl.alias.public" value="%{bookmark.publicAlias}" /> </div> - <s:submit cssClass="submit-button" key="popup.commons.submit" name="submit" /> + <div class="buttons-group"> + <s:submit cssClass="submit-button" key="popup.commons.submit" name="submit" /> + </div> </s:form> </div> </body> 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 fa4b762..85bb51f 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp @@ -79,32 +79,46 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. </head> <body onload="showAddedMembers()"> <div id="content"> - <div class="menu clearfix"> - <h2><s:text name="bow.groupEdit.title" /></h2> - </div> - <div class="formFrame fond"> - <s:form id="groupEditForm" cssClass="pretty-form" action="groupSave" + + <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}"/> - <s:if test="config.allowPublicGroup"> - <s:checkbox labelposition="left" name="public" labelSeparator=" " key="bow.groupEdit.public" - value="%{public}" /> - </s:if> - <s:textfield disabled="%{groupId != null}" name="group.name" labelSeparator=" " key="bow.groupEdit.name" - value="%{group.name}" /> - - <s:textfield name="group.description" labelSeparator=" " key="bow.groupEdit.description" - value="%{group.description}" /> - - <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><s:textfield id="userLogin" onkeypress="return addUserEnter(event)"/> <button type='button' name="+" onclick="addUser()">+</button></div> + <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"/> 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 ad639e3..3880709 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp @@ -32,13 +32,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <title><s:text name="bow.groupView.title"/></title> </head> <body> + <jsp:include page="inc/header.jsp" flush="true"/> + <div class="bow-form-wrapper"> <h1><s:text name="bow.groupView.title"/></h1> <s:actionerror/> - <div class="bow-form"> - <s:a action="groupEdit"><s:text name="bow.group.new" /></s:a> - <ul> + <div> + <ul class="items-list"> <s:iterator value="groups" var="group"> <s:set name="group" value="group"/> <li class="public-${u:isPublicGroup(group)}" title="${group.description}"> @@ -49,24 +50,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <s:url var="groupEdit" action="groupEdit" escapeAmp="true"> <s:param name="groupId" value="%{#group.wikittyId}" /> </s:url> - <a class="edit" href="${groupEdit}">edit</a> + <a class="button" href="${groupEdit}">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="removeMe" href="${groupRemoveMe}">removeMe</a> + <a class="button" href="${groupRemoveMe}">removeMe</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="atom" href="${atom}">atom</a> + <a class="button" href="${atom}">atom</a> </span> </li> </s:iterator> </ul> + <div class="buttons-group"> + <s:a action="groupEdit" cssClass="button"><s:text name="bow.group.new" /></s:a> + </div> </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 a503745..3819bfe 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp @@ -27,6 +27,9 @@ <title><s:text name="bow.preferences.title"/></title> </head> <body> + +<jsp:include page="inc/header.jsp" flush="true"/> + <div class="bow-form-wrapper"> <h1><s:text name="bow.preferences.title"/></h1> <s:actionerror/> @@ -67,6 +70,9 @@ <s:set var="bowUrl" value="config.bowUrl" /> <s:set var="permanentToken" value="bowSession.getPermanentToken()" /> <s:set var="temporaryToken" value="bowSession.getTemporaryToken()" /> + + <h3><s:text name="bow.temporary.link"/></h3> + <ul> <li> <s:a title="%{getText('bow.temporary.link.searchDescription')}" @@ -92,6 +98,11 @@ <s:text name="bow.permanent.link.suggestion" /> </s:a> </li> + </ul> + + <h3><s:text name="bow.rightMenu.extensions"/> / <s:text name="bow.rightMenu.bookmark"/></h3> + + <ul> <li> <s:text name="bow.rightMenu.bookmark.temporaryLink" /> <a href="${u:scriptletAdd(bowUrl, temporaryToken)}">BowAddTemp</a> @@ -106,6 +117,11 @@ <s:text name="bow.rightMenu.chromiumExtension" /> </a> </li> + </ul> + + <h3><s:text name="bow.rightMenu.token.permanent"/></h3> + + <ul> <li> <strong><s:text name="bow.rightMenu.token.permanent"/> :</strong> <s:property value="%{#permanentToken}"/> @@ -154,7 +170,10 @@ labelposition="top"/> </div> <s:hidden name="update" value="user"/> - <s:submit key="bow.preferences.submit" name="submit"/> + + <div class="buttons-group"> + <s:submit type="button" key="bow.preferences.submit" name="submit" cssClass="submit-button"/> + </div> </s:form> </section> @@ -195,7 +214,10 @@ </div> <s:hidden name="update" value="authentication"/> - <s:submit key="bow.preferences.submit" name="submit"/> + + <div class="buttons-group"> + <s:submit type="button" key="bow.preferences.submit" name="submit" cssClass="submit-button"/> + </div> </s:form> <script type="text/javascript"> @@ -242,14 +264,17 @@ <td><s:textfield name="searchPrefix[%{#stat.index}].prefix" value="%{prefix}"/></td> <td><s:textfield name="searchPrefix[%{#stat.index}].search" value="%{search}"/></td> <td><s:textfield name="searchPrefix[%{#stat.index}].suggestion" value="%{suggestion}"/></td> - <td><s:submit action="removePrefix" value="X" onclick="return setRemoveIndex(%{#stat.index})"></s:submit></td> + <td><s:submit type="button" action="removePrefix" value="X" onclick="return setRemoveIndex(%{#stat.index})" cssClass="submit-button"></s:submit></td> </tr> </s:iterator> </table> - <s:submit action="addPrefix" value="add prefix"></s:submit> - <s:hidden name="update" value="site"/> - <s:submit key="bow.preferences.submit" name="submit"/> + <div class="buttons-group"> + <s:submit type="button" action="addPrefix" value="add prefix" cssClass="submit-button"></s:submit> + + <s:hidden name="update" value="site"/> + <s:submit type="button" key="bow.preferences.submit" name="submit" cssClass="submit-button"/> + </div> </s:form> </section> @@ -264,8 +289,8 @@ </div> <div class="action"> <s:text name="bow.preferences.labels.name.field"/><s:textfield name="newLabel" /> - <s:submit name="rename" key="bow.preferences.labels.rename.submit" /> - <s:submit name="delete" key="bow.preferences.labels.delete.submit" /> + <s:submit type="button" name="rename" key="bow.preferences.labels.rename.submit" cssClass="submit-button" /> + <s:submit type="button" name="delete" key="bow.preferences.labels.delete.submit" cssClass="submit-button" /> </div> </s:form> </section> @@ -280,7 +305,7 @@ <s:file name="upfile" labelSeparator=""/> <s:hidden name="tagLine" value="%{tagLine}"/> <s:hidden name="fullTextLine" value="%{fullTextLine}"/> - <s:submit key="bow.preferences.import.submit" name="submit"/> + <s:submit type="button" key="bow.preferences.import.submit" name="submit" cssClass="submit-button"/> </s:form> <s:if test="bookmarksImportDate != null"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.