Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendi...

[friendica.git] / view / theme / diabook / theme.php

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index b5fd4cc438b6b75e39bb8a4df7141a8e59070cb5..972ad2e7cbf224b2ab5250d40bed52033c676bbc 100644 (file)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook
  * 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.027)
+ * 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('<META NAME=generator CONTENT="%s"/>', $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'] .= '
+       <script>
+        $(document).ready(function() {
+               $("li#nav-site-linkmenu.nav-menu-icon").attr("style","display: block;");
+               $("li#nav-directory-link.nav-menu").attr("style","margin-right: 0px;");
+               $("li#nav-home-link.nav-menu").attr("style","display: block;margin-right: 8px;");
+       });
+       </script>';
+       }
+
+if ($a->argv[0] == "profile" && $a->argv[1] != $a->user['nickname'] ) {
+       $a->page['htmlhead'] .= '
+       <script>
+        $(document).ready(function() {
+               $("li#nav-site-linkmenu.nav-menu-icon").attr("style","display: block;");
+               $("li#nav-directory-link.nav-menu").attr("style","margin-right: 0px;");
+               $("li#nav-home-link.nav-menu").attr("style","display: block;margin-right: 8px;");
+       });
+       </script>';
+       }
+
+
 //get statuses of boxes at right-hand-column
 $close_pages      = get_diabook_config( "close_pages", 1 );
 $close_profiles   = get_diabook_config( "close_profiles", 0 );
@@ -76,7 +101,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
         $(document).ready(function() {
                $("span.group_unselected").attr("style","display: none;");
                $("span.group_selected").attr("style","display: none;");
-               $("input.unticked.action").attr("style","float: left; margin-top: 5px;");
+               $("input.unticked.action").attr("style","float: left; margin-top: 5px;-moz-appearance: none;");
                $("li.menu-profile-list").attr("style","min-height: 22px;");
        });
        </script>';
@@ -149,9 +174,9 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        $a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $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('<script type="text/javascript" src="%s" ></script>', $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('<link rel="stylesheet" type="text/css" href="%s" />', $jqueryuicssJS);
        }
        
@@ -383,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 = "";
@@ -412,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
@@ -457,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