aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-07-21 23:17:45 -0700
committerfriendica <info@friendica.com>2012-07-21 23:17:45 -0700
commit6d74c2c594fd00c32f38f5ad8d7dd66e9e58b077 (patch)
tree9e95853349b8d0e505afab450f5b8bf458bf56ce
parentc1fe66bec5fb2fe3ce3be2985036c0c8b006d7fd (diff)
downloadvolse-hubzilla-6d74c2c594fd00c32f38f5ad8d7dd66e9e58b077.tar.gz
volse-hubzilla-6d74c2c594fd00c32f38f5ad8d7dd66e9e58b077.tar.bz2
volse-hubzilla-6d74c2c594fd00c32f38f5ad8d7dd66e9e58b077.zip
page templating and css management
-rw-r--r--index.php8
-rw-r--r--mod/zregister.php2
-rw-r--r--view/default.css20
-rw-r--r--view/full.css10
-rw-r--r--view/full.php14
-rw-r--r--view/head.tpl4
-rw-r--r--view/mod_zregister.css27
-rw-r--r--view/theme/duepuntozero/style.css30
8 files changed, 80 insertions, 35 deletions
diff --git a/index.php b/index.php
index 858795201..7c0a26f7b 100644
--- a/index.php
+++ b/index.php
@@ -358,15 +358,17 @@ if($a->module != 'install') {
$page_css = 'view/theme/' . current_theme() . '/'
- . ((x($a->page,'layout')) ? $a->page['layout'] : 'layout' ) . '.css';
+ . ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.css';
if(! file_exists($page_css))
$page_css = str_replace('theme/' . current_theme() . '/', '', $page_css);
$module_css = 'view/theme/' . current_theme() . '/mod_' . $a->module . '.css';
+
if(! file_exists($module_css))
$module_css = str_replace('theme/' . current_theme() . '/', '', $module_css);
-if(! file_exists($module_css))
+
+if(! file_exists($module_css))
$module_css = null;
$interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
@@ -386,7 +388,7 @@ if(! file_exists($module_css))
'$showfewer' => t('show fewer'),
'$update_interval' => $interval,
'$page_css' => $a->get_baseurl() . '/' . $page_css,
- '$module_css' => $a->get_baseurl() . '/' . $module_css,
+ '$module_css' => (($module_css) ? $a->get_baseurl() . '/' . $module_css : null),
'$stylesheet' => current_theme_url(),
'$theme' => current_theme()
));
diff --git a/mod/zregister.php b/mod/zregister.php
index 2b8b0ebff..f24da34c3 100644
--- a/mod/zregister.php
+++ b/mod/zregister.php
@@ -2,7 +2,7 @@
function zregister_init(&$a) {
- $a->page['layout'] = 'full';
+ $a->page['template'] = 'full';
}
diff --git a/view/default.css b/view/default.css
new file mode 100644
index 000000000..956d8c728
--- /dev/null
+++ b/view/default.css
@@ -0,0 +1,20 @@
+
+nav {
+ height: 94px;
+ display: block;
+}
+
+aside {
+ display: block;
+ min-height: 112px;
+ width: 200px;
+ position: absolute;
+ float: left;
+}
+
+
+section {
+ padding-left: 250px;
+ display: block;
+ min-height: 112px;
+}
diff --git a/view/full.css b/view/full.css
new file mode 100644
index 000000000..5819b6b3a
--- /dev/null
+++ b/view/full.css
@@ -0,0 +1,10 @@
+
+nav {
+ height: 94px;
+ display: block;
+}
+
+section {
+ display: block;
+ min-height: 112px;
+}
diff --git a/view/full.php b/view/full.php
new file mode 100644
index 000000000..c4d62d5cd
--- /dev/null
+++ b/view/full.php
@@ -0,0 +1,14 @@
+<!DOCTYPE html >
+<html>
+<head>
+ <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+ <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+ <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+</head>
+<body>
+ <section><?php if(x($page,'content')) echo $page['content']; ?>
+ <div id="page-footer"></div>
+ </section>
+</body>
+</html>
+
diff --git a/view/head.tpl b/view/head.tpl
index 7e753c022..78e2a2abc 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -8,8 +8,8 @@
<link rel="stylesheet" type="text/css" href="$baseurl/library/jslider/bin/jquery.slider.min.css" media="screen" />
<link rel="stylesheet" type="text/css" href="$page_css" media="all" />
-{{ if $mod_css }}
-<link rel="stylesheet" type="text/css" href="$mod_css" media="all" />
+{{ if $module_css }}
+<link rel="stylesheet" type="text/css" href="$module_css" media="all" />
{{ endif }}
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
diff --git a/view/mod_zregister.css b/view/mod_zregister.css
new file mode 100644
index 000000000..160b9ce4b
--- /dev/null
+++ b/view/mod_zregister.css
@@ -0,0 +1,27 @@
+
+h2 {
+ margin-left: 15%;
+ margin-top: 15%;
+}
+
+#zregister-form {
+ font-size: 1.4em;
+ margin-left: 15%;
+ margin-top: 5%;
+}
+
+.zregister-label {
+ float: left;
+ width: 275px;
+}
+
+.zregister-input {
+ float: left;
+ width: 275px;
+ padding: 5px;
+}
+
+.zregister-field-end {
+ clear: both;
+ margin-bottom: 20px;
+}
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 2e1c45fbf..34b57555c 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -87,7 +87,6 @@ blockquote {
/* nav */
nav {
- height: 94px;
display: block;
margin: 0px 10%;
border-bottom: 1px solid #babdb6;
@@ -176,14 +175,11 @@ nav #nav-link-wrapper .nav-link {
aside {
display: block;
min-height: 112px;
- width: 200px;
margin-left: 10%;
padding: 1em;
- float: left;
background-image: url(border.jpg);
background-position: top left;
background-repeat: no-repeat;
- position: absolute;
}
#dfrn-request-link {
@@ -211,16 +207,13 @@ aside {
section {
margin: 0px 10%;
padding-top: 1em;
- padding-left: 250px;
padding-right: 1em;
- display: block;
background-color: #ffffff;
background-image: url(border.jpg);
background-position: top right;
background-repeat: no-repeat;
- min-height: 112px;
-
}
+
.tabs {
height: 27px;
background-image: url(head.jpg);
@@ -3305,24 +3298,3 @@ ul.menu-popup {
left: 5%;
width: 90%;
}
-
-
-#zregister-form {
- font-size: 1.4em;
-}
-
-.zregister-label {
- float: left;
- width: 275px;
-}
-
-.zregister-input {
- float: left;
- width: 275px;
- padding: 5px;
-}
-
-.zregister-field-end {
- clear: both;
- margin-bottom: 20px;
-} \ No newline at end of file