cleanups before merging into master

tomekkup · Nov 10, 2013 · 9e51625 · 9e51625
1 parent 8840a13
commit 9e51625
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 59 deletions.
diff --git a/README.md b/README.md
@@ -81,17 +81,3 @@ You can find me on [LinkedIn] (http://www.linkedin.com/in/tomekkuprowski) and co
 ### Licence and disclaimer
 
 Helenos is distributed free, AS-IS, without any warranty under Creative Commons Attribution [licence] (http://creativecommons.org/licenses/by/2.0/legalcode)
-
-### Donation
-
-You can, of course, donate if you found it useful. I had much of satisfaction working on Helenos, but 10 years Scottish tea is still too expensive.
-
-```html
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-<input type="hidden" name="cmd" value="_s-xclick">
-<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
-">
-<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
-<img alt="" border="0" src="https://www.paypalobjects.com/pl_PL/i/scr/pixel.gif" width="1" height="1">
-</form>
-```
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.kuprowski</groupId>
     <artifactId>helenos</artifactId>
-    <version>1.4-RC2</version>
+    <version>1.4</version>
     <packaging>war</packaging>
     <name>helenos</name>
     <developers>

diff --git a/src/main/frontend/Manifest.json b/src/main/frontend/Manifest.json
@@ -18,7 +18,7 @@
         ],
 
         "version" : "not valid",
-        "qooxdoo-versions": ["2.1.1"]
+        "qooxdoo-versions": ["2.1.2"]
     },
 
     "provides" : 

diff --git a/src/main/frontend/source/class/helenos/components/tab/WelcomePage.js b/src/main/frontend/source/class/helenos/components/tab/WelcomePage.js
@@ -7,7 +7,7 @@ Authors:
   Tomek Kuprowski (tomekkuprowski at gmail dot com)
  ************************************************************************ */
 /*
-#asset(welcome.html)
+#asset(welcome/*)
 #asset(qx/icon/${qx.icontheme}/16/places/user-home.png)
  */
 qx.Class.define("helenos.components.tab.WelcomePage",
@@ -29,7 +29,7 @@ qx.Class.define("helenos.components.tab.WelcomePage",
             layout: new qx.ui.layout.VBox(3, 'top')
         });
 
-        var iframe = new qx.ui.embed.ThemedIframe('resource/welcome.html');
+        var iframe = new qx.ui.embed.ThemedIframe('resource/welcome/index.html?t=' + new Date().getTime());
         this.add(iframe, {flex : 1});
         this.add(this.__getVersionInfoBox());
     },

diff --git a/src/main/frontend/source/resource/welcome.html b/src/main/frontend/source/resource/welcome.html
diff --git a/src/main/frontend/source/resource/welcome/index.html b/src/main/frontend/source/resource/welcome/index.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Welcome page / Helenos by tomekkup</title>
+    <style>
+        body { font-family: "Trebuchet MS", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Tahoma, sans-serif;font-size: 14px;padding: 5px;background-color: #6c727b;color: white}
+        a:link {color: white; font-weight: bold}
+        a:visited {color:white; font-weight: bold}
+    </style>
+  </head>
+  <body>
+    <h2>About</h2>
+    <p>Helenos is a free web based environment that simplifies a data exploring & schema managament with Apache Cassandra database.</p>
+
+    <h2>Licence</h2>
+    <p>This program is distributed free, AS-IS, without any warranty under Creative Commons Attribution <a href="http://creativecommons.org/licenses/by/2.0/legalcode" target="blank">licence</a>.</p>
+
+    <h2>Important links</h2>
+    <ul>
+        <li>Project <a href="https://github.com/tomekkup/helenos" target="blank">main page</a></li>
+        <li><a href="http://sourceforge.net/projects/helenos-gui/files/" target="blank">Download</a> (checkout for new version)</li>
+        <li><a href="https://github.com/tomekkup/helenos/wiki/Changelog" target="blank">Changelog</a></li>
+    </ul>
+
+  <h2>Donation</h2>
+  <p>You can, of course, donate if you found it useful. I had much of satisfaction working on Helenos, but 10 years Scottish tea is still too expensive.</p>
+    <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_blank">
+        <input type="hidden" name="cmd" value="_s-xclick">
+        <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
+">
+        <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!">
+        <img alt="" border="0" src="https://www.paypalobjects.com/pl_PL/i/scr/pixel.gif" width="1" height="1">
+    </form>
+</body>
+</html>