diff --git a/docs/upgrades/upgrade_6.2.8-6.3.0.sql b/docs/upgrades/upgrade_6.2.8-6.3.0.sql index bf7e6ff61..e6c74e96e 100644 --- a/docs/upgrades/upgrade_6.2.8-6.3.0.sql +++ b/docs/upgrades/upgrade_6.2.8-6.3.0.sql @@ -11,7 +11,7 @@ update userProfileData set fieldData='tinyMCE' where fieldName='richEditor'; UPDATE template set template = '\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n
\r\nInsert/Edit Link\r\n\r\n
\r\n Link Settings\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Link URL:
Link Target:\r\n
 
\r\n
\r\n \r\n\r\n
\r\n
\r\n\r\n\r\n
\r\n Available Page Tree\r\n
\r\n\r\n \')\">
\r\n\r\n
\r\n
\r\n \r\n
\r\n\r\n' where namespace='richEditor/pagetree' && templateId = '1'; INSERT INTO template VALUES ('adminConsole','Admin Console','\r\n\r\n\r\n WebGUI <tmpl_var session.webgui.version>-<tmpl_var session.webgui.status> Admin Console\r\n \r\n\r\n\r\n\r\n\r\n\r\n','style',1,0); -INSERT INTO template VALUES ('1','Admin Console','^StyleSheet(^Extras;/adminConsole/adminConsole.css);\r\n^JavaScript(^Extras;/adminConsole/adminConsole.js);\r\n\r\n
\r\n \r\n \" target=\"_blank\">\"?\"\r\n \r\n
\r\n
\r\n \" border=\"0\" title=\"\" alt=\"\" />\r\n
\r\n
\r\n \" border=\"0\" title=\"\" alt=\"\" />\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n  \r\n
\r\n \r\n \r\n
\r\n \">\" border=\"0\" title=\"\" alt=\"\" />
\r\n \">\r\n
\r\n \r\n \r\n
\r\n  \r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n \r\n \">
\r\n \r\n
\r\n
\r\n ^AdminToggle;
\r\n ^LoginToggle;
\r\n
\r\n
\r\n\r\n','AdminConsole',1,1); +INSERT INTO template VALUES ('1','Admin Console','^StyleSheet(^Extras;/adminConsole/adminConsole.css);\r\n^JavaScript(^Extras;/adminConsole/adminConsole.js);\r\n\r\n
\r\n \r\n \" target=\"_blank\">\"?\"\r\n \r\n
\r\n
\r\n \" border=\"0\" title=\"\" alt=\"\" />\r\n
\r\n
\r\n \" border=\"0\" title=\"\" alt=\"\" />\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n  \r\n
\r\n \r\n \r\n
\r\n \">\" border=\"0\" title=\"\" alt=\"\" />
\r\n \">\r\n
\r\n \r\n \r\n
\r\n  \r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n \r\n \">
\r\n \r\n
\r\n
\r\n
\r\n ^AdminToggle;
\r\n ^LoginToggle;
\r\n
\r\n
\r\n\r\n','AdminConsole',1,1); delete from settings where name='adminStyleId'; delete from settings where name='useAdminStyle'; @@ -43,3 +43,6 @@ ALTER TABLE SQLReport ADD databaseLinkId5 VARCHAR(22); UPDATE template set template = '\r\n

\r\n\r\n\r\n\r\n

\r\n\r\n\r\n\r\n

    \r\n \r\n
    • \r\n     \r\n
\r\n\r\n\r\n\r\n\r\n \r\n \r\n \r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n\r\n\r\n
\">\r\n \r\n \r\n \r\n \r\n \r\n
\r\n  \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
\">\r\n \r\n \r\n \r\n \r\n \r\n
\r\n  \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
\">\r\n \r\n \r\n \r\n \r\n \r\n
\r\n  \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
\">\r\n \r\n \r\n \r\n \r\n \r\n
\r\n  \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n\r\n\r\n
\r\n \r\n
\r\n' where templateId="1" and namespace="SQLReport"; + + + diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm index 7bcab08cc..a6f15523b 100644 --- a/lib/WebGUI/AdminConsole.pm +++ b/lib/WebGUI/AdminConsole.pm @@ -28,6 +28,14 @@ sub addSubmenuItem { }); } +sub getAdminConsoleParams { + return { 'title' => WebGUI::International::get("admin console","AdminConsole"), + url => WebGUI::URL::page("op=adminConsole"), + canUse => WebGUI::Grouping::isInGroup("12"), + icon => $session{config}{extrasURL}."/adminConsole/adminConsole.gif" + }; +} + sub getAdminFunction { my $self = shift; my $id = shift; @@ -216,7 +224,7 @@ sub new { my $class = shift; my $id = shift; my %self; - $self{_function} = $class->getAdminFunction($id); + $self{_function} = $class->getAdminFunction($id) if ($id); bless \%self, $class; } @@ -234,10 +242,11 @@ sub render { if (exists $self->{_submenuItem}) { $var{submenu_loop} = $self->{_submenuItem}; } - $var{"console.title"} = WebGUI::International::get("admin console","AdminConsole"); - $var{"console.url"} = WebGUI::URL::page("op=adminConsole"); - $var{"console.canUse"} = WebGUI::Grouping::isInGroup("12"); - $var{"console.icon"} = $session{config}{extrasURL}."/adminConsole/adminConsole.gif"; + my $acParams = $self->getAdminConsoleParams; + $var{"console.title"} = $acParams->{title}; + $var{"console.url"} = $acParams->{url}; + $var{"console.canUse"} = $acParams->{canUse}; + $var{"console.icon"} = $acParams->{icon}; $var{"help.url"} = $self->{_helpUrl}; $var{"application_loop"} = $self->getAdminFunction; $session{page}{useAdminStyle} = 1; diff --git a/lib/WebGUI/Macro/AdminBar.pm b/lib/WebGUI/Macro/AdminBar.pm index 491082633..6a594c98a 100644 --- a/lib/WebGUI/Macro/AdminBar.pm +++ b/lib/WebGUI/Macro/AdminBar.pm @@ -13,6 +13,7 @@ package WebGUI::Macro::AdminBar; use strict qw(refs vars); use Tie::CPHash; use Tie::IxHash; +use WebGUI::AdminConsole; use WebGUI::Grouping; use WebGUI::International; use WebGUI::Macro; @@ -136,56 +137,18 @@ sub process { } $var{'clipboard_loop'} = \@clipboard; #--admin functions - %hash = (); - if (WebGUI::Grouping::isInGroup(3)) { - %hash = ( - WebGUI::URL::page('op=listGroups')=>WebGUI::International::get(5), - WebGUI::URL::page('op=manageSettings')=>WebGUI::International::get(4), - WebGUI::URL::page('op=listUsers')=>WebGUI::International::get(7), - WebGUI::URL::page('op=viewStatistics')=>WebGUI::International::get(144), - WebGUI::URL::page('op=listDatabaseLinks')=>WebGUI::International::get(981), - WebGUI::URL::page('op=listNavigation')=>WebGUI::International::get("manage navigation","Navigation") + %hash = ( + 'http://validator.w3.org/check?uri='.WebGUI::URL::escape(WebGUI::URL::page())=>WebGUI::International::get(399), ); - } elsif (WebGUI::Grouping::isInGroup(11)) { - %hash = ( - WebGUI::URL::page('op=listGroupsSecondary')=>WebGUI::International::get(5), - WebGUI::URL::page('op=addUser')=>WebGUI::International::get(169), - %hash - ); - } - if (WebGUI::Grouping::isInGroup(4)) { - %hash = ( - WebGUI::URL::page('op=listRoots')=>WebGUI::International::get(410), - 'http://validator.w3.org/check?uri='.WebGUI::URL::escape(WebGUI::URL::page())=>WebGUI::International::get(399), - WebGUI::URL::page('op=manageClipboard')=>WebGUI::International::get(949), - WebGUI::URL::page('op=listCollateral')=>WebGUI::International::get(394), - WebGUI::URL::page('op=viewPageTree')=>WebGUI::International::get(447), - WebGUI::URL::page('op=manageTrash')=>WebGUI::International::get(10), - %hash - ); - } - if (WebGUI::Grouping::isInGroup(6)) { - %hash = ( - WebGUI::URL::gateway('packages')=>WebGUI::International::get(374), - %hash - ); - } - if (WebGUI::Grouping::isInGroup(8)) { - %hash = ( - WebGUI::URL::page('op=listTemplates')=>WebGUI::International::get(508), - %hash - ); - } - if (WebGUI::Grouping::isInGroup(9)) { - %hash = ( - WebGUI::URL::page('op=listThemes')=>WebGUI::International::get(900), - %hash - ); - } - %hash = ( - WebGUI::URL::page('op=viewHelpIndex')=>WebGUI::International::get(13), - %hash - ); + my $acParams = WebGUI::AdminConsole->getAdminConsoleParams; + $hash{$acParams->{url}} = $acParams->{title} if ($acParams->{canUse}); +# $acParams = WebGUI::AdminConsole->getAdminFunction("users"); +# $hash{$acParams->{url}} = $acParams->{title} if ($acParams->{canUse}); +# $acParams = WebGUI::AdminConsole->getAdminFunction("groups"); +# $hash{$acParams->{url}} = $acParams->{title} if ($acParams->{canUse}); +# $acParams = WebGUI::AdminConsole->getAdminFunction("assets"); +# $hash{$acParams->{url}} = $acParams->{title} if ($acParams->{canView}); + %hash = sortHash(%hash); %hash = ( WebGUI::URL::page('op=switchOffAdmin')=>WebGUI::International::get(12), diff --git a/lib/WebGUI/i18n/English/AdminConsole.pm b/lib/WebGUI/i18n/English/AdminConsole.pm index edb25480c..67f1ee148 100644 --- a/lib/WebGUI/i18n/English/AdminConsole.pm +++ b/lib/WebGUI/i18n/English/AdminConsole.pm @@ -2,7 +2,7 @@ package WebGUI::i18n::English::AdminConsole; our $I18N = { 'admin console' => { - message => q|WebGUI Admin Console|, + message => q|Admin Console|, lastUpdated => 1099344172, context => q|The title of the admin console.| }, diff --git a/lib/WebGUI/i18n/English/Navigation.pm b/lib/WebGUI/i18n/English/Navigation.pm index 1b4cd1c7f..820bae32d 100644 --- a/lib/WebGUI/i18n/English/Navigation.pm +++ b/lib/WebGUI/i18n/English/Navigation.pm @@ -7,12 +7,6 @@ our $I18N = { context => q|A submenu item in admin console that allows the user to add a new nav config.| }, - 'manage navigation' => { - message => q|Manage Navigation|, - lastUpdated => 1077081255, - context=>q|Used in the Admin Bar| - }, - '33' => { message => q|Error: This identifier is already in use. Please use an unique value.|, lastUpdated => 1077081255 diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index e6cfdd093..a4f212743 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -1308,11 +1308,6 @@ How should this user be notified when they get a new WebGUI message? lastUpdated => 1066073923 }, - '410' => { - message => q|Manage roots.|, - lastUpdated => 1031514049 - }, - '999' => { message => q|Database Link, Delete|, lastUpdated => 1056151382 @@ -1343,11 +1338,6 @@ How should this user be notified when they get a new WebGUI message? lastUpdated => 1031514049 }, - '447' => { - message => q|Manage page tree.|, - lastUpdated => 1031514049 - }, - '536' => { message => q|A new user named ^@; has joined the site.|, lastUpdated => 1031514049 @@ -1453,11 +1443,6 @@ How should this user be notified when they get a new WebGUI message? lastUpdated => 1031514049 }, - '508' => { - message => q|Manage templates.|, - lastUpdated => 1031514049 - }, - '953' => { message => q|Previous Location|, lastUpdated => 1052850265 @@ -2505,11 +2490,6 @@ will be modified to make it unique.|, lastUpdated => 1031514049 }, - '7' => { - message => q|Manage users.|, - lastUpdated => 1031514049 - }, - '26' => { message => q|December|, lastUpdated => 1031514049 @@ -2705,11 +2685,6 @@ The password you use to connect to the DSN. lastUpdated => 1031514049 }, - '394' => { - message => q|Manage collateral.|, - lastUpdated => 1036954925 - }, - '48' => { message => q|Hello|, lastUpdated => 1031514049 @@ -3601,11 +3576,6 @@ The translated label for the link to the home page or the text that you supply t lastUpdated => 1050190959 }, - '374' => { - message => q|Manage packages.|, - lastUpdated => 1031514049 - }, - '930' => { message => q|View Theme|, lastUpdated => 1050270912 @@ -4270,11 +4240,6 @@ As with any delete operation, you are prompted to be sure you wish to proceed wi lastUpdated => 1047842180 }, - '5' => { - message => q|Manage groups.|, - lastUpdated => 1031514049 - }, - '698' => { message => q|Karma is a method of tracking the activity of your users, and potentially rewarding or punishing them for their level of activity. Once karma has been enabled, you'll notice that the menus of many things in WebGUI change to reflect karma.

@@ -5650,11 +5615,6 @@ Start typing! Or better yet, copy the snippet from some other electronic documen lastUpdated => 1031514049 }, - '981' => { - message => q|Manage database links.|, - lastUpdated => 1056151382 - }, - '697' => { message => q|Karma, Using|, lastUpdated => 1031514049 @@ -6676,11 +6636,6 @@ What group should be alerted when a new user registers? lastUpdated => 1031514049 }, - '13' => { - message => q|View help index.|, - lastUpdated => 1031514049 - }, - '972' => { message => q|Date and Time|, lastUpdated => 1053278234 diff --git a/www/extras/adminConsole/adminConsole.js b/www/extras/adminConsole/adminConsole.js index 9056e4494..74993a15e 100644 --- a/www/extras/adminConsole/adminConsole.js +++ b/www/extras/adminConsole/adminConsole.js @@ -1,12 +1,16 @@ var adminConsoleIsOn = true; - -function initAdminConsole (app) { - if (app) { + +function initAdminConsole (viewAnApplication,hasSubmenu) { + if (viewAnApplication) { switchToApplication(); } else { switchToAdminConsole(); + document.getElementById("adminConsoleMainMenu").className = "adminConsoleHidden"; } + if (!hasSubmenu) { + document.getElementById("adminConsoleApplicationSubmenu").className = "adminConsoleHidden"; + } } function switchToApplication () { @@ -17,7 +21,7 @@ function switchToApplication () { document.getElementById("application_help").className = "adminConsoleHelpIcon"; document.getElementById("application_icon").className = "adminConsoleTitleIcon"; document.getElementById("application_title").className = "adminConsoleTitle"; - document.getElementById("application_submenu").className = "adminConsoleSubmenu"; + document.getElementById("adminConsoleApplicationSubmenu").className = "adminConsoleSubmenu"; document.getElementById("application_workarea").className = "adminConsoleWorkArea"; document.getElementById("console_toggle_off").className = "adminConsoleHidden"; document.getElementById("console_toggle_on").className = "adminConsoleToggle"; @@ -27,7 +31,7 @@ function switchToAdminConsole () { adminConsoleIsOn = true; document.getElementById("application_icon").className = "adminConsoleHidden"; document.getElementById("application_title").className = "adminConsoleHidden"; - document.getElementById("application_submenu").className = "adminConsoleHidden"; + document.getElementById("adminConsoleApplicationSubmenu").className = "adminConsoleHidden"; document.getElementById("application_workarea").className = "adminConsoleHidden"; document.getElementById("application_help").className = "adminConsoleHidden"; document.getElementById("console_icon").className = "adminConsoleTitleIcon";