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

21 Apr 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>

    

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

sletellier＠users.chorem.org