[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

24 Feb 2011

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
===================================================================

--- 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 != null) {
             for (BowBookmark bookmark : bookmarks) {
-                export += "<DT><A HREF=\"";
-                export += bookmark.getLink() + "\" ";
-                Date date = bookmark.getCreationDate();
-                if (date != null) {
-                    long milli = date.getTime();
-                    String time = String.valueOf(milli / 1000);
-                    export += "ADD_DATE=\"" + time + "\" LAST_MODIFIED=\"" + time + "\" ";
+                if (bookmark != null) {
+                    export += "<DT><A HREF=\"";
+                    export += bookmark.getLink() + "\" ";
+                    Date date = bookmark.getCreationDate();
+                    if (date != null) {
+                        long milli = date.getTime();
+                        String time = String.valueOf(milli / 1000);
+                        export += "ADD_DATE=\"" + time + "\" LAST_MODIFIED=\"" + time + "\" ";
+                    }
+                    export += "LAST_CHARSET=\"UTF-8\" ";
+                    Set<String> tags = bookmark.getLabels();
+                    if (tags != null && !tags.isEmpty()) {
+                        export += "SHORTCUTURL=\"" + getBookmarkTagsString(bookmark) + "\"";
+                    }
+                    export += ">" + bookmark.getDescription() + "</A>\n";
                 }
-                export += "LAST_CHARSET=\"UTF-8\" ";
-                Set<String> tags = bookmark.getLabels();
-                if (tags != null && !tags.isEmpty()) {
-                    export += "SHORTCUTURL=\"" + getBookmarkTagsString(bookmark) + "\"";
-                }
-                export += ">" + bookmark.getDescription() + "</A>\n";
             }
         }
         export += "</DL><p>";

Modified: trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java
===================================================================
--- 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 = getText("bow.mail.badFormat");
  
                         addActionError(n_(message));
-                        log.error(message + " (email:" + email + ")");
+                        log.error(message + " (email:" + email + ")", e);
                     } catch (MessagingException e) {
                         String message = getText("bow.mail.sendError");
                         
                         addActionError(n_(message));
-                        log.error(message + "(" + e.getMessage() + ")");
+                        log.error(message + "(" + e.getMessage() + ")", e);
                     }
                     result = SUCCESS;
                 } else { //If the email is not associated with an account

Modified: trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java
===================================================================
--- 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
===================================================================
--- 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 = getText("bow.mail.badFormat");
 
                                 addActionError(n_(message));
-                                log.error(message + " (email:" + email + ")");
+                                log.error(message + " (email:" + email + ")", e);
                             } catch (MessagingException e) {
                                 String message = getText("bow.mail.sendError");
 
                                 addActionError(n_(message));
-                                log.error(message + "(" + e.getMessage() + ")");
+                                log.error(message + "(" + e.getMessage() + ")", e);
                             }
                             result = SUCCESS;
                         }

Modified: trunk/src/main/resources/i18n/bow_en_GB.properties
===================================================================
--- trunk/src/main/resources/i18n/bow_en_GB.properties	2011-02-24 10:30:30 UTC (rev 214)
+++ trunk/src/main/resources/i18n/bow_en_GB.properties	2011-02-24 16:26:13 UTC (rev 215)
@@ -1,5 +1,10 @@
 bow.action.locale.english=English
 bow.action.locale.french=Fran\u00E7ais
+bow.admin.dataMigration=Migrate all data from 0.4 to 0.5
+bow.admin.dataReindexation=All data reindexation
+bow.admin.forbidden=You don't have admin rights \!
+bow.admin.home=Return to the home page
+bow.admin.panel=Admin panel
 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

Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties
===================================================================
--- trunk/src/main/resources/i18n/bow_fr_FR.properties	2011-02-24 10:30:30 UTC (rev 214)
+++ trunk/src/main/resources/i18n/bow_fr_FR.properties	2011-02-24 16:26:13 UTC (rev 215)
@@ -1,5 +1,10 @@
 bow.action.locale.english=English
 bow.action.locale.french=Fran\u00E7ais
+bow.admin.dataMigration=Migrer toutes les donn\u00E9es de la version 0.4 \u00E0 0.5
+bow.admin.dataReindexation=R\u00E9indexation des donn\u00E9es
+bow.admin.forbidden=Vous n'\u00EAtes pas administrateur \!
+bow.admin.home=Retour sur la page d''accueil
+bow.admin.panel=Panneau d''administration
 bow.bookmark.add.successful=Marque-page ajout\u00E9 avec succ\u00E8s
 bow.bookmark.badFileFormat=Mauvais format de fichier de favoris \: import impossible (le fichier doit avoir un format de type Netscape)
 bow.bookmark.description=Description

Modified: trunk/src/main/webapp/css/bookmark.css
===================================================================
--- 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 @@
 
 #add h2{
 	margin-bottom:20px;
+}
+
+#adminActions li{
+	list-style-type:none;
+    padding-bottom:15px;
+}
+
+#adminActions li a{
+	text-decoration:none;	
+    color:#804561;
+    font-size:11px;
+    font-weight:bold;
 }
\ No newline at end of file

Modified: trunk/src/main/webapp/jsp/admin.jsp
===================================================================
--- 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="1.0" encoding="UTF-8"?>
 <!--
   #%L
   bow
@@ -24,7 +23,6 @@
   -->
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@taglib prefix="s" uri="/struts-tags"%>
-<%@page import="org.chorem.bow.BowSession" %>
 <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"
@@ -36,21 +34,22 @@
     </head>
     <body>
         <div id="content">
-            <div id="formFrame">
-                <h1>Admin panel</h1>
+            <div class="menu clearfix">
+                <h2><s:text name="bow.admin.panel" /></h2>
+            </div>
+            <div class="formFrame">
                 <br /><br />
-                <%
-BowSession bowSession = BowSession.getBowSession(session);
-if (bowSession.isAdmin()) {
-                %>
-                <ul>
-                    <li><a href="/bow/reIndexation.action">All data re-indexation</a></li>
-                    <li><a href="/bow/migrate04To05.action">Migration all data from 0.4 to 0.5</a></li>
-                    <li><a href="/bow/home.action" id="homePage">Return to the home page</a></li>
-                </ul>
-                <% } else {%>
-                <h2>You don't have admin right !</h2>
-                <% }%>
+
+                <s:if test="#session.BowSession.isAdmin()">
+                    <ul id="adminActions">
+                        <li><s:a action="reIndexation"><s:text name="bow.admin.dataReindexation" /></s:a></li>
+                        <li><s:a action="migrate04To05"><s:text name="bow.admin.dataMigration" /></s:a></li>
+                        <li><s:a action="home" id="homePage"><s:text name="bow.admin.home" /></s:a></li>
+                    </ul>
+                </s:if>
+                <s:else>
+                    <h2><s:text name="bow.admin.forbidden" /></h2>
+                </s:else>
             </div>
         </div>
     </body>

Modified: trunk/src/main/webapp/jsp/inc/tagsCloud.jsp
===================================================================
--- 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="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <%@taglib prefix="s" uri="/struts-tags" %>
 
-<div id="nuage"
-     xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-     xmlns:jsp="http://java.sun.com/JSP/Page">
-  <s:if test="%{#session.BowSession.preference.tags > #request.bookmarkActions.getTagsCloud().size()}">
-	<s:set var="maxTags" value="#request.bookmarkActions.getTagsCloud().size()" />
-</s:if>
-<s:else>
-	<s:set var="maxTags" value="#session.BowSession.preference.tags" />
-</s:else>
-<s:iterator value="%{#request.bookmarkActions.tagsCloud}" status="tag" begin="0" end="%{#maxTags - 1}">
-	<s:url var="search" action="search" escapeAmp="true">
-		<s:param name="addTag"><s:property value="topicName" /></s:param>
-		<s:if test="%{request.searchLine != null}">
-			<s:param name="searchLine">&searchLine=<s:property value="%{request.searchLine}" /></s:param>
-		</s:if>
-	</s:url>
-	<!--  -->
-	<s:a href="%{search}" title="%{count} results" cssClass="tag" cssStyle="font-size: %{#request.bookmarkActions.getFont(count)}px"><s:property value="topicName" /></s:a>
-</s:iterator>
-
-</div>
\ No newline at end of file
+<s:if test="#request.bookmarkActions != null">
+    <div id="nuage"
+         xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+         xmlns:jsp="http://java.sun.com/JSP/Page">
+        <s:if test="%{#session.BowSession.preference.tags > #request.bookmarkActions.getTagsCloud().size()}">
+    	    <s:set var="maxTags" value="#request.bookmarkActions.getTagsCloud().size()" />
+        </s:if>
+        <s:else>
+  	        <s:set var="maxTags" value="#session.BowSession.preference.tags" />
+        </s:else>
+        <s:iterator value="%{#request.bookmarkActions.tagsCloud}" status="tag" begin="0" end="%{#maxTags - 1}">
+        	<s:url var="search" action="search" escapeAmp="true">
+        		<s:param name="addTag"><s:property value="topicName" /></s:param>
+        		<s:if test="%{request.searchLine != null}">
+        			<s:param name="searchLine">&searchLine=<s:property value="%{request.searchLine}" /></s:param>
+        		</s:if>
+        	</s:url>
+        	<!--  -->
+        	<s:a href="%{search}" title="%{count} results" cssClass="tag" cssStyle="font-size: %{#request.bookmarkActions.getFont(count)}px"><s:property value="topicName" /></s:a>
+        </s:iterator>
+    </div>
+</s:if>
\ No newline at end of file

    

[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

vbriand＠users.chorem.org