From 7179b79b8c3108980ef2fd21caeff9db2586c10e Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Fri, 20 Feb 2015 10:26:25 -0500
Subject: [PATCH] Add an ID to main menu options.

---
 web/pgadmin/browser/nodes/server_groups/hooks.py   | 10 ++++++----
 web/pgadmin/browser/templates/browser/index.html   |  8 ++++----
 .../browser/templates/browser/js/browser.js        |  7 +++++++
 web/pgadmin/test/hooks.py                          | 14 +++++++-------
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/web/pgadmin/browser/nodes/server_groups/hooks.py b/web/pgadmin/browser/nodes/server_groups/hooks.py
index 0cb0d27af..e427a1b6d 100644
--- a/web/pgadmin/browser/nodes/server_groups/hooks.py
+++ b/web/pgadmin/browser/nodes/server_groups/hooks.py
@@ -27,14 +27,16 @@ def get_nodes():
 
     
 def get_file_menu_items():
-    """Return a (set) of dicts of file menu items, with name, priority and URL."""
+    """Return a (set) of dicts of file menu items, with name, label, priority and URL."""
     return [
-            {'name': 'Add a server group...', 'priority': 10, 'url': '#', 'onclick': 'add_server_group()'}
+            {'name': 'mnu_add_server_group', 'label': 'Add a server group...', 'priority': 10, 'url': '#', 'onclick': 'add_server_group()'},
+            {'name': 'mnu_delete_server_group', 'label': 'Delete server group', 'priority': 20, 'url': '#', 'onclick': 'delete_server_group()'},
+            {'name': 'mnu_rename_server_group', 'label': 'Rename server group...', 'priority': 30, 'url': '#', 'onclick': 'rename_server_group()'}
            ]
 
 
 def get_context_menu_items():
-    """Return a (set) of dicts of content menu items with name, text, priority and JS"""
+    """Return a (set) of dicts of content menu items with name, label, priority and JS"""
     return [
             {'name': 'delete', 'label': 'Delete server group', 'priority': 100, 'onclick': 'delete_server_group(item);'},
             {'name': 'rename', 'label': 'Rename server group...', 'priority': 200, 'onclick': 'rename_server_group(item);'}
@@ -53,4 +55,4 @@ def get_css_snippets():
             url_for('NODE-server-group.static', filename='img/server-group.png')
     css += "{"
     
-    return css
\ No newline at end of file
+    return css
diff --git a/web/pgadmin/browser/templates/browser/index.html b/web/pgadmin/browser/templates/browser/index.html
index 15dd0f86a..4528dc3db 100644
--- a/web/pgadmin/browser/templates/browser/index.html
+++ b/web/pgadmin/browser/templates/browser/index.html
@@ -20,28 +20,28 @@
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">File <span class="caret"></span></a>
           <ul class="dropdown-menu" role="menu">{% for file_item in file_items %}
-            <li><a href="{{ file_item.url }}" onclick="{{ file_item.onclick|safe }}">{{ file_item.name }}</a></li>{% endfor %}
+            <li><a id="{{ file_item.name }}" href="{{ file_item.url }}" onclick="{{ file_item.onclick|safe }}">{{ file_item.label }}</a></li>{% endfor %}
           </ul>
         </li>
 
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Edit <span class="caret"></span></a>
           <ul class="dropdown-menu" role="menu">{% for edit_item in edit_items %}
-            <li><a href="{{ edit_item.url }}" onclick="{{ edit_item.onclick|safe }}">{{ edit_item.name }}</a></li>{% endfor %}
+            <li><a id="{{ edit_item.name }}" href="{{ edit_item.url }}" onclick="{{ edit_item.onclick|safe }}">{{ edit_item.label }}</a></li>{% endfor %}
           </ul>
         </li>
         
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Tools <span class="caret"></span></a>
           <ul class="dropdown-menu" role="menu">{% for tools_item in tools_items %}
-            <li><a href="{{ tools_item.url }}" onclick="{{ tools_item.onclick|safe }}">{{ tools_item.name }}</a></li>{% endfor %}
+            <li><a id="{{ tools_item.name }}" href="{{ tools_item.url }}" onclick="{{ tools_item.onclick|safe }}">{{ tools_item.label }}</a></li>{% endfor %}
           </ul>
         </li>
         
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help <span class="caret"></span></a>
           <ul class="dropdown-menu" role="menu">{% for help_item in help_items %}
-            <li><a href="{{ help_item.url }}" onclick="{{ help_item.onclick|safe }}">{{ help_item.name }}</a></li>{% endfor %}
+            <li><a id="{{ help_item.name }}" href="{{ help_item.url }}" onclick="{{ help_item.onclick|safe }}">{{ help_item.label }}</a></li>{% endfor %}
           </ul>
         </li>
 
diff --git a/web/pgadmin/browser/templates/browser/js/browser.js b/web/pgadmin/browser/templates/browser/js/browser.js
index 62a247f1f..81e48b819 100644
--- a/web/pgadmin/browser/templates/browser/js/browser.js
+++ b/web/pgadmin/browser/templates/browser/js/browser.js
@@ -117,5 +117,12 @@ $(document).ready(function(){
                 callback: null
             };
         }
+    }).on('acitree', function(event, api, item, eventName, options) {
+        switch (eventName) {
+            case 'selected':
+                alertify.alert(tree.getLabel(item));
+                
+                break;
+        }
     });
 });
diff --git a/web/pgadmin/test/hooks.py b/web/pgadmin/test/hooks.py
index 933fe7cf3..d7d8e0013 100644
--- a/web/pgadmin/test/hooks.py
+++ b/web/pgadmin/test/hooks.py
@@ -12,14 +12,14 @@
 from flask import render_template, url_for
 
 def get_file_menu_items():
-    """Return a (set) of dicts of file menu items, with name, priority and URL."""
+    """Return a (set) of dicts of file menu items, with name, label, priority and URL."""
     return [
-            {'name': 'Generated Test HTML', 'priority': 100, 'url': url_for('test.generated')},
-            {'name': 'Test Alert', 'priority': 200, 'url': '#', 'onclick': 'test_alert()'},
-            {'name': 'Test Confirm', 'priority': 300, 'url': '#', 'onclick': 'test_confirm()'},
-            {'name': 'Test Dialog', 'priority': 400, 'url': '#', 'onclick': 'test_dialog()'},
-            {'name': 'Test Prompt', 'priority': 500, 'url': '#', 'onclick': 'test_prompt()'},
-            {'name': 'Test Notifier', 'priority': 600, 'url': '#', 'onclick': 'test_notifier()'},
+            {'name': 'mnu_generate_test_html', 'label': 'Generated Test HTML', 'priority': 100, 'url': url_for('test.generated')},
+            {'name': 'mnu_test_alert', 'label': 'Test Alert', 'priority': 200, 'url': '#', 'onclick': 'test_alert()'},
+            {'name': 'mnu_test_confirm', 'label': 'Test Confirm', 'priority': 300, 'url': '#', 'onclick': 'test_confirm()'},
+            {'name': 'mnu_test_dialog', 'label': 'Test Dialog', 'priority': 400, 'url': '#', 'onclick': 'test_dialog()'},
+            {'name': 'mnu_test_prompt', 'label': 'Test Prompt', 'priority': 500, 'url': '#', 'onclick': 'test_prompt()'},
+            {'name': 'mnu_test_notifier', 'label': 'Test Notifier', 'priority': 600, 'url': '#', 'onclick': 'test_notifier()'},
            ]
     
 def get_scripts():