X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fdiabook%2Ftheme.php;h=972ad2e7cbf224b2ab5250d40bed52033c676bbc;hb=2d280f55acc258dcc152a31fad2c9f2615cab48f;hp=bd7553d9ead06357eceae6697dbf0dd95b898c5f;hpb=0cdc23d9fb0a13b3cb6d221e02c980b89bf42337;p=friendica.git
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index bd7553d9ea..972ad2e7cb 100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -2,8 +2,8 @@
/*
* Name: Diabook
- * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.027)
+ * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or http://bugs.friendica.com/view_all_bug_page.php
+ * Version: (Version: 1.028)
* Author:
*/
@@ -26,7 +26,7 @@ function diabook_init(&$a) {
set_template_engine($a, 'smarty3');
//print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.027)";
+$diabook_version = "Diabook (Version: 1.028)";
$a->page['htmlhead'] .= sprintf('', $diabook_version);
//init css on network and profilepages
@@ -36,6 +36,31 @@ $cssFile = null;
load_config("diabook");
load_pconfig(local_user(), "diabook");
+
+// adjust nav-bar, depending state of user
+if (local_user() ) {
+ $a->page['htmlhead'] .= '
+ ';
+ }
+
+if ($a->argv[0] == "profile" && $a->argv[1] != $a->user['nickname'] ) {
+ $a->page['htmlhead'] .= '
+ ';
+ }
+
+
//get statuses of boxes at right-hand-column
$close_pages = get_diabook_config( "close_pages", 1 );
$close_profiles = get_diabook_config( "close_profiles", 0 );
@@ -69,6 +94,18 @@ if ($color=="pink") $color_path = "/diabook-pink/";
if ($color=="green") $color_path = "/diabook-green/";
if ($color=="dark") $color_path = "/diabook-dark/";
+ // remove doubled checkboxes at contacts-edit-page
+ if ($a->argv[0] === "contacts" && $a->argv[1] != NULL && local_user()){
+ $a->page['htmlhead'] .= '
+ ';
+ }
//build personal menue at lefthand-col (id="profile_side") and boxes at right-hand-col at networkpages
if ($a->argv[0] === "network" && local_user()){
@@ -137,9 +174,9 @@ if ($color=="dark") $color_path = "/diabook-dark/";
$a->page['htmlhead'] .= sprintf('', $imageresizeJS);
//load jquery.ui.js
if($ccCookie != "9") {
- $jqueryuiJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js";
+ $jqueryuiJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery-ui.min.js";
$a->page['htmlhead'] .= sprintf('', $jqueryuiJS);
- $jqueryuicssJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/jquery-ui-1.8.20.custom.css";
+ $jqueryuicssJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/jquery-ui.min.css";
$a->page['htmlhead'] .= sprintf('', $jqueryuicssJS);
}
@@ -371,7 +408,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
}}
// last 12 users
- if($close_lastusers != "1") {
+ if(($close_lastusers != "1") AND !get_config('diabook','disable_features')) {
$aside['$lastusers_title'] = t('Last users');
$aside['$lastusers_items'] = array();
$sql_extra = "";
@@ -400,7 +437,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
}}
// last 10 liked items
- if($close_lastlikes != "1") {
+ if(($close_lastlikes != "1") AND !get_config('diabook','disable_features')) {
$aside['$like_title'] = t('Last likes');
$aside['$like_items'] = array();
$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM
@@ -445,7 +482,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
}}
// last 12 photos
- if($close_lastphotos != "1") {
+ if(($close_lastphotos != "1") AND !get_config('diabook','disable_features')) {
$aside['$photos_title'] = t('Last photos');
$aside['$photos_items'] = array();
$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM