Merge commit 'b8845e25fa' into WebGUI8. Up to 7.10.0

2010-09-22 07:58:06 -07:00 · 2010-09-22 07:58:06 -07:00 · 0180b11064
commit 0180b11064
parent f61e8faeb9 b8845e25fa
45 changed files with 480 additions and 46 deletions
--- a/etc/WebGUI.conf.original
+++ b/etc/WebGUI.conf.original
@ -419,6 +419,13 @@
      "url" : "^PageUrl(\"\",op=switchOffAdmin);",
      "title" : "^International(12,WebGUI);"
   },
+   "addons" : {
+      "icon" : "addons.png",
+      "uiLevel" : 1,
+      "group" : "12",
+      "url" : "http://www.webgui.org/addons",
+      "title" : "Addons"
+   },
   "contentFilters" : {
      "icon" : "contentFilters.gif",
      "uiLevel" : 3,