4 commits - hosted/skins lib/hosted public_html/skins
Torsten Grote
grote at kolabsys.com
Tue Sep 4 15:33:11 CEST 2012
hosted/skins | 1
hosted/skins/default/hosted.css | 22 ++++++++++++
hosted/skins/default/images/error.png | 1
hosted/skins/default/images/favicon.png | 1
hosted/skins/default/images/info.png | 1
hosted/skins/default/images/loading.gif | 1
hosted/skins/default/images/logo.png |binary
hosted/skins/default/style.css | 1
hosted/skins/default/templates/footer.html | 1
hosted/skins/default/templates/signup.html | 43 ++++++++++++++++++++++++
hosted/skins/default/ui.js | 1
lib/hosted/kolab_client_task_signup.php | 2 -
public_html/skins/default/templates/signup.html | 43 ------------------------
13 files changed, 73 insertions(+), 45 deletions(-)
New commits:
commit f409d7b25ea4a7774f34e5debe36e9d8ab00a13f
Merge: a7da53e 4710087
Author: Torsten Grote <grote at kolabsys.com>
Date: Tue Sep 4 15:32:32 2012 +0200
Merge branch 'master' of ssh://git.kolab.org/git/kolab-wap
commit a7da53e628cc2423f40486e463e342db909e3841
Author: Torsten Grote <grote at kolabsys.com>
Date: Tue Sep 4 15:31:56 2012 +0200
added missing images to hosted skin
diff --git a/hosted/skins/default/images/error.png b/hosted/skins/default/images/error.png
new file mode 120000
index 0000000..fe901a7
--- /dev/null
+++ b/hosted/skins/default/images/error.png
@@ -0,0 +1 @@
+../../../../public_html/skins/default/images/error.png
\ No newline at end of file
diff --git a/hosted/skins/default/images/favicon.png b/hosted/skins/default/images/favicon.png
new file mode 120000
index 0000000..7ee1ea8
--- /dev/null
+++ b/hosted/skins/default/images/favicon.png
@@ -0,0 +1 @@
+../../../../public_html/skins/default/images/favicon.png
\ No newline at end of file
diff --git a/hosted/skins/default/images/info.png b/hosted/skins/default/images/info.png
new file mode 120000
index 0000000..8e1fec7
--- /dev/null
+++ b/hosted/skins/default/images/info.png
@@ -0,0 +1 @@
+../../../../public_html/skins/default/images/info.png
\ No newline at end of file
diff --git a/hosted/skins/default/images/loading.gif b/hosted/skins/default/images/loading.gif
new file mode 120000
index 0000000..aaca76f
--- /dev/null
+++ b/hosted/skins/default/images/loading.gif
@@ -0,0 +1 @@
+../../../../public_html/skins/default/images/loading.gif
\ No newline at end of file
commit b5d51fa0bca411689aff2cab318f7ae9e29c0844
Author: Torsten Grote <grote at kolabsys.com>
Date: Tue Sep 4 15:24:15 2012 +0200
moved captcha into signup form table
diff --git a/hosted/skins/default/hosted.css b/hosted/skins/default/hosted.css
index c7871e9..4f50305 100644
--- a/hosted/skins/default/hosted.css
+++ b/hosted/skins/default/hosted.css
@@ -16,3 +16,7 @@ body {
margin: 10px;
cursor: default;
}
+
+td.label {
+ vertical-align: top;
+}
diff --git a/lib/hosted/kolab_client_task_signup.php b/lib/hosted/kolab_client_task_signup.php
index 7813da7..7ebbac8 100644
--- a/lib/hosted/kolab_client_task_signup.php
+++ b/lib/hosted/kolab_client_task_signup.php
@@ -87,7 +87,7 @@ class kolab_client_task_signup extends kolab_client_task
if (!empty($publickey)) {
// TODO find a less dirty way to add captcha into form
- $form = preg_replace('/<div class="formbuttons">/', '<div id="recaptcha_div"></div><div class="formbuttons">', $form);
+ $form = preg_replace('/<\/tbody>/', '<tr><td class="label">Captcha</td><td class="value"><div id="recaptcha_div"></div></td></tr></tbody>', $form);
// load captcha
$form .= '
commit e603a6ea01d6f29d821131f51f21ada6d53acfaf
Author: Torsten Grote <grote at kolabsys.com>
Date: Tue Sep 4 15:11:01 2012 +0200
added dedicated skin for hosted kolab
diff --git a/hosted/skins b/hosted/skins
deleted file mode 120000
index 536cdba..0000000
--- a/hosted/skins
+++ /dev/null
@@ -1 +0,0 @@
-../public_html/skins/
\ No newline at end of file
diff --git a/hosted/skins/default/hosted.css b/hosted/skins/default/hosted.css
new file mode 100644
index 0000000..c7871e9
--- /dev/null
+++ b/hosted/skins/default/hosted.css
@@ -0,0 +1,18 @@
+body {
+ background: #f0f0f0;
+ text-align: center;
+}
+
+#bodybox {
+ display: inline-block;
+ width: 900px;
+ text-align: left;
+}
+
+#logo {
+ width: 462px;
+ height: 100px;
+ position: relative;
+ margin: 10px;
+ cursor: default;
+}
diff --git a/hosted/skins/default/images/logo.png b/hosted/skins/default/images/logo.png
new file mode 100644
index 0000000..0c06ff1
Binary files /dev/null and b/hosted/skins/default/images/logo.png differ
diff --git a/hosted/skins/default/style.css b/hosted/skins/default/style.css
new file mode 120000
index 0000000..6f5490d
--- /dev/null
+++ b/hosted/skins/default/style.css
@@ -0,0 +1 @@
+../../../public_html/skins/default/style.css
\ No newline at end of file
diff --git a/hosted/skins/default/templates/footer.html b/hosted/skins/default/templates/footer.html
new file mode 100644
index 0000000..4b6bac5
--- /dev/null
+++ b/hosted/skins/default/templates/footer.html
@@ -0,0 +1 @@
+This is a service offered by <a href="http://kolabsys.com">Kolab Systems</a>.
diff --git a/hosted/skins/default/templates/signup.html b/hosted/skins/default/templates/signup.html
new file mode 100644
index 0000000..3f3ba5b
--- /dev/null
+++ b/hosted/skins/default/templates/signup.html
@@ -0,0 +1,43 @@
+<!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="http://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="bodybox">
+ <div id="logo"></div>
+ <div id="content">
+
+
+ <div id="task_content" class="signup">
+
+ <h1>Sign Up For Hosted Kolab</h1>
+ <p>
+ Having an account on a Kolab server is way better than just simple Email. It also provides you with full groupware functionality including shared adressbooks, calendars, tasks and journal.
+ </p>
+ <p>
+ You can sign up now for a personal account at no cost.
+ </p>
+
+ <div id="taskcontent" class="signup">{$form}</div>
+
+
+ </div>
+
+ </div>
+ <div id="footer">
+ {include file="footer.html"}
+ </div>
+ </div>
+{$script}
+</body>
+</html>
diff --git a/hosted/skins/default/ui.js b/hosted/skins/default/ui.js
new file mode 120000
index 0000000..625253b
--- /dev/null
+++ b/hosted/skins/default/ui.js
@@ -0,0 +1 @@
+../../../public_html/skins/default/ui.js
\ No newline at end of file
diff --git a/public_html/skins/default/templates/signup.html b/public_html/skins/default/templates/signup.html
deleted file mode 100644
index 9eb22bc..0000000
--- a/public_html/skins/default/templates/signup.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!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="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="http://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="logo"></div>
- <div id="topmenu"></div>
- <div id="navigation"></div>
- <div id="task_navigation"></div>
- <div id="content">
-
-
- <div id="task_content" class="signup">
-
- <h1>Sign Up For Hosted Kolab</h1>
- <p>
- Having an account on a Kolab server is way better than just simple Email. It also provides you with full groupware functionality including shared adressbooks, calendars, tasks and journal.
- </p>
- <p>
- You can sign up now for a personal account at no cost.
- </p>
-
- <div id="taskcontent" class="signup">{$form}</div>
-
-
- </div>
-
- </div>
- <div id="footer">
- {include file="footer.html"}
- </div>
-{$script}
-</body>
-</html>
More information about the commits
mailing list