Thread: [Openutils-svn] SF.net SVN: openutils:[1551] trunk/openutils-mgnlmessages/src/main

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1551
          http://openutils.svn.sourceforge.net/openutils/?rev=1551&view=rev
Author:   fgiust
Date:     2009-12-27 17:23:17 +0000 (Sun, 27 Dec 2009)

Log Message:
-----------
restyle

Modified Paths:
--------------
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-messages/messages/messages_en.properties
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-messages/messages/messages_it.properties
    trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.html
    trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.html

Added Paths:
-----------
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/css/mgnladmin.css
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/admin-bottomleft.png
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/admin-bottomright.png
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/admin-topleft.png
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/admin-topright.png
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/ico-warning.png
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/openmind-logo.png

Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java
===================================================================

--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java	2009-12-27 16:57:46 UTC (rev 1550)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java	2009-12-27 17:23:17 UTC (rev 1551)
@@ -177,6 +177,11 @@
      */
     public String importExcel()
     {
+        if (uploadFile == null)
+        {
+            AlertUtil.setMessage("Please select an excel file for upload");
+            return this.show();
+        }
         FileInputStream fis;
         try
         {

Modified: trunk/openutils-mgnlmessages/src/main/resources/mgnl-messages/messages/messages_en.properties
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/mgnl-messages/messages/messages_en.properties	2009-12-27 16:57:46 UTC (rev 1550)
+++ trunk/openutils-mgnlmessages/src/main/resources/mgnl-messages/messages/messages_en.properties	2009-12-27 17:23:17 UTC (rev 1551)
@@ -3,3 +3,4 @@
 messages.expimppage.doexport=Export
 messages.expimppage.doimport=Import
 messages.expimppage.uploadFile=Upload excel
+messages.expimpinfo=From here you can upload an excel file for easily import translations. Click on "export" to get an excel with actual translations that you can edit.
\ No newline at end of file

Modified: trunk/openutils-mgnlmessages/src/main/resources/mgnl-messages/messages/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/mgnl-messages/messages/messages_it.properties	2009-12-27 16:57:46 UTC (rev 1550)
+++ trunk/openutils-mgnlmessages/src/main/resources/mgnl-messages/messages/messages_it.properties	2009-12-27 17:23:17 UTC (rev 1551)
@@ -3,3 +3,4 @@
 messages.expimppage.doexport=Esporta
 messages.expimppage.doimport=Importa
 messages.expimppage.uploadFile=Carica file excel
+messages.expimpinfo=Da qui puoi caricare un file excel per importare velocemente un elenco di traduzioni. Clicca su "esporta" per scaricare un file excel con le traduzioni attuali che potrai editare.

Added: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/css/mgnladmin.css
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/css/mgnladmin.css	                        (rev 0)
+++ trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/css/mgnladmin.css	2009-12-27 17:23:17 UTC (rev 1551)
@@ -0,0 +1,102 @@
+body.ma {
+  background-color: #333;
+  padding: 10px;
+  margin: 0;
+}
+
+body.ma form {
+  margin: 0;
+  padding: 0;
+  display: block;
+}
+
+body.ma img {
+  border: none;
+}
+
+body.ma div,body.ma span,body.ma p,body.ma input,body.ma select,body.ma pre,body.ma textarea {
+  font-size: 12px;
+  font-family: verdana, sans-serif;
+}
+
+.ma-frame {
+  background-color: #fff;
+  background-image: url("../img/admin-topleft.png");
+  background-repeat: no-repeat;
+  background-position: top left;
+  padding: 0;
+  margin: 0;
+}
+
+.ma-frame h2 {
+  background-image: url("../img/admin-topright.png");
+  background-repeat: no-repeat;
+  background-repeat: no-repeat;
+  background-position: top right;
+  height: 59px;
+  color: #fff;
+  padding: 0 20px 0 20px;
+  font-family: georgia, sans-serif;
+  font-weight: lighter;
+  font-size: 20px;
+  line-height: 55px;
+}
+
+.ma-framecenter {
+  padding: 10px 20px 10px 20px;
+}
+
+.ma-framefooter {
+  background-image: url("../img/admin-bottomleft.png");
+  background-repeat: no-repeat;
+  background-repeat: no-repeat;
+  background-position: bottom left;
+  height: 75px;
+  padding: 0;
+  color: #fff;
+}
+
+.ma-framefooterinner {
+  padding: 0 20px 0 20px;
+  background-image: url("../img/admin-bottomright.png");
+  background-repeat: no-repeat;
+  background-repeat: no-repeat;
+  background-position: bottom right;
+  height: 75px;
+}
+
+.ma-buttons {
+  text-align: right;
+  padding-top: 40px;
+}
+
+.ma-warning {
+  border: 1px solid #FFD324;
+  padding: 10px 11px 8px 10px;
+  background-color: #FFF8BF;
+  color: #B35F00;
+  margin: 0 0 20px 0;
+}
+
+.ma-warning p {
+  margin: 0;
+}
+
+.ma-info {
+  border: 1px solid #769837;
+  padding: 10px 11px 8px 10px;
+  background-color: #eaf5d6;
+  margin: 0 0 20px 0;
+  color: #769837;
+}
+
+.ma-formel-container {
+  margin-bottom: 10px;
+}
+
+.ma-formel-left {
+  float: left;
+  width: 150px;
+  color: #769837;
+  font-weight: bold;
+}
\ No newline at end of file


Property changes on: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/css/mgnladmin.css
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/admin-bottomleft.png
===================================================================
(Binary files differ)


Property changes on: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/admin-bottomleft.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/admin-bottomright.png
===================================================================
(Binary files differ)


Property changes on: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/admin-bottomright.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/admin-topleft.png
===================================================================
(Binary files differ)


Property changes on: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/admin-topleft.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/admin-topright.png
===================================================================
(Binary files differ)


Property changes on: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/admin-topright.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/ico-warning.png
===================================================================
(Binary files differ)


Property changes on: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/ico-warning.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/openmind-logo.png
===================================================================
(Binary files differ)


Property changes on: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/img/openmind-logo.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Modified: trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.html
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.html	2009-12-27 16:57:46 UTC (rev 1550)
+++ trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.html	2009-12-27 17:23:17 UTC (rev 1551)
@@ -3,19 +3,36 @@
   <head>
     <title>Magnolia</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <link href="${this.request.contextPath}/.resources/admin-css/admin-all.css" type="text/css" rel="stylesheet" />
+    <link href="${this.request.contextPath}/.resources/messages/css/mgnladmin.css" type="text/css" rel="stylesheet" />
   </head>
-  <body id="mgnl" class="mgnlBgLight mgnlImportExport">
-    <h2>Extract messages from dialogs</h2>
-    <div class="pageframe">
-      Select dialogs roots to extract messages from:
+  <body class="ma">
+    <div class="ma-frame">
+      <h2>
+        Extract messages from dialogs
+        <a target="_blank" href="http://www.openmindonline.it" style="position:absolute;right:45px;">
+          <img class="omlogo" alt="openmind" src="${this.request.contextPath}/.resources/repoutils/img/openmind-logo.png" />
+        </a>
+      </h2>
       <form method="post" action="" enctype="multipart/form-data">
-        <input type="hidden" name="command" value="extract" />
-        <ul style="list-style: none"><#list this.dialogsRoot as root>
-          <li><input type="checkbox" name="dialogsRoots" value="${root}"/>${root}</li>
-        </#list>
-        </ul>
-        <input type="submit" name="doextract" value='Do extract' />
+        <div class="ma-framecenter">
+          Select dialogs roots to extract messages from:
+          <input type="hidden" name="command" value="extract" />
+          <ul style="list-style: none">
+            [#list this.dialogsRoot as root]
+            <li>
+              <input type="checkbox" name="dialogsRoots" value="${root}" />
+              ${root}
+            </li>
+            [/#list]
+          </ul>
+        </div>
+        <div class="ma-framefooter">
+          <div class="ma-framefooterinner">
+            <div class="ma-buttons">
+              <input type="submit" name="doextract" value='Do extract' />
+            </div>
+          </div>
+        </div>
       </form>
     </div>
   </body>

Modified: trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.html
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.html	2009-12-27 16:57:46 UTC (rev 1550)
+++ trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.html	2009-12-27 17:23:17 UTC (rev 1551)
@@ -3,25 +3,44 @@
   <head>
     <title>Magnolia</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <link href="${this.request.contextPath}/.resources/admin-css/admin-all.css" type="text/css" rel="stylesheet" />
+    <link href="${this.request.contextPath}/.resources/messages/css/mgnladmin.css" type="text/css" rel="stylesheet" />
   </head>
-  <body id="mgnl" class="mgnlBgLight mgnlImportExport">
-    <h2>${this.messages.get("messages.expimppage")}</h2>
-    <div class="pageframe">
+  <body class="ma">
+    <div class="ma-frame">
+      <h2>
+        ${this.messages.get("messages.expimppage")}
+        <a target="_blank" href="http://www.openmindonline.it" style="position:absolute;right:45px;">
+          <img class="omlogo" alt="openmind" src="${this.request.contextPath}/.resources/repoutils/img/openmind-logo.png" />
+        </a>
+      </h2>
       <form method="post" action="" enctype="multipart/form-data">
-        <input type="hidden" name="command" value="exportExcel" />
-        <input type="submit" name="doexport" value='${this.messages.get("messages.expimppage.doexport")}' />
-      </form>
-    </div>
-    <div class="pageframe">
-      <form method="post" action="" enctype="multipart/form-data">
-        <div class="formelement">
-          <label for="uploadFile">${this.messages.get("messages.expimppage.uploadFile")}
-          </label>
-          <input name="uploadFile" type="file" />
+        <div class="ma-framecenter">
+          <div class="ma-warning">
+            <p>${this.messages.get("messages.expimpinfo")}</p>
+          </div>
+          <div class="ma-formel-container">
+            <div class="ma-formel-left">
+              <label for="uploadFile">${this.messages.get("messages.expimppage.uploadFile")}</label>
+            </div>
+            <div class="ma-formel-right">
+              <input name="uploadFile" type="file" />
+            </div>
+          </div>
+          <input type="hidden" name="command" value="importExcel" id="command" />
+          [#if message?exists]
+          <pre class="ma-info">${message}</pre>
+          [/#if]
         </div>
-        <input type="hidden" name="command" value="importExcel" />
-        <input type="submit" name="doimport" value='${this.messages.get("messages.expimppage.doimport")}' />
+        <div class="ma-framefooter">
+          <div class="ma-framefooterinner">
+            <div class="ma-buttons">
+              <input type="submit" name="doexport" value='${this.messages.get("messages.expimppage.doexport")}'
+                onclick="document.getElementById('command').value='exportExcel'" />
+              <input type="submit" name="doimport" value='${this.messages.get("messages.expimppage.doimport")}'
+                onclick="document.getElementById('command').value='importExcel'" />
+            </div>
+          </div>
+        </div>
       </form>
     </div>
   </body>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Openutils-svn] SF.net SVN: openutils:[1551] trunk/openutils-mgnlmessages/src/main

openutils-svn