Menu
▾
▴
[frontierkernel-commits] odbs/mainResponderRoot/mainResponder/adminSite/macros statusCenter,1.2,1.3 adminMenu,1.1.1.1,1.2
|
From: creedon <icr...@us...> - 2005-07-10 05:58:18
|
Update of /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/adminSite/macros In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20541 Modified Files: statusCenter adminMenu Log Message: home page of adminSite becomes status, and status center takes over page Index: adminMenu =================================================================== RCS file: /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/adminSite/macros/adminMenu,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** adminMenu 26 Mar 2005 21:45:10 -0000 1.1.1.1 --- adminMenu 10 Jul 2005 05:58:09 -0000 1.2 *************** *** 1,3 **** FrontierVcsFile:1:scpt:mainResponder.adminSite.macros.adminMenu ! on adminMenu (color = "#FFFFFF") { ÇChanges Ç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 + " <b>|</b> " + fontclose)}}; add (fontopen + "<b>Frontier " + frontier.version () + "</b>: " + fontclose); addCommand ("Home", 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 Ç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 + " <b>|</b> " + fontclose)}}; add (fontopen + "<b>Frontier " + frontier.version () + "</b>: " + 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 Index: statusCenter =================================================================== RCS file: /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/adminSite/macros/statusCenter,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** statusCenter 15 Jun 2005 23:36:31 -0000 1.2 --- statusCenter 10 Jul 2005 05:58:09 -0000 1.3 *************** *** 1,3 **** FrontierVcsFile:1:scpt:mainResponder.adminSite.macros.statusCenter ! on statusCenter () { ÇChanges Ç1/24/05; 10:49:20 AM by TAC Çdisabled trial version check for open source release Çupdated testing bundle ÇThu, Jul 15, 2004 at 5:00:47 PM by JS ÇUpdated trial version notice. Ç5/19/04; 6:31:44 PM by JES ÇAdded support for control panel add-ins. They appear below Tools. Ç6/7/02; 2:57:43 PM by JES ÇCreated. local (pta = html.getPageTableAddress ()); local (htmltext = "", indentlevel = 0); on add (s) { htmltext = htmltext + (string.filledString ("\t", indentlevel) + s + "\r\n");}; on addSubItem (s) { add ("<div class=\"small\" style=\"padding-left: 5px; padding-bottom: 5px;\">"); indentlevel++; add (s); add ("</div>"); indentlevel--}; ÇNotes -- to do? ÇAdd "web server" and "xml-rpc/soap" sections? ÇSupport center? (probably not yet) Çbundle // 1/24/05; 10:48:53 AM by TAC - disabled for open source release, eventually remove? Çif defined (userland.trialVersion.flTrialVersion) Çif userland.trialVersion.flTrialVersion Çlocal (storeurl = mainResponder.adminSite.urls.store) Çlocal (ctdays = 60 - ((number (clock.now ()) - number (userland.trialVersion.whenInstalled)) / (24 * 60 * 60)) ) Çlocal (serialNumberUrl = "http://127.0.0.1:" + user.inetd.config.http2.port + mainResponder.adminSite.urls.serialNumber) Çadd ("<div class=\"small\" style=\"padding-bottom: 5px;\"><b><a href=\"" + storeUrl + "\">Trial version</a></b></div>") ÇaddSubItem (ctdays + " days remaining. Click <a href=\"" + serialNumberUrl + "\">here</a> to enter your serial number. A license costs $1,099, and an academic license costs $499. We accept all major credit cards. Why delay? <i>Get yours today!</i>") bundle { //server status on tooltip (s) { return ("title=\"Click this link for a detailed readout of " + s + " on this server.\"")}; bundle { //header-link add ("<div class=\"small\" style=\"padding-bottom: 5px;\"><b><a href=\"" + mainResponder.adminSite.urls.readouts + "\">Server Status</a></b></div>")}; bundle { //up-since, hits local (uphours = (number (clock.now ()) - number (user.webserver.stats.upsince)) / 3600); addSubItem ("Up for " + uphours + " hours; " + string.addCommas (user.webserver.stats.hits) + " total <a href=\"" + mainResponder.adminSite.urls.http + "\" " + tooltip ("hits") + ">hits</a>; " + user.webserver.stats.maxConnections + " max connections.")}; bundle { //RAM usage local (s); if defined (system.environment.isCarbon) and system.environment.isCarbon { //the way RAM works on MacOS X is totally different local (programName = file.fileFromPath (frontier.getProgramPath ())); programName = string.replaceAll (programName, "ª", ""); local (psout = sys.unixShellCommand ("ps -auxww | grep \"" + programName + "\"") ); while psout contains " " { psout = string.replaceAll (psout, " ", " ")}; local (memUsage = double (string.nthField (psout, " ", 5)) * 1024); local (resident = double (string.nthField (psout, " ", 6)) * 1024); s = "Total memory usage: " + string.gigabyteString (memUsage) + "; Resident: " + string.gigabyteString (resident) + "."} else { //original Windows and Mac Classic behavior s = "Available RAM: " + string.gigabytestring (memavail ()) + "; "; s = s + "Smallest: " + string.megabytestring (user.webserver.stats.minMemAvail) + "; "; s = s + "Largest: " + string.megabytestring (user.webserver.stats.maxMemAvail) + "."}; addSubItem (s)}; bundle { //databases local (totalSizeDouble = double (file.size (Frontier.getFilePath ()))); local (adr); for adr in @system.compiler.files { totalSizeDouble = totalSizeDouble + file.size (nameOf (adr^))}; addSubItem ((sizeOf (system.compiler.files) + 1) + " open <a href=\"" + mainResponder.adminSite.urls.databases + "\" " + tooltip ("open databases") + ">databases</a>, total size " + string.gigabyteString (totalSizeDouble) + ".")}; bundle { //Frontier disk usage local (nomad = Frontier.pathString); local (pc = file.getPathChar ()); while string.countFields (nomad, pc) > 1 { nomad = file.folderFromPath (nomad)}; local (homeVolSize = file.volumeSizeDouble (nomad)); local (homeVolFree = file.freeSpaceOnVolumeDouble (nomad)); local (percentFree = (number (homeVolFree / homeVolSize * 1000)) / 10.0); addSubItem (string.gigabyteString (homeVolFree) + " of " + string.gigaByteString (homeVolSize) + " available on <a href=\"" + mainResponder.adminSite.urls.disk + "\" " + tooltip ("disk status") + ">disk</a>. (" + percentFree + "%)")}}; bundle { //tools status local (adr, cttools = 0); for adr in @user.tools.databases { try { if adr^.flInstalled { local (adrtool = @[adr^.path]); if defined (adrtool^) { //is the database opened? local (toolname = Frontier.tools.cleanToolName (file.fileFromPath (adr^.path))); local (adrsuite = @adrtool^.[toolname + "Suite"]); if defined (adrsuite^) { //tools aren't required to have a suite sub-table if defined (adrsuite^.statusCenterMessage) { local (displayname = toolname + " Tool"); local (adrinfo = @adrtool^.[toolname + "Info"]); bundle { //get displayname if defined (adrinfo^) { if defined (adrinfo^.name) { if sizeOf (adrinfo^.name) > 0 { if adrinfo^.name != toolname { displayname = adrinfo^.name}}}}}; local (s); s = adrsuite^.statusCenterMessage (); local (toollink = displayname); local (host = pta^.host); bundle { //set host host = pta^.host; if host contains ":" { host = string.nthField (host, ":", 1)}; local (adrlisten); if defined (adrinfo^.localUrl) { adrlisten = @user.inetd.config.http} else { if defined (user.inetd.config.http2) { adrlisten = @user.inetd.config.http2}}; local (port = adrlisten^.port); if defined (adrlisten^.apparentPort) { port = adrlisten^.apparentPort}; if port != 80 { host = host + ":" + port}}; if defined (adrinfo^) and defined (adrinfo^.localUrl) { if adrinfo^.localUrl beginsWith "http://" { toollink = html.getLink (toollink, adrinfo^.localUrl)} else { local (url = adrinfo^.localUrl); if not (url beginsWith "/") { url = "/" + url}; toollink = html.getLink (toollink, "http://" + host + adrinfo^.localUrl)}} else { //default link to the Tool's website if defined (adrtool^.[toolname + "Website"]) { toollink = html.getLink (toollink, "http://" + host + "/" + toolname + "/")}}; add ("<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\"><tr><td class=\"small\" style=\"padding-bottom:5px;\"><b>" + toollink + "</b><br />" + s + "</td></tr></table>"); cttools++}}}}}}}; bundle { //addins if defined (config.mainResponder.controlPanel.wizards) { local (adr); for adr in @config.mainResponder.controlPanel.wizards { local (addinlink); addinlink = html.getLink (nameOf (adr^) + " add-in", "addIns" + "?command=" + nameOf (adr^)); add ("<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\"><tr><td class=\"small\" style=\"padding-bottom:5px;\"><b>" + addinlink + "</b></td></tr></table>")}}}; bundle { //version info local (osname = system.environment.osFullNameForDisplay, osversion); if system.environment.isMac { if defined (system.environment.isCarbon) and system.environment.isCarbon { if date.versionLessThan (Frontier.version (), "10.1a1") { // 1/22/05; 12:34:08 PM by TAC osname = "MacOS X"; bundle { //set osversion ÇJES 8/4/02: MacOS X returns a version string in decimal, but the visual representation is actually the hexadecimal version -- we get something like 16.1.5, but that really should be displayed as 10.1.5. 0x10 == 16. Strange, but true... local (firstpart = string.nthField (system.environment.osVersionString, ".", 1)); osversion = string.delete (system.environment.osVersionString, 1, sizeOf (firstpart)); osversion = number (string.nthField (string.hex (firstpart), "x", 2)) + osversion}} else { osname = system.environment.osFullNameForDisplay; osversion = system.environment.osVersionString}} else { osname = "MacOS"; osversion = system.environment.osVersionString}} else { //windows -- add service pack name osversion = system.environment.osVersionString; if defined (system.environment.winServicePackNumber) { osversion = osversion + " " + string.trimWhiteSpace (system.environment.winServicePackNumber)}}; add ("<div class=\"small\">Frontier v" + Frontier.version () + "<br />" + osname + " v" + osversion + "</div>")}; // 1/22/05; 12:36:00 PM by TAC - removed period at end, easier to read return (htmltext)}; Çbundle //testing Çlocal (pagetable); new (tableType, @pagetable) Çpagetable.method = "GET" Çhtml.setPageTableAddress (@pagetable) ÇstatusCenter () Çhtml.deletePageTableAddress () \ No newline at end of file --- 1,3 ---- FrontierVcsFile:1:scpt:mainResponder.adminSite.macros.statusCenter ! on statusCenter (flDisplayHeaderLink = true, versionInfoSectionSeperator = "<br/>") { ÇChanges Ç7/9/05; 11:54:30 AM by TAC Çversion info section uses addSubItem Çadded flDisplayHeaderLink paramater Çadded versionInfoSectionSeperator paramater Ç1/24/05; 10:49:20 AM by TAC Çdisabled trial version check for open source release Çupdated testing bundle Ç1/22/05; 12:36:00 PM by TAC Çremoved period at end of version info section, easier to read ÇThu, Jul 15, 2004 at 5:00:47 PM by JS ÇUpdated trial version notice. Ç5/19/04; 6:31:44 PM by JES ÇAdded support for control panel add-ins. They appear below Tools. Ç6/7/02; 2:57:43 PM by JES ÇCreated. local (pta = html.getPageTableAddress ()); local (htmlText = "", indentLevel = 0); on add (s) { htmlText = htmlText + (string.filledString ("\t", indentLevel) + s + "\r\n");}; on addSubItem (s) { add ("<div class=\"small\" style=\"padding-left: 5px; padding-bottom: 5px;\">"); indentLevel++; add (s); add ("</div>"); indentLevel--}; ÇNotes -- to do? ÇAdd "web server" and "xml-rpc/soap" sections? ÇSupport center? (probably not yet) Çbundle // 1/24/05; 10:48:53 AM by TAC - disabled for open source release, eventually remove? Çif defined (userland.trialVersion.flTrialVersion) Çif userland.trialVersion.flTrialVersion Çlocal (storeurl = mainResponder.adminSite.urls.store) Çlocal (ctdays = 60 - ((number (clock.now ()) - number (userland.trialVersion.whenInstalled)) / (24 * 60 * 60)) ) Çlocal (serialNumberUrl = "http://127.0.0.1:" + user.inetd.config.http2.port + mainResponder.adminSite.urls.serialNumber) Çadd ("<div class=\"small\" style=\"padding-bottom: 5px;\"><b><a href=\"" + storeUrl + "\">Trial version</a></b></div>") ÇaddSubItem (ctdays + " days remaining. Click <a href=\"" + serialNumberUrl + "\">here</a> to enter your serial number. A license costs $1,099, and an academic license costs $499. We accept all major credit cards. Why delay? <i>Get yours today!</i>") bundle { //server status on tooltip (s) { return ("title=\"Click this link for a detailed readout of " + s + " on this server.\"")}; if flDisplayHeaderLink { //header-link add ("<div class=\"small\" style=\"padding-bottom: 5px;\"><b><a href=\"" + mainResponder.adminSite.urls.readouts + "\">Server Status</a></b></div>")}; bundle { //up-since, hits local (uphours = (number (clock.now ()) - number (user.webserver.stats.upsince)) / 3600); addSubItem ("Up for " + uphours + " hours; " + string.addCommas (user.webserver.stats.hits) + " total <a href=\"" + mainResponder.adminSite.urls.http + "\" " + tooltip ("hits") + ">hits</a>; " + user.webserver.stats.maxConnections + " max connections.")}; bundle { //RAM usage local (s); if defined (system.environment.isCarbon) and system.environment.isCarbon { //the way RAM works on MacOS X is totally different local (programName = file.fileFromPath (frontier.getProgramPath ())); programName = string.replaceAll (programName, "ª", ""); local (psout = sys.unixShellCommand ("ps -auxww | grep \"" + programName + "\"") ); while psout contains " " { psout = string.replaceAll (psout, " ", " ")}; local (memUsage = double (string.nthField (psout, " ", 5)) * 1024); local (resident = double (string.nthField (psout, " ", 6)) * 1024); s = "Total memory usage: " + string.gigabyteString (memUsage) + "; Resident: " + string.gigabyteString (resident) + "."} else { //original Windows and Mac Classic behavior s = "Available RAM: " + string.gigabytestring (memavail ()) + "; "; s = s + "Smallest: " + string.megabytestring (user.webserver.stats.minMemAvail) + "; "; s = s + "Largest: " + string.megabytestring (user.webserver.stats.maxMemAvail) + "."}; addSubItem (s)}; bundle { //databases local (totalSizeDouble = double (file.size (Frontier.getFilePath ()))); local (adr); for adr in @system.compiler.files { totalSizeDouble = totalSizeDouble + file.size (nameOf (adr^))}; addSubItem ((sizeOf (system.compiler.files) + 1) + " open <a href=\"" + mainResponder.adminSite.urls.databases + "\" " + tooltip ("open databases") + ">databases</a>, total size " + string.gigabyteString (totalSizeDouble) + ".")}; bundle { //Frontier disk usage local (nomad = Frontier.pathString); local (pc = file.getPathChar ()); while string.countFields (nomad, pc) > 1 { nomad = file.folderFromPath (nomad)}; local (homeVolSize = file.volumeSizeDouble (nomad)); local (homeVolFree = file.freeSpaceOnVolumeDouble (nomad)); local (percentFree = (number (homeVolFree / homeVolSize * 1000)) / 10.0); addSubItem (string.gigabyteString (homeVolFree) + " of " + string.gigaByteString (homeVolSize) + " available on <a href=\"" + mainResponder.adminSite.urls.disk + "\" " + tooltip ("disk status") + ">disk</a>. (" + percentFree + "%)")}}; bundle { //tools status local (adr, cttools = 0); for adr in @user.tools.databases { try { if adr^.flInstalled { local (adrtool = @[adr^.path]); if defined (adrtool^) { //is the database opened? local (toolname = Frontier.tools.cleanToolName (file.fileFromPath (adr^.path))); local (adrsuite = @adrtool^.[toolname + "Suite"]); if defined (adrsuite^) { //tools aren't required to have a suite sub-table if defined (adrsuite^.statusCenterMessage) { local (displayname = toolname + " Tool"); local (adrinfo = @adrtool^.[toolname + "Info"]); bundle { //get displayname if defined (adrinfo^) { if defined (adrinfo^.name) { if sizeOf (adrinfo^.name) > 0 { if adrinfo^.name != toolname { displayname = adrinfo^.name}}}}}; local (s); s = adrsuite^.statusCenterMessage (); local (toollink = displayname); local (host = pta^.host); bundle { //set host host = pta^.host; if host contains ":" { host = string.nthField (host, ":", 1)}; local (adrlisten); if defined (adrinfo^.localUrl) { adrlisten = @user.inetd.config.http} else { if defined (user.inetd.config.http2) { adrlisten = @user.inetd.config.http2}}; local (port = adrlisten^.port); if defined (adrlisten^.apparentPort) { port = adrlisten^.apparentPort}; if port != 80 { host = host + ":" + port}}; if defined (adrinfo^) and defined (adrinfo^.localUrl) { if adrinfo^.localUrl beginsWith "http://" { toollink = html.getLink (toollink, adrinfo^.localUrl)} else { local (url = adrinfo^.localUrl); if not (url beginsWith "/") { url = "/" + url}; toollink = html.getLink (toollink, "http://" + host + adrinfo^.localUrl)}} else { //default link to the Tool's website if defined (adrtool^.[toolname + "Website"]) { toollink = html.getLink (toollink, "http://" + host + "/" + toolname + "/")}}; add ("<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\"><tr><td class=\"small\" style=\"padding-bottom:5px;\"><b>" + toollink + "</b><br />" + s + "</td></tr></table>"); cttools++}}}}}}}; bundle { //addins if defined (config.mainResponder.controlPanel.wizards) { local (adr); for adr in @config.mainResponder.controlPanel.wizards { local (addinlink); addinlink = html.getLink (nameOf (adr^) + " add-in", "addIns" + "?command=" + nameOf (adr^)); add ("<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\"><tr><td class=\"small\" style=\"padding-bottom:5px;\"><b>" + addinlink + "</b></td></tr></table>")}}}; bundle { //version info local (osname = system.environment.osFullNameForDisplay, osversion); if system.environment.isMac { if defined (system.environment.isCarbon) and system.environment.isCarbon { if date.versionLessThan (Frontier.version (), "10.1a1") { // 1/22/05; 12:34:08 PM by TAC osname = "MacOS X"; bundle { //set osversion ÇJES 8/4/02: MacOS X returns a version string in decimal, but the visual representation is actually the hexadecimal version -- we get something like 16.1.5, but that really should be displayed as 10.1.5. 0x10 == 16. Strange, but true... local (firstpart = string.nthField (system.environment.osVersionString, ".", 1)); osversion = string.delete (system.environment.osVersionString, 1, sizeOf (firstpart)); osversion = number (string.nthField (string.hex (firstpart), "x", 2)) + osversion}} else { osname = system.environment.osFullNameForDisplay; osversion = system.environment.osVersionString}} else { osname = "MacOS"; osversion = system.environment.osVersionString}} else { //windows -- add service pack name osversion = system.environment.osVersionString; if defined (system.environment.winServicePackNumber) { osversion = osversion + " " + string.trimWhiteSpace (system.environment.winServicePackNumber)}}; addSubItem ("Frontier v" + Frontier.version () + versionInfoSectionSeperator + osname + " v" + osversion)}; return (htmlText)}; Çbundle //testing Çlocal (pagetable); new (tableType, @pagetable) Çpagetable.method = "GET" Çhtml.setPageTableAddress (@pagetable) ÇstatusCenter () Çhtml.deletePageTableAddress () \ No newline at end of file |