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

remove javascript to set selectect nav item. enanche img template prefetch ignoring

Browse source
This commit is contained in:
fabrixxm 2011-08-17 18:36:24 +02:00
parent bdf42473a0
commit 07b6c868b3
16 changed files with 58 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -5,6 +5,7 @@ require_once('include/network.php');
require_once('include/plugin.php'); require_once('include/plugin.php');
require_once('include/text.php'); require_once('include/text.php');
require_once("include/pgettext.php"); require_once("include/pgettext.php");
require_once('include/nav.php');
define ( 'FRIENDIKA_VERSION', '2.2.1074' ); define ( 'FRIENDIKA_VERSION', '2.2.1074' );
@ -1156,3 +1157,4 @@ function load_contact_links($uid) {
$a->contacts = $ret; $a->contacts = $ret;
return; return;
}} }}

22
include/nav.php
View file

@ -157,8 +157,28 @@ function nav(&$a) {
'$banner' => $banner, '$banner' => $banner,
'$emptynotifications' => t('Nothing new here'), '$emptynotifications' => t('Nothing new here'),
'$userinfo' => $userinfo, '$userinfo' => $userinfo,
'$sel' => $a->nav_sel,
)); ));
call_hooks('page_header', $a->page['nav']); call_hooks('page_header', $a->page['nav']);
}
/*
* Set a menu item in navbar as selected
*
*/
function nav_set_selected($item){
$a = get_app();
$a->nav_sel = array(
'community' => null,
'network' => null,
'home' => null,
'profiles' => null,
'notifications' => null,
'messages' => null,
'directyory' => null,
'settings' => null,
'contacts' => null,
);
$a->nav_sel[$item] = 'selected';
} }

13
include/template_processor.php
View file

@ -11,15 +11,18 @@
private function _preg_error(){ private function _preg_error(){
switch(preg_last_error()){ switch(preg_last_error()){
case PREG_INTERNAL_ERROR: die('PREG_INTERNAL_ERROR'); break; case PREG_INTERNAL_ERROR: echo('PREG_INTERNAL_ERROR'); break;
case PREG_BACKTRACK_LIMIT_ERROR: die('PREG_BACKTRACK_LIMIT_ERROR'); break; case PREG_BACKTRACK_LIMIT_ERROR: echo('PREG_BACKTRACK_LIMIT_ERROR'); break;
case PREG_RECURSION_LIMIT_ERROR: die('PREG_RECURSION_LIMIT_ERROR'); break; case PREG_RECURSION_LIMIT_ERROR: echo('PREG_RECURSION_LIMIT_ERROR'); break;
case PREG_BAD_UTF8_ERROR: die('PREG_BAD_UTF8_ERROR'); break; case PREG_BAD_UTF8_ERROR: echo('PREG_BAD_UTF8_ERROR'); break;
case PREG_BAD_UTF8_OFFSET_ERROR: die('PREG_BAD_UTF8_OFFSET_ERROR'); break; case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break;
default: default:
//die("Unknown preg error."); //die("Unknown preg error.");
return; return;
} }
echo "<hr><pre>";
debug_print_backtrace();
die();
} }
private function _build_replace($r, $prefix){ private function _build_replace($r, $prefix){

5
index.php
View file

@ -195,8 +195,8 @@ if(strlen($a->module)) {
if(! $a->module_loaded) { if(! $a->module_loaded) {
// Stupid browser tried to pre-fetch our ACL img template. Don't log the event or return anything - just quietly exit. // Stupid browser tried to pre-fetch our Javascript img template. Don't log the event or return anything - just quietly exit.
if((x($_SERVER,'QUERY_STRING')) && strpos($_SERVER['QUERY_STRING'],'{0}') !== false) { if((x($_SERVER,'QUERY_STRING')) && preg_match('/{[0-9]}/',$_SERVER['QUERY_STRING']) !== 0) {
killme(); killme();
} }
@ -306,7 +306,6 @@ $a->page['content'] .= '<div id="pause"></div>';
*/ */
if($a->module != 'install') { if($a->module != 'install') {
require_once('nav.php');
nav($a); nav($a);
} }

2
mod/community.php
View file

@ -25,7 +25,7 @@ function community_content(&$a, $update = 0) {
$o .= '<h3>' . t('Community') . '</h3>'; $o .= '<h3>' . t('Community') . '</h3>';
if(! $update) { if(! $update) {
$o .= set_nav_selected('nav-community-link'); nav_set_selected('community');
$o .= '<div id="live-community"></div>' . "\r\n"; $o .= '<div id="live-community"></div>' . "\r\n";
$o .= "<script> var profile_uid = -1; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; $o .= "<script> var profile_uid = -1; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
} }

2
mod/contacts.php
View file

@ -124,7 +124,7 @@ function contacts_content(&$a) {
$sort_type = 0; $sort_type = 0;
$o = ''; $o = '';
$o .= set_nav_selected('nav-contacts-link'); nav_set_selected('contacts');
$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;

2
mod/directory.php
View file

@ -22,7 +22,7 @@ function directory_content(&$a) {
} }
$o = ''; $o = '';
$o .= set_nav_selected('nav-directory-link'); nav_set_selected('directory');
if(x($_SESSION,'theme')) if(x($_SESSION,'theme'))
unset($_SESSION['theme']); unset($_SESSION['theme']);

3
mod/help.php
View file

@ -17,6 +17,7 @@ function load_doc_file($s) {
function help_content(&$a) { function help_content(&$a) {
nav_set_selected('help');
global $lang; global $lang;
@ -41,4 +42,4 @@ function help_content(&$a) {
return Markdown($text); return Markdown($text);
} }

2
mod/message.php
View file

@ -110,7 +110,7 @@ function message_post(&$a) {
function message_content(&$a) { function message_content(&$a) {
$o = ''; $o = '';
$o .= set_nav_selected('nav-messages-link'); nav_set_selected('messages');
if(! local_user()) { if(! local_user()) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);

2
mod/network.php
View file

@ -98,7 +98,7 @@ function network_content(&$a, $update = 0) {
} }
} }
$o .= set_nav_selected('nav-network-link'); nav_set_selected('network');
$_SESSION['return_url'] = $a->cmd; $_SESSION['return_url'] = $a->cmd;

2
mod/notifications.php
View file

@ -64,7 +64,7 @@ function notifications_content(&$a) {
} }
$o = ''; $o = '';
$o .= set_nav_selected("nav-notifications-link"); nav_set_selected("notifications");
if(($a->argc > 1) && ($a->argv[1] == 'all')) if(($a->argc > 1) && ($a->argv[1] == 'all'))
$sql_extra = ''; $sql_extra = '';

5
mod/profile.php
View file

@ -69,8 +69,9 @@ function profile_content(&$a, $update = 0) {
$a->profile['profile_uid'] = $update; $a->profile['profile_uid'] = $update;
} }
else { else {
if($a->profile['profile_uid'] == local_user()) if($a->profile['profile_uid'] == local_user()) {
$o .= set_nav_selected('nav-home-link'); nav_set_selected('home');
}
} }
$contact = null; $contact = null;

2
mod/profiles.php
View file

@ -220,7 +220,7 @@ function profiles_post(&$a) {
function profiles_content(&$a) { function profiles_content(&$a) {
$o = ''; $o = '';
$o .= set_nav_selected('nav-profiles-link'); nav_set_selected('profiles');
if(! local_user()) { if(! local_user()) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);

2
mod/search.php
View file

@ -13,6 +13,8 @@ function search_content(&$a) {
notice( t('Public access denied.') . EOL); notice( t('Public access denied.') . EOL);
return; return;
} }
nav_set_selected('search');
require_once("include/bbcode.php"); require_once("include/bbcode.php");
require_once('include/security.php'); require_once('include/security.php');

2
mod/settings.php
View file

@ -299,7 +299,7 @@ if(! function_exists('settings_content')) {
function settings_content(&$a) { function settings_content(&$a) {
$o = ''; $o = '';
$o .= set_nav_selected('nav-settings-link'); nav_set_selected('settings');
if(! local_user()) { if(! local_user()) {
notice( t('Permission denied.') . EOL ); notice( t('Permission denied.') . EOL );

19
view/nav.tpl
View file

@ -15,24 +15,25 @@
{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }} {{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }} {{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
</ul> </ul>
</li> </li>
{{ endif }} {{ endif }}
{{ if $nav.community }} {{ if $nav.community }}
<li id="nav-community-link" class="nav-menu"> <li id="nav-community-link" class="nav-menu $sel.community">
<a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a> <a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
</li> </li>
{{ endif }} {{ endif }}
{{ if $nav.network }} {{ if $nav.network }}
<li id="nav-network-link" class="nav-menu"> <li id="nav-network-link" class="nav-menu $sel.network">
<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a> <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
<span id="net-update" class="nav-notify"></span> <span id="net-update" class="nav-notify"></span>
</li> </li>
{{ endif }} {{ endif }}
{{ if $nav.network }} {{ if $nav.home }}
<li id="nav-home-link" class="nav-menu"> <li id="nav-home-link" class="nav-menu $sel.home">
<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a> <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
<span id="home-update" class="nav-notify"></span> <span id="home-update" class="nav-notify"></span>
</li> </li>
@ -67,19 +68,19 @@
</li> </li>
<li id="nav-help-link" class="nav-menu"> <li id="nav-help-link" class="nav-menu $sel.help">
<a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a> <a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
</li> </li>
<li id="nav-search-link" class="nav-menu"> <li id="nav-search-link" class="nav-menu $sel.search">
<a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a> <a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
</li> </li>
<li id="nav-directory-link" class="nav-menu"> <li id="nav-directory-link" class="nav-menu $sel.directory">
<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a> <a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
</li> </li>
{{ if $nav.apps }} {{ if $nav.apps }}
<li id="nav-apps-link" class="nav-menu"> <li id="nav-apps-link" class="nav-menu $sel.apps">
<a class=" $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a> <a class=" $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>
</li> </li>
{{ endif }} {{ endif }}
@ -122,7 +123,7 @@
{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }} {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }} {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
</span> </span>
<span id="nav-end"></span> <span id="nav-end"></span>
<span id="banner">$banner</span> <span id="banner">$banner</span>