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

26 Apr 2011

Author: sletellier
Date: 2011-04-26 15:17:07 +0200 (Tue, 26 Apr 2011)
New Revision: 263

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

Log:
- Fix i18n in popupPublicAlias
- Allow to modify alias to null or empty
- Add padding for ul in preference
- Remove delete alias code
- Fix test in bookmark if public alias is empty



Modified:
   trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java
   trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java
   trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties
   trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties
   trunk/bow-ui/src/main/webapp/css/bookmark.css
   trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp
   trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp
   trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp
   trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp

Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java
===================================================================

--- trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java	2011-04-22 16:28:18 UTC (rev 262)
+++ trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java	2011-04-26 13:17:07 UTC (rev 263)
@@ -337,12 +337,12 @@
         addTagsToBookmark(tags, bookmark);
         if (privateAlias != null) {
             privateAlias = privateAlias.trim();
-            bookmark.setPrivateAlias(privateAlias);
         }
+        bookmark.setPrivateAlias(privateAlias);
         if (publicAlias != null) {
             publicAlias = publicAlias.trim();
-            bookmark.setPublicAlias(publicAlias);
         }
+        bookmark.setPublicAlias(publicAlias);
     }
 
     public static String getBookmarkTagsString(BowBookmark bookmark) {

Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java
===================================================================
--- trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java	2011-04-22 16:28:18 UTC (rev 262)
+++ trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java	2011-04-26 13:17:07 UTC (rev 263)
@@ -195,6 +195,7 @@
             if (name != null) {
                 // Si l'alias prive souhaite est deja utilise on ne l'accept pas
                 // Si l'alias public souhaite est deja utilise on ne l'accept pas
+                // TODO sletellier 20110416 : return error message when public or private alias is already used
                 Criteria privateAliasCriteria = null;
                 Criteria publicAliasCriteria = null;
                 if (privateAlias != null && !privateAlias.isEmpty()) {

Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties
===================================================================
--- trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties	2011-04-22 16:28:18 UTC (rev 262)
+++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties	2011-04-26 13:17:07 UTC (rev 263)
@@ -135,9 +135,10 @@
 bow.token.generate.successful=The token has been regenerated successfully
 popup.addurl.alias.private=Private alias
 popup.addurl.alias.public=Public alias
-popup.addurl.cancel=Cancel
 popup.addurl.link=Url
 popup.addurl.name=Description
-popup.addurl.submit=Validate
 popup.addurl.tags=Tags
 popup.addurl.title=Add or modify URL
+popup.commons.cancel=Cancel
+popup.commons.submit=Validate
+popup.setPublicAliasPopup.title=Enter the public alias

Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties
===================================================================
--- trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties	2011-04-22 16:28:18 UTC (rev 262)
+++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties	2011-04-26 13:17:07 UTC (rev 263)
@@ -135,9 +135,10 @@
 bow.token.generate.successful=Le token a \u00E9t\u00E9 reg\u00E9n\u00E9r\u00E9 avec succ\u00E8s
 popup.addurl.alias.private=Alias priv\u00E9
 popup.addurl.alias.public=Alias public
-popup.addurl.cancel=Annuler
 popup.addurl.link=Url
 popup.addurl.name=Description
-popup.addurl.submit=Valider
 popup.addurl.tags=Tags
 popup.addurl.title=Ajouter ou modifier une URL
+popup.commons.cancel=Annuler
+popup.commons.submit=Valider
+popup.setPublicAliasPopup.title=Entrer un alias public

Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css
===================================================================
--- trunk/bow-ui/src/main/webapp/css/bookmark.css	2011-04-22 16:28:18 UTC (rev 262)
+++ trunk/bow-ui/src/main/webapp/css/bookmark.css	2011-04-26 13:17:07 UTC (rev 263)
@@ -380,6 +380,10 @@
     padding-right:70px;
 }
 
+.formFrame ul{
+    padding-left:10px;
+}
+
 .formFrame h1{
     color:#804561;
     width:225px;

Modified: trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp
===================================================================
--- trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp	2011-04-22 16:28:18 UTC (rev 262)
+++ trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp	2011-04-26 13:17:07 UTC (rev 263)
@@ -54,7 +54,7 @@
                         <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator=" " value="%{bookmark.publicAlias}" /><br />
                         <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator=" " value="%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}" /><br />
                     </p>
-                    <s:submit key="popup.addurl.submit" name="submit" />
+                    <s:submit key="popup.commons.submit" name="submit" />
                 </s:form>
             </div>
         </div>

Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp
===================================================================
--- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp	2011-04-22 16:28:18 UTC (rev 262)
+++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp	2011-04-26 13:17:07 UTC (rev 263)
@@ -67,23 +67,10 @@
                 <s:property value="%{#wikittyId}" />
             </s:a>
 --%>
-            <s:if test="%{#publicAliasUrl != null}">
+            <s:if test="%{!#publicAliasUrl.empty}">
                 <s:a cssClass="alias" href="%{#aliasServlet + #publicAliasUrl}.action" title="%{#bookmarkLink}" onclick="window.open(this.href); return false;">
                     <s:property value="%{#publicAliasUrl}" />
                 </s:a>
-                <s:url var="deleteAlias" action="deleteAlias">
-                    <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param>
-                </s:url>
-                <s:if test="%{!(formBookmarkId == null || !formBookmarkId.equals(wikittyId))}">
-                    <s:a cssStyle="text-decoration:none;" href="%{#deleteAlias}">
-                        <img style="border:none;" src="img/delete.png" alt="Delete alias" title="Delete" />
-                    </s:a>
-                </s:if>
-                <s:else>
-                   <s:a name="%{#wikittyId}" cssStyle="display:none; text-decoration:none;" href="%{#deleteAlias}">
-                        <img style="border:none;" src="img/delete.png" alt="Delete alias" title="Delete" />
-                   </s:a>
-                </s:else>
             </s:if>
             <s:else>
                 <s:url var="addAlias" action="createAlias">

Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp
===================================================================
--- trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp	2011-04-22 16:28:18 UTC (rev 262)
+++ trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp	2011-04-26 13:17:07 UTC (rev 263)
@@ -51,7 +51,7 @@
     }
 </script>
 
-<s:set  id="title">
+<s:set id="title">
     <s:text name="popup.addurl.title"/>
 </s:set>
 
@@ -68,7 +68,7 @@
             <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator=" " /><br />
             <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator=" " /><br />
         </p>
-        <a class="button" onclick="submitAddUrl()"><s:text name="popup.addurl.submit"/></a>
-        <a class="button" onclick="closePopupAddUrl()"><s:text name="popup.addurl.cancel"/></a>
+        <a class="button" onclick="submitAddUrl()"><s:text name="popup.commons.submit"/></a>
+        <a class="button" onclick="closePopupAddUrl()"><s:text name="popup.commons.cancel"/></a>
     </s:form>
 </div>

Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp
===================================================================
--- trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp	2011-04-22 16:28:18 UTC (rev 262)
+++ trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp	2011-04-26 13:17:07 UTC (rev 263)
@@ -19,26 +19,42 @@
             autoOpen: false,
             width: 300,
             modal: true,
-            buttons: {
-                "Validate": function() {
-                    $("#setPublicAliasForm").submit();
-                    $( this ).dialog( "close" );
-                },
-                Cancel: function() {
-                    $( this ).dialog( "close" );
-                }
-            },
+//            buttons: {
+//                "Validate": function() {
+//                    $("#setPublicAliasForm").submit();
+//                    $( this ).dialog( "close" );
+//                },
+//                Cancel: function() {
+//                    $( this ).dialog( "close" );
+//                }
+//            },
             close: function() {
                 //allFields.val( "" ).removeClass( "ui-state-error" );
             }
         });
-        });
+    });
+    function submitPublicAlias() {
+        $("#setPublicAliasForm").submit();
+        closePopupAddUrl();
+    }
+
+    function closePopupPublicAlias() {
+        $( "#setPublicAliasPopup" ).dialog( "close" )
+    }
 </script>
 
+<s:set id="title">
+    <s:text name="popup.setPublicAliasPopup.title"/>
+</s:set>
+
 <div xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-    id="setPublicAliasPopup" title="Enter the public alias">
+    id="setPublicAliasPopup" title="${title}">
     <s:form id="setPublicAliasForm" action="createAlias">
-        <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" class="text ui-widget-content ui-corner-all" />
-        <s:hidden id="publicAliasFormBookmarkId" name="bookmarkId" />
+        <p>
+            <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" class="text ui-widget-content ui-corner-all" />
+            <s:hidden id="publicAliasFormBookmarkId" name="bookmarkId" />
+        </p>
+        <a class="button" onclick="submitPublicAlias()"><s:text name="popup.commons.submit"/></a>
+        <a class="button" onclick="closePopupPublicAlias()"><s:text name="popup.commons.cancel"/></a>
     </s:form>
 </div>

    

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

sletellier＠users.chorem.org

tags

participants (1)