From 6eef1f399cdc91ea57f07273b102e616115c7468 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <Roberto.Rosario.Gonzalez@gmail.com>
Date: Sat, 28 May 2011 16:39:40 -0400
Subject: [PATCH] Moved the global history icon to the tools menu

---
 apps/history/__init__.py | 5 -----
 apps/main/__init__.py    | 3 ++-
 settings.py              | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/apps/history/__init__.py b/apps/history/__init__.py
index 06419c4469..f00d07661e 100644
--- a/apps/history/__init__.py
+++ b/apps/history/__init__.py
@@ -3,7 +3,6 @@ from django.utils.translation import ugettext_lazy as _
 from navigation.api import register_links, register_menu
 from permissions.api import register_permission, set_namespace_title
 
-
 PERMISSION_HISTORY_VIEW = {'namespace': 'history', 'name': u'history_view', 'label': _(u'Access the history app')}
 
 set_namespace_title('history', _(u'history'))
@@ -13,7 +12,3 @@ register_permission(PERMISSION_HISTORY_VIEW)
 history_list = {'text': _(u'history'), 'view': 'history_list', 'famfam': 'book', 'permissions': [PERMISSION_HISTORY_VIEW]}
 
 register_links(['history_list'], [history_list], menu_name='sidebar')
-
-register_menu([
-    {'text': _(u'history'), 'view': 'history_list', 'links': [
-    ], 'famfam': 'book', 'position': 3}])
diff --git a/apps/main/__init__.py b/apps/main/__init__.py
index f9d059871a..11a6d56b5b 100644
--- a/apps/main/__init__.py
+++ b/apps/main/__init__.py
@@ -4,6 +4,7 @@ from navigation.api import register_menu
 from permissions import role_list
 from user_management import user_list, group_list
 from navigation.api import register_links
+from history import history_list
 
 from main.conf.settings import SIDE_BAR_SEARCH
 
@@ -30,7 +31,7 @@ __version_info__ = {
 main_menu = [
     {'text': _(u'home'), 'view': 'home', 'famfam': 'house', 'position': 0},
     {'text': _(u'tools'), 'view': 'tools_menu', 'links': [
-        tools, statistics, diagnostics, sentry
+        tools, statistics, diagnostics, history_list, sentry, 
         ], 'famfam': 'wrench', 'name': 'tools', 'position': 7},
 
     {'text': _(u'setup'), 'view': 'setting_list', 'links': [
diff --git a/settings.py b/settings.py
index 0ab77165f7..2c9bcfd951 100644
--- a/settings.py
+++ b/settings.py
@@ -122,9 +122,9 @@ INSTALLED_APPS = (
     'django.contrib.comments',
     'smart_settings',
     'navigation',
-    'history',
     'web_theme',
     'main',
+    'history',
     'common',
     'metadata',
     'pagination',