aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-29 21:58:35 -0700
committerfriendica <info@friendica.com>2014-09-29 21:58:35 -0700
commit5292e3a100dd8da20865167e59f859a528676df7 (patch)
treeac5312f1c12f7cfeb0cab14d3dfda85c1f8965f5
parent7c3b428e670ec3508f821a95568ba1248ce33616 (diff)
downloadvolse-hubzilla-5292e3a100dd8da20865167e59f859a528676df7.tar.gz
volse-hubzilla-5292e3a100dd8da20865167e59f859a528676df7.tar.bz2
volse-hubzilla-5292e3a100dd8da20865167e59f859a528676df7.zip
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.
-rw-r--r--include/Contact.php13
-rw-r--r--include/nav.php7
-rw-r--r--version.inc2
-rw-r--r--view/js/main.js1
-rw-r--r--view/theme/redbasic/css/style.css13
-rwxr-xr-xview/tpl/nav.tpl3
6 files changed, 38 insertions, 1 deletions
diff --git a/include/Contact.php b/include/Contact.php
index 8d50b1e5b..4440369dc 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -328,6 +328,19 @@ function mark_orphan_hubsxchans() {
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)",
intval(HUBLOC_OFFLINE),
intval(HUBLOC_FLAGS_ORPHANCHECK)
diff --git a/include/nav.php b/include/nav.php
index 98d1b644e..c35466412 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -239,6 +239,12 @@ EOT;
$x = array('nav' => $nav, 'usermenu' => $userinfo );
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');
$a->page['nav'] .= replace_macros($tpl, array(
@@ -250,6 +256,7 @@ EOT;
'$userinfo' => $x['usermenu'],
'$localuser' => local_user(),
'$sel' => $a->nav_sel,
+ '$powered_by' => $powered_by,
'$pleasewait' => t('Please wait...')
));
diff --git a/version.inc b/version.inc
index 0947c89cf..39675f71c 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-09-27.811
+2014-09-29.813
diff --git a/view/js/main.js b/view/js/main.js
index f3b252171..7d036076c 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1069,6 +1069,7 @@ function previewTheme(elm) {
}
$(document).ready(function() {
+
jQuery.timeago.settings.strings = {
prefixAgo : aStr['t01'],
prefixFromNow : aStr['t02'],
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 1d43fe983..9bbf996d5 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -166,6 +166,19 @@ header {
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 {
color: #FF0000;
font-size: 1.1em;
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 2953f3b41..6c461f062 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -166,6 +166,9 @@
<a href="/search" title="{{$nav.search.3}}"><i class="icon-search"></i></a>
</li>
+ {{if $powered_by}}
+ <div id="powered-by">{{$powered_by}}</div>
+ {{/if}}
{{if $nav.directory}}
<li class="{{$sel.directory}}">
<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap"></i></a>