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

r253 - in trunk/bow-ui/src/main: java/org/chorem/bow java/org/chorem/bow/action resources webapp/css webapp/jsp webapp/jsp/inc
by sletellier＠users.chorem.org April 21, 2011

April 21, 2011

Author: sletellier Date: 2011-04-21 17:29:13 +0200 (Thu, 21 Apr 2011) New Revision: 253 Url: http://chorem.org/repositories/revision/bow/253 Log: - Set default size for textarea in css - Allow to modify bookmark without javascript Added: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java trunk/bow-ui/src/main/resources/struts.xml trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.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-21 13:57:31 UTC (rev 252) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-04-21 15:29:13 UTC (rev 253) @@ -34,8 +34,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.FacetTopic; import org.nuiton.wikitty.search.PagedResult; Added: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java (rev 0) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-21 15:29:13 UTC (rev 253) @@ -0,0 +1,55 @@ +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; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.search.operators.Element; + +import static org.nuiton.i18n.I18n.n_; + +/** + * Load a bookmark to display it on modification page + * + * @author sletellier + */ +public class EditBookmarkAction extends BowBaseAction { + + protected String id; + protected BowBookmark bookmark; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public BowBookmark getBookmark() { + if (bookmark == null) { + bookmark = new BowBookmarkImpl(); + } + return bookmark; + } + + @Override + public String execute() throws Exception { + if (id == null) { + return SUCCESS; + } + try { + WikittyProxy proxy = getBowProxy(); + Criteria criteria = Search.query() + .eq(Element.ELT_ID, id).criteria(); + bookmark = proxy.findByCriteria(BowBookmark.class, criteria); + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); + } + return SUCCESS; + } +} Modified: trunk/bow-ui/src/main/resources/struts.xml =================================================================== --- trunk/bow-ui/src/main/resources/struts.xml 2011-04-21 13:57:31 UTC (rev 252) +++ trunk/bow-ui/src/main/resources/struts.xml 2011-04-21 15:29:13 UTC (rev 253) @@ -262,7 +262,7 @@ <interceptor-ref name="loginStack"/> <result>/jsp/admin.jsp</result> </action> - <action name="editBookmark"> + <action name="editBookmark" class="org.chorem.bow.action.EditBookmarkAction"> <interceptor-ref name="loginStack"/> <result>/jsp/editBookmark.jsp</result> </action> Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-04-21 13:57:31 UTC (rev 252) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-04-21 15:29:13 UTC (rev 253) @@ -58,6 +58,11 @@ padding:2px; } +textarea{ + height:100px; + width:200px; +} + #wrap{ clear:both; float:left; Modified: trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-21 13:57:31 UTC (rev 252) +++ trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-21 15:29:13 UTC (rev 253) @@ -46,13 +46,11 @@ <s:form id="popupAddUrlForm" action="addUrl" method="post"> <p> <input type="hidden" id="popupAddUrlFormBookmarkId" name="bookmarkId" value="<%=bookmark == null ? null : bookmark.getWikittyId()%>"/> - <s:hidden name="searchLine" value="%{searchLine}" /> - <s:hidden name="fullTextLine" value="%{fullTextLine}" /> - <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator="" /><br /> - <s:textarea key="popup.addurl.name" id="popupAddUrlFormName" name="name" labelSeparator="" /><br /> - <s:textfield key="popup.addurl.alias.private" id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator="" /><br /> - <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 /> + <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> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-21 13:57:31 UTC (rev 252) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-21 15:29:13 UTC (rev 253) @@ -107,9 +107,11 @@  - <s:a cssClass="edit" href="http://linuxfr.org" - onclick="return openPopupAddUrl('%{#wikittyId}', '%{#bookmarkLink}', '<%=StringEscapeUtils.escapeJavaScript(bookmark.getDescription())%>', '%{#bookmarkAlias}', '%{#publicAliasUrl}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}');"> - + <s:url var="editBookmark" action="editBookmark"> + <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)}');"> </s:a> <s:url var="removeBookmark" action="removeBookmark" escapeAmp="true"> <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param>

1 0

r252 - in trunk/bow-ui/src/main: java/org/chorem/bow/action resources resources/i18n webapp/css webapp/jsp webapp/jsp/inc
by sletellier＠users.chorem.org April 21, 2011

April 21, 2011

Author: sletellier Date: 2011-04-21 15:57:31 +0200 (Thu, 21 Apr 2011) New Revision: 252 Url: http://chorem.org/repositories/revision/bow/252 Log: - Fix popup traduction - Enable bookmark creation without javascript - Fix css Modified: 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/resources/struts.xml trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp trunk/bow-ui/src/main/webapp/jsp/home.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 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-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-04-21 13:57:31 UTC (rev 252) @@ -99,7 +99,7 @@ } /** - * @param privateAlias the privateAlias to set + * @param alias the privateAlias to set */ public void setPrivateAlias(String alias) { this.privateAlias = alias; 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-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-21 13:57:31 UTC (rev 252) @@ -132,8 +132,11 @@ bow.search.submit=Search bow.search.title=Search bow.token.generate.successful=The token has been regenerated successfully -popup.addurl.alias.private=private alias -popup.addurl.alias.public=public alias -popup.addurl.link=url -popup.addurl.name=description -popup.addurl.tags=tags +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 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-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-21 13:57:31 UTC (rev 252) @@ -132,8 +132,11 @@ bow.search.submit=Rechercher bow.search.title=Recherche 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.link=url -popup.addurl.name=description -popup.addurl.tags=tags +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 Modified: trunk/bow-ui/src/main/resources/struts.xml =================================================================== --- trunk/bow-ui/src/main/resources/struts.xml 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/resources/struts.xml 2011-04-21 13:57:31 UTC (rev 252) @@ -262,5 +262,9 @@ <interceptor-ref name="loginStack"/> <result>/jsp/admin.jsp</result> </action> + <action name="editBookmark"> + <interceptor-ref name="loginStack"/> + <result>/jsp/editBookmark.jsp</result> + </action> </package> </struts> Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-04-21 13:57:31 UTC (rev 252) @@ -46,6 +46,18 @@ clear:both; } +.button{ + margin-top:20px; + background:url('../img/fdboutonV.jpg') repeat-x; + height:31px; + line-height:31px; + color:#FFFFFF; + font-weight:bold; + border:none; + width:auto; + padding:2px; +} + #wrap{ clear:both; float:left; Modified: trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css 2011-04-21 13:57:31 UTC (rev 252) @@ -60,7 +60,7 @@ .ui-widget .ui-widget { font-size: 1em; } .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } .ui-widget-content { border: 1px solid #aaaaaa; background: #dbdbdb url(images/ui-bg_flat_75_dbdbdb_40x100.png) 50% 50% repeat-x; color: #222222; } -.ui-widget-content a { color: #222222; } +/*.ui-widget-content a { color: #222222; }*/ .ui-widget-header { border: 1px solid #aaaaaa; background: #bf8a9c url(images/ui-bg_highlight-soft_75_bf8a9c_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } .ui-widget-header a { color: #222222; } @@ -570,4 +570,5 @@ * http://docs.jquery.com/UI/Progressbar#theming */ .ui-progressbar { height:2em; text-align: left; } -.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file +.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } + Modified: trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-21 13:57:31 UTC (rev 252) @@ -40,12 +40,12 @@ <body> <div id="content"> <div class="menu clearfix"> - <h2><s:text name="bow.bookmark.edit" /></h2> + <h2><s:text name="popup.addurl.title" /></h2> </div> <div class="formFrame fond"> <s:form id="popupAddUrlForm" action="addUrl" method="post"> <p> - <input type="hidden" id="popupAddUrlFormBookmarkId" name="bookmarkId" value="<%=bookmark.getWikittyId()%>"/> + <input type="hidden" id="popupAddUrlFormBookmarkId" name="bookmarkId" value="<%=bookmark == null ? null : bookmark.getWikittyId()%>"/> <s:hidden name="searchLine" value="%{searchLine}" /> <s:hidden name="fullTextLine" value="%{fullTextLine}" /> <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator="" /><br /> @@ -54,6 +54,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> + <s:submit key="popup.addurl.submit" name="submit" /> </s:form> </div> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/home.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/home.jsp 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/webapp/jsp/home.jsp 2011-04-21 13:57:31 UTC (rev 252) @@ -94,7 +94,6 @@ </div> <s:include value="inc/popupPublicAlias.jsp" /> - <s:include value="inc/popupAddUrl.jsp" /> </body> </html> <% } %> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-21 13:57:31 UTC (rev 252) @@ -1,4 +1,5 @@ -<%-- +<%@ page import="static org.nuiton.i18n.I18n._" %> +<%-- Document : popupAddUrl Created on : 20 avr. 2011, 17:03:37 Author : poussin @@ -25,24 +26,37 @@ autoOpen: false, width: 400, modal: true, - buttons: { - "Validate": function() { - $("#popupAddUrlForm").submit(); - $( this ).dialog( "close" ); - }, - Cancel: function() { - $( this ).dialog( "close" ); - } - }, +// buttons: { +// "Validate": function() { +// $("#popupAddUrlForm").submit(); +// $( this ).dialog( "close" ); +// }, +// Cancel: function() { +// $( this ).dialog( "close" ); +// } +// }, close: function() { //allFields.val( "" ).removeClass( "ui-state-error" ); } }); }); + + function submitAddUrl() { + $("#popupAddUrlForm").submit(); + closePopupAddUrl(); + } + + function closePopupAddUrl() { + $( "#addUrlPopup" ).dialog( "close" ) + } </script> +<s:set id="title"> + <s:text name="popup.addurl.title"/> +</s:set> + <div xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - id="addUrlPopup" title="Add or modify URL"> + id="addUrlPopup" title="${title}"> <s:form id="popupAddUrlForm" action="addUrl" method="post"> <p> <s:hidden id="popupAddUrlFormBookmarkId" name="bookmarkId" /> @@ -54,5 +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> </s:form> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-21 13:57:31 UTC (rev 252) @@ -42,6 +42,7 @@ </div> <div id="side" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> + <s:include value="popupAddUrl.jsp" /> <s:set var="searchLine" value="%{request.bookmarkActions.searchLine}" /> <s:set var="fullTextLine" value="%{request.bookmarkActions.fullTextLine}" /> <div id="colonneD"> @@ -51,8 +52,8 @@ </s:if> <li><s:a action="preferences"><s:text name="bow.preferences.title" /></s:a></li> <li> - <s:a href="http://linuxfr.org" - onclick="return openPopupAddUrl('', '', '', '', '', '');"> + <s:url var="editBookmark" action="editBookmark"/> + <s:a href="%{editBookmark}" onclick="return openPopupAddUrl('', '', '', '', '', '');"> <s:text name="bow.rightMenu.addUrl.link" /> </s:a> </li>

1 0

r251 - in trunk/bow-ui/src/main: java/org/chorem/bow java/org/chorem/bow/action resources resources/i18n webapp/img webapp/js webapp/jsp webapp/jsp/inc xmi
by bpoussin＠users.chorem.org April 21, 2011

April 21, 2011

Author: bpoussin Date: 2011-04-21 11:42:50 +0200 (Thu, 21 Apr 2011) New Revision: 251 Url: http://chorem.org/repositories/revision/bow/251 Log: Evolution #271: Add information in preference page and move some menu item too - l'ajout/modification d'un item ce fait via une popup Added: trunk/bow-ui/src/main/webapp/img/add.png trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp Removed: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 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/resources/struts.xml trunk/bow-ui/src/main/webapp/js/bookmark.js trunk/bow-ui/src/main/webapp/jsp/home.jsp trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp trunk/bow-ui/src/main/xmi/bow.zargo 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-20 14:55:48 UTC (rev 250) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-04-21 09:42:50 UTC (rev 251) @@ -125,7 +125,7 @@ String link = getUrlFromHtml(html); String tags = getTagsFromHtml(html); Date date = getDateFromHtml(html); - BowBookmark bookmark = createBookmark(link, name, tags, user, null, date); + BowBookmark bookmark = createBookmark(link, name, tags, user, null, null, date); return bookmark; } @@ -280,12 +280,12 @@ * @param name of bookmark * @param tags of bookmark * @param user creating bookmark - * @param alias of bookmark + * @param privateAlias of bookmark * @param date of creation * @return bookMarl created */ public static BowBookmark createBookmark(String url, String name, String tags, - BowUser user, String alias, Date date) { + BowUser user, String privateAlias, String publicAlias, Date date) { BowBookmark bookmark = new BowBookmarkImpl(); if (name != null) { @@ -306,12 +306,18 @@ date = new Date(); } bookmark.setCreationDate(date); // set the date - if (alias != null) { - alias = alias.trim(); - bookmark.setPrivateAlias(alias); + if (privateAlias != null) { + privateAlias = privateAlias.trim(); + bookmark.setPrivateAlias(privateAlias); } else { bookmark.setPrivateAlias(""); } + if (publicAlias != null) { + publicAlias = publicAlias.trim(); + bookmark.setPublicAlias(publicAlias); + } else { + bookmark.setPublicAlias(""); + } return bookmark; } @@ -323,7 +329,7 @@ } public static void updateBookmark(BowBookmark bookmark, String name, - String link, String tags, String alias) { + String link, String tags, String privateAlias, String publicAlias) { if (name != null) { name = name.trim(); bookmark.setDescription(name); @@ -331,10 +337,14 @@ addUrlToBookmark(link, bookmark); bookmark.clearLabels(); addTagsToBookmark(tags, bookmark); - if (alias != null) { - alias = alias.trim(); - bookmark.setPrivateAlias(alias); + if (privateAlias != null) { + privateAlias = privateAlias.trim(); + bookmark.setPrivateAlias(privateAlias); } + if (publicAlias != null) { + publicAlias = publicAlias.trim(); + 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-20 14:55:48 UTC (rev 250) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-04-21 09:42:50 UTC (rev 251) @@ -31,10 +31,12 @@ import static org.nuiton.i18n.I18n.n_; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; /** - * Ajoute un bookmark, soit par le formulaire, soit par un appel javascript + * Ajoute ou modifie un bookmark, soit par le formulaire, + * soit par un appel javascript * * @author poussin */ @@ -42,15 +44,25 @@ private static final long serialVersionUID = 3389170166034184139L; + protected String bookmarkId; protected String link; protected String name; - protected String alias; + protected String privateAlias; + protected String publicAlias; protected String tags; protected String nameAndTags; protected String redirectTo; protected String searchLine; - protected String fullTextLine; + protected String fullTextLine; + + public String getBookmarkId() { + return bookmarkId; + } + public void setBookmarkId(String bookmarkId) { + this.bookmarkId = bookmarkId; + } + /** * @return the link */ @@ -80,19 +92,27 @@ } /** - * @return the alias + * @return the privateAlias */ - public String getAlias() { - return alias; + public String getPrivateAlias() { + return privateAlias; } /** - * @param alias the alias to set + * @param privateAlias the privateAlias to set */ - public void setAlias(String alias) { - this.alias = alias; + public void setPrivateAlias(String alias) { + this.privateAlias = alias; } + public String getPublicAlias() { + return publicAlias; + } + + public void setPublicAlias(String publicAlias) { + this.publicAlias = publicAlias; + } + /** * @return the tags */ @@ -160,27 +180,68 @@ try { WikittyProxy proxy = getBowProxy(); BowBookmark bookmark = null; + BowBookmark bookmarkToModify = null; BowUser user = getBowSession().getUser(); + String userId = user.getWikittyId(); + if (bookmarkId != null && !StringUtils.isEmpty(bookmarkId)) { + bookmarkToModify = proxy.restore(BowBookmark.class, bookmarkId); + } + if (log.isDebugEnabled()) { + log.debug("Change old wikitty: " + bookmarkToModify); + } + + // gere le cas d'une mise a jour ou d'un ajout via le formulaire if (name != null) { - if (alias != null && !alias.isEmpty()) { - Criteria criteria = Search.query().eq( - BowBookmark.FQ_FIELD_BOWBOOKMARK_PRIVATEALIAS, alias).criteria(); - - if (proxy.findByCriteria(BowBookmark.class, criteria) != null) { - alias = ""; + // 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 + Criteria privateAliasCriteria = null; + Criteria publicAliasCriteria = null; + if (privateAlias != null && !privateAlias.isEmpty()) { + privateAliasCriteria = Search.query() + .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_PRIVATEALIAS, privateAlias) + .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_BOWUSER, userId) + .criteria().setEndIndex(0); + } + if (publicAlias != null && !publicAlias.isEmpty()) { + publicAliasCriteria = Search.query() + .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_PUBLICALIAS, publicAlias) + .criteria().setEndIndex(0); + } + PagedResult<String>[] aliasResult = proxy.findAllIdByCriteria( + privateAliasCriteria, publicAliasCriteria); + + if (aliasResult[0] != null && aliasResult[0].getNumFound() > 0) { + if (bookmarkToModify == null) { + privateAlias = ""; + } else { + privateAlias = bookmarkToModify.getPrivateAlias(); } } - bookmark = BookmarkUtils.createBookmark(link, name, tags, user, alias, null); + if (aliasResult[1] != null && aliasResult[1].getNumFound() > 0) { + if (bookmarkToModify == null) { + publicAlias = ""; + } else { + publicAlias = bookmarkToModify.getPublicAlias(); + } + } + + if (bookmarkToModify == null) { + bookmark = BookmarkUtils.createBookmark( + link, name, tags, user, privateAlias, publicAlias, null); + } else { + BookmarkUtils.updateBookmark( + bookmarkToModify, name, link, tags, privateAlias, publicAlias); + } } else { //This part is for the bookmark addition by script if (nameAndTags != null) { bookmark = BookmarkUtils.createBookmark(link, nameAndTags, user); } } - // si on a reussi a creer le bookmark + // si on a reussi a creer le bookmark, on regarde s'il ne faut pas + // le fusionner avec un deja existant if (bookmark != null && !bookmark.getDescription().isEmpty() && !bookmark.getBowUser().isEmpty()) { - String userId = user.getWikittyId(); // looking for already bookmark with same url, to fusion them String link = bookmark.getLink(); @@ -192,7 +253,7 @@ proxy.findByCriteria(BowBookmark.class, criteria); if(oldBookmark != null) { // fusionne les descriptions et les tags - // par contre on prend le dernier alias prive choisi par + // par contre on prend le dernier privateAlias prive choisi par // l'utilisateur s'il y en a un String description = oldBookmark.getDescription(); if (!StringUtils.isEmpty(bookmark.getDescription())) { @@ -212,7 +273,10 @@ bookmark = oldBookmark; } - proxy.store(bookmark); //Stores the bookmark if everything is ok + } + + if (bookmark != null || bookmarkToModify != null) { + proxy.store(bookmark, bookmarkToModify); //Stores the bookmark if everything is ok addActionMessage(getText(n_("bow.bookmark.add.successful"))); if (log.isDebugEnabled()) { log.debug("Adding URL"); Deleted: 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-20 14:55:48 UTC (rev 250) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-21 09:42:50 UTC (rev 251) @@ -1,127 +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 javax.servlet.http.HttpServletRequest; - -import org.apache.struts2.interceptor.ServletRequestAware; -import org.chorem.bow.BowBookmark; -import org.chorem.bow.BookmarkUtils; -import org.chorem.bow.BowConfig; -import org.chorem.bow.BowInit; -import org.chorem.bow.BowPreference; -import org.chorem.bow.BowSearch; -import org.nuiton.wikitty.WikittyProxy; - -/** - * Prepare les données pour la modification d'un bookmark - * TODO poussin 20110211 peut-etre le remplacer par une popup JS d'edition ? - * - * @author poussin - */ -public class EditBookmarkAction extends BowBaseAction implements ServletRequestAware { - private static final long serialVersionUID = 2706590901233864637L; - protected String bookmarkId; - protected String searchLine; - protected String fullTextLine; - protected HttpServletRequest request; - - /** - * @return the bookmarkId - */ - public String getBookmarkId() { - return bookmarkId; - } - - /** - * @param bookmarkId the bookmarkId to set - */ - public void setBookmarkId(String bookmarkId) { - this.bookmarkId = bookmarkId; - } - - /** - * @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; - } - - @Override - public void setServletRequest(HttpServletRequest request) { - this.request = request; - } - - public String execute() { - String result; - - if (bookmarkId != null && !bookmarkId.isEmpty()) { - WikittyProxy proxy = getBowProxy(); - BowBookmark bookmark = proxy.restore(BowBookmark.class, bookmarkId); - - if (bookmark != null) { - request.setAttribute("link", bookmark.getLink()); - request.setAttribute("name", bookmark.getDescription()); - request.setAttribute("alias", bookmark.getPrivateAlias()); - request.setAttribute("tags", BookmarkUtils.getBookmarkTagsString(bookmark)); - String servletName = BowConfig.getInstance().getServletBow(); - request.setAttribute("formAction", - "/" + servletName + "/modifyBookmark.action" - + "?bookmarkId=" + bookmarkId - + "&searchLine=" + searchLine - + "&fullTextLine=" + fullTextLine); - } - } - BowPreference user = getBowSession().getPreference(); - if (searchLine == null || searchLine.equals("")) { - BowInit.initHomePage(request, user); - result = "home"; - } else { - BowSearch.search(request, user); - result = "search"; - } - return result; - } -} \ No newline at end of file Deleted: trunk/bow-ui/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-04-20 14:55:48 UTC (rev 250) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-04-21 09:42:50 UTC (rev 251) @@ -1,174 +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.BookmarkUtils; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.search.Search; - -import static org.nuiton.i18n.I18n.n_; - -/** - * Modifie une entree du bookmark - * - * @author poussin - */ -public class ModifyBookmarkAction extends BowBaseAction { - private static final long serialVersionUID = 8197008295267924063L; - protected String link; - protected String name; - protected String alias; - protected String tags; - protected String bookmarkId; - protected String searchLine; - protected String fullTextLine; - - /** - * @return the link - */ - public String getLink() { - return link; - } - - /** - * @param url the link to set - */ - public void setLink(String link) { - this.link = link; - } - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * @return the alias - */ - public String getAlias() { - return alias; - } - - /** - * @param alias the alias to set - */ - public void setAlias(String alias) { - this.alias = alias; - } - - /** - * @return the tags - */ - public String getTags() { - return tags; - } - - /** - * @param tags the tags to set - */ - public void setTags(String tags) { - this.tags = tags; - } - - /** - * @return the bookmarkId - */ - public String getBookmarkId() { - return bookmarkId; - } - - /** - * @param bookmarkId the bookmarkId to set - */ - public void setBookmarkId(String bookmarkId) { - this.bookmarkId = bookmarkId; - } - - /** - * @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; - } - - /** - * Modifies a bookmark - */ - public String execute() { - try { - WikittyProxy proxy = getBowProxy(); - BowBookmark bookmark = proxy.restore(BowBookmark.class, bookmarkId); - - if (bookmark != null) { - if (alias != null && !alias.isEmpty()) { - Criteria criteria = Search.query().eq( - BowBookmark.FQ_FIELD_BOWBOOKMARK_PRIVATEALIAS, alias).criteria(); - - if (proxy.findByCriteria(BowBookmark.class, criteria) != null) { - alias = bookmark.getPrivateAlias(); - } - } - BookmarkUtils.updateBookmark(bookmark, name, link, tags, alias); - proxy.store(bookmark); - addActionMessage(getText(n_("bow.bookmark.update.successful"))); - } - } 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/i18n/bow-ui_en_GB.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-20 14:55:48 UTC (rev 250) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-21 09:42:50 UTC (rev 251) @@ -8,12 +8,12 @@ bow.admin.home=Return to the home page bow.admin.panel=Admin panel bow.admin.reIndexationDone=Data reindexed successfully -bow.alias.alread.exists= bow.alias.already.exists=The alias {0} already exists bow.alias.bookmarkId.unknown=There is no bookmark with id {0} bow.bookmark.add.successful=Bookmark successfully added bow.bookmark.badFileFormat=Bad bookmarks file format \: unsuccessful import (expected Netscape-like bookmarks file) bow.bookmark.description=Description +bow.bookmark.edit= bow.bookmark.import.delete.successful=The imported bookmarks were deleted successfully bow.bookmark.import.successful=The bookmarks were imported successfully bow.bookmark.remove.successful=The bookmark was removed successfully @@ -92,6 +92,7 @@ bow.register.submit=Register bow.register.title=Register bow.requiredstring=${getText(fieldKey)} is required +bow.rightMenu.addUrl.link=Add entry bow.rightMenu.admin=Admin bow.rightMenu.bookmark.addModify=Add / Modify bow.rightMenu.bookmark.alias=ALIAS @@ -131,3 +132,8 @@ bow.search.submit=Search bow.search.title=Search bow.token.generate.successful=The token has been regenerated successfully +popup.addurl.alias.private=private alias +popup.addurl.alias.public=public alias +popup.addurl.link=url +popup.addurl.name=description +popup.addurl.tags=tags 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-20 14:55:48 UTC (rev 250) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-21 09:42:50 UTC (rev 251) @@ -13,6 +13,7 @@ bow.bookmark.add.successful=Marque-page ajout\u00E9 avec succ\u00E8s bow.bookmark.badFileFormat=Mauvais format de fichier de favoris \: import impossible (le format de type Netscape n'est pas support\u00E9) bow.bookmark.description=Description +bow.bookmark.edit= bow.bookmark.import.delete.successful=Les marque-pages import\u00E9s ont \u00E9t\u00E9 supprim\u00E9s avec succ\u00E8s bow.bookmark.import.successful=Les marque-pages ont \u00E9t\u00E9 import\u00E9s avec succ\u00E8s bow.bookmark.remove.successful=Le marque-page a \u00E9t\u00E9 supprim\u00E9 avec succ\u00E8s @@ -91,6 +92,7 @@ bow.register.submit=S''enregistrer bow.register.title=S''enregistrer bow.requiredstring=${getText(fieldKey)} est obligatoire +bow.rightMenu.addUrl.link=Ajouter une entr\u00E9e bow.rightMenu.admin=Admin bow.rightMenu.bookmark.addModify=Ajouter / Modifier bow.rightMenu.bookmark.alias=ALIAS @@ -130,3 +132,8 @@ bow.search.submit=Rechercher bow.search.title=Recherche 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.link=url +popup.addurl.name=description +popup.addurl.tags=tags Modified: trunk/bow-ui/src/main/resources/struts.xml =================================================================== --- trunk/bow-ui/src/main/resources/struts.xml 2011-04-20 14:55:48 UTC (rev 250) +++ trunk/bow-ui/src/main/resources/struts.xml 2011-04-21 09:42:50 UTC (rev 251) @@ -121,13 +121,6 @@ <param name="contentDisposition">attachment;filename="bookmarks.html"</param> </result> </action> - <action name="modifyBookmark" class="org.chorem.bow.action.ModifyBookmarkAction"> - <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <interceptor-ref name="loginStack"/> - <result type="redirectAction">home</result> - </action> <action name="removeBookmark" class="org.chorem.bow.action.RemoveBookmarkAction"> <interceptor-ref name="store"> <param name="operationMode">STORE</param> @@ -135,11 +128,6 @@ <interceptor-ref name="loginStack"/> <result type="redirect">${redirectTo}</result> </action> - <action name="editBookmark" class="org.chorem.bow.action.EditBookmarkAction"> - <interceptor-ref name="loginStack"/> - <result name="home" type="redirectAction">home</result> - <result name="search">/jsp/search.jsp</result> - </action> <action name="deleteImport" class="org.chorem.bow.action.DeleteImportAction"> <interceptor-ref name="store"> <param name="operationMode">STORE</param> Added: trunk/bow-ui/src/main/webapp/img/add.png =================================================================== (Binary files differ) Property changes on: trunk/bow-ui/src/main/webapp/img/add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/bow-ui/src/main/webapp/js/bookmark.js =================================================================== --- trunk/bow-ui/src/main/webapp/js/bookmark.js 2011-04-20 14:55:48 UTC (rev 250) +++ trunk/bow-ui/src/main/webapp/js/bookmark.js 2011-04-21 09:42:50 UTC (rev 251) @@ -31,9 +31,3 @@ window.location = goTo; } } - -function openPublicAliasForm(bookmarkId) { - $("#publicAliasFormBookmarkId")[0].value = bookmarkId; - $("#setPublicAliasPopup").dialog("open"); - return false; -} \ No newline at end of file Copied: trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp (from rev 247, trunk/bow-ui/src/main/webapp/jsp/admin.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-21 09:42:50 UTC (rev 251) @@ -0,0 +1,61 @@ + +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags"%> +<%@page import="org.chorem.bow.BowBookmark"%> + +<% +BowBookmark bookmark = null; +%> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <head> + <s:url var="css" value="/css/bookmark.css" /> + <link href="${css}" rel="stylesheet" type="text/css" /> + <s:head /> + </head> + <body> + <div id="content"> + <div class="menu clearfix"> + <h2><s:text name="bow.bookmark.edit" /></h2> + </div> + <div class="formFrame fond"> + <s:form id="popupAddUrlForm" action="addUrl" method="post"> + <p> + <input type="hidden" id="popupAddUrlFormBookmarkId" name="bookmarkId" value="<%=bookmark.getWikittyId()%>"/> + <s:hidden name="searchLine" value="%{searchLine}" /> + <s:hidden name="fullTextLine" value="%{fullTextLine}" /> + <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator="" /><br /> + <s:textarea key="popup.addurl.name" id="popupAddUrlFormName" name="name" labelSeparator="" /><br /> + <s:textfield key="popup.addurl.alias.private" id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator="" /><br /> + <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> + </s:form> + </div> + </div> + </body> +</html> Modified: trunk/bow-ui/src/main/webapp/jsp/home.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/home.jsp 2011-04-20 14:55:48 UTC (rev 250) +++ trunk/bow-ui/src/main/webapp/jsp/home.jsp 2011-04-21 09:42:50 UTC (rev 251) @@ -93,35 +93,8 @@ <% } %> </div> - <script> - $(function() { - $( "#setPublicAliasPopup" ).dialog({ - autoOpen: false, - height: 100, - width: 200, - modal: true, - buttons: { - "Validate": function() { - var bValid = true; - $("#setPublicAliasForm").submit(); - $( this ).dialog( "close" ); - }, - Cancel: function() { - $( this ).dialog( "close" ); - } - }, - close: function() { - //allFields.val( "" ).removeClass( "ui-state-error" ); - } - }); - }); - </script> - <div id="setPublicAliasPopup" title="Enter the public alias"> - <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" /> - </s:form> - </div> + <s:include value="inc/popupPublicAlias.jsp" /> + <s:include value="inc/popupAddUrl.jsp" /> </body> </html> <% } %> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-20 14:55:48 UTC (rev 250) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-21 09:42:50 UTC (rev 251) @@ -25,6 +25,7 @@ <%@taglib prefix="s" uri="/struts-tags" %> <%@page import="org.chorem.bow.BowBookmark" %> <%@page import="org.chorem.bow.BowUtils"%> +<%@page import="org.apache.commons.lang.StringEscapeUtils"%> <div class="bookmark" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" @@ -102,8 +103,14 @@ <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></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:url> + + <s:a cssClass="edit" href="http://linuxfr.org" + onclick="return openPopupAddUrl('%{#wikittyId}', '%{#bookmarkLink}', '<%=StringEscapeUtils.escapeJavaScript(bookmark.getDescription())%>', '%{#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> <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> Added: trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-21 09:42:50 UTC (rev 251) @@ -0,0 +1,58 @@ +<%-- + Document : popupAddUrl + Created on : 20 avr. 2011, 17:03:37 + Author : poussin +--%> + +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> + +<script> + function openPopupAddUrl(bookmarkId, link, name, privateAlias, publicAlias, tags) { + $("#popupAddUrlFormBookmarkId")[0].value = bookmarkId; + $("#popupAddUrlFormLink")[0].value = link; + $("#popupAddUrlFormName")[0].value = name; + $("#popupAddUrlFormPrivateAlias")[0].value = privateAlias; + $("#popupAddUrlFormPublicAlias")[0].value = publicAlias; + $("#popupAddUrlFormTags")[0].value = tags; + + $("#addUrlPopup").dialog("open"); + return false; + } + + $(function() { + $( "#addUrlPopup" ).dialog({ + autoOpen: false, + width: 400, + modal: true, + buttons: { + "Validate": function() { + $("#popupAddUrlForm").submit(); + $( this ).dialog( "close" ); + }, + Cancel: function() { + $( this ).dialog( "close" ); + } + }, + close: function() { + //allFields.val( "" ).removeClass( "ui-state-error" ); + } + }); + }); +</script> + +<div xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + id="addUrlPopup" title="Add or modify URL"> + <s:form id="popupAddUrlForm" action="addUrl" method="post"> + <p> + <s:hidden id="popupAddUrlFormBookmarkId" name="bookmarkId" /> + <s:hidden name="searchLine" value="%{searchLine}" /> + <s:hidden name="fullTextLine" value="%{fullTextLine}" /> + <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator=" " /><br /> + <s:textarea key="popup.addurl.name" id="popupAddUrlFormName" name="name" labelSeparator=" " /><br /> + <s:textfield key="popup.addurl.alias.private" id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator=" " /><br /> + <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> + </s:form> +</div> Added: trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp 2011-04-21 09:42:50 UTC (rev 251) @@ -0,0 +1,45 @@ +<%-- + Document : popupPublicAlias + Created on : 20 avr. 2011, 17:03:37 + Author : poussin +--%> + +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> + +<script> + function openPublicAliasForm(bookmarkId) { + $("#publicAliasFormBookmarkId")[0].value = bookmarkId; + $("#setPublicAliasPopup").dialog("open"); + return false; + } + + $(function() { + $( "#setPublicAliasPopup" ).dialog({ + autoOpen: false, + height: 100, + width: 200, + modal: true, + buttons: { + "Validate": function() { + $("#setPublicAliasForm").submit(); + $( this ).dialog( "close" ); + }, + Cancel: function() { + $( this ).dialog( "close" ); + } + }, + close: function() { + //allFields.val( "" ).removeClass( "ui-state-error" ); + } + }); + }); +</script> + +<div xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + id="setPublicAliasPopup" title="Enter the public alias"> + <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" /> + </s:form> +</div> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-20 14:55:48 UTC (rev 250) +++ trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-21 09:42:50 UTC (rev 251) @@ -50,6 +50,12 @@ <li><s:a action="admin"><s:text name="bow.rightMenu.admin" /></s:a></li> </s:if> <li><s:a action="preferences"><s:text name="bow.preferences.title" /></s:a></li> + <li> + <s:a href="http://linuxfr.org" + onclick="return openPopupAddUrl('', '', '', '', '', '');"> + <s:text name="bow.rightMenu.addUrl.link" /> + </s:a> + </li> </ul> <div class="recherche"> <s:form action="search"> @@ -67,20 +73,6 @@ </div> </s:form> </div> - <div id="add" class="clearfix"> - <h2><s:text name="bow.rightMenu.bookmark.addModify" /></h2> - <s:form id="bookmarkForm" action="%{#request.formAction}"> - <p> - <s:textfield key="bow.rightMenu.bookmark.link" name="link" value="%{#request.link}" labelSeparator="" /><br /> - <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" value="%{#request.alias}" labelSeparator="" /><br /> - <s:textfield key="bow.rightMenu.bookmark.name" name="name" value="%{#request.name}" labelSeparator="" /><br /> - <s:textfield key="bow.rightMenu.bookmark.tags" name="tags" value="%{#request.tags}" labelSeparator="" /><br /><br /> - <s:hidden name="searchLine" value="%{searchLine}" /> - <s:hidden name="fullTextLine" value="%{fullTextLine}" /> - <s:submit key="bow.rightMenu.bookmark.submit" name="submit" /> - </p> - </s:form> - </div>  <s:if test="%{searchLine != null}"> <jsp:include page="tagsCloud.jsp" flush="true"> Modified: trunk/bow-ui/src/main/xmi/bow.zargo =================================================================== (Binary files differ)

1 0

r250 - in trunk/bow-ui/src/main/webapp: WEB-INF/decorators css css/images jsp
by bpoussin＠users.chorem.org April 20, 2011

April 20, 2011

Author: bpoussin Date: 2011-04-20 16:55:48 +0200 (Wed, 20 Apr 2011) New Revision: 250 Url: http://chorem.org/repositories/revision/bow/250 Log: - ajout du style pour jquery et des images associ?\195?\169es Added: trunk/bow-ui/src/main/webapp/css/images/ trunk/bow-ui/src/main/webapp/css/images/ui-bg_flat_0_aaaaaa_40x100.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_flat_75_dbdbdb_40x100.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_55_fbf9ee_1x400.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_65_ffffff_1x400.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_75_dadada_1x400.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_75_e6e6e6_1x400.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_highlight-soft_75_bf8a9c_1x100.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png trunk/bow-ui/src/main/webapp/css/images/ui-icons_222222_256x240.png trunk/bow-ui/src/main/webapp/css/images/ui-icons_2e83ff_256x240.png trunk/bow-ui/src/main/webapp/css/images/ui-icons_454545_256x240.png trunk/bow-ui/src/main/webapp/css/images/ui-icons_888888_256x240.png trunk/bow-ui/src/main/webapp/css/images/ui-icons_cd0a0a_256x240.png trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css Modified: trunk/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp trunk/bow-ui/src/main/webapp/jsp/home.jsp Modified: trunk/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp 2011-04-20 13:56:27 UTC (rev 249) +++ trunk/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp 2011-04-20 14:55:48 UTC (rev 250) @@ -29,47 +29,48 @@ <%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %> <%@taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %> <%@taglib prefix="s" uri="/struts-tags" %> + <html xmlns="http://www.w3.org/1999/xhtml" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:decorator="http://www.opensymphony.com/sitemesh/decorator"> - <head> - <title>Bow : <decorator:title default="Bow" /></title> - <decorator:head /> - <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - <meta name="description" content="Bookmarks on the web" /> - <s:url var="temporaryXml" action="temporaryXml" /> - <s:url var="permanentXml" action="permanentXml" /> - <s:url var="favicon" value="/img/favicon.png" /> - <link rel="icon" type="image/png" href="${favicon}" /> - <s:if test="%{#session.BowSession.user != null}"> - <link rel="search" type="application/opensearchdescription+xml" title="Bow (temporary)" href="${temporaryXml}" /> - <link rel="search" type="application/opensearchdescription+xml" title="Bow (permanent)" href="${permanentXml}" /> - </s:if> - <s:url var="jqueryUiCSS" value="/css/flick/jquery-ui-1.8.11.custom.css" /> - <s:url var="globalCSS" value="/css/global.css" /> - <link href="${jqueryUiCSS}" rel="stylesheet" type="text/css" media="all" /> - <link href="${globalCSS}" rel="stylesheet" type="text/css" media="all" /> - <s:url var="jqueryJS" value="/js/jquery-1.5.2.min.js" /> - <s:url var="jqueryUiJS" value="/js/jquery-ui-1.8.11.custom.min.js" /> - <s:url var="bookmarkJS" value="/js/bookmark.js" /> - <script type="text/javascript" src="${jqueryJS}"></script> - <script type="text/javascript" src="${jqueryUiJS}"></script> - <script type="text/javascript" src="${bookmarkJS}"></script> - </head> - <body id="page-home"> - <div id="wrap"> - <div id="page"> - <%@include file="/jsp/inc/header.jsp" %> - <div id="main"> - <%@include file="/jsp/inc/errorFrame.jsp" %> - <decorator:body /> - </div> + <head> + <title>Bow : <decorator:title default="Bow" /></title> + <decorator:head /> + <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> + <meta name="description" content="Bookmarks on the web" /> + <s:url var="temporaryXml" action="temporaryXml" /> + <s:url var="permanentXml" action="permanentXml" /> + <s:url var="favicon" value="/img/favicon.png" /> + <link rel="icon" type="image/png" href="${favicon}" /> <s:if test="%{#session.BowSession.user != null}"> - <jsp:include page="/jsp/inc/rightMenu.jsp" /> + <link rel="search" type="application/opensearchdescription+xml" title="Bow (temporary)" href="${temporaryXml}" /> + <link rel="search" type="application/opensearchdescription+xml" title="Bow (permanent)" href="${permanentXml}" /> </s:if> - </div> - </div> - <%@include file="/jsp/inc/footer.jsp" %> - </body> + <s:url var="jqueryUiCSS" value="/css/jquery-ui-1.8.11.custom.bow.css" /> + <s:url var="globalCSS" value="/css/global.css" /> + <link href="${jqueryUiCSS}" rel="stylesheet" type="text/css" media="all" /> + <link href="${globalCSS}" rel="stylesheet" type="text/css" media="all" /> + <s:url var="jqueryJS" value="/js/jquery-1.5.2.min.js" /> + <s:url var="jqueryUiJS" value="/js/jquery-ui-1.8.11.custom.min.js" /> + <s:url var="bookmarkJS" value="/js/bookmark.js" /> + <script type="text/javascript" src="${jqueryJS}"></script> + <script type="text/javascript" src="${jqueryUiJS}"></script> + <script type="text/javascript" src="${bookmarkJS}"></script> + </head> + <body id="page-home"> + <div id="wrap"> + <div id="page"> + <%@include file="/jsp/inc/header.jsp" %> + <div id="main"> + <%@include file="/jsp/inc/errorFrame.jsp" %> + <decorator:body /> + </div> + <s:if test="%{#session.BowSession.user != null}"> + <jsp:include page="/jsp/inc/rightMenu.jsp" /> + </s:if> + </div> + </div> + <%@include file="/jsp/inc/footer.jsp" %> + </body> </html> Added: trunk/bow-ui/src/main/webapp/css/images/ui-bg_flat_0_aaaaaa_40x100.png =================================================================== (Binary files differ) Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/bow-ui/src/main/webapp/css/images/ui-bg_flat_75_dbdbdb_40x100.png =================================================================== (Binary files differ) Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_flat_75_dbdbdb_40x100.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_55_fbf9ee_1x400.png =================================================================== (Binary files differ) Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_55_fbf9ee_1x400.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_65_ffffff_1x400.png =================================================================== (Binary files differ) Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_65_ffffff_1x400.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_75_dadada_1x400.png =================================================================== (Binary files differ) Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_75_dadada_1x400.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_75_e6e6e6_1x400.png =================================================================== (Binary files differ) Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_75_e6e6e6_1x400.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/bow-ui/src/main/webapp/css/images/ui-bg_highlight-soft_75_bf8a9c_1x100.png =================================================================== (Binary files differ) Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_highlight-soft_75_bf8a9c_1x100.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/bow-ui/src/main/webapp/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png =================================================================== (Binary files differ) Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/bow-ui/src/main/webapp/css/images/ui-icons_222222_256x240.png =================================================================== (Binary files differ) Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/bow-ui/src/main/webapp/css/images/ui-icons_2e83ff_256x240.png =================================================================== (Binary files differ) Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-icons_2e83ff_256x240.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/bow-ui/src/main/webapp/css/images/ui-icons_454545_256x240.png =================================================================== (Binary files differ) Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-icons_454545_256x240.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/bow-ui/src/main/webapp/css/images/ui-icons_888888_256x240.png =================================================================== (Binary files differ) Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-icons_888888_256x240.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/bow-ui/src/main/webapp/css/images/ui-icons_cd0a0a_256x240.png =================================================================== (Binary files differ) Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css (rev 0) +++ trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css 2011-04-20 14:55:48 UTC (rev 250) @@ -0,0 +1,573 @@ +/* + * jQuery UI CSS Framework 1.8.11 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + */ + +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { display: none; } +.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } +.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } +.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } +.ui-helper-clearfix { display: inline-block; } +/* required comment for clearfix to work in Opera \*/ +* html .ui-helper-clearfix { height:1%; } +.ui-helper-clearfix { display:block; } +/* end clearfix */ +.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { cursor: default !important; } + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } + + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } + + +/* + * jQuery UI CSS Framework 1.8.11 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + * + * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefau… + */ + + +/* Component containers +----------------------------------*/ +.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; } +.ui-widget .ui-widget { font-size: 1em; } +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } +.ui-widget-content { border: 1px solid #aaaaaa; background: #dbdbdb url(images/ui-bg_flat_75_dbdbdb_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content a { color: #222222; } +.ui-widget-header { border: 1px solid #aaaaaa; background: #bf8a9c url(images/ui-bg_highlight-soft_75_bf8a9c_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } +.ui-widget-header a { color: #222222; } + +/* Interaction states +----------------------------------*/ +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; } +.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; } +.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; } +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; } +.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; } +.ui-widget :active { outline: none; } + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; } +.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; } +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_inset-soft_95_fef1ec_1x100.png) 50% bottom repeat-x; color: #cd0a0a; } +.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; } +.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; } +.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } +.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } +.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); } +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } +.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } +.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); } +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); } + +/* positioning */ +.ui-icon-carat-1-n { background-position: 0 0; } +.ui-icon-carat-1-ne { background-position: -16px 0; } +.ui-icon-carat-1-e { background-position: -32px 0; } +.ui-icon-carat-1-se { background-position: -48px 0; } +.ui-icon-carat-1-s { background-position: -64px 0; } +.ui-icon-carat-1-sw { background-position: -80px 0; } +.ui-icon-carat-1-w { background-position: -96px 0; } +.ui-icon-carat-1-nw { background-position: -112px 0; } +.ui-icon-carat-2-n-s { background-position: -128px 0; } +.ui-icon-carat-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -64px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -64px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-off { background-position: -96px -144px; } +.ui-icon-radio-on { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-start { background-position: -80px -160px; } +/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; } +.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; } +.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; } +.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } +.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; } +.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } +.ui-corner-right { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } +.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; } +.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; } + +/* Overlays */ +.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } +.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* + * jQuery UI Resizable 1.8.11 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Resizable#theming + */ +.ui-resizable { position: relative;} +.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;} +.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } +.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } +.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } +.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; } +.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; } +.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } +.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } +.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } +.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* + * jQuery UI Selectable 1.8.11 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Selectable#theming + */ +.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; } +/* + * jQuery UI Accordion 1.8.11 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Accordion#theming + */ +/* IE/Win - Fix animation bug - #4615 */ +.ui-accordion { width: 100%; } +.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; } +.ui-accordion .ui-accordion-li-fix { display: inline; } +.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; } +.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; } +.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; } +.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } +.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; } +.ui-accordion .ui-accordion-content-active { display: block; } +/* + * jQuery UI Autocomplete 1.8.11 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Autocomplete#theming + */ +.ui-autocomplete { position: absolute; cursor: default; } + +/* workarounds */ +* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ + +/* + * jQuery UI Menu 1.8.11 + * + * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Menu#theming + */ +.ui-menu { + list-style:none; + padding: 2px; + margin: 0; + display:block; + float: left; +} +.ui-menu .ui-menu { + margin-top: -3px; +} +.ui-menu .ui-menu-item { + margin:0; + padding: 0; + zoom: 1; + float: left; + clear: left; + width: 100%; +} +.ui-menu .ui-menu-item a { + text-decoration:none; + display:block; + padding:.2em .4em; + line-height:1.5; + zoom:1; +} +.ui-menu .ui-menu-item a.ui-state-hover, +.ui-menu .ui-menu-item a.ui-state-active { + font-weight: normal; + margin: -1px; +} +/* + * jQuery UI Button 1.8.11 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Button#theming + */ +.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */ +.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ +button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ +.ui-button-icons-only { width: 3.4em; } +button.ui-button-icons-only { width: 3.7em; } + +/*button text element */ +.ui-button .ui-button-text { display: block; line-height: 1.4; } +.ui-button-text-only .ui-button-text { padding: .4em 1em; } +.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; } +.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; } +.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; } +.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; } +/* no icon support for input elements, provide padding by default */ +input.ui-button { padding: .4em 1em; } + +/*button icon element(s) */ +.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; } +.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; } +.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; } +.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } +.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } + +/*button sets*/ +.ui-buttonset { margin-right: 7px; } +.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; } + +/* workarounds */ +button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ +/* + * jQuery UI Dialog 1.8.11 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Dialog#theming + */ +.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; } +.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; } +.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } +.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } +.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } +.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } +.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } +.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } +.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; } +.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; } +.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } +.ui-draggable .ui-dialog-titlebar { cursor: move; } +/* + * jQuery UI Slider 1.8.11 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Slider#theming + */ +.ui-slider { position: relative; text-align: left; } +.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } +.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; } + +.ui-slider-horizontal { height: .8em; } +.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; } +.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; } +.ui-slider-horizontal .ui-slider-range-min { left: 0; } +.ui-slider-horizontal .ui-slider-range-max { right: 0; } + +.ui-slider-vertical { width: .8em; height: 100px; } +.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; } +.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } +.ui-slider-vertical .ui-slider-range-min { bottom: 0; } +.ui-slider-vertical .ui-slider-range-max { top: 0; }/* + * jQuery UI Tabs 1.8.11 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Tabs#theming + */ +.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ +.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; } +.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; } +.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; } +.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; } +.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; } +.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ +.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; } +.ui-tabs .ui-tabs-hide { display: none !important; } +/* + * jQuery UI Datepicker 1.8.11 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Datepicker#theming + */ +.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; } +.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } +.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } +.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } +.ui-datepicker .ui-datepicker-prev { left:2px; } +.ui-datepicker .ui-datepicker-next { right:2px; } +.ui-datepicker .ui-datepicker-prev-hover { left:1px; } +.ui-datepicker .ui-datepicker-next-hover { right:1px; } +.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } +.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } +.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } +.ui-datepicker select.ui-datepicker-month-year {width: 100%;} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { width: 49%;} +.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } +.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } +.ui-datepicker td { border: 0; padding: 1px; } +.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } +.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } +.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } + +/* with multiple calendars */ +.ui-datepicker.ui-datepicker-multi { width:auto; } +.ui-datepicker-multi .ui-datepicker-group { float:left; } +.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } +.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } +.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } +.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } +.ui-datepicker-row-break { clear:both; width:100%; } + +/* RTL support */ +.ui-datepicker-rtl { direction: rtl; } +.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } +.ui-datepicker-rtl .ui-datepicker-group { float:right; } +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } + +/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ +.ui-datepicker-cover { + display: none; /*sorry for IE5*/ + display/**/: block; /*sorry for IE5*/ + position: absolute; /*must have*/ + z-index: -1; /*must have*/ + filter: mask(); /*must have*/ + top: -4px; /*must have*/ + left: -4px; /*must have*/ + width: 200px; /*must have*/ + height: 200px; /*must have*/ +}/* + * jQuery UI Progressbar 1.8.11 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Progressbar#theming + */ +.ui-progressbar { height:2em; text-align: left; } +.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file Modified: trunk/bow-ui/src/main/webapp/jsp/home.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/home.jsp 2011-04-20 13:56:27 UTC (rev 249) +++ trunk/bow-ui/src/main/webapp/jsp/home.jsp 2011-04-20 14:55:48 UTC (rev 250) @@ -116,7 +116,7 @@ }); }); </script> - <div id="setPublicAliasPopup" class="fond" title="Enter the public alias"> + <div id="setPublicAliasPopup" title="Enter the public alias"> <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" />

1 0

r249 - in trunk/bow-ui/src/main: java/org/chorem/bow java/org/chorem/bow/action webapp/css webapp/jsp webapp/jsp/inc
by bpoussin＠users.chorem.org April 20, 2011

April 20, 2011

Author: bpoussin Date: 2011-04-20 15:56:27 +0200 (Wed, 20 Apr 2011) New Revision: 249 Url: http://chorem.org/repositories/revision/bow/249 Log: - centralisation du rendu des dates par BowUtils.formatDate - ajout d'un fond aux popups javascript d'ajout d'alias public Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowUtils.java trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/jsp/home.jsp trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp trunk/bow-ui/src/main/webapp/jsp/search.jsp Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowUtils.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowUtils.java 2011-04-20 13:36:20 UTC (rev 248) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowUtils.java 2011-04-20 13:56:27 UTC (rev 249) @@ -23,52 +23,27 @@ */ package org.chorem.bow; -import org.apache.commons.lang.time.DateUtils; +import java.util.Date; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.Search; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.UUID; +import org.apache.commons.lang.time.DateFormatUtils; public class BowUtils { - public static String BOW_DATE_PATTERN = "dd/MM/yyyy HH:mm:ss"; - + final static public String BOW_DATE_SHORT_PATTERN = "yyyy/MM/dd"; + private BowUtils() { } - /** - * Convert bow formated date to date object - * - * @param dateAsString bow formated date - * @return Date parsed - * @throws ParseException if error occured on parsing date - */ - static public Date parseDate(String dateAsString) throws ParseException { - return DateUtils.parseDate(dateAsString, new String[]{BOW_DATE_PATTERN}); + static public String formatDate(Date date) { + String result = DateFormatUtils.format(date, BOW_DATE_SHORT_PATTERN); + return result; } - /** - * Convert date to bow format - * - * @param date date to format - * @return formated date - * @throws ParseException if error occured on parsing date - */ - static public String formatDate(Date date) throws ParseException { - if (date == null) { - return null; - } - SimpleDateFormat format = new SimpleDateFormat(BOW_DATE_PATTERN); - return format.format(date); - } - - - /** * Generates a random token * * @return the generated token 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-20 13:36:20 UTC (rev 248) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-04-20 13:56:27 UTC (rev 249) @@ -24,7 +24,6 @@ package org.chorem.bow.action; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateFormatUtils; import org.chorem.bow.BookmarkUtils; import org.chorem.bow.BowBookmark; import org.chorem.bow.BowUser; @@ -43,8 +42,6 @@ private static final long serialVersionUID = 3389170166034184139L; - final static private String DATE_FORMAT = "yyyy/MM/dd"; - protected String link; protected String name; protected String alias; @@ -200,8 +197,8 @@ String description = oldBookmark.getDescription(); if (!StringUtils.isEmpty(bookmark.getDescription())) { description += "\n"; - description += DateFormatUtils.format( - bookmark.getCreationDate(), DATE_FORMAT) + ": "; + description += BowUtils.formatDate( + bookmark.getCreationDate()) + ": "; description += bookmark.getDescription(); } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java 2011-04-20 13:36:20 UTC (rev 248) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java 2011-04-20 13:56:27 UTC (rev 249) @@ -41,7 +41,9 @@ @Override public String execute() throws Exception { - log.debug("Redirect alias " + alias); + if (log.isDebugEnabled()) { + log.debug("Redirect alias " + alias); + } String result = SUCCESS; try { if (!StringUtils.isEmpty(alias)) { Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-04-20 13:36:20 UTC (rev 248) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-04-20 13:56:27 UTC (rev 249) @@ -140,4 +140,6 @@ -webkit-border-radius: 0.5em; -moz-border-radius: 0.5em; + + padding:10px; } \ No newline at end of file Modified: trunk/bow-ui/src/main/webapp/jsp/home.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/home.jsp 2011-04-20 13:36:20 UTC (rev 248) +++ trunk/bow-ui/src/main/webapp/jsp/home.jsp 2011-04-20 13:56:27 UTC (rev 249) @@ -28,7 +28,6 @@ <%@page import="org.chorem.bow.BowBookmark" %> <%@page import="org.chorem.bow.BowPreference" %> <%@page import="java.util.List" %> -<%@page import="java.text.SimpleDateFormat" %> <% BowSession bowSession = BowSession.getBowSession(session); BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); @@ -52,13 +51,11 @@ <% int nbBookmarks = preference.getBookmarks(); - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); List<BowBookmark> bookmarkList = bookmarkActions.getBookmarks(); if (!bookmarkList.isEmpty()) { int count = 0; for (BowBookmark bookmark : bookmarkList) { request.setAttribute("bookmark", bookmark); - request.setAttribute("sdf", sdf); %> <s:include value="inc/bookmark.jsp" /> <% @@ -83,7 +80,6 @@ int count = 0; for (BowBookmark bookmark : lastBookmarks) { request.setAttribute("bookmark", bookmark); - request.setAttribute("sdf", sdf); %> <s:include value="inc/bookmark.jsp" /> <% @@ -120,7 +116,7 @@ }); }); </script> - <div id="setPublicAliasPopup" title="Enter the public alias"> + <div id="setPublicAliasPopup" class="fond" title="Enter the public alias"> <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" /> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-20 13:36:20 UTC (rev 248) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-20 13:56:27 UTC (rev 249) @@ -24,6 +24,8 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags" %> <%@page import="org.chorem.bow.BowBookmark" %> +<%@page import="org.chorem.bow.BowUtils"%> + <div class="bookmark" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> @@ -51,10 +53,9 @@ <s:set var="aliasServlet" value="%{@org.chorem.bow.BowConfig@getInstance().getServletAliasUrl()}" /> <s:set var="publicAliasUrl" value="%{#request.bookmark.getPublicAlias()}" /> <s:set var="aliasUrl" value="%{@org.chorem.bow.BowConfig@getInstance().getServletAliasUrl() + #bookmarkAlias}" /> - <s:set var="date" value="%{#request.sdf.format(#request.bookmark.getCreationDate())}" /> <div class="bookmarkhead"> - <p class="date">(<s:property value="%{date}" />)</p> + <p class="date"><%=BowUtils.formatDate(bookmark.getCreationDate())%></p> <s:a cssClass="alias" href="%{#aliasServlet + #wikittyId}.action" title="%{#bookmarkLink}" onclick="window.open(this.href); return false;"> a:<s:property value="%{#privateAlias}" /> </s:a> Modified: trunk/bow-ui/src/main/webapp/jsp/search.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/search.jsp 2011-04-20 13:36:20 UTC (rev 248) +++ trunk/bow-ui/src/main/webapp/jsp/search.jsp 2011-04-20 13:56:27 UTC (rev 249) @@ -80,10 +80,8 @@ List<BowBookmark> bookmarkList = bookmarkActions.getBookmarks(); if (!bookmarkList.isEmpty()) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); for (BowBookmark bookmark : bookmarkList) { request.setAttribute("bookmark", bookmark); - request.setAttribute("sdf", sdf); %> <jsp:include page="inc/bookmark.jsp" flush="true"> <jsp:param name="searchLine" value="%{#searchLine}" />

1 0

r248 - trunk/bow-ui/src/main/webapp/jsp
by bpoussin＠users.chorem.org April 20, 2011

April 20, 2011

Author: bpoussin Date: 2011-04-20 15:36:20 +0200 (Wed, 20 Apr 2011) New Revision: 248 Url: http://chorem.org/repositories/revision/bow/248 Log: suppression des tabulations et reformatage Modified: trunk/bow-ui/src/main/webapp/jsp/search.jsp Modified: trunk/bow-ui/src/main/webapp/jsp/search.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/search.jsp 2011-04-20 13:25:07 UTC (rev 247) +++ trunk/bow-ui/src/main/webapp/jsp/search.jsp 2011-04-20 13:36:20 UTC (rev 248) @@ -31,71 +31,71 @@ BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); if (bookmarkActions != null) { - %> +%> - <html xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> - - <s:set var="searchLine" value="%{#request.bookmarkActions.getSearchLine()}" /> - <s:set var="fullText" value="%{#request.bookmarkActions.getFullTextLine()}" /> - - <head> - <title><s:text name="bow.search.title" /></title> - <s:url var="css" value="/css/bookmark.css" /> - <link href="${css}" rel="stylesheet" type="text/css" /> - <s:head /> - </head> - <body> - <div class="menu clearfix"> - <h2><s:text name="bow.search.title" /></h2> - <s:form action="order"> - <p> - <label for="type"><s:text name="bow.search.orderby" /></label> - <select id="type" name="type"> - <option value="ascName"><s:text name="bow.search.ascname" /></option> - <option value="descName"><s:text name="bow.search.descname" /></option> - <option value="ascClick"><s:text name="bow.search.ascclick" /></option> - <option value="descClick"><s:text name="bow.search.descclick" /></option> - <option value="ascDate"><s:text name="bow.search.ascdate" /></option> - <option value="descDate"><s:text name="bow.search.descdate" /></option> - </select> - <s:submit key="bow.search.submit" name="submit" /> - <s:set name="bookmarksToDelete" value="%{#request.bookmarkActions.getBookmarks().size()}" /> - <s:if test="%{#bookmarksToDelete > 0}"> - <s:url var="deleteSearchResults" action="deleteSearchResults" escapeAmp="false"> - <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> - <s:param name="fullTextLine"><s:property value="%{#fullText}" /></s:param> - </s:url> - <s:a id="deleteSearchResultsButton" href="" onclick="deleteConfirmation('%{deleteSearchResults}', %{#bookmarksToDelete}); return(false);"></s:a> - </s:if> - <s:hidden name="searchLine" value="%{#searchLine}" /> - <s:hidden name="fullTextLine" value="%{#fullText}" /> - </p> - </s:form> - </div> - <div class="content"> - <% - List<BowBookmark> bookmarkList = bookmarkActions.getBookmarks(); - - if (!bookmarkList.isEmpty()) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - for (BowBookmark bookmark : bookmarkList) { - request.setAttribute("bookmark", bookmark); - request.setAttribute("sdf", sdf); - %> - <jsp:include page="inc/bookmark.jsp" flush="true"> - <jsp:param name="searchLine" value="%{#searchLine}" /> - <jsp:param name="fullTextLine" value="%{#fullText}" /> - </jsp:include> - <% - } - } - else { %> - <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> - <% } %> - </div> - </body> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + + <s:set var="searchLine" value="%{#request.bookmarkActions.getSearchLine()}" /> + <s:set var="fullText" value="%{#request.bookmarkActions.getFullTextLine()}" /> + + <head> + <title><s:text name="bow.search.title" /></title> + <s:url var="css" value="/css/bookmark.css" /> + <link href="${css}" rel="stylesheet" type="text/css" /> + <s:head /> + </head> + <body> + <div class="menu clearfix"> + <h2><s:text name="bow.search.title" /></h2> + <s:form action="order"> + <p> + <label for="type"><s:text name="bow.search.orderby" /></label> + <select id="type" name="type"> + <option value="ascName"><s:text name="bow.search.ascname" /></option> + <option value="descName"><s:text name="bow.search.descname" /></option> + <option value="ascClick"><s:text name="bow.search.ascclick" /></option> + <option value="descClick"><s:text name="bow.search.descclick" /></option> + <option value="ascDate"><s:text name="bow.search.ascdate" /></option> + <option value="descDate"><s:text name="bow.search.descdate" /></option> + </select> + <s:submit key="bow.search.submit" name="submit" /> + <s:set name="bookmarksToDelete" value="%{#request.bookmarkActions.getBookmarks().size()}" /> + <s:if test="%{#bookmarksToDelete > 0}"> + <s:url var="deleteSearchResults" action="deleteSearchResults" escapeAmp="false"> + <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> + <s:param name="fullTextLine"><s:property value="%{#fullText}" /></s:param> + </s:url> + <s:a id="deleteSearchResultsButton" href="" onclick="deleteConfirmation('%{deleteSearchResults}', %{#bookmarksToDelete}); return(false);"></s:a> + </s:if> + <s:hidden name="searchLine" value="%{#searchLine}" /> + <s:hidden name="fullTextLine" value="%{#fullText}" /> + </p> + </s:form> + </div> + <div class="content"> + <% + List<BowBookmark> bookmarkList = bookmarkActions.getBookmarks(); + + if (!bookmarkList.isEmpty()) { + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + for (BowBookmark bookmark : bookmarkList) { + request.setAttribute("bookmark", bookmark); + request.setAttribute("sdf", sdf); + %> + <jsp:include page="inc/bookmark.jsp" flush="true"> + <jsp:param name="searchLine" value="%{#searchLine}" /> + <jsp:param name="fullTextLine" value="%{#fullText}" /> + </jsp:include> + <% + } + } else { %> + <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> + <% + } %> + </div> + </body> </html> <% } %>

1 0

r247 - trunk/bow-ui/src/main/webapp/jsp
by bpoussin＠users.chorem.org April 20, 2011

April 20, 2011

Author: bpoussin Date: 2011-04-20 15:25:07 +0200 (Wed, 20 Apr 2011) New Revision: 247 Url: http://chorem.org/repositories/revision/bow/247 Log: suppression des tabulations et reformatage Modified: trunk/bow-ui/src/main/webapp/jsp/home.jsp Modified: trunk/bow-ui/src/main/webapp/jsp/home.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/home.jsp 2011-04-20 13:15:52 UTC (rev 246) +++ trunk/bow-ui/src/main/webapp/jsp/home.jsp 2011-04-20 13:25:07 UTC (rev 247) @@ -35,99 +35,97 @@ BowPreference preference = bowSession.getPreference(); if (bookmarkActions != null) { - %> - <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> - <head> - <title><s:text name="bow.home.title" /></title> - <s:url var="css" value="/css/bookmark.css" /> - <link href="${css}" rel="stylesheet" type="text/css" /> - <s:head /> - </head> - <body> - <div class="menu clearfix"> - <h2><s:text name="bow.home.mostUsedBookmarks" /></h2> - </div> - <div class="content"> - <% - int nbBookmarks = preference.getBookmarks(); - - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - List<BowBookmark> bookmarkList = bookmarkActions.getBookmarks(); - if (!bookmarkList.isEmpty()) { - int count = 0; - for (BowBookmark bookmark : bookmarkList) { - request.setAttribute("bookmark", bookmark); - request.setAttribute("sdf", sdf); - %> - <s:include value="inc/bookmark.jsp" /> - <% - ++count; - if (count >= nbBookmarks) { - break; - } - } - } - else { %> - <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> - <% } %> - </div> - - <div class="menu clearfix"> - <h2><s:text name="bow.home.latestBookmarks" /></h2> - </div> - <div class="content"> - <% - List<BowBookmark> lastBookmarks = bookmarkActions.getLastBookmarks(); - - if (!lastBookmarks.isEmpty()) { - int count = 0; - for (BowBookmark bookmark : lastBookmarks) { - request.setAttribute("bookmark", bookmark); - request.setAttribute("sdf", sdf); - %> - <s:include value="inc/bookmark.jsp" /> - <% - ++count; - if (count >= nbBookmarks) { - break; - } - } - } - else { %> - <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> - <% } %> - </div> +%> +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="bow.home.title" /></title> + <s:url var="css" value="/css/bookmark.css" /> + <link href="${css}" rel="stylesheet" type="text/css" /> + <s:head /> + </head> + <body> + <div class="menu clearfix"> + <h2><s:text name="bow.home.mostUsedBookmarks" /></h2> + </div> + <div class="content"> + <% + int nbBookmarks = preference.getBookmarks(); + + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + List<BowBookmark> bookmarkList = bookmarkActions.getBookmarks(); + if (!bookmarkList.isEmpty()) { + int count = 0; + for (BowBookmark bookmark : bookmarkList) { + request.setAttribute("bookmark", bookmark); + request.setAttribute("sdf", sdf); + %> + <s:include value="inc/bookmark.jsp" /> + <% + ++count; + if (count >= nbBookmarks) { + break; + } + } + } else { %> + <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> + <% } %> + </div> + + <div class="menu clearfix"> + <h2><s:text name="bow.home.latestBookmarks" /></h2> + </div> + <div class="content"> + <% + List<BowBookmark> lastBookmarks = bookmarkActions.getLastBookmarks(); - <script> - $(function() { - $( "#setPublicAliasPopup" ).dialog({ - autoOpen: false, - height: 100, - width: 200, - modal: true, - buttons: { - "Validate": function() { - var bValid = true; - $("#setPublicAliasForm").submit(); - $( this ).dialog( "close" ); - }, - Cancel: function() { - $( this ).dialog( "close" ); - } + if (!lastBookmarks.isEmpty()) { + int count = 0; + for (BowBookmark bookmark : lastBookmarks) { + request.setAttribute("bookmark", bookmark); + request.setAttribute("sdf", sdf); + %> + <s:include value="inc/bookmark.jsp" /> + <% + ++count; + if (count >= nbBookmarks) { + break; + } + } + } else { %> + <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> + <% } %> + </div> + + <script> + $(function() { + $( "#setPublicAliasPopup" ).dialog({ + autoOpen: false, + height: 100, + width: 200, + modal: true, + buttons: { + "Validate": function() { + var bValid = true; + $("#setPublicAliasForm").submit(); + $( this ).dialog( "close" ); }, - close: function() { - //allFields.val( "" ).removeClass( "ui-state-error" ); + Cancel: function() { + $( this ).dialog( "close" ); } - }); + }, + close: function() { + //allFields.val( "" ).removeClass( "ui-state-error" ); + } }); - </script> - <div id="setPublicAliasPopup" title="Enter the public alias"> - <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" /> - </s:form> - </div> - </body> - </html> + }); + </script> + <div id="setPublicAliasPopup" title="Enter the public alias"> + <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" /> + </s:form> + </div> + </body> +</html> <% } %>

1 0

r246 - trunk/bow-ui/src/main/webapp/jsp/inc
by bpoussin＠users.chorem.org April 20, 2011

April 20, 2011

Author: bpoussin Date: 2011-04-20 15:15:52 +0200 (Wed, 20 Apr 2011) New Revision: 246 Url: http://chorem.org/repositories/revision/bow/246 Log: suppression des tabulations Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-19 17:51:16 UTC (rev 245) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-20 13:15:52 UTC (rev 246) @@ -58,10 +58,13 @@ <s:a cssClass="alias" href="%{#aliasServlet + #wikittyId}.action" title="%{#bookmarkLink}" onclick="window.open(this.href); return false;"> a:<s:property value="%{#privateAlias}" /> </s:a> - +--%> <s:if test="%{#publicAliasUrl != null}"> <s:a cssClass="alias" href="%{#aliasServlet + #publicAliasUrl}.action" title="%{#bookmarkLink}" onclick="window.open(this.href); return false;"> <s:property value="%{#publicAliasUrl}" /> @@ -90,20 +93,20 @@ </s:a> </s:else> <s:url var="editBookmarkModify" action="modifyBookmark" escapeAmp="false"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> - <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> - <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> + <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></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:url var="editBookmark" action="modifyBookmark" escapeAmp="true"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> - <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> - <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> + <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></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:a cssClass="edit" href="%{editBookmark}" onclick="return modify('%{#bookmarkDescription}', '%{#bookmarkAlias}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}', '%{#bookmarkLink}', '%{editBookmarkModify}', '%{#wikittyId}');"></s:a> <s:url var="removeBookmark" action="removeBookmark" escapeAmp="true"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> - <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> - <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> + <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></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:a cssClass="supprim" href="%{removeBookmark}"></s:a> </div> @@ -113,37 +116,37 @@ <div class="description"> <h3><s:text name="bow.bookmark.description" /> :</h3> <p> - <s:url var="redirectTo" action="redirectToUrl"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> - </s:url> - <s:a title="%{#bookmarkLink}" href="%{redirectTo}" - onclick="window.open(this.href); return false;"> - <%=bookmarkDescription%> - </s:a> + <s:url var="redirectTo" action="redirectToUrl"> + <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> + </s:url> + <s:a title="%{#bookmarkLink}" href="%{redirectTo}" + onclick="window.open(this.href); return false;"> + <%=bookmarkDescription%> + </s:a> </p> <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> - <s:a href="%{search}" cssStyle="text-decoration:none"><s:property /></s:a> + <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> + <s:a href="%{search}" cssStyle="text-decoration:none"><s:property /></s:a> </s:iterator> </p> </div>

1 0

r245 - in trunk/bow-ui/src/main/webapp: css jsp jsp/inc
by bpoussin＠users.chorem.org April 19, 2011

April 19, 2011

Author: bpoussin Date: 2011-04-19 19:51:16 +0200 (Tue, 19 Apr 2011) New Revision: 245 Url: http://chorem.org/repositories/revision/bow/245 Log: reorganisation du menu de droite en deplacant des choses dans preferences (un peu de style a refaire) Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp trunk/bow-ui/src/main/webapp/jsp/preferences.jsp Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-19 17:34:39 UTC (rev 244) +++ trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-19 17:51:16 UTC (rev 245) @@ -370,12 +370,12 @@ .formFrame{ min-width:400px; - min-height: 315px; +/* min-height: 315px; */ position:relative; margin-top:20px; margin-bottom:20px; margin-right:100px; - margin-left:100px; + margin-left:40px; padding-top:10px; padding-bottom:10px; padding-left:40px; Modified: trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-19 17:34:39 UTC (rev 244) +++ trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-19 17:51:16 UTC (rev 245) @@ -34,9 +34,9 @@ <div id="logoutDiv" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> <s:form action="logout"> - <div class="input"> - <s:submit key="bow.rightMenu.logout" name="submit" /> - </div> + <div class="input"> + <s:submit key="bow.rightMenu.logout" name="submit" /> + </div> </s:form> <a href="http://maven-site.chorem.org/bow/" class="help" onclick="window.open(this.href); return false;"><s:text name="bow.rightMenu.help" /></a> </div> @@ -47,27 +47,30 @@ <div id="colonneD"> <ul class="droite"> <s:if test="#session.BowSession.isAdmin()"> - <li><s:a action="admin"><s:text name="bow.rightMenu.admin" /></s:a></li> - </s:if> + <li><s:a action="admin"><s:text name="bow.rightMenu.admin" /></s:a></li> + </s:if> <li><s:a action="preferences"><s:text name="bow.preferences.title" /></s:a></li> - <s:set var="permanentToken" value="#session.BowSession.getPermanentToken()" /> - <s:set var="temporaryToken" value="#session.BowSession.getTemporaryToken()" /> - <li><a title="%{getText('bow.rightMenu.bookmark.temporaryLinkDescription')}" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=bowUrl%>addUrl.action?token=${temporaryToken}&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:text name="bow.rightMenu.bookmark.temporaryLink" /></a></li> - <li><a title="%{getText('bow.rightMenu.bookmark.permanentLinkDescription')}" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=bowUrl%>addUrl.action?token=${permanentToken}&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:text name="bow.rightMenu.bookmark.permanentLink" /></a></li> </ul> - <div id="extensions"> - <h2><s:text name="bow.rightMenu.extensions" /></h2> - <ul class="droite"> - <li><a href="extensions/bow4chromium.crx"><img src="img/chromium.png" alt="Chromium" class="extensionIcon" /> - <s:text name="bow.rightMenu.chromiumExtension" /></a></li> - <li><strong><s:text name="bow.rightMenu.token.permanent" /> :</strong><br /><s:property value="%{#session.BowSession.getPermanentToken()}" /></li> - <li><strong><s:text name="bow.rightMenu.token.temporary" /> :</strong><br /><s:property value="%{#session.BowSession.getTemporaryToken()}" /></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> <div id="add" class="clearfix"> <h2><s:text name="bow.rightMenu.bookmark.addModify" /></h2> <s:form id="bookmarkForm" action="%{#request.formAction}"> - <p> + <p> <s:textfield key="bow.rightMenu.bookmark.link" name="link" value="%{#request.link}" labelSeparator="" /><br /> <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" value="%{#request.alias}" labelSeparator="" /><br /> <s:textfield key="bow.rightMenu.bookmark.name" name="name" value="%{#request.name}" labelSeparator="" /><br /> @@ -88,24 +91,8 @@ <jsp:include page="tagsCloud.jsp" flush="true" /> </s:else>  - <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> <div class="colonnebas"> - <img src="img/piedmenu.jpg" width="401" height="77" alt="Pied de menu" /> + <img src="img/piedmenu.jpg" width="401" height="77" alt="Pied de menu" /> </div> </div> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-04-19 17:34:39 UTC (rev 244) +++ trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-04-19 17:51:16 UTC (rev 245) @@ -1,3 +1,4 @@ +<%@page import="org.chorem.bow.BowConfig"%> <%@page import="org.nuiton.wikitty.search.FacetTopic"%> <%@page import="org.chorem.bow.action.PreferencesAction"%> <!-- @@ -28,6 +29,7 @@ <% PreferencesAction action = PreferencesAction.getAction(); +String bowUrl = BowConfig.getInstance().getBowUrl(); %> <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" @@ -44,6 +46,45 @@ <h2><s:text name="bow.preferences.title"/></h2> </div> <s:actionerror/> + + <div class="formFrame fond"> + <s:set var="permanentToken" value="#session.BowSession.getPermanentToken()" /> + <s:set var="temporaryToken" value="#session.BowSession.getTemporaryToken()" /> + <ul> + <li> + <a title="%{getText('bow.rightMenu.bookmark.temporaryLinkDescription')}" + href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=bowUrl%>addUrl.action?token=${temporaryToken}&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"> + <s:text name="bow.rightMenu.bookmark.temporaryLink" /> + </a> + </li> + <li> + <a title="%{getText('bow.rightMenu.bookmark.permanentLinkDescription')}" + href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=bowUrl%>addUrl.action?token=${permanentToken}&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"> + <s:text name="bow.rightMenu.bookmark.permanentLink" /> + </a> + </li> + <li> + <a href="extensions/bow4chromium.crx"> + <img src="img/chromium.png" alt="Chromium" class="extensionIcon" /> + <s:text name="bow.rightMenu.chromiumExtension" /> + </a> + </li> + <li> + <strong><s:text name="bow.rightMenu.token.permanent"/> :</strong> + <s:property value="%{#permanentToken}"/> + </li> + <li> + <strong><s:text name="bow.rightMenu.token.temporary"/> :</strong> + <s:property value="%{#temporaryToken}"/> + </li> + </ul> + + <s:url var="regenPermToken" action="regenPermToken"/> + <s:a href="%{regenPermToken}" id="regenPermToken"> + <s:text name="bow.preferences.regenPermToken"/> + </s:a> + </div> + <s:form action="preferences"> <div class="formFrame fond"> <h3><s:text name="bow.preferences.userInfo"/></h3> @@ -59,26 +100,6 @@ name="confirmNewPassword" labelposition="top"/><br/> <s:submit key="bow.preferences.submit" name="submit"/><br/> </p> - - <br/> - <br/> - <br/> - <br/> - <ul> - <li> - <strong><s:text name="bow.rightMenu.token.permanent"/> :</strong> - <s:property value="%{#session.BowSession.getPermanentToken()}"/> - </li> - <li> - <strong><s:text name="bow.rightMenu.token.temporary"/> :</strong> - <s:property value="%{#session.BowSession.getTemporaryToken()}"/> - </li> - </ul> - - <s:url var="regenPermToken" action="regenPermToken"/> - <s:a href="%{regenPermToken}" id="regenPermToken"> - <s:text name="bow.preferences.regenPermToken"/> - </s:a> </div> <div class="formFrame fond"> <h3><s:text name="bow.preferences.siteLook"/></h3>

1 0

r244 - in trunk: . bow-ui bow-ui/src/main/java/org/chorem/bow/action bow-ui/src/main/resources bow-ui/src/main/resources/i18n bow-ui/src/main/webapp/css bow-ui/src/main/webapp/jsp
by bpoussin＠users.chorem.org April 19, 2011

April 19, 2011

Author: bpoussin Date: 2011-04-19 19:34:39 +0200 (Tue, 19 Apr 2011) New Revision: 244 Url: http://chorem.org/repositories/revision/bow/244 Log: Evolution #217: Administrate all tags - replace all tab with space in css - use css to add background in preference and login page (before image is used) - use Wikitty 3.1 snapshot with new indexation multivalued field and without -impl module suffix Modified: trunk/bow-ui/pom.xml trunk/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.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/resources/struts.xml trunk/bow-ui/src/main/webapp/css/bookmark.css trunk/bow-ui/src/main/webapp/css/connexion.css trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/jsp/admin.jsp trunk/bow-ui/src/main/webapp/jsp/forgotPassword.jsp trunk/bow-ui/src/main/webapp/jsp/login.jsp trunk/bow-ui/src/main/webapp/jsp/preferences.jsp trunk/bow-ui/src/main/webapp/jsp/register.jsp trunk/pom.xml Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-04-19 06:36:50 UTC (rev 243) +++ trunk/bow-ui/pom.xml 2011-04-19 17:34:39 UTC (rev 244) @@ -110,13 +110,13 @@ <dependency> <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc-impl</artifactId> + <artifactId>wikitty-jdbc</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr-impl</artifactId> + <artifactId>wikitty-solr</artifactId> <scope>runtime</scope> </dependency> Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.java 2011-04-19 06:36:50 UTC (rev 243) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.java 2011-04-19 17:34:39 UTC (rev 244) @@ -46,6 +46,8 @@ protected static final Log log = LogFactory.getLog(BowBaseAction.class); + final static protected String CONTEXT_ACTION_KEY = "action"; + public static final String UNTRANSLATED_MARKER = "???"; protected Map<String, Object> session; Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-04-19 06:36:50 UTC (rev 243) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-04-19 17:34:39 UTC (rev 244) @@ -23,17 +23,33 @@ */ package org.chorem.bow.action; -import java.util.Date; +import org.chorem.bow.BookmarkUtils; +import org.chorem.bow.BowBookmark; +import org.chorem.bow.BowInit; +import org.chorem.bow.BowPreference; +import org.chorem.bow.BowProxy; +import org.chorem.bow.BowUser; +import com.opensymphony.xwork2.ActionContext; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.TreeSet; import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.StringUtils; import org.apache.struts2.interceptor.ServletRequestAware; -import org.chorem.bow.*; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.FacetTopic; +import org.nuiton.wikitty.search.FacetTopicNameComparator; +import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; import static org.nuiton.i18n.I18n.n_; @@ -45,6 +61,10 @@ */ public class PreferencesAction extends BowBaseAction implements ServletRequestAware { private static final long serialVersionUID = -58341106356599721L; + + static public PreferencesAction getAction() { + return (PreferencesAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); + } protected String colors; protected String tagsNb; protected String bookmarksHomePage; @@ -58,7 +78,36 @@ protected Map<String, Integer> bookmarksImportDate; protected HttpServletRequest request; + protected Set<FacetTopic> labels; + protected String[] selectedLabels; + protected String rename; + protected String delete; + protected String newLabel; + + public String getNewLabel() { + return newLabel; + } + + public void setNewLabel(String newLabel) { + this.newLabel = newLabel; + } + public void setRename(String rename) { + this.rename = rename; + } + + public String getRename() { + return rename; + } + + public void setDelete(String delete) { + this.delete = delete; + } + + public String getDelete() { + return delete; + } + /** * @return the colors */ @@ -213,6 +262,18 @@ this.bookmarksImportDate = bookmarksImportDate; } + public Set<FacetTopic> getLabels() { + return labels; + } + + public String[] getSelectedLabels() { + return selectedLabels; + } + + public void setSelectedLabels(String[] selectedLabels) { + this.selectedLabels = selectedLabels; + } + @Override public void setServletRequest(HttpServletRequest request) { this.request = request; @@ -253,6 +314,79 @@ } /** + * Charge dans la variable labels tous les labels de l'utilisateur + * @param proxy + */ + protected void loadLabels(WikittyProxy proxy) { + BowUser user = getBowSession().getUser(); + String userId = user.getWikittyId(); + + Criteria c = Search.query() + .exteq(BowBookmark.EXT_WIKITTYLABEL) + .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_BOWUSER, userId) + .criteria().setEndIndex(0) + .addFacetField(BowBookmark.FQ_FIELD_WIKITTYLABEL_LABELS); + PagedResult<Wikitty> result = proxy.findAllByCriteria(c); + List<FacetTopic> topics = result.getTopic( + BowBookmark.FQ_FIELD_WIKITTYLABEL_LABELS); + labels = new TreeSet<FacetTopic>(new FacetTopicNameComparator(true)); + labels.addAll(topics); + } + + /** + * Fait les modification demandé par l'utilisateur dans l'interface de + * preference: renome ou supprime des labels. Si l'utilisateur demande le + * remplacement de label on indiquant pas de nouveau label, alors la chaine + * vide est utilisee. + * + * @return + */ + public String adminlabels() { + String result = SUCCESS; + try { + if (log.isDebugEnabled()) { + log.debug("Selected labels: " + Arrays.toString(selectedLabels)); + log.debug("action delete: " + delete + " rename: " + rename); + } + + List<String> selectedLabelsList = Arrays.asList(selectedLabels); + boolean isRename = !StringUtils.isEmpty(rename); + + BowProxy proxy = getBowProxy(); + BowUser user = getBowSession().getUser(); + String userId = user.getWikittyId(); + + Criteria c = Search.query() + .in(BowBookmark.FQ_FIELD_WIKITTYLABEL_LABELS, selectedLabelsList) + .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_BOWUSER, userId) + .criteria(); + PagedResult<WikittyLabel> searchResult = + proxy.findAllByCriteria(WikittyLabel.class, c); + + List<WikittyLabel> toStore = new ArrayList<WikittyLabel>(); + for (WikittyLabel label : searchResult) { + toStore.add(label); + Set<String> l = label.getLabels(); + if (l != null) { + // on fait une copie, car l retourne est non modifiable + l = new HashSet<String>(l); + l.removeAll(selectedLabelsList); + if (isRename) { + l.add(newLabel); + } + label.setLabels(l); + } + } + proxy.store(toStore); + } catch (Exception eee) { + addActionError(getText(n_("bow.error.internal"))); + log.error(eee.getMessage(), eee); + } + return result; + + } + + /** * Changes the user preferences */ public String execute() { @@ -263,6 +397,7 @@ // BowPreference extends BowUser, donc on l'utilise pour tout BowPreference preference = getBowSession().getPreference(); + loadLabels(proxy); Map<String,Integer> bookmarksByImportDate = BookmarkUtils.getBookmarksByImportDate(request, preference); if (log.isDebugEnabled()) { @@ -302,7 +437,7 @@ setTagsNb(String.valueOf(preference.getTags())); setBookmarksHomePage(String.valueOf(preference.getBookmarks())); setSearchEngineUrlSuggestions(preference.getSearchEngineUrlSuggestions()); - setSearchEngineUrlResults(preference.getSearchEngineUrlResults()); + setSearchEngineUrlResults(preference.getSearchEngineUrlResults()); } // retrieve last reference preference = getBowSession().getPreference(); 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-19 06:36:50 UTC (rev 243) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-19 17:34:39 UTC (rev 244) @@ -67,6 +67,10 @@ bow.preferences.import.submit=Import bow.preferences.importExport=Import / Export bow.preferences.importedBookmarks=Imported bookmarks +bow.preferences.labels=Labels administration +bow.preferences.labels.delete.submit=Delete +bow.preferences.labels.name.field=new name +bow.preferences.labels.rename.submit=Rename bow.preferences.newPassword=New password bow.preferences.noImportedBookmarks=No imported bookmarks bow.preferences.regenPermToken=Regenerate permanent token 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-19 06:36:50 UTC (rev 243) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-19 17:34:39 UTC (rev 244) @@ -8,7 +8,6 @@ bow.admin.home=Retour sur la page d''accueil bow.admin.panel=Panneau d''administration bow.admin.reIndexationDone=Les donn\u00E9es ont bien \u00E9t\u00E9 r\u00E9index\u00E9es -bow.alias.alread.exists= bow.alias.already.exists=L''alias {0} existe d\u00E9j\u00E0 bow.alias.bookmarkId.unknown=Il n''y a pas de marque-page correspondant \u00E0 l''identifiant {0} bow.bookmark.add.successful=Marque-page ajout\u00E9 avec succ\u00E8s @@ -67,6 +66,10 @@ bow.preferences.import.submit=Importer bow.preferences.importExport=Import / Export bow.preferences.importedBookmarks=Marque-pages import\u00E9s +bow.preferences.labels=Gestion des labels +bow.preferences.labels.delete.submit=Supprimer +bow.preferences.labels.name.field=Nouveau nom +bow.preferences.labels.rename.submit=Renomer bow.preferences.newPassword=Nouveau mot de passe bow.preferences.noImportedBookmarks=Aucun marque-page import\u00E9 bow.preferences.regenPermToken=Reg\u00E9n\u00E9rer le token permanent Modified: trunk/bow-ui/src/main/resources/struts.xml =================================================================== --- trunk/bow-ui/src/main/resources/struts.xml 2011-04-19 06:36:50 UTC (rev 243) +++ trunk/bow-ui/src/main/resources/struts.xml 2011-04-19 17:34:39 UTC (rev 244) @@ -241,6 +241,11 @@ <action name="*Xml"> <result>/jsp/{1}Xml.jsp</result> </action> + + <action name="adminlabels" class="org.chorem.bow.action.PreferencesAction" method="adminlabels"> + <result type="redirectAction">preferences</result> + </action> + <action name="preferences" class="org.chorem.bow.action.PreferencesAction"> <interceptor-ref name="store"> <param name="operationMode">STORE</param> Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-19 06:36:50 UTC (rev 243) +++ trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-19 17:34:39 UTC (rev 244) @@ -21,60 +21,60 @@ * 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% - */ +*/ #page{ - background-color:#9EDCF8; - float:left; - left:77%; - position:relative; - width:100%; - margin-bottom:50px; + background-color:#9EDCF8; + float:left; + left:77%; + position:relative; + width:100%; + margin-bottom:50px; } #header{ - background:#fff url('../img/fondhead.jpg') repeat-x 0 0; - float:left; - position:absolute; - right:85%; - top:0; - height:100px; - width:100%; + background:#fff url('../img/fondhead.jpg') repeat-x 0 0; + float:left; + position:absolute; + right:85%; + top:0; + height:100px; + width:100%; } #header a.logo{ - background:transparent url('../img/logobow.jpg') repeat scroll 0 0; - display:block; - height:100px; - text-indent:-99999px; - width:290px; - float:left; - left:8%; - position:relative; + background:transparent url('../img/logobow.jpg') repeat scroll 0 0; + display:block; + height:100px; + text-indent:-99999px; + width:290px; + float:left; + left:8%; + position:relative; } #main{ - margin-top:120px; - float:left; + margin-top:120px; + float:left; position:relative; - right:69%; - width:59%; - clear:both; + right:69%; + width:59%; + clear:both; } .content{ width:100%; float:left; - background-color:#fff; - margin-bottom: 25px; + background-color:#fff; + margin-bottom: 25px; } #side { - clear:right; - float:right; - position:relative; - right:73%; - width:27%; + clear:right; + float:right; + position:relative; + right:73%; + width:27%; } .bookmark{ @@ -84,18 +84,18 @@ } .bookmark .bookmarkhead{ - width:100%; - height:32px; - background-color:#bf8a9c; - border-bottom:2px solid #9EDCF8; - position:relative; - clear:both; + width:100%; + height:32px; + background-color:#bf8a9c; + border-bottom:2px solid #9EDCF8; + position:relative; + clear:both; } .bookmark .bookmarkcontenu{ - clear:both; - padding-top:5px; - padding-right: 152px; + clear:both; + padding-top:5px; + padding-right: 152px; } .bookmark .bookmarkhead .date{ @@ -107,42 +107,42 @@ .bookmark .bookmarkhead .edit{ background:url('../img/edit.jpg') no-repeat; - width:31px; - height:32px; - position:absolute; - top:0; - right:32px; + width:31px; + height:32px; + position:absolute; + top:0; + right:32px; } .bookmark .bookmarkhead .supprim{ background:url('../img/croix.jpg') no-repeat; - width:31px; - height:32px; - position:absolute; - top:0; - right:0; + width:31px; + height:32px; + position:absolute; + top:0; + right:0; } .bookmark .bookmarkhead a{ - color:#FFF; - font-weight:bold; - font-size:14px; - line-height:32px; - padding-left:40px; - background:url('../img/ptit_livre.jpg') no-repeat; - height:32px; - display:block; - text-decoration:none; - float:left; - margin-right:3%; - margin-left:3%; + color:#FFF; + font-weight:bold; + font-size:14px; + line-height:32px; + padding-left:40px; + background:url('../img/ptit_livre.jpg') no-repeat; + height:32px; + display:block; + text-decoration:none; + float:left; + margin-right:3%; + margin-left:3%; } .bookmark .bookmarkhead .alias{ float:left; margin-right:15px; display:block; -/* background:url('../img/ptit-livre.jpg') no-repeat; */ + /* background:url('../img/ptit-livre.jpg') no-repeat; */ } .bookmark .screenshot{ @@ -181,67 +181,67 @@ } .bookmark .click{ - background:transparent url('../img/click.jpg') no-repeat scroll 0 0; - float:right; - height:27px; - margin:10px -25px 5px 5px; - padding-top:31px; - position:relative; - right:-120px; - width:31px; - text-align:center; + background:transparent url('../img/click.jpg') no-repeat scroll 0 0; + float:right; + height:27px; + margin:10px -25px 5px 5px; + padding-top:31px; + position:relative; + right:-120px; + width:31px; + text-align:center; } .nobookmarks{ - font-size: large; - padding-left: 5px; + font-size: large; + padding-left: 5px; } #logoutDiv{ - float:right; - position:relative; - right:67%; - width:33%; - background:#BF8A9C url('../img/moyen-livre.jpg') no-repeat scroll 7% 44%; - height:100px; + float:right; + position:relative; + right:67%; + width:33%; + background:#BF8A9C url('../img/moyen-livre.jpg') no-repeat scroll 7% 44%; + height:100px; } #logoutDiv a.help{ - background:transparent url('../img/aide.jpg') no-repeat scroll 0 0; - display:block; - height:34px; - text-indent:-99999px; - width:34px; - margin-left:15%; - margin-top:12%; - float:left; + background:transparent url('../img/aide.jpg') no-repeat scroll 0 0; + display:block; + height:34px; + text-indent:-99999px; + width:34px; + margin-left:15%; + margin-top:12%; + float:left; } #logoutDiv form input{ - background:transparent url('../img/fondbouton.jpg') repeat-x scroll 0 0; - border:medium none; - color:#9C7186; - font-size:12px; - font-weight:bold; - height:27px; - line-height:27px; - display:block; - text-decoration:none; - text-align:center; - width:72px; - float:left; - margin-left:25%; - margin-top:6%; + background:transparent url('../img/fondbouton.jpg') repeat-x scroll 0 0; + border:medium none; + color:#9C7186; + font-size:12px; + font-weight:bold; + height:27px; + line-height:27px; + display:block; + text-decoration:none; + text-align:center; + width:72px; + float:left; + margin-left:25%; + margin-top:6%; } #side #colonneD{ - font-size:14px; - color:#9edcf8; + font-size:14px; + color:#9edcf8; } #colonneD{ - overflow-x:auto; - background-color:#804561; + overflow-x:auto; + background-color:#804561; } #colonneD a{ @@ -299,13 +299,13 @@ } #colonneD h2{ - color:#9edcf8; - font-size:140%; - font-weight:normal; + color:#9edcf8; + font-size:140%; + font-weight:normal; } #colonneD #add{ - height:auto; + height:auto; } #colonneD #add form{ @@ -320,65 +320,66 @@ height:22px; width:50%; border:none; - height:28px; - padding-left:4px; + height:28px; + padding-left:4px; } #colonneD #add form label{ - display:inline-block; - padding-right:9%; - text-align:right; - width:45px; + display:inline-block; + padding-right:9%; + text-align:right; + width:45px; } #colonneD form input[type="submit"]{ - background:transparent url('../img/fondbouton.jpg') repeat-x scroll 0 0; - border:medium none; - color:#9C7186; - display:block; - float:right; - font-size:12px; - font-weight:bold; - height:28px; - line-height:28px; - position:relative; - right:20%; - text-align:center; - text-decoration:none; - width:25%; + background:transparent url('../img/fondbouton.jpg') repeat-x scroll 0 0; + border:medium none; + color:#9C7186; + display:block; + float:right; + font-size:12px; + font-weight:bold; + height:28px; + line-height:28px; + position:relative; + right:20%; + text-align:center; + text-decoration:none; + width:25%; } #colonneD #nuage{ - padding-right:80px; + padding-right:80px; min-height:100px; text-align:justify; } .colonnebas img{ - width:86%; - height:auto; - display:block; - position:relative; + width:86%; + height:auto; + display:block; + position:relative; } #import .input input{ - width:90%; - margin-bottom:10px; + width:90%; + margin-bottom:10px; } + + .formFrame{ - width:400px; - height:315px; - background:url('../img/fondconnexion.jpg') no-repeat; + min-width:400px; + min-height: 315px; position:relative; margin-top:20px; - margin-bottom:20px; - margin-right:100px; - margin-left:100px; - padding-top:10px; - padding-bottom:10px; - padding-left:40px; - padding-right:70px; + margin-bottom:20px; + margin-right:100px; + margin-left:100px; + padding-top:10px; + padding-bottom:10px; + padding-left:40px; + padding-right:70px; } .formFrame h1{ @@ -401,7 +402,6 @@ } .formFrame input[type="submit"]{ - float:left; margin-top:20px; background:url('../img/fdboutonV.jpg') repeat-x; height:31px; @@ -414,7 +414,7 @@ } .formFrame p a{ - position:absolute; + position:absolute; color:#804561; left:75px; font-weight:bold; @@ -424,84 +424,84 @@ .formFrame #homePage, .formFrame #regenPermToken{ - bottom:50px; - left:185px; - font-size:10px; + bottom:50px; + left:185px; + font-size:10px; } .formFrame p input, td input{ - margin-bottom:2px; + margin-bottom:2px; } .deleteImport{ - width:100%; - height:32px; - border:1px solid black; - margin-bottom:4px; - padding-top:10px; - padding-left:15px; + width:100%; + height:32px; + border:1px solid black; + margin-bottom:4px; + padding-top:10px; + padding-left:15px; } .deleteImportPink{ - background-color:#BF8A9C; + background-color:#BF8A9C; } .deleteImportWhite{ - background-color:white; - margin-left:30px; + background-color:white; + margin-left:30px; } .deleteImport span{ - color:blue; - font-size:large; + color:blue; + font-size:large; } .deleteImport .deleteImportButton{ background:url('../img/croixtr.png') no-repeat; - width:31px; - height:32px; - float:right; - margin-right:15px; - position:relative; - top:-5px; + width:31px; + height:32px; + float:right; + margin-right:15px; + position:relative; + top:-5px; } #deleteSearchResultsButton{ - background:url('../img/croixtr.png') no-repeat; - width:31px; - height:32px; - float:right; - margin-left:25px; - margin-right:11px; + background:url('../img/croixtr.png') no-repeat; + width:31px; + height:32px; + float:right; + margin-left:25px; + margin-right:11px; } .input label{ - color:#9edcf8; - font-size:20px; - font-weight:normal; - font-style:normal; - float:left; - margin-bottom:20px; - width:100%; + color:#9edcf8; + font-size:20px; + font-weight:normal; + font-style:normal; + float:left; + margin-bottom:20px; + width:100%; } #bookmarkForm label{ - margin-top:12px; - font-style:normal; + margin-top:12px; + font-style:normal; } #add h2{ - margin-bottom:20px; + margin-bottom:20px; } #adminActions li{ - list-style-type:none; + list-style-type:none; padding-bottom:15px; } #adminActions li a{ - text-decoration:none; + text-decoration:none; color:#804561; font-size:11px; font-weight:bold; -} \ No newline at end of file +} Modified: trunk/bow-ui/src/main/webapp/css/connexion.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/connexion.css 2011-04-19 06:36:50 UTC (rev 243) +++ trunk/bow-ui/src/main/webapp/css/connexion.css 2011-04-19 17:34:39 UTC (rev 244) @@ -24,7 +24,7 @@ */ #header{ - background:#FFFFFF url('../img/fondhead.jpg') repeat-x; + background:#FFFFFF url('../img/fondhead.jpg') repeat-x; width:100%; float:left; height:100px; @@ -34,13 +34,13 @@ } #header a.logo{ - background:transparent url('../img/logobow.jpg') repeat scroll 0 0; - display:block; - height:100px; - text-indent:-99999px; - width:290px; - float:left; - position:relative; + background:transparent url('../img/logobow.jpg') repeat scroll 0 0; + display:block; + height:100px; + text-indent:-99999px; + width:290px; + float:left; + position:relative; } #main{ @@ -51,7 +51,7 @@ } #main .menu{ - margin-top: 25px; + margin-top: 25px; } #page{ @@ -70,7 +70,7 @@ #formFrame{ width:225px; height:315px; - background:url('../img/fondconnexion.jpg') no-repeat; +/* background:url('../img/fondconnexion.jpg') no-repeat; */ position:relative; margin:100px auto; padding:10px 70px; @@ -96,7 +96,7 @@ } #formFrame a{ - position: absolute; + position: absolute; color:#804561; left:75px; font-weight:bold; @@ -114,9 +114,9 @@ } #formFrame #homePage{ - bottom: 50px; - left: 200px; - font-size: 10px; + bottom: 50px; + left: 200px; + font-size: 10px; } input[type="submit"]{ @@ -133,15 +133,15 @@ } #formFrame input[type="submit"]{ - position:absolute; - bottom:40px; - right:30px; + position:absolute; + bottom:40px; + right:30px; } #forgotPassword{ - margin-top:30px; + margin-top:30px; } #register{ - margin-top:20px; + margin-top:20px; } \ No newline at end of file Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-04-19 06:36:50 UTC (rev 243) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-04-19 17:34:39 UTC (rev 244) @@ -8,7 +8,7 @@ * %% * Copyright (C) 2010 CodeLutin * %% - * This program is free software: you can redistribute it and/or modify +* 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. @@ -21,7 +21,7 @@ * 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% - */ +*/ *{ padding:0; @@ -47,51 +47,51 @@ } #wrap{ - clear:both; - float:left; - overflow-x:hidden; - overflow-y:visible; - position:relative; - width:100%; - background-color:#9EDCF8; + clear:both; + float:left; + overflow-x:hidden; + overflow-y:visible; + position:relative; + width:100%; + background-color:#9EDCF8; } #main .menu{ - width:90%; - height:35px; - background:#804561 url('../img/pointemenu.jpg') no-repeat right; - margin-bottom:15px; - padding:0 40px; - line-height:35px; - clear:both; + width:90%; + height:35px; + background:#804561 url('../img/pointemenu.jpg') no-repeat right; + margin-bottom:15px; + padding:0 40px; + line-height:35px; + clear:both; } #main div[class="menu clearfix"] h2{ - color:#9edcf8; - font-size:18px; - font-weight:normal; - float:left; + color:#9edcf8; + font-size:18px; + font-weight:normal; + float:left; } #main .menu form{ - float:right; - color:#9edcf8; - font-size:12px; + float:right; + color:#9edcf8; + font-size:12px; } #import .input input{ - width:90%; - margin-bottom:10px; + width:90%; + margin-bottom:10px; } .error{ - float:left; - color:red; - font-size:medium; - background-color:white; - overflow:auto; - margin-bottom:25px; - padding:4px; + float:left; + color:red; + font-size:medium; + background-color:white; + overflow:auto; + margin-bottom:25px; + padding:4px; } #footer{ @@ -100,7 +100,7 @@ } #footer a{ - color:#bf8a9c; + color:#bf8a9c; } #footer p{ @@ -131,4 +131,13 @@ #actionmessageHeader ul, #actionerrorHeader ul{ list-style-type:none; +} + +.fond { + -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#dbdbdb'); + background-image: -moz-linear-gradient(top, #fff, #dbdbdb); + background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#dbdbdb)); + + -webkit-border-radius: 0.5em; + -moz-border-radius: 0.5em; } \ No newline at end of file Modified: trunk/bow-ui/src/main/webapp/jsp/admin.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/admin.jsp 2011-04-19 06:36:50 UTC (rev 243) +++ trunk/bow-ui/src/main/webapp/jsp/admin.jsp 2011-04-19 17:34:39 UTC (rev 244) @@ -37,7 +37,7 @@ <div class="menu clearfix"> <h2><s:text name="bow.admin.panel" /></h2> </div> - <div class="formFrame"> + <div class="formFrame fond"> <br /><br /> <s:if test="#session.BowSession.isAdmin()"> Modified: trunk/bow-ui/src/main/webapp/jsp/forgotPassword.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/forgotPassword.jsp 2011-04-19 06:36:50 UTC (rev 243) +++ trunk/bow-ui/src/main/webapp/jsp/forgotPassword.jsp 2011-04-19 17:34:39 UTC (rev 244) @@ -35,7 +35,7 @@ </head> <body> <div id="content"> - <div id="formFrame"> + <div id="formFrame fond"> <h1><s:text name="bow.forgotpwd.title" /></h1> <s:form action="forgotPassword"> <p> Modified: trunk/bow-ui/src/main/webapp/jsp/login.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/login.jsp 2011-04-19 06:36:50 UTC (rev 243) +++ trunk/bow-ui/src/main/webapp/jsp/login.jsp 2011-04-19 17:34:39 UTC (rev 244) @@ -34,7 +34,7 @@ </head> <body> <div id="content"> - <div id="formFrame"> + <div id="formFrame" class="fond"> <h1><s:text name="bow.login.title" /></h1> <s:actionerror /> <s:form action="login"> Modified: trunk/bow-ui/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-04-19 06:36:50 UTC (rev 243) +++ trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-04-19 17:34:39 UTC (rev 244) @@ -1,3 +1,5 @@ +<%@page import="org.nuiton.wikitty.search.FacetTopic"%> +<%@page import="org.chorem.bow.action.PreferencesAction"%> <!-- #%L bow @@ -24,6 +26,10 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@taglib prefix="s" uri="/struts-tags" %> +<% +PreferencesAction action = PreferencesAction.getAction(); +%> + <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> <head> @@ -39,7 +45,7 @@ </div> <s:actionerror/> <s:form action="preferences"> - <div class="formFrame"> + <div class="formFrame fond"> <h3><s:text name="bow.preferences.userInfo"/></h3> <p> @@ -74,7 +80,7 @@ <s:text name="bow.preferences.regenPermToken"/> </s:a> </div> - <div class="formFrame"> + <div class="formFrame fond"> <h3><s:text name="bow.preferences.siteLook"/></h3> <p> @@ -97,7 +103,31 @@ </div> </s:form> - <div class="formFrame"> + <div class="formFrame fond"> + <h3><s:text name="bow.preferences.labels"/></h3> + <s:form action="adminlabels" method="post"> + <ul> + <% for (FacetTopic topic : action.getLabels()) { %> + <div> + <%-- impossible de mettre un <s:checkbox, a priori erreur soit + disant que la tld ne permet pas d'expression :(. Comme + ca marche tres bien en HTML pure, vive le HTML :) --%> + <input type="checkbox" name="selectedLabels" + value="<%=topic.getTopicName()%>"> + <%=topic.getTopicName()%>(<%=topic.getCount()%>) + </input> + </div> + <% } %> + <div> + <s:textfield name="newLabel" key="bow.preferences.labels.name.field" /> + <s:submit name="rename" key="bow.preferences.labels.rename.submit" /> + <s:submit name="delete" key="bow.preferences.labels.delete.submit" /> + </div> + </ul> + </s:form> + </div> + + <div class="formFrame fond"> <s:a action="exportBookmarks"><s:text name="bow.preferences.export.bookmarks"/></s:a> <br/> Modified: trunk/bow-ui/src/main/webapp/jsp/register.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/register.jsp 2011-04-19 06:36:50 UTC (rev 243) +++ trunk/bow-ui/src/main/webapp/jsp/register.jsp 2011-04-19 17:34:39 UTC (rev 244) @@ -29,25 +29,25 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <head> <title><s:text name="bow.register.title" /></title> - <s:url var="css" value="/css/connexion.css" /> + <s:url var="css" value="/css/connexion.css" /> <link href="${css}" rel="stylesheet" type="text/css" /> <s:head /> </head> <body> - <div id="content"> - <div id="formFrame"> - <h1><s:text name="bow.register.title" /></h1> - <s:form action="register"> - <s:actionerror /> - <p> - <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /> - <s:password key="bow.login.password" name="password" labelposition="top" labelSeparator=" :" /> - <s:password key="bow.login.repeatPassword" name="repeatPassword" labelposition="top" labelSeparator=" :" /> - <s:submit key="bow.register.submit" name="submit" /> - </p> - </s:form> - <s:a action="login_input" id="loginLink"><s:text name="bow.login.title" /></s:a> - </div> - </div> + <div id="content"> + <div id="formFrame" class="fond"> + <h1><s:text name="bow.register.title" /></h1> + <s:form action="register"> + <s:actionerror /> + <p> + <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /> + <s:password key="bow.login.password" name="password" labelposition="top" labelSeparator=" :" /> + <s:password key="bow.login.repeatPassword" name="repeatPassword" labelposition="top" labelSeparator=" :" /> + <s:submit key="bow.register.submit" name="submit" /> + </p> + </s:form> + <s:a action="login_input" id="loginLink"><s:text name="bow.login.title" /></s:a> + </div> + </div> </body> </html> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-19 06:36:50 UTC (rev 243) +++ trunk/pom.xml 2011-04-19 17:34:39 UTC (rev 244) @@ -52,7 +52,7 @@ <eugenePluginVersion>2.3.2</eugenePluginVersion> <nuitonUtilsVersion>2.1.1</nuitonUtilsVersion> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <wikittyVersion>3.0.5</wikittyVersion> + <wikittyVersion>3.1-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.1.8.1</struts2Version> <xWorkCoreVersion>2.1.6</xWorkCoreVersion> @@ -128,14 +128,14 @@ <dependency> <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc-impl</artifactId> + <artifactId>wikitty-jdbc</artifactId> <version>${wikittyVersion}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr-impl</artifactId> + <artifactId>wikitty-solr</artifactId> <version>${wikittyVersion}</version> </dependency>

1 0