Merge branch 'admin-sections/4' into 0.9.x

[quix0rs-gnu-social.git] / lib / adminpanelaction.php

diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index 6d4b974c3773c03513f9bf23ecbce46469b3c25a..7997eb2b1f4b13a7db84f7c78fd3af07d0c44527 100644 (file)
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -224,62 +224,37 @@ class AdminPanelAction extends Action
         $this->clientError(_('saveSettings() not implemented.'));
         return;
     }
-}
-
-/**
- * Menu for public group of actions
- *
- * @category Output
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @author   Sarven Capadisli <csarven@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- * @see      Widget
- */
-
-class AdminPanelNav extends Widget
-{
-    var $action = null;
-
+    
     /**
-     * Construction
+     * Delete a design setting
      *
-     * @param Action $action current action, used for output
-     */
-
-    function __construct($action=null)
-    {
-        parent::__construct($action);
-        $this->action = $action;
-    }
-
-    /**
-     * Show the menu
+     * // XXX: Maybe this should go in Design? --Z
      *
-     * @return void
+     * @return mixed $result false if something didn't work
      */
 
-    function show()
+    function deleteSetting($section, $setting)
     {
-        $action_name = $this->action->trimmed('action');
-
-        $this->action->elementStart('ul', array('class' => 'nav'));
+        $config = new Config();
 
-        if (Event::handle('StartAdminPanelNav', array($this))) {
+        $config->section = $section;
+        $config->setting = $setting;
 
-            $this->out->menuItem(common_local_url('siteadminpanel'), _('Site'),
-                _('Basic site configuration'), $action_name == 'siteadminpanel', 'nav_site_admin_panel');
-
-            Event::handle('EndAdminPanelNav', array($this));
+        if ($config->find(true)) {
+            $result = $config->delete();
+            if (!$result) {
+                common_log_db_error($config, 'DELETE', __FILE__);
+                $this->clientError(_("Unable to delete design setting."));
+                return null;
+            }
         }
-        $this->action->elementEnd('ul');
+
+        return $result;
     }
 }
 
 /**
- * Menu for admin group of actions
+ * Menu for public group of actions
  *
  * @category Output
  * @package  StatusNet
@@ -291,7 +266,7 @@ class AdminPanelNav extends Widget
  * @see      Widget
  */
 
-class PublicGroupNav extends Widget
+class AdminPanelNav extends Widget
 {
     var $action = null;
 
@@ -319,25 +294,21 @@ class PublicGroupNav extends Widget
 
         $this->action->elementStart('ul', array('class' => 'nav'));
 
-        if (Event::handle('StartPublicGroupNav', array($this))) {
-            $this->out->menuItem(common_local_url('public'), _('Public'),
-                _('Public timeline'), $action_name == 'public', 'nav_timeline_public');
+        if (Event::handle('StartAdminPanelNav', array($this))) {
 
-            $this->out->menuItem(common_local_url('groups'), _('Groups'),
-                _('User groups'), $action_name == 'groups', 'nav_groups');
+            $this->out->menuItem(common_local_url('siteadminpanel'), _('Site'),
+                _('Basic site configuration'), $action_name == 'siteadminpanel', 'nav_site_admin_panel');
 
-            $this->out->menuItem(common_local_url('publictagcloud'), _('Recent tags'),
-                _('Recent tags'), $action_name == 'publictagcloud', 'nav_recent-tags');
+            $this->out->menuItem(common_local_url('designadminpanel'), _('Design'),
+                _('Design configuration'), $action_name == 'designadminpanel', 'nav_design_admin_panel');
 
-            if (count(common_config('nickname', 'featured')) > 0) {
-                $this->out->menuItem(common_local_url('featured'), _('Featured'),
-                    _('Featured users'), $action_name == 'featured', 'nav_featured');
-            }
+            $this->out->menuItem(common_local_url('useradminpanel'), _('User'),
+                _('Paths configuration'), $action_name == 'useradminpanel', 'nav_design_admin_panel');
 
-            $this->out->menuItem(common_local_url('favorited'), _('Popular'),
-                _("Popular notices"), $action_name == 'favorited', 'nav_timeline_favorited');
+            $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'),
+                _('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel');
 
-            Event::handle('EndPublicGroupNav', array($this));
+            Event::handle('EndAdminPanelNav', array($this));
         }
         $this->action->elementEnd('ul');
     }