Diabook - first part of clean-up to make the theme maintainable.

diff --git a/view/theme/diabook/admin_users.tpl b/view/theme/diabook/admin_users.tpl
deleted file mode 100644 (file)
index 8aabb51..0000000
--- a/view/theme/diabook/admin_users.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<script>
-       function confirm_delete(uname){
-               return confirm( "$confirm_delete".format(uname));
-       }
-       function confirm_delete_multi(){
-               return confirm("$confirm_delete_multi");
-       }
-       function selectall(cls){
-               $("."+cls).attr('checked','checked');
-               return false;
-       }
-</script>
-<div id='adminpage'>
-       <h1>$title - $page</h1>
-       
-       <form action="$baseurl/admin/users" method="post">
-                       <input type='hidden' name='form_security_token' value='$form_security_token'>
-               <h3>$h_pending</h3>
-               {{ if $pending }}
-                       <table id='pending'>
-                               <thead>
-                               <tr>
-                                       {{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-                                       <th></th>
-                                       <th></th>
-                               </tr>
-                               </thead>
-                               <tbody>
-                       {{ for $pending as $u }}
-                               <tr>
-                                       <td class="created">$u.created</td>
-                                       <td class="name">$u.name</td>
-                                       <td class="email">$u.email</td>
-                                       <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-                                       <td class="tools">
-                                               <a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-                                               <a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-                                       </td>
-                               </tr>
-                       {{ endfor }}
-                               </tbody>
-                       </table>
-                       <div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-                       <div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>                        
-               {{ else }}
-                       <p>$no_pending</p>
-               {{ endif }}
-       
-       
-               
-       
-               <h3>$h_users</h3>
-               {{ if $users }}
-                       <table id='users'>
-                               <thead>
-                               <tr>
-                                       <th></th>
-                                       {{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-                                       <th></th>
-                                       <th></th>
-                               </tr>
-                               </thead>
-                               <tbody>
-                               {{ for $users as $u }}
-                                       <tr>
-                                               <td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-                                               <td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-                                               <td class='email'>$u.email</td>
-                                               <td class='register_date'>$u.register_date</td>
-                                               <td class='login_date'>$u.login_date</td>
-                                               <td class='lastitem_date'>$u.lastitem_date</td>
-                                               <td class='login_date'>$u.page-flags</td>
-                                               <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-                                               <td class="tools" style="width:60px;">
-                                                       <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-                                                       <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
-                                               </td>
-                                       </tr>
-                               {{ endfor }}
-                               </tbody>
-                       </table>
-                       <div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-                       <div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>                                              
-               {{ else }}
-                       NO USERS?!?
-               {{ endif }}
-       </form>
-</div>

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index cf454417575c365b0f9a8ea60dcd1fb45a2cbbc1..c0ca82b41c96bbcf6d08ecc9b5df434ebc257c70 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", 1 );
 $close_profiles   = get_diabook_config( "close_profiles", 0 );
 $close_helpers    = get_diabook_config( "close_helpers", 0 );
 $close_services   = get_diabook_config( "close_services", 0 );
@@ -297,11 +296,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        <script>
        $("right_aside").ready(function(){
 
-       if('.$close_pages.')
-               {
-               document.getElementById( "close_pages" ).style.display = "none";
-                       };
-
        if('.$close_mapquery.')
                {
                document.getElementById( "close_mapquery" ).style.display = "none";
@@ -368,7 +362,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
  function diabook_community_info() {
        $a = get_app();
 
-       $close_pages      = get_diabook_config( "close_pages", 1 );
        $close_profiles   = get_diabook_config( "close_profiles", 0 );
        $close_helpers    = get_diabook_config( "close_helpers", 0 );
        $close_services   = get_diabook_config( "close_services", 0 );
@@ -530,40 +523,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        $aside['$nv'] = $nv;
        }}
 
-   //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-decoration: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
 
    //mapquery
 
@@ -616,7 +575,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        }
    //end twitter
    if($ccCookie != "10") {
-       $close_pages      = get_diabook_config( "close_pages", 1 );
        $close_profiles   = get_diabook_config( "close_profiles", 0 );
        $close_helpers    = get_diabook_config( "close_helpers", 0 );
        $close_services   = get_diabook_config( "close_services", 0 );
@@ -629,7 +587,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        $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);
@@ -643,7 +600,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
    $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']);