From e98fc02e9b76a3580c9ed3945d8d62b4f956884e Mon Sep 17 00:00:00 2001 From: JT Smith Date: Wed, 29 Apr 2009 14:34:42 +0000 Subject: [PATCH] rfe: Button to Turn Admin Off on Admin Accordian (#475) --- docs/changelog/7.x.x.txt | 1 + docs/upgrades/upgrade_7.7.4-7.7.5.pl | 21 +++++++++++------- etc/WebGUI.conf.original | 7 ++++++ www/extras/adminConsole/adminConsoleOff.gif | Bin 0 -> 1998 bytes .../adminConsole/small/adminConsoleOff.gif | Bin 0 -> 637 bytes 5 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 www/extras/adminConsole/adminConsoleOff.gif create mode 100644 www/extras/adminConsole/small/adminConsoleOff.gif 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 0000000000000000000000000000000000000000..746e0eb9c3295409e0f39686ca4647eaa60b40f7 GIT binary patch literal 1998 zcmV;<2Qm0ZNk%w1VK4wN0Qdg@(b3U`g@ev*0+f`I`T6a@s;Y2rYyV_q*NHl~US8*tINOCL;o;%`b91PusN9Q-)ssl3TLb^3 zr2i}{{v{>FKG7h5ro= zjf;lasj2oH9RCRk{5Avr1_jG%YX3Yu+}z#tBO}y(e57q{+Sbb-*hy1IRQdeqd@@bK@?mR!SQ z0LN+p$8Qvrg>#jQe{^(n>Zw|{cr*V-M*pEG)oKj?Ha6bg-M>#V|E)rma7O+E0NZc@ zu##xahBeH~%JSgh@`4QiI2YZ}&+}bf-jP6|bV>dJ0lZ`n_R-P*!foW_{eFpgAMm6DDgu>^G;6i3=D>B zW#Xx+i+O16Y-`_)Qj&IA|DQtUAONzktjLm)-ObFAgnyobeT!OG^=@v#HY(pYH>9JY z{H#=|bv^&LOwP{C`KU^yUlWFMTbw{6lx{} zFxw@ugh`ZEWMGNNsDUFVZZVQ5(xHK!KOyg86s9HO1v?kWc|l1+kTNU@{`3j?PtwUM z5z8#Yf-UD704!K2v%@*TKE(?SRApjBsjwZ4_$UKOQBHshUEVBKNl=iln@ZoD+qA-h z9Et&$mpv&&O7=!#R zfISQgq#;H~H1Gl>0eo=vKpF9q#vF6_LB}9*0Dj825%swcHA^f}1R3%&aIHWkGvtOC zV))TUB5~M&iU5s_GEo)m31dYWO2B9}MntFp!zpplkO}i=gp?5*>SVNQK?*E3#1TEv zaDxCn&`uF0OT9r%?Ta1bz5s&=ZY$w9K>-HNLXZc{;v_^Uz$q|btAR}FElPj`9s+=` ze@vhjDezWCY>^HKG!S(s$pSg}z=95-K_GJYMhfQ8hF+i~1C?mt=Q5%-ISe3B0zm*T z7C{GagdrR`aZe1Z3=#y!;Y11>7ziH_00n^rBL&5y1M(!Wlqxbr3Hd~&F7lE{c7S#|y_cC#WM&#pXYCK7p{(%NP z)Zq+YKma1HB#>0VgB1}t!VTC5iO2QMiX0*c6EL6$MCf5!1K|WWc)$u^m_Q%$Bghr1 g_=NKrL=G2tN2ER&kr|X=1SPA&2)IH^f&>HrJ3PFiR{#J2 literal 0 HcmV?d00001 diff --git a/www/extras/adminConsole/small/adminConsoleOff.gif b/www/extras/adminConsole/small/adminConsoleOff.gif new file mode 100644 index 0000000000000000000000000000000000000000..6e17839db73c84779c79b283264ac15aaf5b712e GIT binary patch literal 637 zcmV-@0)qWVNk%w1VGsZi0Oo!G{{R5z{KK@ktIT#7|1&eg$*TV(BPkQ z$j8Rs?!woCddQ?*`Gy(XK_cumH0FL2zOSwS1_r~#xBs-X|9gA?R8-cJlfFO)$=6=+niS7X=(H~H~+4#|LW?*zp}igZ0YK?|6^nS`T6fw zRm;PY{{sX6goODI594QM@roe#C@8wRxcEyrzn+uLa~JWAA^+s$|Hj7s3kl~mBkds{ z`vnEyfN%Q?3c|Ug`HLFFZ72H+0{#XC-t)Wk85Y)F6YRW<|2#a;U|z$9L)L|S`5qqs z;o<)t9_){9*LiCH=jZ>xz|yy$^mknAVp#MV81*$Q|JBvVm6QGi1N;UC|Ba3R*x3KQ zz3)vs`g9i4+r_tCTl^ap@f;lgy1Lp*N%vMm?jI2A)usRc{{R30A^8LW004dfEC2ui z01yBW000NtfPQ`ff-MaI01g|1bqsI~cvGX@B>-ZhG(>y=HW9A?4GsW<7D@wESpYs0ga8nD004~zDg(S==pzL{jRZ&T zb#p^!z3RLAWBm~fPxW8LM)gx2?3c2 X0t!%2@Zo?TI1dOAI9H*7pFjXR-p?!& literal 0 HcmV?d00001