r170 - in trunk/src/main: java/org/chorem/bow java/org/chorem/bow/action resources/i18n webapp/jsp/inc - Bow-commits

13 Jan 2011

Author: vbriand
Date: 2011-01-13 16:11:42 +0100 (Thu, 13 Jan 2011)
New Revision: 170

Url: http://chorem.org/repositories/revision/bow/170

Log:
Fixed the links to add bookmarks. Added some translations. Fixed various bugs.

Modified:
   trunk/src/main/java/org/chorem/bow/BowInit.java
   trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java
   trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java
   trunk/src/main/resources/i18n/bow_en_GB.properties
   trunk/src/main/resources/i18n/bow_fr_FR.properties
   trunk/src/main/webapp/jsp/inc/bookmark.jsp
   trunk/src/main/webapp/jsp/inc/rightMenu.jsp

Modified: trunk/src/main/java/org/chorem/bow/BowInit.java
===================================================================

--- trunk/src/main/java/org/chorem/bow/BowInit.java	2011-01-13 10:58:47 UTC (rev 169)
+++ trunk/src/main/java/org/chorem/bow/BowInit.java	2011-01-13 15:11:42 UTC (rev 170)
@@ -51,8 +51,12 @@
     static public void initSession(Map<String, Object> session, User user) throws NoSuchAlgorithmException {
 	WikittyProxy proxy = BowProxy.getInstance();
 	Preference preference = proxy.restore(Preference.class, user.getWikittyId());
+	BowConfig config = BowConfig.getInstance();
+	
 	session.put("user", user);
 	session.put("preference", preference);
+	session.put("version", config.getVersion());
+	session.put("bowUrl", config.getBowUrl());
 	initializeToken(session, user);
 	checkAdmin(session, user.getEmail());
     }

Modified: trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java	2011-01-13 10:58:47 UTC (rev 169)
+++ trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java	2011-01-13 15:11:42 UTC (rev 170)
@@ -12,7 +12,7 @@
     private static final long serialVersionUID = 1L;
     public static final String UNTRANSLATED_MARKER = "???";
     private static final Log log = LogFactory.getLog(BowBaseAction.class);
-
+    
     @Override
     public String getText(String aTextName) {
         String value = super.getText(aTextName);

Modified: trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java	2011-01-13 10:58:47 UTC (rev 169)
+++ trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java	2011-01-13 15:11:42 UTC (rev 170)
@@ -152,51 +152,54 @@
 	User user = (User)session.get("user");
 	
 	if (user != null) {
-	    try {
-		List<?> lines;
+	    if (upfile != null) {
+		try {
+		    List<?> lines;
 
-		lines = FileUtils.readLines(upfile);
-		String content = "";
-		
-		for (Object line : lines) {
-		    content += (String)line;
-		}
-		WikittyProxy proxy = BowProxy.getInstance();
-		
-		try {
-		    Parser parser = new Parser(content);
-		    NodeList list = parser.parse(null);
-		    List<Bookmark> bookmarks = new ArrayList<Bookmark>();
-		    parseHtmlToBookmarks(list, user, bookmarks, new ArrayList<String>());
-		    bookmarks = proxy.store(bookmarks);
-		    createImportExtension(bookmarks);
-		    BowInit.initHomePage(request, user);
-		    return SUCCESS;
-		} catch (ParserException e) {
-		    request.setAttribute("errorMsgUser", getText(n_("bow.bookmark.badFileFormat")));
-		    request.setAttribute("errorMsgTech", e.getMessage());
-		    
-		    if (request.getParameter("searchLine") == null) {
+		    lines = FileUtils.readLines(upfile);
+		    String content = "";
+
+		    for (Object line : lines) {
+			content += (String)line;
+		    }
+		    WikittyProxy proxy = BowProxy.getInstance();
+
+		    try {
+			Parser parser = new Parser(content);
+			NodeList list = parser.parse(null);
+			List<Bookmark> bookmarks = new ArrayList<Bookmark>();
+			parseHtmlToBookmarks(list, user, bookmarks, new ArrayList<String>());
+			bookmarks = proxy.store(bookmarks);
+			createImportExtension(bookmarks);
 			BowInit.initHomePage(request, user);
 			return SUCCESS;
-		    } else {
-			try {
-			    BowSearch.search(request, user);
-			} catch (IOException e1) {
-			    // TODO Auto-generated catch block
-			    e1.printStackTrace();
-			} catch (ServletException e1) {
-			    // TODO Auto-generated catch block
-			    e1.printStackTrace();
-			}
-			return "search";
-		    } 
+		    } catch (ParserException e) {
+			request.setAttribute("errorMsgUser", getText(n_("bow.bookmark.badFileFormat")));
+			request.setAttribute("errorMsgTech", e.getMessage());
+
+			if (request.getParameter("searchLine") == null) {
+			    BowInit.initHomePage(request, user);
+			    return SUCCESS;
+			} else {
+			    try {
+				BowSearch.search(request, user);
+			    } catch (IOException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			    } catch (ServletException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			    }
+			    return "search";
+			} 
+		    }
+		} catch (IOException e2) {
+		    // TODO Auto-generated catch block
+		    e2.printStackTrace();
 		}
-	    } catch (IOException e2) {
-		// TODO Auto-generated catch block
-		e2.printStackTrace();
+		return ERROR;
 	    }
-	    return ERROR;
+	    return SUCCESS;
 	}
 	return LOGIN;
     }

Modified: trunk/src/main/resources/i18n/bow_en_GB.properties
===================================================================
--- trunk/src/main/resources/i18n/bow_en_GB.properties	2011-01-13 10:58:47 UTC (rev 169)
+++ trunk/src/main/resources/i18n/bow_en_GB.properties	2011-01-13 15:11:42 UTC (rev 170)
@@ -1,7 +1,7 @@
 bow.action.locale.english=English
 bow.action.locale.french=French
 bow.bookmark.badFileFormat=
-bow.bookmarks.noBookmarks=
+bow.bookmarks.noBookmarks=No bookmarks
 bow.config.alias.url.description=
 bow.config.application.version.description=
 bow.config.bow.addressFrom.description=
@@ -15,10 +15,9 @@
 bow.forgotPassword.emailDoesntExist=
 bow.forgotpwd.submit=Send
 bow.forgotpwd.title=Forgot your password?
-bow.home.latestBookmarks=
-bow.home.mostUsedBookmarks=
-bow.home.noBookmarks=
-bow.home.title=
+bow.home.latestBookmarks=The latest added bookmarks
+bow.home.mostUsedBookmarks=The most used bookmarks
+bow.home.title=Home
 bow.label.locale.english=
 bow.label.locale.french=
 bow.login.authenticationFailure=
@@ -52,7 +51,24 @@
 bow.register.mailHi=
 bow.register.mailPwd=
 bow.register.mailSubject=
-bow.register.pwdDontMatch=Passwords don't match
+bow.register.pwdDontMatch=Passwords don''t match
 bow.register.submit=Register
 bow.register.title=Register
 bow.requiredstring=${getText(fieldKey)} is required
+bow.rightMenu.bookmark.addModify=Add / Modify
+bow.rightMenu.bookmark.alias=ALIAS
+bow.rightMenu.bookmark.link=URL
+bow.rightMenu.bookmark.name=DESC
+bow.rightMenu.bookmark.permanentLink=Bookmark add link (permanent)
+bow.rightMenu.bookmark.tags=TAGS
+bow.rightMenu.bookmark.temporaryLink=Bookmark add link (session)
+bow.rightMenu.chromiumExtension=Chromium extension
+bow.rightMenu.exportBookmarks=Export bookmarks
+bow.rightMenu.extensions=Extensions
+bow.rightMenu.find.submit=Find
+bow.rightMenu.fullTextSearch=Full text search
+bow.rightMenu.import.submit=Import
+bow.rightMenu.importBookmarks=Import bookmarks
+bow.rightMenu.search=Search
+bow.rightMenu.token.permanent=Permanent token id
+bow.rightMenu.token.temporary=Session token id

Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties
===================================================================
--- trunk/src/main/resources/i18n/bow_fr_FR.properties	2011-01-13 10:58:47 UTC (rev 169)
+++ trunk/src/main/resources/i18n/bow_fr_FR.properties	2011-01-13 15:11:42 UTC (rev 170)
@@ -1,7 +1,7 @@
 bow.action.locale.english=Anglais
 bow.action.locale.french=Fran\u00E7ais
 bow.bookmark.badFileFormat=
-bow.bookmarks.noBookmarks=
+bow.bookmarks.noBookmarks=Pas de marque-page
 bow.config.alias.url.description=
 bow.config.application.version.description=
 bow.config.bow.addressFrom.description=
@@ -15,10 +15,9 @@
 bow.forgotPassword.emailDoesntExist=
 bow.forgotpwd.submit=Envoyer
 bow.forgotpwd.title=Vous avez oubli\u00E9 votre mot de passe ?
-bow.home.latestBookmarks=
-bow.home.mostUsedBookmarks=
-bow.home.noBookmarks=
-bow.home.title=
+bow.home.latestBookmarks=Les derniers marque-pages ajout\u00E9s
+bow.home.mostUsedBookmarks=Les marque-pages les plus utilis\u00E9s
+bow.home.title=Accueil
 bow.label.locale.english=
 bow.label.locale.french=
 bow.login.authenticationFailure=
@@ -56,3 +55,20 @@
 bow.register.submit=S''enregistrer
 bow.register.title=S''enregistrer
 bow.requiredstring=${getText(fieldKey)} est obligatoire
+bow.rightMenu.bookmark.addModify=Ajouter / Modifier
+bow.rightMenu.bookmark.alias=ALIAS
+bow.rightMenu.bookmark.link=URL
+bow.rightMenu.bookmark.name=DESC
+bow.rightMenu.bookmark.permanentLink=Ajouter un bookmark (permanent)
+bow.rightMenu.bookmark.tags=TAGS
+bow.rightMenu.bookmark.temporaryLink=Ajouter un bookmark (session)
+bow.rightMenu.chromiumExtension=Extension pour chromium
+bow.rightMenu.exportBookmarks=Exporter les marque-pages
+bow.rightMenu.extensions=Extensions
+bow.rightMenu.find.submit=Rechercher
+bow.rightMenu.fullTextSearch=Recherche full text
+bow.rightMenu.import.submit=Importer
+bow.rightMenu.importBookmarks=Importer des marque-pages
+bow.rightMenu.search=Recherche
+bow.rightMenu.token.permanent=Token permanent
+bow.rightMenu.token.temporary=Token session

Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp
===================================================================
--- trunk/src/main/webapp/jsp/inc/bookmark.jsp	2011-01-13 10:58:47 UTC (rev 169)
+++ trunk/src/main/webapp/jsp/inc/bookmark.jsp	2011-01-13 15:11:42 UTC (rev 170)
@@ -33,10 +33,9 @@
 Bookmark bookmark = (Bookmark) request.getAttribute("bookmark");
 BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions");
 SimpleDateFormat sdf = (SimpleDateFormat) request.getAttribute("sdf");
-String url = (String) request.getAttribute("bowUrl");
 String aliasUrl = BowConfig.getInstance().getServletAliasUrl();
-url = "toto"; //TODO: à changer
-if (url != null && bookmark != null && sdf != null && bookmarkActions != null) {
+
+if (bookmark != null && sdf != null && bookmarkActions != null) {
     String formBookmarkId = (String) request.getAttribute("formBookmarkId");
     String link = bookmark.getLink();
     link = link.replace("'", "\\'");

Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp
===================================================================
--- trunk/src/main/webapp/jsp/inc/rightMenu.jsp	2011-01-13 10:58:47 UTC (rev 169)
+++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp	2011-01-13 15:11:42 UTC (rev 170)
@@ -33,6 +33,7 @@
 <%@page import="org.chorem.bow.TokenActions" %>
 <%@page import="org.nuiton.wikitty.FacetTopic" %>
 <%@page import="org.chorem.bow.Bookmark" %>
+<%@page import="org.chorem.bow.BowConfig" %>
 <%@page import="org.chorem.bow.Preference" %>
 <%
 TokenActions tokenActions = (TokenActions)session.getAttribute("tokenActions");
@@ -44,7 +45,7 @@
 
 String temporaryToken = tokenActions.getTemporaryToken();
 String permanentToken = tokenActions.getPermanentToken();
-String url = (String) request.getAttribute("bowUrl");
+
 int nbTags = 100;
 Preference preference = (Preference)session.getAttribute("preference");
 if (preference != null) {
@@ -94,15 +95,15 @@
             	<li><s:a action="admin"><s:text name="bow.rightMenu.admin" /></s:a></li>
             <% } %>
             <li><s:a action="preferences"><s:text name="bow.preferences.title" /></s:a></li>
-            <li><s: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='<%=url%>/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" /></s:a></li>
-            <li><s: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='<%=url%>/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" /></s:a></li>
+            <li><s: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='%{#session.bowUrl}addUrl.action?token=%{#session.tokenActions.getTemporaryToken()}&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" /></s:a></li>
+            <li><s: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='%{#session.bowUrl}addUrl.action?token=%{#session.tokenActions.getPermanentToken()}&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" /></s: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" />Extension pour Chromium</a></li>
-                <li><strong><s:text name="bow.rightMenu.token.permanent" /></strong><%=permanentToken%></li>
-                <li><strong><s:text name="bow.rightMenu.token.temporary" /></strong><%=temporaryToken%></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><br /><s:property value="%{#session.tokenActions.getPermanentToken()}" /></li>
+                <li><strong><s:text name="bow.rightMenu.token.temporary" /> :</strong><br /><s:property value="%{#session.tokenActions.getTemporaryToken()}" /></li>
             </ul>
         </div>
         <div id="add" class="clearfix">
@@ -127,7 +128,7 @@
         <div class="recherche">
             <h2><s:text name="bow.rightMenu.search" /></h2>
             <s:form action="search">
-                <s:textfield key="bow.rightMenu.find.searchLine" name="searchLine" />
+                <s:textfield name="searchLine" />
                 <s:submit key="bow.rightMenu.find.submit" />
             </s:form>
         </div>
@@ -135,17 +136,17 @@
             <h2><s:text name="bow.rightMenu.fullTextSearch" /></h2>
             <s:form action="fullText">
 	        	<% if (fullText != null) { %>
-                    <s:textfield key="bow.rightMenu.search.fullTextLine" name="fullTextLine" value="" /> <!-- <%=fullText%> -->
+                    <s:textfield name="fullTextLine" value="" /> <!-- <%=fullText%> -->
                 <% } else { %>
-                   	<s:textfield key="bow.rightMenu.search.fullTextLine" name="fullTextLine" />
+                   	<s:textfield name="fullTextLine" />
                 <% } %>
-                <s:submit key="bow.rightMenu.find" />
+                <s:submit key="bow.rightMenu.find.submit" />
             </s:form>
         </div>
         <div id="import">
             <h2><s:text name="bow.rightMenu.importBookmarks" /></h2>
             <s:form action="importBookmarks" enctype="multipart/form-data">
-                <s:file name="upfile" size="15%" key="bow.rightMenu.import.file" /><br />
+                <s:file name="upfile" size="15%" /><br />
             	<s:submit key="bow.rightMenu.import.submit" />
             </s:form>
             <s:a action="exportBookmarks"><s:text name="bow.rightMenu.exportBookmarks" /></s:a>

    

r170 - in trunk/src/main: java/org/chorem/bow java/org/chorem/bow/action resources/i18n webapp/jsp/inc

vbriand＠users.chorem.org

tags

participants (1)