diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index d31f7b26d..97860a3a3 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,5 +1,6 @@ 7.7.5 - Adding StoryManager. + - rfe: Button to Turn Admin Off on Admin Accordian (#475) - fixed #10223: Calendar List View Ignores Event Permissions (dhelsten) - fixed #10226: html2text dropping text - fixed #10210: Generated Message-Id invalid (patch basis from tektek) diff --git a/docs/upgrades/upgrade_7.7.4-7.7.5.pl b/docs/upgrades/upgrade_7.7.4-7.7.5.pl index 312cc4b2e..2782c1f1e 100644 --- a/docs/upgrades/upgrade_7.7.4-7.7.5.pl +++ b/docs/upgrades/upgrade_7.7.4-7.7.5.pl @@ -37,20 +37,25 @@ my $session = start(); # this line required installStoryManagerTables($session); sm_upgradeConfigFiles($session); sm_updateDailyWorkflow($session); +turnOffAdmin($session); correctEventTemplateVariables($session); finish($session); # this line required - #---------------------------------------------------------------------------- -# Describe what our function does -#sub exampleFunction { -# my $session = shift; -# print "\tWe're doing some stuff here that you should know about... " unless $quiet; -# # and here's our code -# print "DONE!\n" unless $quiet; -#} +sub turnOffAdmin { + my $session = shift; + print "\tAdding admin off link to admin console." unless $quiet; + $session->config->addToHash("adminConsole","adminConsoleOff", { + "icon" => "adminConsoleOff.gif", + "group" => "12", + "uiLevel" => 1, + "url" => "^PageUrl(\"\",op=switchOffAdmin);", + "title" => "^International(12,WebGUI);" + }); + print "OK\n" unless $quiet; +} sub installStoryManagerTables { my ($session) = @_; diff --git a/etc/WebGUI.conf.original b/etc/WebGUI.conf.original index d9d3ff961..999a0d7f2 100644 --- a/etc/WebGUI.conf.original +++ b/etc/WebGUI.conf.original @@ -380,6 +380,13 @@ "title" : "^International(spectre,Spectre);", "groupSetting" : "groupIdAdminSpectre" }, + "adminConsoleOff" : { + "icon" : "adminConsoleOff.gif", + "uiLevel" : 1, + "group" : "12", + "url" : "^PageUrl(\"\",op=switchOffAdmin);", + "title" : "^International(12,WebGUI);" + }, "contentFilters" : { "icon" : "contentFilters.gif", "uiLevel" : 3, diff --git a/www/extras/adminConsole/adminConsoleOff.gif b/www/extras/adminConsole/adminConsoleOff.gif new file mode 100644 index 000000000..746e0eb9c Binary files /dev/null and b/www/extras/adminConsole/adminConsoleOff.gif differ diff --git a/www/extras/adminConsole/small/adminConsoleOff.gif b/www/extras/adminConsole/small/adminConsoleOff.gif new file mode 100644 index 000000000..6e17839db Binary files /dev/null and b/www/extras/adminConsole/small/adminConsoleOff.gif differ