Changeset 29168 for trunk/plugins

Timestamp:

Aug 4, 2014, 11:07:41 PM (10 years ago)

Author:

mistic100

Message:

add MultiView controller on admin page (replaces the "switch theme" button)

Location:

trunk/plugins/AdminTools

Files:

• include/MultiView.class.php (modified) (2 diffs)
• include/events.inc.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)
• template/admin_controller.js (added)
• template/admin_controller.tpl (added)
• template/admin_style.css (added)
• template/public_controller.tpl (modified) (1 diff)
• template/public_style.css (moved) (moved from trunk/plugins/AdminTools/template/style.css)

trunk/plugins/AdminTools/include/MultiView.class.php

@@ -102 +102 @@
     return $url;
   }
+  
+  /**
+   * Returns the current url minus MultiView params
+   *
+   * @param bool $with_amp - adds ? or & at the end of the url
+   * @return string
+   */
+  public function get_clean_admin_url($with_amp=false)
+  {
+    $url = PHPWG_ROOT_PATH.'admin.php';
+    
+    $get = $_GET;
+    unset($get['page'], $get['section'], $get['tag']);
+    if (count($get) == 0 and !empty($_SERVER['QUERY_STRING']))
+    {
+      $url.= '?' . str_replace('&', '&', $_SERVER['QUERY_STRING']);
+    }
+    
+    if ($with_amp)
+    {
+      $url.= strpos($url, '?')!==false ? '&' : '?';
+    }
+    
+    return $url;
+  }
 
   /**
@@ -278 +303 @@
 SELECT
   '.$conf['user_fields']['id'].' AS id,
-  '.$conf['user_fields']['username'].' AS username
-FROM '.USERS_TABLE.'
+  '.$conf['user_fields']['username'].' AS username,
+  status
+FROM '.USERS_TABLE.' AS u
+  INNER JOIN '.USER_INFOS_TABLE.' AS i
+    ON '.$conf['user_fields']['id'].' = user_id
   ORDER BY CONVERT('.$conf['user_fields']['username'].', CHAR)
 ;';

trunk/plugins/AdminTools/include/events.inc.php

@@ -176 +176 @@
 
 /**
+ * Add main toolbar to current page
+ * @trigger loc_after_page_header
+ */
+function admintools_add_admin_controller()
+{
+  global $MultiView, $conf, $template, $page, $user;
+
+  $url_root = get_root_url();
+  $tpl_vars = array();
+
+  $tpl_vars['MULTIVIEW'] =     $MultiView->get_data();
+  $tpl_vars['DELETE_CACHE'] =  isset($conf['multiview_invalidate_cache']);
+  $tpl_vars['U_SELF'] =        $MultiView->get_clean_admin_url(true);
+  
+  if (($admin_lang = $MultiView->get_user_language()) !== false)
+  {
+    include_once(PHPWG_ROOT_PATH . 'include/functions_mail.inc.php');
+    switch_lang_to($admin_lang);
+  }
+
+  $template->assign(array(
+    'ADMINTOOLS_PATH' => './plugins/' . ADMINTOOLS_ID .'/',
+    'ato' => $tpl_vars,
+  ));
+
+  $template->set_filename('ato_admin_controller', realpath(ADMINTOOLS_PATH . 'template/admin_controller.tpl'));
+  $template->parse('ato_admin_controller');
+
+  if ($MultiView->is_admin() && @$admin_lang !== false)
+  {
+    switch_lang_back();
+  }
+  
+  $template->set_prefilter('header', 'admintools_admin_prefilter');
+}
+
+function admintools_admin_prefilter($content)
+{
+  $search = '<a class="icon-brush tiptip" href="{$U_CHANGE_THEME}" title="{\'Switch to clear or dark colors for administration\'|translate}">{\'Change Admin Colors\'|translate}</a>';
+  $replace = '<span id="ato_container"><a class="icon-cog-alt" href="#">{\'Tools\'|translate}</a></span>';
+  return str_replace($search, $replace, $content);
+}
+
+/**
  * Disable privacy level switchbox
  */

trunk/plugins/AdminTools/main.inc.php

@@ -39 +39 @@
 else
 {
+  add_event_handler('loc_begin_page_header', 'admintools_add_admin_controller');
   add_event_handler('get_admin_plugin_menu_links', 'admintools_admin_link');
 }

trunk/plugins/AdminTools/template/public_controller.tpl

@@ -1 +1 @@
 {strip}
-{combine_css path=$ADMINTOOLS_PATH|cat:'template/style.css'}
+{combine_css path=$ADMINTOOLS_PATH|cat:'template/public_style.css'}
 {combine_css path='admin/themes/default/fontello/css/fontello.css'}
 {combine_css path=$ADMINTOOLS_PATH|cat:'template/fontello/css/fontello-ato.css'}