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

r263 - in trunk/bow-ui/src/main: java/org/chorem/bow java/org/chorem/bow/action resources/i18n webapp/css webapp/jsp webapp/jsp/inc
by sletellier＠users.chorem.org 26 Apr '11

26 Apr '11

Author: sletellier Date: 2011-04-26 15:17:07 +0200 (Tue, 26 Apr 2011) New Revision: 263 Url: http://chorem.org/repositories/revision/bow/263 Log: - Fix i18n in popupPublicAlias - Allow to modify alias to null or empty - Add padding for ul in preference - Remove delete alias code - Fix test in bookmark if public alias is empty Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties trunk/bow-ui/src/main/webapp/css/bookmark.css trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-04-26 13:17:07 UTC (rev 263) @@ -337,12 +337,12 @@ addTagsToBookmark(tags, bookmark); if (privateAlias != null) { privateAlias = privateAlias.trim(); - bookmark.setPrivateAlias(privateAlias); } + bookmark.setPrivateAlias(privateAlias); if (publicAlias != null) { publicAlias = publicAlias.trim(); - bookmark.setPublicAlias(publicAlias); } + bookmark.setPublicAlias(publicAlias); } public static String getBookmarkTagsString(BowBookmark bookmark) { Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-04-26 13:17:07 UTC (rev 263) @@ -195,6 +195,7 @@ if (name != null) { // Si l'alias prive souhaite est deja utilise on ne l'accept pas // Si l'alias public souhaite est deja utilise on ne l'accept pas + // TODO sletellier 20110416 : return error message when public or private alias is already used Criteria privateAliasCriteria = null; Criteria publicAliasCriteria = null; if (privateAlias != null && !privateAlias.isEmpty()) { Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-26 13:17:07 UTC (rev 263) @@ -135,9 +135,10 @@ bow.token.generate.successful=The token has been regenerated successfully popup.addurl.alias.private=Private alias popup.addurl.alias.public=Public alias -popup.addurl.cancel=Cancel popup.addurl.link=Url popup.addurl.name=Description -popup.addurl.submit=Validate popup.addurl.tags=Tags popup.addurl.title=Add or modify URL +popup.commons.cancel=Cancel +popup.commons.submit=Validate +popup.setPublicAliasPopup.title=Enter the public alias Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-26 13:17:07 UTC (rev 263) @@ -135,9 +135,10 @@ bow.token.generate.successful=Le token a \u00E9t\u00E9 reg\u00E9n\u00E9r\u00E9 avec succ\u00E8s popup.addurl.alias.private=Alias priv\u00E9 popup.addurl.alias.public=Alias public -popup.addurl.cancel=Annuler popup.addurl.link=Url popup.addurl.name=Description -popup.addurl.submit=Valider popup.addurl.tags=Tags popup.addurl.title=Ajouter ou modifier une URL +popup.commons.cancel=Annuler +popup.commons.submit=Valider +popup.setPublicAliasPopup.title=Entrer un alias public Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-26 13:17:07 UTC (rev 263) @@ -380,6 +380,10 @@ padding-right:70px; } +.formFrame ul{ + padding-left:10px; +} + .formFrame h1{ color:#804561; width:225px; Modified: trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-26 13:17:07 UTC (rev 263) @@ -54,7 +54,7 @@ <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator=" " value="%{bookmark.publicAlias}" /><br /> <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator=" " value="%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}" /><br /> </p> - <s:submit key="popup.addurl.submit" name="submit" /> + <s:submit key="popup.commons.submit" name="submit" /> </s:form> </div> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-26 13:17:07 UTC (rev 263) @@ -67,23 +67,10 @@ <s:property value="%{#wikittyId}" /> </s:a> --%> - <s:if test="%{#publicAliasUrl != null}"> + <s:if test="%{!#publicAliasUrl.empty}"> <s:a cssClass="alias" href="%{#aliasServlet + #publicAliasUrl}.action" title="%{#bookmarkLink}" onclick="window.open(this.href); return false;"> <s:property value="%{#publicAliasUrl}" /> </s:a> - <s:url var="deleteAlias" action="deleteAlias"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> - </s:url> - <s:if test="%{!(formBookmarkId == null || !formBookmarkId.equals(wikittyId))}"> - <s:a cssStyle="text-decoration:none;" href="%{#deleteAlias}"> - <img style="border:none;" src="img/delete.png" alt="Delete alias" title="Delete" /> - </s:a> - </s:if> - <s:else> - <s:a name="%{#wikittyId}" cssStyle="display:none; text-decoration:none;" href="%{#deleteAlias}"> - <img style="border:none;" src="img/delete.png" alt="Delete alias" title="Delete" /> - </s:a> - </s:else> </s:if> <s:else> <s:url var="addAlias" action="createAlias"> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-26 13:17:07 UTC (rev 263) @@ -51,7 +51,7 @@ } </script> -<s:set id="title"> +<s:set id="title"> <s:text name="popup.addurl.title"/> </s:set> @@ -68,7 +68,7 @@ <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator=" " /><br /> <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator=" " /><br /> </p> - <a class="button" onclick="submitAddUrl()"><s:text name="popup.addurl.submit"/></a> - <a class="button" onclick="closePopupAddUrl()"><s:text name="popup.addurl.cancel"/></a> + <a class="button" onclick="submitAddUrl()"><s:text name="popup.commons.submit"/></a> + <a class="button" onclick="closePopupAddUrl()"><s:text name="popup.commons.cancel"/></a> </s:form> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp 2011-04-26 13:17:07 UTC (rev 263) @@ -19,26 +19,42 @@ autoOpen: false, width: 300, modal: true, - buttons: { - "Validate": function() { - $("#setPublicAliasForm").submit(); - $( this ).dialog( "close" ); - }, - Cancel: function() { - $( this ).dialog( "close" ); - } - }, +// buttons: { +// "Validate": function() { +// $("#setPublicAliasForm").submit(); +// $( this ).dialog( "close" ); +// }, +// Cancel: function() { +// $( this ).dialog( "close" ); +// } +// }, close: function() { //allFields.val( "" ).removeClass( "ui-state-error" ); } }); - }); + }); + function submitPublicAlias() { + $("#setPublicAliasForm").submit(); + closePopupAddUrl(); + } + + function closePopupPublicAlias() { + $( "#setPublicAliasPopup" ).dialog( "close" ) + } </script> +<s:set id="title"> + <s:text name="popup.setPublicAliasPopup.title"/> +</s:set> + <div xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - id="setPublicAliasPopup" title="Enter the public alias"> + id="setPublicAliasPopup" title="${title}"> <s:form id="setPublicAliasForm" action="createAlias"> - <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" class="text ui-widget-content ui-corner-all" /> - <s:hidden id="publicAliasFormBookmarkId" name="bookmarkId" /> + <p> + <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" class="text ui-widget-content ui-corner-all" /> + <s:hidden id="publicAliasFormBookmarkId" name="bookmarkId" /> + </p> + <a class="button" onclick="submitPublicAlias()"><s:text name="popup.commons.submit"/></a> + <a class="button" onclick="closePopupPublicAlias()"><s:text name="popup.commons.cancel"/></a> </s:form> </div>

1 0

r262 - trunk/bow-ui/src/main/java/org/chorem/bow/action
by bpoussin＠users.chorem.org 22 Apr '11

22 Apr '11

Author: bpoussin Date: 2011-04-22 18:28:18 +0200 (Fri, 22 Apr 2011) New Revision: 262 Url: http://chorem.org/repositories/revision/bow/262 Log: ajout information javadoc Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-22 16:27:49 UTC (rev 261) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-22 16:28:18 UTC (rev 262) @@ -10,7 +10,8 @@ import static org.nuiton.i18n.I18n.n_; /** - * Load a bookmark to display it on modification page + * Load a bookmark to display it on modification page, used when javascript + * is not available on client * * @author sletellier */

1 0

r261 - in trunk/bow-ui/src/main: resources/i18n webapp/css webapp/jsp/inc
by bpoussin＠users.chorem.org 22 Apr '11

22 Apr '11

Author: bpoussin Date: 2011-04-22 18:27:49 +0200 (Fri, 22 Apr 2011) New Revision: 261 Url: http://chorem.org/repositories/revision/bow/261 Log: diminution des textes de recherches Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties trunk/bow-ui/src/main/webapp/css/bookmark.css trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-22 16:26:55 UTC (rev 260) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-22 16:27:49 UTC (rev 261) @@ -108,12 +108,12 @@ bow.rightMenu.chromiumExtension=Chromium extension bow.rightMenu.extensions=Extensions bow.rightMenu.find.submit=Find -bow.rightMenu.fullTextSearch=Full text search +bow.rightMenu.fullTextSearch=Full text bow.rightMenu.help=Help bow.rightMenu.import.submit=Import bow.rightMenu.importBookmarks=Import bookmarks bow.rightMenu.logout=Logout -bow.rightMenu.search=Search +bow.rightMenu.search.tags=by tags bow.rightMenu.token.permanent=Permanent token id bow.rightMenu.token.temporary=Session token id bow.search.ascclick=Asc. clicks nb Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-22 16:26:55 UTC (rev 260) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-22 16:27:49 UTC (rev 261) @@ -108,12 +108,12 @@ bow.rightMenu.chromiumExtension=Extension pour chromium bow.rightMenu.extensions=Extensions bow.rightMenu.find.submit=Rechercher -bow.rightMenu.fullTextSearch=Recherche full text +bow.rightMenu.fullTextSearch=Full text bow.rightMenu.help=Aide bow.rightMenu.import.submit=Importer bow.rightMenu.importBookmarks=Importer des marque-pages bow.rightMenu.logout=D\u00E9connexion -bow.rightMenu.search=Recherche +bow.rightMenu.search.tags=Par tags bow.rightMenu.token.permanent=Token permanent bow.rightMenu.token.temporary=Token session bow.search.ascclick=Nb clics asc. Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-22 16:26:55 UTC (rev 260) +++ trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-22 16:27:49 UTC (rev 261) @@ -475,12 +475,14 @@ .input label{ color:#804561; +/* font-size:20px; font-weight:normal; font-style:normal; float:left; margin-bottom:20px; width:100%; +*/ } #bookmarkForm label{ Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-04-22 16:26:55 UTC (rev 260) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-04-22 16:27:49 UTC (rev 261) @@ -58,11 +58,11 @@ padding-top:20px; padding-right:15%; } - +/* #header .input{ width:250px; } - +*/ .button{ margin-top:20px; background:url('../img/fdboutonV.jpg') repeat-x; Modified: trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-04-22 16:26:55 UTC (rev 260) +++ trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-04-22 16:27:49 UTC (rev 261) @@ -39,6 +39,20 @@ </div> <s:if test="%{#session.BowSession.user != null}"> <div class="recherche right"> + <h5>Recherche</h5> + <s:form action="search"> + <div class="input"> + <s:textfield key="bow.rightMenu.search.tags" name="searchLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.find.submit" name="submit" /> + </div> + </s:form> + <s:form action="fullText"> + <div class="input"> + <s:textfield key="bow.rightMenu.fullTextSearch" name="fullTextLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.find.submit" name="submit" /> + </div> + </s:form> +<%-- <div class="right"> <s:form action="search"> <div class="input"> @@ -55,6 +69,7 @@ </div> </s:form> </div> +--%> </div> </s:if> <div id="msg">

1 0

r260 - trunk/bow-ui/src/main/webapp
by bpoussin＠users.chorem.org 22 Apr '11

22 Apr '11

Author: bpoussin Date: 2011-04-22 18:26:55 +0200 (Fri, 22 Apr 2011) New Revision: 260 Url: http://chorem.org/repositories/revision/bow/260 Log: remplacement des tabulations Modified: trunk/bow-ui/src/main/webapp/index.jsp Modified: trunk/bow-ui/src/main/webapp/index.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/index.jsp 2011-04-22 14:43:21 UTC (rev 259) +++ trunk/bow-ui/src/main/webapp/index.jsp 2011-04-22 16:26:55 UTC (rev 260) @@ -24,8 +24,8 @@ <%@page import="org.chorem.bow.BowSession"%> <% if (BowSession.getBowSession(session).getUser() == null) { - response.sendRedirect("login_input.action"); + response.sendRedirect("login_input.action"); } else { - response.sendRedirect("home.action"); + response.sendRedirect("home.action"); } %> \ No newline at end of file

1 0

r259 - trunk/bow-ui/src/main/webapp/jsp/inc
by bpoussin＠users.chorem.org 22 Apr '11

22 Apr '11

Author: bpoussin Date: 2011-04-22 16:43:21 +0200 (Fri, 22 Apr 2011) New Revision: 259 Url: http://chorem.org/repositories/revision/bow/259 Log: changement des dimensions de la fenetre pour que tout s'affiche convenablement Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp 2011-04-22 14:42:51 UTC (rev 258) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp 2011-04-22 14:43:21 UTC (rev 259) @@ -17,8 +17,7 @@ $(function() { $( "#setPublicAliasPopup" ).dialog({ autoOpen: false, - height: 100, - width: 200, + width: 300, modal: true, buttons: { "Validate": function() {

1 0

r258 - in trunk/bow-ui/src/main: java/org/chorem/bow/action resources webapp/jsp/inc
by bpoussin＠users.chorem.org 22 Apr '11

22 Apr '11

Author: bpoussin Date: 2011-04-22 16:42:51 +0200 (Fri, 22 Apr 2011) New Revision: 258 Url: http://chorem.org/repositories/revision/bow/258 Log: suppression de l'action DeleteTag qui ne sert plus maintenant qu'on a une popup d'edition Removed: trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteTagAction.java Modified: trunk/bow-ui/src/main/resources/struts.xml trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp Deleted: trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteTagAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteTagAction.java 2011-04-22 12:59:26 UTC (rev 257) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteTagAction.java 2011-04-22 14:42:51 UTC (rev 258) @@ -1,129 +0,0 @@ -/* - * #%L - * bow - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2011 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.bow.action; - -import org.chorem.bow.BowBookmark; -import org.chorem.bow.BowUtils; -import org.nuiton.wikitty.WikittyProxy; - -import static org.nuiton.i18n.I18n.n_; - -/** - * Supprime un tag d'un bookmark - * - * @author poussin - */ -public class DeleteTagAction extends BowBaseAction { - private static final long serialVersionUID = -6174966873862161966L; - protected String bookmarkId; - protected String deleteTag; - protected String redirectTo; - protected String searchLine; - protected String fullTextLine; - - /** - * @return the bookmarkId - */ - public String getBookmarkId() { - return bookmarkId; - } - /** - * @param bookmarkId the bookmarkId to set - */ - public void setBookmarkId(String bookmarkId) { - this.bookmarkId = bookmarkId; - } - /** - * @return the deleteTag - */ - public String getDeleteTag() { - return deleteTag; - } - /** - * @param deleteTag the deleteTag to set - */ - public void setDeleteTag(String deleteTag) { - this.deleteTag = deleteTag; - } - - /** - * @return the searchLine - */ - public String getSearchLine() { - return searchLine; - } - - /** - * @param searchLine the searchLine to set - */ - public void setSearchLine(String searchLine) { - this.searchLine = searchLine; - } - - /** - * @return the fullTextLine - */ - public String getFullTextLine() { - return fullTextLine; - } - - /** - * @param fullTextLine the fullTextLine to set - */ - public void setFullTextLine(String fullTextLine) { - this.fullTextLine = fullTextLine; - } - - /** - * @return the redirectTo - */ - public String getRedirectTo() { - return redirectTo; - } - - /** - * Deletes a bookmark's tag - */ - public String execute() { - try { - if (deleteTag != null && bookmarkId != null) { - if (!bookmarkId.isEmpty()) { - WikittyProxy proxy = getBowProxy(); - BowBookmark bookmark = proxy.restore(BowBookmark.class, bookmarkId); - - if (bookmark != null) { - bookmark.removeLabels(deleteTag); - proxy.store(bookmark); - addActionMessage(getText(n_("bow.bookmark.tag.deleted"))); - } - } - } - redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); - } catch (Exception e) { - addActionError(getText(n_("bow.error.internal"))); - log.error(e.getMessage(), e); - } - return SUCCESS; - } -} \ No newline at end of file Modified: trunk/bow-ui/src/main/resources/struts.xml =================================================================== --- trunk/bow-ui/src/main/resources/struts.xml 2011-04-22 12:59:26 UTC (rev 257) +++ trunk/bow-ui/src/main/resources/struts.xml 2011-04-22 14:42:51 UTC (rev 258) @@ -214,13 +214,6 @@ <interceptor-ref name="loginStack"/> <result type="redirectAction">preferences</result> </action> - <action name="deleteTag" class="org.chorem.bow.action.DeleteTagAction"> - <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <interceptor-ref name="loginStack"/> - <result type="redirect">${redirectTo}</result> - </action> <action name="redirectToUrl" class="org.chorem.bow.action.RedirectToUrlAction"> <interceptor-ref name="loginStack"/> <result name="error" type="redirectAction">home</result> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-22 12:59:26 UTC (rev 257) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-22 14:42:51 UTC (rev 258) @@ -137,22 +137,6 @@ <p class="tags"> <strong><s:text name="bow.bookmark.tags" /> :</strong> <s:iterator value="#request.bookmark.labels"> - <s:url var="deleteTag" action="deleteTag"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> - <s:param name="deleteTag"><s:property /></s:param> - <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> - <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> - </s:url> - <s:if test="%{!(formBookmarkId == null || !formBookmarkId.equals(wikittyId))}"> - <s:a cssStyle="text-decoration:none;" href="%{deleteTag}"> - <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> - </s:a> - </s:if> - <s:else> - <s:a name="%{#wikittyId}" cssStyle="display:none; text-decoration:none;" href="%{#deleteTag}"> - <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> - </s:a> - </s:else> <s:url var="search" action="search"> <s:param name="searchLine"><s:property /></s:param> </s:url>

1 0

r257 - in trunk/bow-ui/src/main: resources/i18n webapp/jsp
by sletellier＠users.chorem.org 22 Apr '11

22 Apr '11

Author: sletellier Date: 2011-04-22 14:59:26 +0200 (Fri, 22 Apr 2011) New Revision: 257 Url: http://chorem.org/repositories/revision/bow/257 Log: Move preference tags edition to own section Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties trunk/bow-ui/src/main/webapp/jsp/preferences.jsp Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-22 12:58:14 UTC (rev 256) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-22 12:59:26 UTC (rev 257) @@ -78,6 +78,7 @@ bow.preferences.searchEngineUrlSuggestions=Search Engine URL Suggestions bow.preferences.siteLook=Site look bow.preferences.submit=Change +bow.preferences.tagsManagement=Tags edition bow.preferences.tagsNb=Number of tags displayed in the tag cloud bow.preferences.title=Preferences bow.preferences.update.successful=The preferences have been updated successfully Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-22 12:58:14 UTC (rev 256) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-22 12:59:26 UTC (rev 257) @@ -78,6 +78,7 @@ bow.preferences.searchEngineUrlSuggestions=Search Engine URL Suggestions bow.preferences.siteLook=Pr\u00E9f\u00E9rences du site bow.preferences.submit=Changer +bow.preferences.tagsManagement=Edition des tags bow.preferences.tagsNb=Nombre de tags affich\u00E9s sur le nuage de tags bow.preferences.title=Pr\u00E9f\u00E9rences bow.preferences.update.successful=Vos pr\u00E9f\u00E9rences ont \u00E9t\u00E9 mises \u00E0 jour avec succ\u00E8s Modified: trunk/bow-ui/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-04-22 12:58:14 UTC (rev 256) +++ trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-04-22 12:59:26 UTC (rev 257) @@ -119,11 +119,12 @@ <s:a href="%{home}" id="homePage"><s:text name="bow.home.title"/></s:a> </p> </div> - <div class="menu clearfix"> - <h2><s:text name="bow.preferences.importExport"/></h2> - </div> </s:form> + <div class="menu clearfix"> + <h2><s:text name="bow.preferences.tagsManagement"/></h2> + </div> + <div class="formFrame fond"> <h3><s:text name="bow.preferences.labels"/></h3> <s:form action="adminlabels" method="post"> @@ -148,6 +149,10 @@ </s:form> </div> + <div class="menu clearfix"> + <h2><s:text name="bow.preferences.importExport"/></h2> + </div> + <div class="formFrame fond"> <s:a action="exportBookmarks"><s:text name="bow.preferences.export.bookmarks"/></s:a> <br/>

1 0

r256 - in trunk/bow-ui/src/main/webapp: css jsp/inc
by sletellier＠users.chorem.org 22 Apr '11

22 Apr '11

Author: sletellier Date: 2011-04-22 14:58:14 +0200 (Fri, 22 Apr 2011) New Revision: 256 Url: http://chorem.org/repositories/revision/bow/256 Log: Move search panel to header Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-22 12:57:22 UTC (rev 255) +++ trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-22 12:58:14 UTC (rev 256) @@ -129,7 +129,7 @@ font-size:14px; line-height:32px; padding-left:40px; - background:url('../img/ptit_livre.jpg') no-repeat; + background:url('../img/ptit-livre.jpg') no-repeat; height:32px; display:block; text-decoration:none; @@ -289,9 +289,7 @@ padding: 4px 0 0 30px; } - #colonneD #nuage, -#colonneD .recherche, #colonneD #import, #colonneD #add{ padding:4% 10%; @@ -476,7 +474,7 @@ } .input label{ - color:#9edcf8; + color:#804561; font-size:20px; font-weight:normal; font-style:normal; Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-04-22 12:57:22 UTC (rev 255) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-04-22 12:58:14 UTC (rev 256) @@ -46,6 +46,23 @@ clear:both; } +.left{ + float:left; +} + +.right{ + float:right; +} + +.recherche{ + padding-top:20px; + padding-right:15%; +} + +#header .input{ + width:250px; +} + .button{ margin-top:20px; background:url('../img/fdboutonV.jpg') repeat-x; Modified: trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-04-22 12:57:22 UTC (rev 255) +++ trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-04-22 12:58:14 UTC (rev 256) @@ -37,6 +37,26 @@ <s:a cssClass="logo" action="home">bow</s:a> </s:else> </div> + <s:if test="%{#session.BowSession.user != null}"> + <div class="recherche right"> + <div class="right"> + <s:form action="search"> + <div class="input"> + <s:textfield key="bow.rightMenu.search" name="searchLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.find.submit" name="submit" /> + </div> + </s:form> + </div> + <div class="left"> + <s:form action="fullText"> + <div class="input"> + <s:textfield key="bow.rightMenu.fullTextSearch" name="fullTextLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.find.submit" name="submit" /> + </div> + </s:form> + </div> + </div> + </s:if> <div id="msg"> <span id="actionmessageHeader"> <s:actionmessage /> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-22 12:57:22 UTC (rev 255) +++ trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-22 12:58:14 UTC (rev 256) @@ -58,22 +58,6 @@ </s:a> </li> </ul> - <div class="recherche"> - <s:form action="search"> - <div class="input"> - <s:textfield key="bow.rightMenu.search" name="searchLine" labelSeparator="" /> - <s:submit key="bow.rightMenu.find.submit" name="submit" /> - </div> - </s:form> - </div> - <div class="recherche"> - <s:form action="fullText"> - <div class="input"> - <s:textfield key="bow.rightMenu.fullTextSearch" name="fullTextLine" labelSeparator="" /> - <s:submit key="bow.rightMenu.find.submit" name="submit" /> - </div> - </s:form> - </div>  <s:if test="%{searchLine != null}"> <jsp:include page="tagsCloud.jsp" flush="true">

1 0

r255 - trunk/bow-ui/src/main/webapp/jsp
by sletellier＠users.chorem.org 22 Apr '11

22 Apr '11

Author: sletellier Date: 2011-04-22 14:57:22 +0200 (Fri, 22 Apr 2011) New Revision: 255 Url: http://chorem.org/repositories/revision/bow/255 Log: Fix search with null when editing bookmark without javascript Modified: trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp Modified: trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-21 16:01:59 UTC (rev 254) +++ trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-22 12:57:22 UTC (rev 255) @@ -45,12 +45,14 @@ <div class="formFrame fond"> <s:form id="popupAddUrlForm" action="addUrl" method="post"> <p> + <s:hidden name="searchLine" value="%{searchLine}" /> + <s:hidden name="fullTextLine" value="%{fullTextLine}" /> <input type="hidden" id="popupAddUrlFormBookmarkId" name="bookmarkId" value="<%=bookmark == null ? null : bookmark.getWikittyId()%>"/> - <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator="" value="%{bookmark.link}" /><br /> - <s:textarea key="popup.addurl.name" id="popupAddUrlFormName" name="name" labelSeparator="" value="%{bookmark.description}" /><br /> - <s:textfield key="popup.addurl.alias.private" id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator="" value="%{bookmark.privateAlias}" /><br /> - <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator="" value="%{bookmark.publicAlias}" /><br /> - <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator="" value="%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}" /><br /> + <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator=" " value="%{bookmark.link}" /><br /> + <s:textarea key="popup.addurl.name" id="popupAddUrlFormName" name="name" labelSeparator=" " value="%{bookmark.description}" /><br /> + <s:textfield key="popup.addurl.alias.private" id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator=" " value="%{bookmark.privateAlias}" /><br /> + <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator=" " value="%{bookmark.publicAlias}" /><br /> + <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator=" " value="%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}" /><br /> </p> <s:submit key="popup.addurl.submit" name="submit" /> </s:form>

1 0

r254 - in trunk/bow-ui/src/main: java/org/chorem/bow/action webapp/jsp/inc
by sletellier＠users.chorem.org 21 Apr '11

21 Apr '11

Author: sletellier Date: 2011-04-21 18:01:59 +0200 (Thu, 21 Apr 2011) New Revision: 254 Url: http://chorem.org/repositories/revision/bow/254 Log: Debug bookmark description editor Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-21 15:29:13 UTC (rev 253) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-21 16:01:59 UTC (rev 254) @@ -1,7 +1,5 @@ package org.chorem.bow.action; -import org.apache.commons.lang.StringUtils; -import org.chorem.bow.Bookmark; import org.chorem.bow.BowBookmark; import org.chorem.bow.BowBookmarkImpl; import org.nuiton.wikitty.WikittyProxy; Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-21 15:29:13 UTC (rev 253) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-21 16:01:59 UTC (rev 254) @@ -111,7 +111,7 @@ <s:param name="id" value="%{#wikittyId}"/> </s:url> <s:a cssClass="edit" href="%{editBookmark}" - onclick="return openPopupAddUrl('%{#wikittyId}', '%{#bookmarkLink}', '%{@org.apache.commons.lang.StringEscapeUtils@escapeJavaScript(bookmark.getDescription())}', '%{#bookmarkAlias}', '%{#publicAliasUrl}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}');"> + onclick="return openPopupAddUrl('%{#wikittyId}', '%{#bookmarkLink}', '%{@org.apache.commons.lang.StringEscapeUtils@escapeJavaScript(#request.bookmark.description)}', '%{#bookmarkAlias}', '%{#publicAliasUrl}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}');"> </s:a> <s:url var="removeBookmark" action="removeBookmark" escapeAmp="true"> <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-21 15:29:13 UTC (rev 253) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-21 16:01:59 UTC (rev 254) @@ -12,7 +12,7 @@ function openPopupAddUrl(bookmarkId, link, name, privateAlias, publicAlias, tags) { $("#popupAddUrlFormBookmarkId")[0].value = bookmarkId; $("#popupAddUrlFormLink")[0].value = link; - $("#popupAddUrlFormName")[0].value = name; + $("#popupAddUrlFormName")[0].innerHTML = name; $("#popupAddUrlFormPrivateAlias")[0].value = privateAlias; $("#popupAddUrlFormPublicAlias")[0].value = publicAlias; $("#popupAddUrlFormTags")[0].value = tags;

1 0