[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/html/commands newSite,1.1.1.1,1.2

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

Update of /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/html/commands
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22458

Modified Files:
	newSite 
Log Message:
work with host root files not named Frontier.root

Index: newSite
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/html/commands/newSite,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** newSite	26 Mar 2005 19:43:00 -0000	1.1.1.1
--- newSite	27 Mar 2005 23:07:45 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:system.verbs.builtins.html.commands.newSite
  
! if dialog.ask ("Name of new website table?", @user.prefs.dialogs.lastNewSite) {
	local (name = user.prefs.dialogs.lastNewSite);
	local (adrSite);
	bundle { //5.1.5 -- more complex logic to allow for guest databases
		local (filepath = Frontier.getFilePath (), adrSitesTable);
		if string.lower (file.fileFromPath (filepath)) == "frontier.root" {
			adrSitesTable = @websites}
		else {
			adrSitesTable = @[filepath]}; //don't create a websites table: PBS 1/15/99
		if not defined (adrSitesTable^) {
			new (tabletype, adrSitesTable)};
		adrSite = @adrSitesTable^.[name]};
	
	if defined (adrSite^) {
		if not dialog.confirm ("Replace existing website table named \"" + name + "\"?") {
			return}};
	
	if defined (user.html.newSiteTemplate) { //user-defined new site template
		adrSite^ = user.html.newSiteTemplate}
	else { //use default new site template
		adrSite^ = html.data.newSiteTemplate;
		
		bundle { //set font and font size of new site according to user's prefs
			ÇWednesday, January 21, 1998 at 4:23:41 PM by PBS
			local (oldTarget = target.set (adrSite));
			editMenu.setFont (user.prefs.fonts.tableFont);
			editMenu.setFontSize (user.prefs.fonts.tableFontSize);
			target.set (oldTarget)};
		
		case sys.os () { //set addLineFeeds pref if on Windows
			"Win95";
			"WinNT" {
				adrSite^.["#prefs"].addLinefeeds = true}};
		
		bundle { //set the #ftpSite table, as a local site, contained within the parent site, or the Websites folder
			with adrSite^.["#ftpSite"] {
				local (pc = file.getPathChar ());
				folder = file.folderFromPath (Frontier.getProgramPath ()) + "Websites" + pc + name + pc;
				url = file.fileToURL (folder);
				url = url + "/"}};
		
		bundle { //create the default home page
			local (defaultFileName = "index");
			try {defaultFileName = user.html.prefs.defaultFileName};
			if defaultFileName != "index" {
				table.rename (@adrSite^.index, defaultFileName)};
			local (oldTarget = target.set (@adrSite^.[defaultFileName]));
			editMenu.selectAll ();
			editMenu.setFont (user.prefs.fonts.wpTextFont);
			editMenu.setFontSize (user.prefs.fonts.wpTextFontSize);
			wp.setSelect (infinity, infinity);
			target.set (oldTarget)}};
	
	window.zoom (adrSite);
	fileMenu.save ();
	edit (adrSite);
	return (true)}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:system.verbs.builtins.html.commands.newSite
  
! ÇChanges
	Ç12/5/04; 10:25:20 PM by TAC
		Çwork with host root files not named "Frontier.root"

if dialog.ask ("Name of new website table?", @user.prefs.dialogs.lastNewSite) {
	local (name = user.prefs.dialogs.lastNewSite);
	local (adrSite);
	bundle { // 12/5/04; 10:31:13 PM by TAC - determine where to create the new site table
		local (adrSitesTable = table.getCursorAddress ());
		if adrSitesTable == nil {
			return (false)};
		if table.inGuestDatabase (adrSitesTable) {
			adrSitesTable = parentOf (adrSitesTable^)}
		else {
			adrSitesTable = @websites};
		if not defined (adrSitesTable^) {
			new (tabletype, adrSitesTable)};
		adrSite = @adrSitesTable^.[name];
		Çold code
			Çbundle //5.1.5 -- more complex logic to allow for guest databases
				Çlocal (filepath = Frontier.getFilePath (), adrSitesTable)
				Çif string.lower (file.fileFromPath (filepath)) == "frontier.root"
					ÇadrSitesTable = @websites
				Çelse
					ÇadrSitesTable = @[filepath] //don't create a websites table: PBS 1/15/99
				Çif not defined (adrSitesTable^)
					Çnew (tabletype, adrSitesTable)
				ÇadrSite = @adrSitesTable^.[name] };
	
	if defined (adrSite^) {
		if not dialog.confirm ("Replace existing website table named \"" + name + "\"?") {
			return}};
	
	if defined (user.html.newSiteTemplate) { //user-defined new site template
		adrSite^ = user.html.newSiteTemplate}
	else { //use default new site template
		adrSite^ = html.data.newSiteTemplate;
		
		bundle { //set font and font size of new site according to user's prefs
			ÇWednesday, January 21, 1998 at 4:23:41 PM by PBS
			local (oldTarget = target.set (adrSite));
			editMenu.setFont (user.prefs.fonts.tableFont);
			editMenu.setFontSize (user.prefs.fonts.tableFontSize);
			target.set (oldTarget)};
		
		case sys.os () { //set addLineFeeds pref if on Windows
			"Win95";
			"WinNT" {
				adrSite^.["#prefs"].addLinefeeds = true}};
		
		bundle { //set the #ftpSite table, as a local site, contained within the parent site, or the Websites folder
			with adrSite^.["#ftpSite"] {
				local (pc = file.getPathChar ());
				folder = file.folderFromPath (Frontier.getProgramPath ()) + "Websites" + pc + name + pc;
				url = file.fileToURL (folder);
				url = url + "/"}};
		
		bundle { //create the default home page
			local (defaultFileName = "index");
			try {defaultFileName = user.html.prefs.defaultFileName};
			if defaultFileName != "index" {
				table.rename (@adrSite^.index, defaultFileName)};
			local (oldTarget = target.set (@adrSite^.[defaultFileName]));
			editMenu.selectAll ();
			editMenu.setFont (user.prefs.fonts.wpTextFont);
			editMenu.setFontSize (user.prefs.fonts.wpTextFontSize);
			wp.setSelect (infinity, infinity);
			target.set (oldTarget)}};
	
	window.zoom (adrSite);
	fileMenu.save ();
	edit (adrSite);
	return (true)}
\ No newline at end of file