[frontierkernel-commits] odbs/mainResponderRoot/mainResponder/adminSite/macros adminMenu,1.2,1.3

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/adminSite/macros
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21545

Modified Files:
	adminMenu 
Log Message:
changed font to span tags

tweaked formatting of script

replaced hard coded Frontier name with Frontier.getProgramname

removed extraneous " character from spanOpen

Index: adminMenu
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/adminSite/macros/adminMenu,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** adminMenu	10 Jul 2005 05:58:09 -0000	1.2
--- adminMenu	7 Jan 2006 21:36:13 -0000	1.3
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:mainResponder.adminSite.macros.adminMenu
  
! on adminMenu (color = "#FFFFFF") {
	ÇChanges
		Ç7/9/05; 12:17:29 PM by TAC
			Çchanged name of Home webpage to Status
		Ç12/16/03; 4:07:37 AM by JES
			ÇAdded Updates link to the Pending Updates page.
		Ç7/3/03; 3:21:42 PM by JES
			ÇDon't add the admin menu if we're serving a mainResponder error page.
		Ç6/6/02; 1:16:37 PM by JES
			ÇCreated. Cribbed from radioCommunityServerSuite.websites.macros.menu.
	local (pta = html.getPageTableAddress ());
	if pta^.adrObject == @mainResponder.adminSite.website.errorPage {
		return ("")};
	local (fontopen = "<font class=\"adminMenuLinkFont\" \" color=\"" + color + "\">", fontclose = "</font>");
	local (uriWithSearchArgs = pta^.uri);
	if sizeof (pta^.searchargs) > 0 {
		uriWithSearchArgs =  uriWithSearchArgs + "?" + pta^.searchargs};
	local (htmlText = "");
	on add (s) {
		htmlText = htmlText +  s};
	on addCommand (linetext, url, fllastcommand = false) {
		local (flhot = true);
		if uriWithSearchArgs == url {
			flhot = false};
		if flhot {
			add ("<a class=\"adminMenuLink\" href=\"" + url + "\">" + fontopen + linetext + fontclose + "</a>")}
		else {
			add ("<b><font class=\"adminMenuLinkFontCurrent\">" + linetext + "</font></b>")};
		if not fllastcommand {
			add (fontopen + "&nbsp;<b>|</b>&nbsp;" + fontclose)}};
	
	add (fontopen + "<b>Frontier&nbsp;" + frontier.version () + "</b>:&nbsp;" + fontclose);
	addCommand ("Status", mainResponder.adminSite.urls.home);
	addCommand ("Readouts", mainResponder.adminSite.urls.readouts);
	addCommand ("Settings", mainResponder.adminSite.urls.settings);
	addCommand ("Maintenance", mainResponder.adminSite.urls.maintenance);
	addCommand ("Updates", mainResponder.adminSite.urls.updates);
	addCommand ("Tools", mainResponder.adminSite.urls.tools);
	addCommand ("Help", mainResponder.adminSite.urls.help, fllastcommand:true);
	
	return (htmlText)}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:mainResponder.adminSite.macros.adminMenu
  
! on adminMenu (color = "#FFFFFF") {
	ÇChanges
		Ç1/7/06; 12:32:33 PM by TAC
			Çchanged font to span tags
			Çtweaked formatting of script
			Çreplaced hard coded Frontier name with Frontier.getProgramname
			Çremoved extraneous " character from spanOpen
		Ç7/9/05; 12:17:29 PM by TAC
			Çchanged name of Home webpage to Status
		Ç12/16/03; 4:07:37 AM by JES
			ÇAdded Updates link to the Pending Updates page.
		Ç7/3/03; 3:21:42 PM by JES
			ÇDon't add the admin menu if we're serving a mainResponder error page.
		Ç6/6/02; 1:16:37 PM by JES
			ÇCreated. Cribbed from radioCommunityServerSuite.websites.macros.menu.
	
	local (pta = html.getPageTableAddress ());
	
	if pta^.adrObject == @mainResponder.adminSite.website.errorPage {
		return ("")};
	
	local (spanOpen = "<span class=\"adminMenuLinkFont\" style=\"color: " + color + "\">", spanClose = "</span>");
	local (uriWithSearchArgs = pta^.uri);
	
	if sizeof (pta^.searchargs) > 0 {
		uriWithSearchArgs =  uriWithSearchArgs + "?" + pta^.searchargs};
	
	local (htmlText = "");
	
	on add (s) {
		htmlText = htmlText +  s};
	
	on addCommand (lineText, url, flLastCommand = false) {
		local (flHot = true);
		
		if uriWithSearchArgs == url {
			flHot = false};
		
		if flHot {
			add ("<a class=\"adminMenuLink\" href=\"" + url + "\">" + spanOpen + lineText + spanClose + "</a>")}
		else {
			add ("<b><span class=\"adminMenuLinkFontCurrent\">" + lineText + "</span></b>")};
		
		if not flLastCommand {
			add (spanOpen + "&nbsp;<b>|</b>&nbsp;" + spanClose)}};
	
	add (spanOpen + "<b>" + Frontier.getProgramName () + "</b>:&nbsp;" + spanClose);
	addCommand ("Status", mainResponder.adminSite.urls.home);
	addCommand ("Readouts", mainResponder.adminSite.urls.readouts);
	addCommand ("Settings", mainResponder.adminSite.urls.settings);
	addCommand ("Maintenance", mainResponder.adminSite.urls.maintenance);
	addCommand ("Updates", mainResponder.adminSite.urls.updates);
	addCommand ("Tools", mainResponder.adminSite.urls.tools);
	addCommand ("Help", mainResponder.adminSite.urls.help, flLastCommand:true);
	
	return (htmlText)}
\ No newline at end of file