aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-08-16 05:23:26 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-08-16 05:23:26 -0700
commit30e3a65c0f15f2cbcc538b35c18b1f60490fda9b (patch)
tree5f702db316822d065442ba0e3983272deab861ac /view
parent4bcf38029656fa3ad2e1914f531491ef90320c23 (diff)
downloadvolse-hubzilla-30e3a65c0f15f2cbcc538b35c18b1f60490fda9b.tar.gz
volse-hubzilla-30e3a65c0f15f2cbcc538b35c18b1f60490fda9b.tar.bz2
volse-hubzilla-30e3a65c0f15f2cbcc538b35c18b1f60490fda9b.zip
full theming support
Diffstat (limited to 'view')
-rw-r--r--view/acl_selectors.php3
-rw-r--r--view/head.tpl2
-rw-r--r--view/settings.tpl6
-rw-r--r--view/theme/default/style.css (renamed from view/style.css)13
4 files changed, 21 insertions, 3 deletions
diff --git a/view/acl_selectors.php b/view/acl_selectors.php
index ac34fab3a..b22099ddf 100644
--- a/view/acl_selectors.php
+++ b/view/acl_selectors.php
@@ -128,4 +128,5 @@ function populate_acl($user = null) {
$o .= '<div id="acl-wrapper-end"></div>' . "\r\n";
return $o;
-} \ No newline at end of file
+}
+
diff --git a/view/head.tpl b/view/head.tpl
index d0fea606c..d3c17d926 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -1,6 +1,6 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<base href="$baseurl" />
-<link rel="stylesheet" type="text/css" href="$baseurl/view/style.css" media="all" />
+<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
<!--[if IE]>
<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/settings.tpl b/view/settings.tpl
index a918aefc1..b9c2c7ecb 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -25,6 +25,12 @@ $zoneselect
</div>
<div id="settings-timezone-end" ></div>
+<div id="settings-theme-select">
+<label id="settings-theme-label" for="theme-select" >Display Theme: </label>
+$theme
+</div>
+<div id="settings-theme-end"></div>
+
<div id="settings-default-perms" class="settings-default-perms" >
<div id="settings-default-perms-menu" onClick="openClose('settings-default-perms-select');" />$permissions</div>
<div id="settings-default-perms-menu-end"></div>
diff --git a/view/style.css b/view/theme/default/style.css
index 83795869b..456465a74 100644
--- a/view/style.css
+++ b/view/theme/default/style.css
@@ -301,7 +301,8 @@ input#dfrn-url {
#settings-username-end,
#settings-email-end,
#settings-nick-end,
-#settings-timezone-end,
+#settings-timezone-end,
+#settings-theme-end,
#settings-password-end,
#settings-confirm-end,
#notify1-end,
@@ -317,6 +318,7 @@ input#dfrn-url {
#settings-email-label,
#settings-nick-label,
#settings-timezone-label,
+#settings-theme-label,
#settings-password-label,
#settings-confirm-label,
#settings-label-notify1,
@@ -332,6 +334,7 @@ input#dfrn-url {
#settings-email,
#settings-nick,
#timezone-select,
+#theme-select,
#settings-password,
#settings-confirm,
#notify1,
@@ -343,6 +346,14 @@ input#dfrn-url {
margin-bottom: 20px;
}
+#settings-theme-label {
+ margin-top: 20px;
+}
+
+#theme-select {
+ margin-top: 20px;
+ width: 207px;
+}
#settings-notify-desc {
margin-top: 20px;
margin-bottom: 20px;