From d302dfb52cc840740d45bb8b3e1911286fc0e6a0 Mon Sep 17 00:00:00 2001
From: Edward <edward@roojs.com>
Date: Thu, 4 Jun 2015 14:04:14 +0800
Subject: [PATCH] Pman.Tab.AdminEnum.bjs Pman.Tab.AdminEnum.js

---
 Pman.Tab.AdminEnum.bjs | 8 ++++++--
 Pman.Tab.AdminEnum.js  | 9 +++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Pman.Tab.AdminEnum.bjs b/Pman.Tab.AdminEnum.bjs
index 508faed..d822121 100644
--- a/Pman.Tab.AdminEnum.bjs
+++ b/Pman.Tab.AdminEnum.bjs
@@ -10,8 +10,8 @@
   "d1228f5476d15142b1358ae4b5fa2454" : "Order #",
   "fdff10eac021dfbb69e9c38204237fdc" : "Add new pulldown list",
   "1206eb8aea05be4625371c9c12818785" : "Pulldown",
-  "7dce122004969d56ae2e0245cb754d35" : "Edit",
   "801ab24683a4a8c433c6eb40c48bcd9d" : "Download",
+  "68be4837f6c739877233e527a996dd00" : "Merge",
   "7af54708cf5a4286cf0cfa58ff5148a8" : "Internal #",
   "be53a0541a6d36f6ecb879fa2c584b08" : "Image",
   "b48968e1c912da07df5e8d6d246291ec" : "Display Name",
@@ -309,11 +309,15 @@
              "$ icon" : "rootURL + '/Pman/templates/images/trash.gif'",
              "$ xns" : "Roo.Toolbar"
             },
+            {
+             "xtype" : "Separator",
+             "$ xns" : "Roo.Toolbar"
+            },
             {
              "listeners" : {
               "|click" : "function()\n{\n    var s = _this.grid.getSelectionModel().getSelections();\n    if (!s.length || (s.length > 1))  {\n        Roo.MessageBox.alert(\"Error\", s.length ? \"Select only one Row\" : \"Select a Row\");\n        return;\n    }\n    if (!_this.dialog) return;\n    _this.dialog.show(s[0].data, function() {\n        _this.grid.footer.onClick('first');\n    }); \n    \n}\n"
              },
-             "text" : "Edit",
+             "text" : "Merge",
              "xtype" : "Button",
              "cls" : "x-btn-text-icon",
              "$ icon" : "Roo.rootURL + 'images/default/tree/leaf.gif'",
diff --git a/Pman.Tab.AdminEnum.js b/Pman.Tab.AdminEnum.js
index 42e9cde..c6069c2 100644
--- a/Pman.Tab.AdminEnum.js
+++ b/Pman.Tab.AdminEnum.js
@@ -11,8 +11,8 @@ Pman.Tab.AdminEnum = new Roo.XComponent({
   'd1228f5476d15142b1358ae4b5fa2454' :"Order #",
   'fdff10eac021dfbb69e9c38204237fdc' :"Add new pulldown list",
   '1206eb8aea05be4625371c9c12818785' :"Pulldown",
-  '7dce122004969d56ae2e0245cb754d35' :"Edit",
   '801ab24683a4a8c433c6eb40c48bcd9d' :"Download",
+  '68be4837f6c739877233e527a996dd00' :"Merge",
   '7af54708cf5a4286cf0cfa58ff5148a8' :"Internal #",
   'be53a0541a6d36f6ecb879fa2c584b08' :"Image",
   'b48968e1c912da07df5e8d6d246291ec' :"Display Name",
@@ -629,11 +629,16 @@ Pman.Tab.AdminEnum = new Roo.XComponent({
             }
           }
          },
+         {
+          '|xns' : 'Roo.Toolbar',
+          xns : Roo.Toolbar,
+          xtype : 'Separator'
+         },
          {
           '|xns' : 'Roo.Toolbar',
           cls : 'x-btn-text-icon',
           icon : Roo.rootURL + 'images/default/tree/leaf.gif',
-          text : _this._strings['7dce122004969d56ae2e0245cb754d35'],
+          text : _this._strings['68be4837f6c739877233e527a996dd00'],
           xns : Roo.Toolbar,
           xtype : 'Button',
           listeners : {
-- 
2.39.2