Diabook - kill wall_thread, remove need for wide variants, fix live updates, add...

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

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index b4d7de1796e61615476f408c7910ec32d89c3210..5ddad11e891c5cf896e11301893dc472eeacc4c8 100644 (file)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -37,7 +37,6 @@ load_config("diabook");
 load_pconfig(local_user(), "diabook");
 
 //get statuses of boxes at right-hand-column
-$close_pages      = get_diabook_config( "close_pages", 0 );
 $close_profiles   = get_diabook_config( "close_profiles", 0 );
 $close_helpers    = get_diabook_config( "close_helpers", 0 );
 $close_services   = get_diabook_config( "close_services", 0 );
@@ -109,8 +108,9 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        diabook_community_info();
 
        // CUSTOM CSS
+       // Makes no difference now - but we'll keep this here in case I fucked up.
        if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network.css";}
-       if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network-wide.css";}
+       if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network.css";}
        }
        }
 
@@ -124,7 +124,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 
        // CUSTOM CSS
        if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile.css";}
-       if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile-wide.css";}
+       if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile.css";}
 
        }
        }
@@ -302,11 +302,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
                document.getElementById( "close_mapquery" ).style.display = "none";
                        };
 
-       if('.$close_pages.')
-               {
-               document.getElementById( "close_pages" ).style.display = "none";
-                       };
-
        if('.$close_profiles.')
                {
                document.getElementById( "close_profiles" ).style.display = "none";
@@ -368,7 +363,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
  function diabook_community_info() {
        $a = get_app();
 
-       $close_pages      = get_diabook_config( "close_pages", 0 );
        $close_profiles   = get_diabook_config( "close_profiles", 0 );
        $close_helpers    = get_diabook_config( "close_helpers", 0 );
        $close_services   = get_diabook_config( "close_services", 0 );
@@ -379,43 +373,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        $close_twitter    = get_diabook_config( "close_twitter", 1 );
        $close_mapquery   = get_diabook_config( "close_mapquery", 1 );
 
-       //Community_Pages at right_aside
-       if($close_pages != "1") {
-               if(local_user()) {
-                       $page = '
-                        <h3 style="margin-top:0px;">'.t("Community Pages").'<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decorat
-ion:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
-                        <div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
-
-                       $pagelist = array();
-
-                       $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-                               WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-                               ORDER BY `name` ASC",
-                               intval($a->user['uid'])
-                               );
-
-                       $pageD = array();
-
-                       // Look if the profile is a community page
-                       foreach($contacts as $contact) {
-                               $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-                       };
-
-
-                       $contacts = $pageD;
-
-                       foreach($contacts as $contact) {
-                               $page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px; word-wrap: break-word; width: 132px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
-                                       $contact["name"]."</a></li>";
-                       }
-                       $page .= '</ul></div>';
-                       //if (sizeof($contacts) > 0)
-                               $aside['$page'] = $page;
-               }
-       }
-       //END Community Page
-
        // comunity_profiles
        if($close_profiles != "1") {
        $aside['$comunity_profiles_title'] = t('Community Profiles');
@@ -619,7 +576,6 @@ ion:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
        }
    //end twitter
    if($ccCookie != "10") {
-       $close_pages      = get_diabook_config( "close_pages", 0 );
        $close_profiles   = get_diabook_config( "close_profiles", 0 );
        $close_helpers    = get_diabook_config( "close_helpers", 0 );
        $close_services   = get_diabook_config( "close_services", 0 );
@@ -632,7 +588,6 @@ ion:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
        $close_or_not = array('1'=>t("don't show"),     '0'=>t("show"),);
        $boxsettings['title'] = Array("", t('Show/hide boxes at right-hand column:'), "", "");
        $aside['$boxsettings'] = $boxsettings;
-       $aside['$close_pages'] = array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_or_not);
        $aside['$close_mapquery'] = array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_or_not);
        $aside['$close_profiles'] = array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_or_not);
        $aside['$close_helpers'] = array('diabook_close_helpers', t('Help or @NewHere ?'), $close_helpers, '', $close_or_not);
@@ -646,7 +601,6 @@ ion:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
    $baseurl = $a->get_baseurl($ssl_state);
    $aside['$baseurl'] = $baseurl;
    if (isset($_POST['diabook-settings-box-sub']) && $_POST['diabook-settings-box-sub']!=''){
-               set_pconfig(local_user(), 'diabook', 'close_pages', $_POST['diabook_close_pages']);
                set_pconfig(local_user(), 'diabook', 'close_mapquery', $_POST['diabook_close_mapquery']);
                set_pconfig(local_user(), 'diabook', 'close_profiles', $_POST['diabook_close_profiles']);
                set_pconfig(local_user(), 'diabook', 'close_helpers', $_POST['diabook_close_helpers']);