Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-11 06:22:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/nav.php
View file

@ -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>';

5
index.php
View file

@ -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');
/**
*

2
mod/dfrn_request.php
View file

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

13
mod/directory.php
View file

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

3
mod/display.php
View file

@ -5,7 +5,8 @@ function display_content(&$a) {
$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);

10
mod/home.php
View file

@ -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;

11
mod/search.php
View file

@ -1,13 +1,22 @@
<?php
function search_post(&$a) {
if(x($_POST,'search'))
$a->data['search'] = $_POST['search'];
}
function search_content(&$a) {
$o = '<div id="live-search"></div>' . "\r\n";
$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);

33
view/theme/default/style.css
View file

@ -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;