aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/nav.php5
-rw-r--r--index.php5
-rw-r--r--mod/home.php10
-rw-r--r--view/theme/default/style.css33
4 files changed, 29 insertions, 24 deletions
diff --git a/include/nav.php b/include/nav.php
index dd2655e84..77cffc3ab 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,8 +1,5 @@
<?php
- if(! x($a->page,'nav'))
- $a->page['nav'] = '';
-
$a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
if(local_user()) {
@@ -56,7 +53,9 @@
$banner = get_config('system','banner');
+
if($banner === false)
$banner .= '<img id="logo-img" src="images/ff-32.jpg" alt="logo" /><span id="logo-text">Friendika</span>';
+
$a->page['nav'] .= '<span id="banner">' . $banner . '</span>';
diff --git a/index.php b/index.php
index f2c43a8b3..e91603a30 100644
--- a/index.php
+++ b/index.php
@@ -120,6 +120,9 @@ else
* "module"_afterpost
* "module"_content - the string return of this function contains our page body
*
+ * Modules which emit other serialisations besides HTML (XML,JSON, etc.) should do
+ * so within the module init and/or post functions and then invoke killme() to terminate
+ * further processing.
*/
if(strlen($a->module)) {
@@ -193,7 +196,7 @@ $a->page['content'] .= '<div id="pause"></div>';
*/
if($a->module != 'install')
- require_once("nav.php");
+ require_once('nav.php');
/**
*
diff --git a/mod/home.php b/mod/home.php
index b8f16158e..59cc31d3b 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -14,12 +14,14 @@ if(! function_exists('home_content')) {
function home_content(&$a) {
$o = '';
- if(! (x($a->page,'footer')))
- $a->page['footer'] = '';
- $a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://friendika.com\" title=\"friendika\" >friendika</a></div>";
+/*
+ * if(! (x($a->page,'footer')))
+ * $a->page['footer'] = '';
+ * $a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://friendika.com\" title=\"friendika\" >friendika</a></div>";
+ */
$o .= '<h1>Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '</h1>';
if(file_exists('home.html'))
- $o .= file_get_contents('home.html');
+ $o .= file_get_contents('home.html');
$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
return $o;
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index c5f535527..f20341dd6 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -178,10 +178,13 @@ img.photo {
font-weight: bold;
margin-left: 280px;
}
-#page-footer {
- height: 20px;
-/* border-bottom: 3px dashed #15607B; */
-}
+
+/*
+ * #page-footer {
+ * height: 20px;
+ *
+ * }
+ */
.heart {
color: #FF0000;
@@ -224,18 +227,16 @@ nav {
background: #15607B;
}
-footer {
- /*position: absolute;*/
- left: 0px;
- /*right: 0px;*/
- bottom: 0px;
- /*margin: 20px 20px 20px 20px;*/
-
- position: fixed;
- background-color: #0CBEFE;
- width: 100%;
- padding: 2px 3%;
-}
+/*
+ * footer {
+ * left: 0px;
+ * bottom: 0px;
+ * position: fixed;
+ * background-color: #0CBEFE;
+ * width: 100%;
+ * padding: 2px 3%;
+ * }
+ */
.fn {
font-size: 1.4em;