harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implement a "powered-by" but leave it turned off until somebody with a good eye for layout can figure out where best to put it.

Browse Source
This commit is contained in:
friendica 2014-09-29 21:58:35 -07:00
parent 7c3b428e67
commit 5292e3a100
6 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/Contact.php
View File

@ -328,6 +328,19 @@ function mark_orphan_hubsxchans() {
intval(HUBLOC_OFFLINE) intval(HUBLOC_OFFLINE)
); );
// $realm = get_directory_realm();
// if($realm == DIRECTORY_REALM) {
// $r = q("select * from site where site_access != 0 and site_register !=0 and ( site_realm = '%s' or site_realm = '') order by rand()",
// dbesc($realm)
// );
// }
// else {
// $r = q("select * from site where site_access != 0 and site_register !=0 and site_realm = '%s' order by rand()",
// dbesc($realm)
// );
// }
$r = q("select hubloc_id, hubloc_hash from hubloc where (hubloc_status & %d) and not (hubloc_flags & %d)", $r = q("select hubloc_id, hubloc_hash from hubloc where (hubloc_status & %d) and not (hubloc_flags & %d)",
intval(HUBLOC_OFFLINE), intval(HUBLOC_OFFLINE),
intval(HUBLOC_FLAGS_ORPHANCHECK) intval(HUBLOC_FLAGS_ORPHANCHECK)

7
include/nav.php
View File

@ -239,6 +239,12 @@ EOT;
$x = array('nav' => $nav, 'usermenu' => $userinfo ); $x = array('nav' => $nav, 'usermenu' => $userinfo );
call_hooks('nav', $x); call_hooks('nav', $x);
// Not sure the best place to put this on the page. So I'm implementing it but leaving it
// turned off until somebody discovers this and figures out a good location for it.
$powered_by = '';
// $powered_by = '<strong>red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="r#" />matrix</strong>';
$tpl = get_markup_template('nav.tpl'); $tpl = get_markup_template('nav.tpl');
$a->page['nav'] .= replace_macros($tpl, array( $a->page['nav'] .= replace_macros($tpl, array(
@ -250,6 +256,7 @@ EOT;
'$userinfo' => $x['usermenu'], '$userinfo' => $x['usermenu'],
'$localuser' => local_user(), '$localuser' => local_user(),
'$sel' => $a->nav_sel, '$sel' => $a->nav_sel,
'$powered_by' => $powered_by,
'$pleasewait' => t('Please wait...') '$pleasewait' => t('Please wait...')
)); ));

2
version.inc
View File

@ -1 +1 @@
2014-09-27.811 2014-09-29.813

1
view/js/main.js
View File

@ -1069,6 +1069,7 @@ function previewTheme(elm) {
} }
$(document).ready(function() { $(document).ready(function() {
jQuery.timeago.settings.strings = { jQuery.timeago.settings.strings = {
prefixAgo : aStr['t01'], prefixAgo : aStr['t01'],
prefixFromNow : aStr['t02'], prefixFromNow : aStr['t02'],

13
view/theme/redbasic/css/style.css
View File

@ -166,6 +166,19 @@ header {
filter:alpha(opacity=$nav_percent_min_opacity); filter:alpha(opacity=$nav_percent_min_opacity);
} }
#powered-by {
font-size: 0.5rem;
position: absolute;
top: 50px;
left: 16px;
}
#powered-by img {
margin-top: -2px;
height: 10px;
width: 10px;
}
.error-message { .error-message {
color: #FF0000; color: #FF0000;
font-size: 1.1em; font-size: 1.1em;

3
view/tpl/nav.tpl
View File

@ -166,6 +166,9 @@
<a href="/search" title="{{$nav.search.3}}"><i class="icon-search"></i></a> <a href="/search" title="{{$nav.search.3}}"><i class="icon-search"></i></a>
</li> </li>
{{if $powered_by}}
<div id="powered-by">{{$powered_by}}</div>
{{/if}}
{{if $nav.directory}} {{if $nav.directory}}
<li class="{{$sel.directory}}"> <li class="{{$sel.directory}}">
<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap"></i></a> <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap"></i></a>