From 4c95269bba89650bd7b713830719f26e587244de Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Mon, 23 Feb 2004 00:13:59 +0000
Subject: [PATCH] added an override in the user profile for toolbar icon set.
 added icons on all of the manage links in the content editing forms. added an
 "edit" icon to the template method in HTMLForm

---
 docs/changelog/6.x.x.txt                      |   1 +
 docs/upgrades/upgrade_5.9.9-6.0.0.pl          |   8 +-
 docs/upgrades/upgrade_5.9.9-6.0.0.sql         |   9 ++
 lib/WebGUI/HTMLForm.pm                        |  16 +--
 lib/WebGUI/Icon.pm                            | 112 +++++++++++++++---
 lib/WebGUI/Navigation.pm                      |   3 +-
 lib/WebGUI/Operation/Page.pm                  |  24 ++--
 lib/WebGUI/Wobject.pm                         |   2 +-
 www/extras/toolbar/charcoal/manage.gif        | Bin 0 -> 1672 bytes
 www/extras/toolbar/classic/manage.gif         | Bin 0 -> 455 bytes
 www/extras/toolbar/dutch/manage.gif           | Bin 0 -> 1802 bytes
 www/extras/toolbar/iconic/manage.gif          | Bin 0 -> 662 bytes
 www/extras/toolbar/italiano/manage.gif        | Bin 0 -> 1869 bytes
 www/extras/toolbar/italianoclassic/manage.gif | Bin 0 -> 489 bytes
 www/extras/toolbar/orange/manage.gif          | Bin 0 -> 1898 bytes
 www/extras/toolbar/spanish/manage.gif         | Bin 0 -> 1840 bytes
 16 files changed, 126 insertions(+), 49 deletions(-)
 create mode 100644 www/extras/toolbar/charcoal/manage.gif
 create mode 100644 www/extras/toolbar/classic/manage.gif
 create mode 100644 www/extras/toolbar/dutch/manage.gif
 create mode 100644 www/extras/toolbar/iconic/manage.gif
 create mode 100644 www/extras/toolbar/italiano/manage.gif
 create mode 100644 www/extras/toolbar/italianoclassic/manage.gif
 create mode 100644 www/extras/toolbar/orange/manage.gif
 create mode 100644 www/extras/toolbar/spanish/manage.gif

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 5ce197f15..679531c18 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -80,6 +80,7 @@ webgui.
  - Added Cool Menus to the navigation system. (Thanks to Thomas Brattli,
    http://www.dhtmlcentral.com)
  - Added a config file option for per-site International message caching.
+ - Added an override in the user profile for toolbar icon set.
 
 
 
diff --git a/docs/upgrades/upgrade_5.9.9-6.0.0.pl b/docs/upgrades/upgrade_5.9.9-6.0.0.pl
index 2d75f7060..ee2288c6e 100644
--- a/docs/upgrades/upgrade_5.9.9-6.0.0.pl
+++ b/docs/upgrades/upgrade_5.9.9-6.0.0.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 use lib "../../lib";
+use File::Path;
 use Getopt::Long;
 use Parse::PlainConfig;
 use strict;
@@ -528,11 +529,8 @@ unlink("../../lib/WebGUI/Wobject/FAQ.pm");
 unlink("../../lib/WebGUI/Wobject/ExtraColumn.pm");
 unlink("../../lib/WebGUI/Authentication.pm");
 unlink("../../lib/WebGUI/Operation/Account.pm");
-unlink("../../lib/WebGUI/Authentication/WebGUI.pm");
-unlink("../../lib/WebGUI/Authentication/LDAP.pm");
-unlink("../../lib/WebGUI/Authentication/SMB.pm");
-rmdir("../../lib/WebGUI/Authentication");
-
+rmtree("../../lib/WebGUI/Authentication");
+rmtree("../../www/extras/toolbar/default");
 
 #--------------------------------------------
 print "\tMigrating wobject privileges.\n" unless ($quiet);
diff --git a/docs/upgrades/upgrade_5.9.9-6.0.0.sql b/docs/upgrades/upgrade_5.9.9-6.0.0.sql
index 27ffa118d..4d3f592f2 100644
--- a/docs/upgrades/upgrade_5.9.9-6.0.0.sql
+++ b/docs/upgrades/upgrade_5.9.9-6.0.0.sql
@@ -527,4 +527,13 @@ INSERT INTO template VALUES (1,'Calendar Month (Big)','<tmpl_if displayTitle>\r\
 
 INSERT INTO template VALUES (7,'Cool Menus','<style>\n/* CoolMenus 4 - default styles - do not edit */\n.cCMAbs{position:absolute; visibility:hidden; left:0; top:0}\n/* CoolMenus 4 - default styles - end */\n\n/*Styles for level 0*/\n.cLevel0,.cLevel0over{position:absolute; padding:2px; font-family:tahoma,arial,helvetica; font-size:12px; font-weight:bold;\n\n}\n.cLevel0{background-color:navy; layer-background-color:navy; color:white;\ntext-align: center;\n}\n.cLevel0over{background-color:navy; layer-background-color:navy; color:white; cursor:pointer; cursor:hand; \ntext-align: center; \n}\n\n.cLevel0border{position:absolute; visibility:hidden; background-color:#569635; layer-background-color:#006699; \n \n}\n\n\n/*Styles for level 1*/\n.cLevel1, .cLevel1over{position:absolute; padding:2px; font-family:tahoma, arial,helvetica; font-size:11px; font-weight:bold}\n.cLevel1{background-color:Navy; layer-background-color:Navy; color:white;}\n.cLevel1over{background-color:#336699; layer-background-color:#336699; color:Yellow; cursor:pointer; cursor:hand; }\n.cLevel1border{position:absolute; visibility:hidden; background-color:#006699; layer-background-color:#006699}\n\n/*Styles for level 2*/\n.cLevel2, .cLevel2over{position:absolute; padding:2px; font-family:tahoma,arial,helvetica; font-size:10px; font-weight:bold}\n.cLevel2{background-color:Navy; layer-background-color:Navy; color:white;}\n.cLevel2over{background-color:#0099cc; layer-background-color:#0099cc; color:Yellow; cursor:pointer; cursor:hand; }\n.cLevel2border{position:absolute; visibility:hidden; background-color:#006699; layer-background-color:#006699}\n\n</style>\n\n  \n\n<script language=\"JavaScript1.2\" src=\"<tmpl_var session.config.extrasURL>/coolmenus/coolmenus4.js\">\n/*****************************************************************************\nCopyright (c) 2001 Thomas Brattli (webmaster@dhtmlcentral.com)\n\nDHTML coolMenus - Get it at coolmenus.dhtmlcentral.com\nVersion 4.0_beta\nThis script can be used freely as long as all copyright messages are\nintact.\n\nExtra info - Coolmenus reference/help - Extra links to help files **** \nCSS help: http://coolmenus.dhtmlcentral.com/projects/coolmenus/reference.asp?m=37\nGeneral: http://coolmenus.dhtmlcentral.com/reference.asp?m=35\nMenu properties: http://coolmenus.dhtmlcentral.com/properties.asp?m=47\nLevel properties: http://coolmenus.dhtmlcentral.com/properties.asp?m=48\n\nBackground bar properties: http://coolmenus.dhtmlcentral.com/properties.asp?m=49\nItem properties: http://coolmenus.dhtmlcentral.com/properties.asp?m=50\n******************************************************************************/\n</script>\n\n\n<script language=\"JavaScript\">\n\n/*** \nThis is the menu creation code - place it right after you body tag\nFeel free to add this to a stand-alone js file and link it to your page.\n**/\n\n//Menu object creation\ncoolmenu=new makeCM(\"coolmenu\") //Making the menu object. Argument: menuname\n\ncoolmenu.frames = 0\n\n//Menu properties   \ncoolmenu.pxBetween=2\ncoolmenu.fromLeft=200 \ncoolmenu.fromTop=100   \ncoolmenu.rows=1\ncoolmenu.menuPlacement=\"center\"   //The whole menu alignment, left, center, or right\n                                                             \ncoolmenu.resizeCheck=1 \ncoolmenu.wait=1000 \ncoolmenu.fillImg=\"cm_fill.gif\"\ncoolmenu.zIndex=100\n\n//Background bar properties\ncoolmenu.useBar=0\ncoolmenu.barWidth=\"100%\"\ncoolmenu.barHeight=\"menu\" \ncoolmenu.barClass=\"cBar\"\ncoolmenu.barX=0 \ncoolmenu.barY=0\ncoolmenu.barBorderX=0\ncoolmenu.barBorderY=0\ncoolmenu.barBorderClass=\"\"\n\n//Level properties - ALL properties have to be spesified in level 0\ncoolmenu.level[0]=new cm_makeLevel() //Add this for each new level\ncoolmenu.level[0].width=110\ncoolmenu.level[0].height=21 \ncoolmenu.level[0].regClass=\"cLevel0\"\ncoolmenu.level[0].overClass=\"cLevel0over\"\ncoolmenu.level[0].borderX=1\ncoolmenu.level[0].borderY=1\ncoolmenu.level[0].borderClass=\"cLevel0border\"\ncoolmenu.level[0].offsetX=0\ncoolmenu.level[0].offsetY=0\ncoolmenu.level[0].rows=0\ncoolmenu.level[0].arrow=0\ncoolmenu.level[0].arrowWidth=0\ncoolmenu.level[0].arrowHeight=0\ncoolmenu.level[0].align=\"bottom\"\n\n//EXAMPLE SUB LEVEL[1] PROPERTIES - You have to specify the properties you want different from LEVEL[0] - If you want all items to look the same just remove this\ncoolmenu.level[1]=new cm_makeLevel() //Add this for each new level (adding one to the number)\ncoolmenu.level[1].width=coolmenu.level[0].width+20\ncoolmenu.level[1].height=25\ncoolmenu.level[1].regClass=\"cLevel1\"\ncoolmenu.level[1].overClass=\"cLevel1over\"\ncoolmenu.level[1].borderX=1\ncoolmenu.level[1].borderY=1\ncoolmenu.level[1].align=\"right\" \ncoolmenu.level[1].offsetX=0\ncoolmenu.level[1].offsetY=0\ncoolmenu.level[1].borderClass=\"cLevel1border\"\n\n\n//EXAMPLE SUB LEVEL[2] PROPERTIES - You have to spesify the properties you want different from LEVEL[1] OR LEVEL[0] - If you want all items to look the same just remove this\ncoolmenu.level[2]=new cm_makeLevel() //Add this for each new level (adding one to the number)\ncoolmenu.level[2].width=coolmenu.level[0].width+20\ncoolmenu.level[2].height=25\ncoolmenu.level[2].offsetX=0\ncoolmenu.level[2].offsetY=0\ncoolmenu.level[2].regClass=\"cLevel2\"\ncoolmenu.level[2].overClass=\"cLevel2over\"\ncoolmenu.level[2].borderClass=\"cLevel2border\"\n\n//EXAMPLE SUB LEVEL[2] PROPERTIES - You have to spesify the properties you want different from LEVEL[1] OR LEVEL[0] - If you want all items to look the same just remove this\ncoolmenu.level[3]=new cm_makeLevel() //Add this for each new level (adding one to the number)\ncoolmenu.level[3].width=coolmenu.level[0].width+20\ncoolmenu.level[3].height=25\ncoolmenu.level[3].offsetX=0\ncoolmenu.level[3].offsetY=0\ncoolmenu.level[3].regClass=\"cLevel2\"\ncoolmenu.level[3].overClass=\"cLevel2over\"\ncoolmenu.level[3].borderClass=\"cLevel2border\"\n\n\n\n<tmpl_loop page_loop>\ncoolmenu.makeMenu(\'coolmenu<tmpl_var page.pageId>\',\'coolmenu<tmpl_var page.parentId>\',\'<tmpl_var page.menuTitle>\',\'<tmpl_var page.url>\'<tmpl_if page.newWindow>,\'_blank\'</tmpl_if>);\n</tmpl_loop>\n\n\ncoolmenu.construct();\n\n</script>','Navigation');
 INSERT INTO Navigation VALUES (17,'coolmenu',99,'descendants','WebGUIroot',-1,7,0,0,0,0);
+delete from international where internationalId=741 and namespace='WebGUI';
+delete from international where internationalId=742 and namespace='WebGUI';
+delete from international where languageId=1 and namespace='WebGUI' and internationalId=1084;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (1084,1,'WebGUI','Default', 1077472740,'A label indicating that the user should use the default setting.');
+update language set toolbar='metal' where toolbar='default';
+INSERT INTO userProfileField VALUES ('toolbar','WebGUI::International::get(746)',0,0,'selectList','WebGUI::Icon::getToolbarOptions()','[\'useLanguageDefault\']',13,4,0,0);
+
+
+
 
diff --git a/lib/WebGUI/HTMLForm.pm b/lib/WebGUI/HTMLForm.pm
index a495f4c70..6e2477868 100644
--- a/lib/WebGUI/HTMLForm.pm
+++ b/lib/WebGUI/HTMLForm.pm
@@ -18,6 +18,7 @@ use CGI::Util qw(rearrange);
 use strict qw(vars refs);
 use WebGUI::DateTime;
 use WebGUI::Form;
+use WebGUI::Icon;
 use WebGUI::International;
 use WebGUI::Privilege;
 use WebGUI::Session;
@@ -1086,6 +1087,9 @@ sub group {
         my ($name, $label, $value, $size, $multiple, $extras, $subtext, $uiLevel, $excludeGroups) =
                 rearrange([qw(name label value size multiple extras subtext uiLevel excludeGroups)], @p);
         if (_uiLevelChecksOut($uiLevel)) {
+		if (WebGUI::Privilege::isInGroup(3)) {
+			$subtext = manageIcon("op=listGroups").$subtext;
+		}
                 $output = WebGUI::Form::group({
                         "name"=>$name,
                         "size"=>$size,
@@ -1961,14 +1965,10 @@ sub template {
         if (_uiLevelChecksOut($uiLevel)) {
 		$label = $label || WebGUI::International::get(356);
 		if (WebGUI::Privilege::isInGroup(8)) {
-			#disabled until we can resolve the "new" wobject problem
-        		#if ($afterEdit) {
-                	#	$subtext = '<a href="'.WebGUI::URL::page("op=editTemplate&tid=".$value."&namespace=".$namespace
-			#		."&afterEdit="
-                        #		.WebGUI::URL::escape($afterEdit)).'">'.WebGUI::International::get(741).'</a> / ';
-        		#}
-        		$subtext .= '<a href="'.WebGUI::URL::page("op=listTemplates&namespace=$namespace").'">'
-				.WebGUI::International::get(742).'</a>';
+        		if ($afterEdit) {
+                		$subtext = editIcon("op=editTemplate&tid=".$value."&namespace=".$namespace."&afterEdit=".WebGUI::URL::escape($afterEdit));
+        		}
+        		$subtext .= manageIcon("op=listTemplates&namespace=$namespace");
 		}
         	$output = WebGUI::Form::template({
                 	"name"=>$name,
diff --git a/lib/WebGUI/Icon.pm b/lib/WebGUI/Icon.pm
index d9ae701e3..99c0119e7 100644
--- a/lib/WebGUI/Icon.pm
+++ b/lib/WebGUI/Icon.pm
@@ -16,11 +16,12 @@ package WebGUI::Icon;
 
 use Exporter;
 use strict;
+use WebGUI::International;
 use WebGUI::Session;
 use WebGUI::URL;
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(&helpIcon &becomeIcon &cutIcon &copyIcon &deleteIcon &editIcon
+our @EXPORT = qw(&helpIcon &becomeIcon &cutIcon &copyIcon &deleteIcon &editIcon &manageIcon
 	&moveBottomIcon &moveDownIcon &moveLeftIcon &moveRightIcon &moveTopIcon &moveUpIcon
 	&pageIcon &dragIcon &shortcutIcon &pasteIcon &wobjectIcon &viewIcon);
 
@@ -41,6 +42,7 @@ A package for generating user interface buttons. The subroutines found herein do
  $html = dragIcon();
  $html = editIcon('op=something');
  $html = helpIcon(1,"MyNamespace");
+ $html = manageIcon('op=something');
  $html = moveBottomIcon('op=something');
  $html = moveDownIcon('op=something');
  $html = moveLeftIcon('op=something');
@@ -53,12 +55,34 @@ A package for generating user interface buttons. The subroutines found herein do
  $html = viewIcon('op=something');
  $html = wobjectIcon();
 
+ $hashRef = getToolbarOptions();
+
 =head1 METHODS
 
 These subroutines are available from this package:
 
 =cut
 
+#-------------------------------------------------------------------
+
+=head2 _getBaseURL ( )
+
+Returns the base URL for this user's toolbar.
+
+=cut
+
+sub _getBaseURL {
+	my $url = $session{config}{extrasURL}.'/toolbar/';
+	if ($session{user}{toolbar} ne "useLanguageDefault") {
+		$url .= $session{user}{toolbar};
+	} else {
+		$url .= $session{language}{toolbar};
+	}
+	$url .= '/';	
+	return $url;
+}
+
+
 #-------------------------------------------------------------------
 
 =head2 copyIcon ( urlParameters [, pageURL ] )
@@ -83,7 +107,7 @@ sub copyIcon {
         my ($output, $pageURL);
         $pageURL = $_[1] || $session{page}{urlizedTitle};
         $output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/copy.gif" align="middle" border="0" alt="Copy" title="Copy" /></a>';
+        $output .= '<img src="'._getBaseURL().'copy.gif" align="middle" border="0" alt="Copy" title="Copy" /></a>';
         return $output;
 }
 
@@ -111,7 +135,7 @@ sub cutIcon {
         my ($output, $pageURL);
         $pageURL = $_[1] || $session{page}{urlizedTitle};
         $output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/cut.gif" align="middle" border="0" alt="Cut" title="Cut" /></a>';
+        $output .= '<img src="'._getBaseURL().'cut.gif" align="middle" border="0" alt="Cut" title="Cut" /></a>';
         return $output;
 }
 
@@ -139,7 +163,7 @@ sub deleteIcon {
         my ($output, $pageURL);
         $pageURL = $_[1] || $session{page}{urlizedTitle};
         $output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
-	$output .= '<img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/delete.gif" align="middle" border="0" alt="Delete" title="Delete" /></a>';
+	$output .= '<img src="'._getBaseURL().'delete.gif" align="middle" border="0" alt="Delete" title="Delete" /></a>';
 	return $output;
 }
 
@@ -152,7 +176,7 @@ Generates an icon that can be used to drag content.
 =cut
 
 sub dragIcon {
-        return '<img id="dragTrigger" class="dragTrigger" src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/drag.gif" align="middle" border="0" alt="Drag" title="Drag" />';
+        return '<img id="dragTrigger" class="dragTrigger" src="'._getBaseURL().'drag.gif" align="middle" border="0" alt="Drag" title="Drag" />';
 }
 
 #-------------------------------------------------------------------
@@ -179,12 +203,36 @@ sub editIcon {
         my ($output, $pageURL);
         $pageURL = $_[1] || $session{page}{urlizedTitle};
         $output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/edit.gif" align="middle" border="0" alt="Edit" title="Edit" /></a>';
+        $output .= '<img src="'._getBaseURL().'edit.gif" align="middle" border="0" alt="Edit" title="Edit" /></a>';
         return $output;
 }
 
 #-------------------------------------------------------------------
 
+=head2 getToolbarOptions ( )
+
+Returns a hash reference containing the list of toolbar icon sets to be selected in user profile.
+
+=cut
+
+sub getToolbarOptions {
+	my %options;
+	tie %options, 'Tie::IxHash';
+	$options{useLanguageDefault} = WebGUI::International::get(1084);
+	my $dir = $session{config}{extrasPath}.$session{os}{slash}."toolbar";
+        opendir (DIR,$dir) or WebGUI::ErrorHandler::warn("Can't open toolbar directory!");
+        my @files = readdir(DIR);
+        foreach my $file (@files) {
+                if ($file ne ".." && $file ne ".") {
+                        $options{$file} = $file;
+                }
+        }
+        closedir(DIR);
+	return \%options;
+}
+
+#-------------------------------------------------------------------
+
 =head2 helpIcon ( helpId [, namespace ] )
 
 Generates a button with the word "Help" printed on it.
@@ -207,12 +255,40 @@ sub helpIcon {
 	my ($output, $namespace);
 	$namespace = $_[1] || "WebGUI";
 	$output = '<a href="'.WebGUI::URL::page('op=viewHelp&hid='.$_[0].'&namespace='.$namespace).
-		'" target="_blank"><img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/help.gif" border="0" align="right"></a>';
+		'" target="_blank"><img src="'._getBaseURL().'help.gif" border="0" align="right" title="Help" Alt="Help"></a>';
 	return $output;
 }
 
 #-------------------------------------------------------------------
 
+=head2 manageIcon ( urlParameters [, pageURL ] )
+
+Generates a button that represents a management function.
+
+=over
+
+=item urlParameters
+
+Any URL parameters that need to be tacked on to the current URL to accomplish whatever function this button represents.
+
+=item pageURL
+
+The URL to any page. Defaults to the current page.
+
+=back
+
+=cut
+
+sub manageIcon {
+        my ($output, $pageURL);
+        $pageURL = $_[1] || $session{page}{urlizedTitle};
+        $output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
+        $output .= '<img src="'._getBaseURL().'manage.gif" align="middle" border="0" alt="Manage" title="Manage" /></a>';
+        return $output;
+}
+
+#-------------------------------------------------------------------
+
 =head2 moveBottomIcon ( urlParameters [, pageURL ] )
 
 Generates a button with a double down arrow printed on it.
@@ -235,7 +311,7 @@ sub moveBottomIcon {
         my ($output, $pageURL);
         $pageURL = $_[1] || $session{page}{urlizedTitle};
         $output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/moveBottom.gif" align="middle" border="0" alt="Move To Bottom" title="Move To Bottom" /></a>';
+        $output .= '<img src="'._getBaseURL().'moveBottom.gif" align="middle" border="0" alt="Move To Bottom" title="Move To Bottom" /></a>';
         return $output;
 }
 
@@ -263,7 +339,7 @@ sub moveDownIcon {
         my ($output, $pageURL);
         $pageURL = $_[1] || $session{page}{urlizedTitle};
         $output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/moveDown.gif" align="middle" border="0" alt="Move Down" title="Move Down" /></a>';
+        $output .= '<img src="'._getBaseURL().'moveDown.gif" align="middle" border="0" alt="Move Down" title="Move Down" /></a>';
         return $output;
 }
 
@@ -291,7 +367,7 @@ sub moveLeftIcon {
         my ($output, $pageURL);
         $pageURL = $_[1] || $session{page}{urlizedTitle};
         $output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/moveLeft.gif" align="middle" border="0" alt="Move Left" title="Move Left" /></a>';
+        $output .= '<img src="'._getBaseURL().'moveLeft.gif" align="middle" border="0" alt="Move Left" title="Move Left" /></a>';
         return $output;
 }
 
@@ -319,7 +395,7 @@ sub moveRightIcon {
         my ($output, $pageURL);
         $pageURL = $_[1] || $session{page}{urlizedTitle};
         $output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/moveRight.gif" align="middle" border="0" alt="Move Right" title="Move Right" /></a>';
+        $output .= '<img src="'._getBaseURL().'moveRight.gif" align="middle" border="0" alt="Move Right" title="Move Right" /></a>';
         return $output;
 }
 
@@ -347,7 +423,7 @@ sub moveTopIcon {
         my ($output, $pageURL);
         $pageURL = $_[1] || $session{page}{urlizedTitle};
         $output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/moveTop.gif" align="middle" border="0" alt="Move To Top" title="Move To Top" /></a>';
+        $output .= '<img src="'._getBaseURL().'moveTop.gif" align="middle" border="0" alt="Move To Top" title="Move To Top" /></a>';
         return $output;
 }
 
@@ -375,7 +451,7 @@ sub moveUpIcon {
         my ($output, $pageURL);
         $pageURL = $_[1] || $session{page}{urlizedTitle};
         $output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/moveUp.gif" align="middle" border="0" alt="Move Up" title="Move Up" /></a>';
+        $output .= '<img src="'._getBaseURL().'moveUp.gif" align="middle" border="0" alt="Move Up" title="Move Up" /></a>';
         return $output;
 }
 
@@ -388,7 +464,7 @@ Generates an icon that looks like a page. It's purpose is to represent whether y
 =cut
 
 sub pageIcon {
-        return '<img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/page.gif" align="middle" border="0" alt="Page Settings" title="Page Settings" />';
+        return '<img src="'._getBaseURL().'page.gif" align="middle" border="0" alt="Page Settings" title="Page Settings" />';
 }
 
 #-------------------------------------------------------------------
@@ -415,7 +491,7 @@ sub pasteIcon {
         my ($output, $pageURL);
         $pageURL = $_[1] || $session{page}{urlizedTitle};
         $output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/paste.gif" align="middle" border="0" alt="Paste" title="Paste" /></a>';
+        $output .= '<img src="'._getBaseURL().'paste.gif" align="middle" border="0" alt="Paste" title="Paste" /></a>';
         return $output;
 }
 
@@ -443,7 +519,7 @@ sub shortcutIcon {
         my ($output, $pageURL);
         $pageURL = $_[1] || $session{page}{urlizedTitle};
         $output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/shortcut.gif" align="middle" border="0" alt="Shortcut" title="Create Shortcut" /></a>';
+        $output .= '<img src="'._getBaseURL().'shortcut.gif" align="middle" border="0" alt="Shortcut" title="Create Shortcut" /></a>';
         return $output;
 }
 
@@ -471,7 +547,7 @@ sub viewIcon {
         my ($output, $pageURL);
         $pageURL = $_[1] || $session{page}{urlizedTitle};
         $output = '<a href="'.WebGUI::URL::gateway($pageURL,$_[0]).'">';
-        $output .= '<img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/view.gif" align="middle" border="0" alt="View" title="View" /></a>';
+        $output .= '<img src="'._getBaseURL().'view.gif" align="middle" border="0" alt="View" title="View" /></a>';
         return $output;
 }
 
@@ -484,7 +560,7 @@ Generates an icon that looks like a wobject. It's purpose is to represent whethe
 =cut
 
 sub wobjectIcon {
-        return '<img src="'.$session{config}{extrasURL}.'/toolbar/'.$session{language}{toolbar}.'/wobject.gif" align="middle" border="0" alt="Wobject Settings" title="Wobject Settings" />';
+        return '<img src="'._getBaseURL().'wobject.gif" align="middle" border="0" alt="Wobject Settings" title="Wobject Settings" />';
 }
 
 
diff --git a/lib/WebGUI/Navigation.pm b/lib/WebGUI/Navigation.pm
index 61f917f75..2609359d3 100644
--- a/lib/WebGUI/Navigation.pm
+++ b/lib/WebGUI/Navigation.pm
@@ -70,7 +70,8 @@ These methods are available from this package:
 #-------------------------------------------------------------------
 sub _getEditButton {
         my $self = shift;
-        return editIcon("op=editNavigation&navigationId=".$self->{_navigationId}."&identifier=".$self->{_identifier});
+        return editIcon("op=editNavigation&navigationId=".$self->{_navigationId}."&identifier=".$self->{_identifier})
+		.manageIcon("op=listNavigation");
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Operation/Page.pm b/lib/WebGUI/Operation/Page.pm
index 0335b1326..c220c8d82 100644
--- a/lib/WebGUI/Operation/Page.pm
+++ b/lib/WebGUI/Operation/Page.pm
@@ -100,12 +100,11 @@ sub _selectPositions {
         my ($templates, $output, $f, $key);
         $f = WebGUI::HTMLForm->new(1);
         $templates = WebGUI::Page::getTemplateList();
-	$f->selectList(
-                -name=>"templateId",
-                -options=>$templates,
-                -value=>[$_[0]],
-                -extras=>'onChange="changeTemplatePreview(this.form.templateId.value)"',
-                -subtext=>' &nbsp; <a href="'.WebGUI::URL::page("op=listTemplates&namespace=Page").'">'.WebGUI::International::get(742).'</a>'
+	$f->template(
+                -value=>$_[0],
+		-namespace=>"page",
+		-afterEdit=>'op=editPage&amp;npp='.$session{form}{npp},
+                -extras=>'onChange="changeTemplatePreview(this.form.templateId.value)"'
                 );
         $output = '
         <script language="JavaScript">
@@ -428,6 +427,7 @@ sub www_editPage {
 			-label=>WebGUI::International::get(912),
 			-value=>($page{styleId} || 2),
 			-namespace=>'style',
+			-afterEdit=>'op=editPage&amp;npp='.$session{form}{npp},
 			-uiLevel=>5
 			);
                 $f->getTab("layout")->template(
@@ -435,6 +435,7 @@ sub www_editPage {
 			-label=>WebGUI::International::get(1079),
 			-value=>($page{printableStyleId} || 3),
 			-namespace=>'style',
+			-afterEdit=>'op=editPage&amp;npp='.$session{form}{npp},
 			-uiLevel=>5
 			);
 		if ($childCount) {
@@ -462,8 +463,7 @@ sub www_editPage {
 			-uiLevel=>6
 			);
 		if (WebGUI::Privilege::isInGroup(3)) {
-			$subtext = ' &nbsp; <a href="'.WebGUI::URL::page('op=listUsers').'">'
-				.WebGUI::International::get(7).'</a>';
+			$subtext = manageIcon('op=listUsers');
 		} else {
 			$subtext = "";
 		}
@@ -484,24 +484,16 @@ sub www_editPage {
 			-subtext=>$subtext,
 			-uiLevel=>6
 			);
-		if (WebGUI::Privilege::isInGroup(3)) {
-			$subtext = ' &nbsp; <a href="'.WebGUI::URL::page('op=listGroups').'">'
-				.WebGUI::International::get(5).'</a>';
-		} else {
-			$subtext = "";
-		}
 		$f->getTab("privileges")->group(
 			-name=>"groupIdView",
 			-label=>WebGUI::International::get(872),
 			-value=>[$page{groupIdView}],
-			-subtext=>$subtext,
 			-uiLevel=>6
 			);
                 $f->getTab("privileges")->group(
                         -name=>"groupIdEdit",
                         -label=>WebGUI::International::get(871),
                         -value=>[$page{groupIdEdit}],
-                        -subtext=>$subtext,
 			-excludeGroups=>[1,7],
                         -uiLevel=>6
                         );
diff --git a/lib/WebGUI/Wobject.pm b/lib/WebGUI/Wobject.pm
index fffc7e35a..81e65647c 100644
--- a/lib/WebGUI/Wobject.pm
+++ b/lib/WebGUI/Wobject.pm
@@ -1223,7 +1223,7 @@ sub www_edit {
 		$f->getTab("layout")->template(
                 	-value=>$_[0]->getValue("templateId"),
                 	-namespace=>$_[0]->get("namespace"),
-                	-afterEdit=>'func=edit&wid='.$_[0]->get("wobjectId")
+                	-afterEdit=>'func=edit&amp;wid='.$_[0]->get("wobjectId")."&amp;namespace=".$_[0]->get("namespace")
                 	);
 	}
 	$f->getTab("layout")->selectList(
diff --git a/www/extras/toolbar/charcoal/manage.gif b/www/extras/toolbar/charcoal/manage.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9bbc2e40c35c17c4ba8d4b2cf6200a9e604f7ff0
GIT binary patch
literal 1672
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
S!`B|X?YR4{d+o9Z1OPjY?5T(V

literal 0
HcmV?d00001

diff --git a/www/extras/toolbar/classic/manage.gif b/www/extras/toolbar/classic/manage.gif
new file mode 100644
index 0000000000000000000000000000000000000000..46fc997f948cb7b5076b829424663a502c8feb8e
GIT binary patch
literal 455
zcmZ?wbhEHb^k(2^IKs=&pT;1-%@AP8aDFnw`&A4EN(}esG0ZPySYN|X;LniY!k{3|
z;GoOE@SkCS2ZNK7)3Ia6{%>U<9w`1~VPs(7WzYd>0olpG`d>k%FC}wc#;SFzp6n~o
zIbV`{|1<N$n)m<p=kh+V*ulit{;0J;C4uh<H$w&IBu0s3fleNlbxuWZc5r6*<%M0S
z_2Lp_V!T$SI<uuC`jA?{XC5IQLAI1M>x|3<7r{^=hAP1Xy;zpWav?@Rb~a{xwrP6J
z{)_F>O_D>IIji*M&T^Z=zIF!JqzT;ly~fS#Jo{PO%{)1oXElcwtSX+uxnl;0AY;yw
zwL&YKVsE9IEjRYe**4360y}5d6b42X-_%)b3~T0{D$7jWyPxOa-HsJ}vzTq(8ZB7s
zy(Vl8$CQns22OfRY?}ghrT4a*OP22lx#)cUC_~zA6#*S#UnNt{H8L(7JA@h+HCKEr
zy1GN+F`tS-Z{EIy*2`xX)W^N3sG72zyD6brifz_S{*KGi`&I0g{@k+as*HeK#@$m}
RS6^SBaJWmB+l+<58UU`~m%ac1

literal 0
HcmV?d00001

diff --git a/www/extras/toolbar/dutch/manage.gif b/www/extras/toolbar/dutch/manage.gif
new file mode 100644
index 0000000000000000000000000000000000000000..01c707334e1258adf3e918383a265862bbb213eb
GIT binary patch
literal 1802
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
A@Bjb+

literal 0
HcmV?d00001

diff --git a/www/extras/toolbar/iconic/manage.gif b/www/extras/toolbar/iconic/manage.gif
new file mode 100644
index 0000000000000000000000000000000000000000..87b1807db22e05c828a7bfa0a8b7f3144c048a6f
GIT binary patch
literal 662
zcmZ?wbhEHb6k`x(c*ekR>g36lD^{*tvBJ*QhK-&5*wLfQmn{<&6LofUWar>GapJ_{
zMT@PiEM1(P)~;C-;O}?**s=7~)ScURL`Ow!-LjR5g?YyG={nll`g(dBH*B=Awq|B!
zF*PwUF*ZJO_y{W-YidezNKjBsb+xmTleU)D{JC?B3Jb-=#DW6@*RNYAA|g^&Qlg}!
z<l*iX6%pRl(6Dg9f|)aBM1+McTe{TJ!hFuG**#rdn>THCaIl{}YgT-0tfPa&f&B;g
z1^5*e6*V+8OifMPTwPYLS``@JzhV6bX=&-{Q>V_KH*e4G-9Z5XhYlWWsH+PN4tB7&
zi;Ib#*w^pv<;lpzv}oZ%5m8Y;U*Bz8w^^8*cXxIsCnhdmw%pLbATuLl>g36Me0)CM
zUdBd7o$c*Wkr6i5Rsnu~Mn*>FW@ZcK&+qT+<Kg3-J7-Q(LPB(81P3Q40|UdE(`SGr
zsX*~33s{Q|hy=w61N-NOyr$-s*0%NzkqB7{g~*N${&?>MYbnMK)wC8RdyytCS(DZn
zGtb;yJvOF1HI6(>{k&|RW(MJm73{&eIqZVk;tZ@Fc@|;KlJYDZ!a_pM%$zK49Ln69
zJ}Kc%F21=&ZC1I-nY<F>%wo+vxiT|anN)HE^4Pc;TC@V4n!Q+?#ROhFdKl1bX2_D7
zaL}<)K|=JDg^5a<Gp}PPTL9yWXFjt9I)ri(R8KIsI5OV)VUg+KEUnAO!^v<d&B4yu
zylD$(aq)#_Gu|YnNt=2aCo{NTsaRRiz^-D>5U?OC_{otg9RBQQ4K64-_UrmzOO@@`
I5MZzd0Nw}E+yDRo

literal 0
HcmV?d00001

diff --git a/www/extras/toolbar/italiano/manage.gif b/www/extras/toolbar/italiano/manage.gif
new file mode 100644
index 0000000000000000000000000000000000000000..96aa6dbcfb049f259c2e1c8be49c1696e34791b2
GIT binary patch
literal 1869
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
WEP}T8=&NZKs*F8$8gmMTSo9a|U-uLM

literal 0
HcmV?d00001

diff --git a/www/extras/toolbar/italianoclassic/manage.gif b/www/extras/toolbar/italianoclassic/manage.gif
new file mode 100644
index 0000000000000000000000000000000000000000..da4855975516485bf224337304fa2733ad3c87ca
GIT binary patch
literal 489
zcmZ?wbhEHb^k(2^IKs=&pT_Wh6@vgb!~J;-3gQd}{tO064C`wc<`*)YpUe<o$&lc}
z;GoOE@SkCS2ZNK7)3Ia6{%>U<9w`1~VPs(7WzYd>0olpG`d>k%FC}wc#;SFzp6n~o
zIbV`{|1<N$n)m<pW!D&VurM%9XAtb*;nF|;kd?uMp>IvtqO(d<eblc!-Ee5b#@53M
zg1Z<5-46<ut15L=9+Bzn*&NPS&fMS@S<Y8hQB~7vP-4g`$dhX=#3C51$Ii^cT^A_G
zB2>%h*`UX>K(Dk*Xnu0cq9uI`4GX5^P2w_Q->k>Apkl!ap;c*1IC*%u7@39kEk1B)
zYl`5+$y4<vO);FHzbc@vfaT~z{o0qzIrmpyxpzJN<}SfKdY4K(FNak#F|t4VwjlUf
zcB5&nP}9fNYTVI!-fTv$oDL3?9K|`5HZZDcI;<^TBXf6Q%175@y*#(m_RdWAbaJyS
zS@wfFprKL4ok>;X=ZwkIcBdO>-%BxNa9~`#sYhz<i6W1Q%D;F-UOslXuN7*Oymc3o
zSJtjoYc74As5*^NFV}|0U;-OUd(^hvi^t}Ae{bt!ulW4x?&<C8@9%G5{>{tCU=08n
CX{?t3

literal 0
HcmV?d00001

diff --git a/www/extras/toolbar/orange/manage.gif b/www/extras/toolbar/orange/manage.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3364c726760dcf251d46ce7643b0da0a7029f548
GIT binary patch
literal 1898
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

literal 0
HcmV?d00001

diff --git a/www/extras/toolbar/spanish/manage.gif b/www/extras/toolbar/spanish/manage.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3caa2263116595c065b8e0f50a08c1f19384aa7f
GIT binary patch
literal 1840
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

literal 0
HcmV?d00001