From vbriand@users.chorem.org Thu Feb 24 17:26:13 2011
From: vbriand@users.chorem.org
To: bow-commits@list.chorem.org
Subject: [Bow-commits] r215 - in trunk/src/main: java/org/chorem/bow
	java/org/chorem/bow/action resources/i18n webapp/css	webapp/jsp
 webapp/jsp/inc
Date: Thu, 24 Feb 2011 17:26:13 +0100
Message-ID: <20110224162613.7CF9915CB8@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7597444709276192482=="

--===============7597444709276192482==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: vbriand
Date: 2011-02-24 17:26:13 +0100 (Thu, 24 Feb 2011)
New Revision: 215

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

Log:
Fixed admin page design

Modified:
   trunk/src/main/java/org/chorem/bow/BookmarkUtils.java
   trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java
   trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java
   trunk/src/main/java/org/chorem/bow/action/RegisterAction.java
   trunk/src/main/resources/i18n/bow_en_GB.properties
   trunk/src/main/resources/i18n/bow_fr_FR.properties
   trunk/src/main/webapp/css/bookmark.css
   trunk/src/main/webapp/jsp/admin.jsp
   trunk/src/main/webapp/jsp/inc/tagsCloud.jsp

Modified: trunk/src/main/java/org/chorem/bow/BookmarkUtils.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/org/chorem/bow/BookmarkUtils.java	2011-02-24 10:30:30=
 UTC (rev 214)
+++ trunk/src/main/java/org/chorem/bow/BookmarkUtils.java	2011-02-24 16:26:13=
 UTC (rev 215)
@@ -141,20 +141,22 @@
                 + "<DL><p>\n";
         if (bookmarks !=3D null) {
             for (BowBookmark bookmark : bookmarks) {
-                export +=3D "<DT><A HREF=3D\"";
-                export +=3D bookmark.getLink() + "\" ";
-                Date date =3D bookmark.getCreationDate();
-                if (date !=3D null) {
-                    long milli =3D date.getTime();
-                    String time =3D String.valueOf(milli / 1000);
-                    export +=3D "ADD_DATE=3D\"" + time + "\" LAST_MODIFIED=
=3D\"" + time + "\" ";
+                if (bookmark !=3D null) {
+                    export +=3D "<DT><A HREF=3D\"";
+                    export +=3D bookmark.getLink() + "\" ";
+                    Date date =3D bookmark.getCreationDate();
+                    if (date !=3D null) {
+                        long milli =3D date.getTime();
+                        String time =3D String.valueOf(milli / 1000);
+                        export +=3D "ADD_DATE=3D\"" + time + "\" LAST_MODIFI=
ED=3D\"" + time + "\" ";
+                    }
+                    export +=3D "LAST_CHARSET=3D\"UTF-8\" ";
+                    Set<String> tags =3D bookmark.getLabels();
+                    if (tags !=3D null && !tags.isEmpty()) {
+                        export +=3D "SHORTCUTURL=3D\"" + getBookmarkTagsStri=
ng(bookmark) + "\"";
+                    }
+                    export +=3D ">" + bookmark.getDescription() + "</A>\n";
                 }
-                export +=3D "LAST_CHARSET=3D\"UTF-8\" ";
-                Set<String> tags =3D bookmark.getLabels();
-                if (tags !=3D null && !tags.isEmpty()) {
-                    export +=3D "SHORTCUTURL=3D\"" + getBookmarkTagsString(b=
ookmark) + "\"";
-                }
-                export +=3D ">" + bookmark.getDescription() + "</A>\n";
             }
         }
         export +=3D "</DL><p>";

Modified: trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java	2011-=
02-24 10:30:30 UTC (rev 214)
+++ trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java	2011-=
02-24 16:26:13 UTC (rev 215)
@@ -113,12 +113,12 @@
                         String message =3D getText("bow.mail.badFormat");
 =20
                         addActionError(n_(message));
-                        log.error(message + " (email:" + email + ")");
+                        log.error(message + " (email:" + email + ")", e);
                     } catch (MessagingException e) {
                         String message =3D getText("bow.mail.sendError");
                        =20
                         addActionError(n_(message));
-                        log.error(message + "(" + e.getMessage() + ")");
+                        log.error(message + "(" + e.getMessage() + ")", e);
                     }
                     result =3D SUCCESS;
                 } else { //If the email is not associated with an account

Modified: trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java	2011=
-02-24 10:30:30 UTC (rev 214)
+++ trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java	2011=
-02-24 16:26:13 UTC (rev 215)
@@ -264,7 +264,7 @@
                 }
             } catch (IOException e2) {
                 addActionError(getText(n_("bow.error.internal")));
-                log.error(e2.getMessage());
+                log.error(e2.getMessage(), e2);
             }
         }
         return SUCCESS;

Modified: trunk/src/main/java/org/chorem/bow/action/RegisterAction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/org/chorem/bow/action/RegisterAction.java	2011-02-24 =
10:30:30 UTC (rev 214)
+++ trunk/src/main/java/org/chorem/bow/action/RegisterAction.java	2011-02-24 =
16:26:13 UTC (rev 215)
@@ -166,12 +166,12 @@
                                 String message =3D getText("bow.mail.badForm=
at");
=20
                                 addActionError(n_(message));
-                                log.error(message + " (email:" + email + ")"=
);
+                                log.error(message + " (email:" + email + ")"=
, e);
                             } catch (MessagingException e) {
                                 String message =3D getText("bow.mail.sendErr=
or");
=20
                                 addActionError(n_(message));
-                                log.error(message + "(" + e.getMessage() + "=
)");
+                                log.error(message + "(" + e.getMessage() + "=
)", e);
                             }
                             result =3D SUCCESS;
                         }

Modified: trunk/src/main/resources/i18n/bow_en_GB.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/resources/i18n/bow_en_GB.properties	2011-02-24 10:30:30 UT=
C (rev 214)
+++ trunk/src/main/resources/i18n/bow_en_GB.properties	2011-02-24 16:26:13 UT=
C (rev 215)
@@ -1,5 +1,10 @@
 bow.action.locale.english=3DEnglish
 bow.action.locale.french=3DFran\u00E7ais
+bow.admin.dataMigration=3DMigrate all data from 0.4 to 0.5
+bow.admin.dataReindexation=3DAll data reindexation
+bow.admin.forbidden=3DYou don't have admin rights \!
+bow.admin.home=3DReturn to the home page
+bow.admin.panel=3DAdmin panel
 bow.bookmark.add.successful=3DBookmark successfully added
 bow.bookmark.badFileFormat=3DBad bookmarks file format \: unsuccessful impor=
t (expected Netscape-like bookmarks file)
 bow.bookmark.description=3DDescription

Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/resources/i18n/bow_fr_FR.properties	2011-02-24 10:30:30 UT=
C (rev 214)
+++ trunk/src/main/resources/i18n/bow_fr_FR.properties	2011-02-24 16:26:13 UT=
C (rev 215)
@@ -1,5 +1,10 @@
 bow.action.locale.english=3DEnglish
 bow.action.locale.french=3DFran\u00E7ais
+bow.admin.dataMigration=3DMigrer toutes les donn\u00E9es de la version 0.4 \=
u00E0 0.5
+bow.admin.dataReindexation=3DR\u00E9indexation des donn\u00E9es
+bow.admin.forbidden=3DVous n'\u00EAtes pas administrateur \!
+bow.admin.home=3DRetour sur la page d''accueil
+bow.admin.panel=3DPanneau d''administration
 bow.bookmark.add.successful=3DMarque-page ajout\u00E9 avec succ\u00E8s
 bow.bookmark.badFileFormat=3DMauvais format de fichier de favoris \: import =
impossible (le fichier doit avoir un format de type Netscape)
 bow.bookmark.description=3DDescription

Modified: trunk/src/main/webapp/css/bookmark.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/webapp/css/bookmark.css	2011-02-24 10:30:30 UTC (rev 214)
+++ trunk/src/main/webapp/css/bookmark.css	2011-02-24 16:26:13 UTC (rev 215)
@@ -492,4 +492,16 @@
=20
 #add h2{
 	margin-bottom:20px;
+}
+
+#adminActions li{
+	list-style-type:none;
+    padding-bottom:15px;
+}
+
+#adminActions li a{
+	text-decoration:none;=09
+    color:#804561;
+    font-size:11px;
+    font-weight:bold;
 }
\ No newline at end of file

Modified: trunk/src/main/webapp/jsp/admin.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/webapp/jsp/admin.jsp	2011-02-24 10:30:30 UTC (rev 214)
+++ trunk/src/main/webapp/jsp/admin.jsp	2011-02-24 16:26:13 UTC (rev 215)
@@ -1,4 +1,3 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <!--
   #%L
   bow
@@ -24,7 +23,6 @@
   -->
 <%@page contentType=3D"text/html; charset=3DUTF-8" pageEncoding=3D"UTF-8"%>
 <%@taglib prefix=3D"s" uri=3D"/struts-tags"%>
-<%@page import=3D"org.chorem.bow.BowSession" %>
 <html xmlns=3D"http://www.w3.org/1999/xhtml"
       xmlns:s=3D"http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
       xmlns:jsp=3D"http://java.sun.com/JSP/Page"
@@ -36,21 +34,22 @@
     </head>
     <body>
         <div id=3D"content">
-            <div id=3D"formFrame">
-                <h1>Admin panel</h1>
+            <div class=3D"menu clearfix">
+                <h2><s:text name=3D"bow.admin.panel" /></h2>
+            </div>
+            <div class=3D"formFrame">
                 <br /><br />
-                <%
-BowSession bowSession =3D BowSession.getBowSession(session);
-if (bowSession.isAdmin()) {
-                %>
-                <ul>
-                    <li><a href=3D"/bow/reIndexation.action">All data re-ind=
exation</a></li>
-                    <li><a href=3D"/bow/migrate04To05.action">Migration all =
data from 0.4 to 0.5</a></li>
-                    <li><a href=3D"/bow/home.action" id=3D"homePage">Return =
to the home page</a></li>
-                </ul>
-                <% } else {%>
-                <h2>You don't have admin right !</h2>
-                <% }%>
+
+                <s:if test=3D"#session.BowSession.isAdmin()">
+                    <ul id=3D"adminActions">
+                        <li><s:a action=3D"reIndexation"><s:text name=3D"bow=
.admin.dataReindexation" /></s:a></li>
+                        <li><s:a action=3D"migrate04To05"><s:text name=3D"bo=
w.admin.dataMigration" /></s:a></li>
+                        <li><s:a action=3D"home" id=3D"homePage"><s:text nam=
e=3D"bow.admin.home" /></s:a></li>
+                    </ul>
+                </s:if>
+                <s:else>
+                    <h2><s:text name=3D"bow.admin.forbidden" /></h2>
+                </s:else>
             </div>
         </div>
     </body>

Modified: trunk/src/main/webapp/jsp/inc/tagsCloud.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/webapp/jsp/inc/tagsCloud.jsp	2011-02-24 10:30:30 UTC (rev =
214)
+++ trunk/src/main/webapp/jsp/inc/tagsCloud.jsp	2011-02-24 16:26:13 UTC (rev =
215)
@@ -25,24 +25,25 @@
 <%@page contentType=3D"text/html; charset=3DUTF-8" pageEncoding=3D"UTF-8" %>
 <%@taglib prefix=3D"s" uri=3D"/struts-tags" %>
=20
-<div id=3D"nuage"
-     xmlns:s=3D"http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-     xmlns:jsp=3D"http://java.sun.com/JSP/Page">
-  <s:if test=3D"%{#session.BowSession.preference.tags > #request.bookmarkAct=
ions.getTagsCloud().size()}">
-	<s:set var=3D"maxTags" value=3D"#request.bookmarkActions.getTagsCloud().siz=
e()" />
-</s:if>
-<s:else>
-	<s:set var=3D"maxTags" value=3D"#session.BowSession.preference.tags" />
-</s:else>
-<s:iterator value=3D"%{#request.bookmarkActions.tagsCloud}" status=3D"tag" b=
egin=3D"0" end=3D"%{#maxTags - 1}">
-	<s:url var=3D"search" action=3D"search" escapeAmp=3D"true">
-		<s:param name=3D"addTag"><s:property value=3D"topicName" /></s:param>
-		<s:if test=3D"%{request.searchLine !=3D null}">
-			<s:param name=3D"searchLine">&amp;searchLine=3D<s:property value=3D"%{req=
uest.searchLine}" /></s:param>
-		</s:if>
-	</s:url>
-	<!--  -->
-	<s:a href=3D"%{search}" title=3D"%{count} results" cssClass=3D"tag" cssStyl=
e=3D"font-size: %{#request.bookmarkActions.getFont(count)}px"><s:property val=
ue=3D"topicName" /></s:a>
-</s:iterator>
-
-</div>
\ No newline at end of file
+<s:if test=3D"#request.bookmarkActions !=3D null">
+    <div id=3D"nuage"
+         xmlns:s=3D"http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xs=
d"
+         xmlns:jsp=3D"http://java.sun.com/JSP/Page">
+        <s:if test=3D"%{#session.BowSession.preference.tags > #request.bookm=
arkActions.getTagsCloud().size()}">
+    	    <s:set var=3D"maxTags" value=3D"#request.bookmarkActions.getTagsClo=
ud().size()" />
+        </s:if>
+        <s:else>
+  	        <s:set var=3D"maxTags" value=3D"#session.BowSession.preference.ta=
gs" />
+        </s:else>
+        <s:iterator value=3D"%{#request.bookmarkActions.tagsCloud}" status=
=3D"tag" begin=3D"0" end=3D"%{#maxTags - 1}">
+        	<s:url var=3D"search" action=3D"search" escapeAmp=3D"true">
+        		<s:param name=3D"addTag"><s:property value=3D"topicName" /></s:par=
am>
+        		<s:if test=3D"%{request.searchLine !=3D null}">
+        			<s:param name=3D"searchLine">&amp;searchLine=3D<s:property value=
=3D"%{request.searchLine}" /></s:param>
+        		</s:if>
+        	</s:url>
+        	<!--  -->
+        	<s:a href=3D"%{search}" title=3D"%{count} results" cssClass=3D"tag"=
 cssStyle=3D"font-size: %{#request.bookmarkActions.getFont(count)}px"><s:prop=
erty value=3D"topicName" /></s:a>
+        </s:iterator>
+    </div>
+</s:if>
\ No newline at end of file


--===============7597444709276192482==--