Merge branch 'master' of git://github.com/friendika/friendika

This commit is contained in:
root 2010-12-13 06:50:06 +01:00
commit b4b65521fe
8 changed files with 54 additions and 28 deletions

View file

@ -1,8 +1,5 @@
<?php <?php
if(! x($a->page,'nav'))
$a->page['nav'] = '';
$a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ; $a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
if(local_user()) { if(local_user()) {
@ -56,7 +53,9 @@
$banner = get_config('system','banner'); $banner = get_config('system','banner');
if($banner === false) if($banner === false)
$banner .= '<img id="logo-img" src="images/ff-32.jpg" alt="logo" /><span id="logo-text">Friendika</span>'; $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>'; $a->page['nav'] .= '<span id="banner">' . $banner . '</span>';

View file

@ -120,6 +120,9 @@ else
* "module"_afterpost * "module"_afterpost
* "module"_content - the string return of this function contains our page body * "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)) { if(strlen($a->module)) {
@ -193,7 +196,7 @@ $a->page['content'] .= '<div id="pause"></div>';
*/ */
if($a->module != 'install') if($a->module != 'install')
require_once("nav.php"); require_once('nav.php');
/** /**
* *

View file

@ -6,7 +6,7 @@ function dfrn_request_init(&$a) {
if($a->argc > 1) if($a->argc > 1)
$which = $a->argv[1]; $which = $a->argv[1];
profile_init($a,$which); profile_load($a,$which);
return; return;
}} }}

View file

@ -3,10 +3,21 @@ function directory_init(&$a) {
$a->set_pager_itemspage(60); $a->set_pager_itemspage(60);
} }
function directory_post(&$a) {
if(x($_POST,'search'))
$a->data['search'] = $_POST['search'];
}
function directory_content(&$a) { function directory_content(&$a) {
$o = ''; $o = '';
$o .= '<script> $(document).ready(function() { $(\'#nav-directory-link\').addClass(\'nav-selected\'); });</script>'; $o .= '<script> $(document).ready(function() { $(\'#nav-directory-link\').addClass(\'nav-selected\'); });</script>';
if(x($a->data,'search'))
$search = notags(trim($a->data['search']));
else
$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : ''); $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
$tpl = load_view_file('view/directory_header.tpl'); $tpl = load_view_file('view/directory_header.tpl');

View file

@ -5,7 +5,8 @@ function display_content(&$a) {
$o = '<div id="live-display"></div>' . "\r\n"; $o = '<div id="live-display"></div>' . "\r\n";
profile_init($a); $nick = (($a->argc > 1) ? $a->argv[1] : '');
profile_load($a,$nick);
$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0); $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);

View file

@ -14,9 +14,11 @@ if(! function_exists('home_content')) {
function home_content(&$a) { function home_content(&$a) {
$o = ''; $o = '';
if(! (x($a->page,'footer'))) /*
$a->page['footer'] = ''; * if(! (x($a->page,'footer')))
$a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://friendika.com\" title=\"friendika\" >friendika</a></div>"; * $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>'; $o .= '<h1>Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '</h1>';
if(file_exists('home.html')) if(file_exists('home.html'))
$o .= file_get_contents('home.html'); $o .= file_get_contents('home.html');

View file

@ -1,13 +1,22 @@
<?php <?php
function search_post(&$a) {
if(x($_POST,'search'))
$a->data['search'] = $_POST['search'];
}
function search_content(&$a) { function search_content(&$a) {
$o = '<div id="live-search"></div>' . "\r\n"; $o = '<div id="live-search"></div>' . "\r\n";
$o .= '<h3>' . t('Search') . '</h3>'; $o .= '<h3>' . t('Search') . '</h3>';
$search = ((x($_GET,'search')) ? rawurldecode($_GET['search']) : ''); if(x($a->data,'search'))
$search = notags(trim($a->data['search']));
else
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
$o .= search($search); $o .= search($search);

View file

@ -178,10 +178,13 @@ img.photo {
font-weight: bold; font-weight: bold;
margin-left: 280px; margin-left: 280px;
} }
#page-footer {
height: 20px; /*
/* border-bottom: 3px dashed #15607B; */ * #page-footer {
} * height: 20px;
*
* }
*/
.heart { .heart {
color: #FF0000; color: #FF0000;
@ -224,18 +227,16 @@ nav {
background: #15607B; background: #15607B;
} }
footer { /*
/*position: absolute;*/ * footer {
left: 0px; * left: 0px;
/*right: 0px;*/ * bottom: 0px;
bottom: 0px; * position: fixed;
/*margin: 20px 20px 20px 20px;*/ * background-color: #0CBEFE;
* width: 100%;
position: fixed; * padding: 2px 3%;
background-color: #0CBEFE; * }
width: 100%; */
padding: 2px 3%;
}
.fn { .fn {
font-size: 1.4em; font-size: 1.4em;