Branch 'kolab-webadmin-3.0' - 2 commits - hosted/js hosted/skins public_html/skins

[Jeroen van Meeuwen]

 hosted/js/kolab_hosted.js                   |    2 +-
 hosted/skins/kolabsys/hosted.css            |   26 ++++++++++++++++++++++++++
 hosted/skins/kolabsys/images/error.png      |    1 +
 hosted/skins/kolabsys/images/favicon.png    |    1 +
 hosted/skins/kolabsys/images/info.png       |    1 +
 hosted/skins/kolabsys/images/loading.gif    |    1 +
 hosted/skins/kolabsys/style.css             |    1 +
 hosted/skins/kolabsys/templates/signup.html |   20 ++++++++++++++++++++
 hosted/skins/kolabsys/ui.js                 |    1 +
 public_html/skins/default/style.css         |    7 +++++++
 10 files changed, 60 insertions(+), 1 deletion(-)

New commits:
commit 808e6e4f944af6698f29465aab7900285b9975f6
Author: Torsten Grote <grote at kolabsys.com>
Date:   Tue Sep 18 13:40:04 2012 +0200

    use proper css from style files for form errors

diff --git a/hosted/js/kolab_hosted.js b/hosted/js/kolab_hosted.js
index 8565079..7baad54 100644
--- a/hosted/js/kolab_hosted.js
+++ b/hosted/js/kolab_hosted.js
@@ -89,7 +89,7 @@ kadm.update_user_info = function(msg, part)
     }
     else {
         // add span area and add message
-        $('input[name="'+part+'"]').after(' <span id="'+span_id+'" style="font-weight:bold;margin-left:1em;color:red;">' + msg + '</span>');
+        $('input[name="'+part+'"]').after(' <span id="'+span_id+'" class="form_error">' + msg + '</span>');
     }
 
     // enable/disable button
diff --git a/public_html/skins/default/style.css b/public_html/skins/default/style.css
index be30a88..d8e39ad 100644
--- a/public_html/skins/default/style.css
+++ b/public_html/skins/default/style.css
@@ -698,6 +698,13 @@ span.listcontent span.listelement.selected {
   background-color: #d6efff;
 }
 
+span.form_error {
+  color: #FF0000;
+  font-weight: bold;
+  font-size: 90%;
+  padding-left: 5px;
+}
+
 /*****   autocomplete list   *****/
 
 #autocompletepane


commit bafd80a71838560f222f05418a63a7e6e9c8e3ec
Author: Torsten Grote <grote at kolabsys.com>
Date:   Tue Sep 18 12:16:09 2012 +0200

    added new kolabsys theme for hosted

diff --git a/hosted/skins/kolabsys/hosted.css b/hosted/skins/kolabsys/hosted.css
new file mode 100644
index 0000000..427d57d
--- /dev/null
+++ b/hosted/skins/kolabsys/hosted.css
@@ -0,0 +1,26 @@
+body {
+  background: #F3F3F3;
+  text-align: center;
+}
+
+#taskcontent {
+  width: 680px;
+  min-height: 100px;
+  max-height: 460px;
+}
+
+form#signup-form {
+  padding-top: 10px;
+}
+
+td.value input {
+    width: 250px;
+}
+
+td.label {
+  vertical-align: top;
+}
+
+table.form td {
+    text-align: left;
+}
diff --git a/hosted/skins/kolabsys/images/error.png b/hosted/skins/kolabsys/images/error.png
new file mode 120000
index 0000000..fe901a7
--- /dev/null
+++ b/hosted/skins/kolabsys/images/error.png
@@ -0,0 +1 @@
+../../../../public_html/skins/default/images/error.png
\ No newline at end of file
diff --git a/hosted/skins/kolabsys/images/favicon.png b/hosted/skins/kolabsys/images/favicon.png
new file mode 120000
index 0000000..7ee1ea8
--- /dev/null
+++ b/hosted/skins/kolabsys/images/favicon.png
@@ -0,0 +1 @@
+../../../../public_html/skins/default/images/favicon.png
\ No newline at end of file
diff --git a/hosted/skins/kolabsys/images/info.png b/hosted/skins/kolabsys/images/info.png
new file mode 120000
index 0000000..8e1fec7
--- /dev/null
+++ b/hosted/skins/kolabsys/images/info.png
@@ -0,0 +1 @@
+../../../../public_html/skins/default/images/info.png
\ No newline at end of file
diff --git a/hosted/skins/kolabsys/images/loading.gif b/hosted/skins/kolabsys/images/loading.gif
new file mode 120000
index 0000000..aaca76f
--- /dev/null
+++ b/hosted/skins/kolabsys/images/loading.gif
@@ -0,0 +1 @@
+../../../../public_html/skins/default/images/loading.gif
\ No newline at end of file
diff --git a/hosted/skins/kolabsys/style.css b/hosted/skins/kolabsys/style.css
new file mode 120000
index 0000000..6f5490d
--- /dev/null
+++ b/hosted/skins/kolabsys/style.css
@@ -0,0 +1 @@
+../../../public_html/skins/default/style.css
\ No newline at end of file
diff --git a/hosted/skins/kolabsys/templates/signup.html b/hosted/skins/kolabsys/templates/signup.html
new file mode 100644
index 0000000..7c756ae
--- /dev/null
+++ b/hosted/skins/kolabsys/templates/signup.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Sign Up For Hosted Kolab</title>
+    <link rel="stylesheet" href="{$skin_path}style.css" />
+    <link rel="stylesheet" href="{$skin_path}hosted.css" />
+    <link rel="shortcut icon" type="image/png" href="{$skin_path}images/favicon.png" />
+    <script src="js/jquery.min.js"></script>
+    <script src="js/kolab_admin.js"></script>
+    <script type="text/javascript" src="https://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
+    <script src="js/kolab_hosted.js"></script>
+    <script src="{$skin_path}ui.js"></script>
+</head>
+<body>
+    <div id="taskcontent" class="signup">{$form}</div>
+
+    {$script}
+</body>
+</html>
diff --git a/hosted/skins/kolabsys/ui.js b/hosted/skins/kolabsys/ui.js
new file mode 120000
index 0000000..625253b
--- /dev/null
+++ b/hosted/skins/kolabsys/ui.js
@@ -0,0 +1 @@
+../../../public_html/skins/default/ui.js
\ No newline at end of file