sandweb-commit Mailing List for SandWeb (Page 32)

Brought to you by: formnull, njennings

sandweb-commit — CVS activity

You can subscribe to this list here.

2001	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (28)	_Nov (58)	_Dec (85)
2002	_Jan (125)	_Feb (222)	_Mar (274)	_Apr (51)	_May (22)	_Jun (50)	_Jul (15)	_Aug (33)	_Sep (11)	_Oct (29)	_Nov (17)	_Dec (1)
2003	_Jan (100)	_Feb (21)	_Mar (7)	_Apr (45)	_May	_Jun (43)	_Jul (27)	_Aug (24)	_Sep	_Oct	_Nov	_Dec
2004	_Jan (1)	_Feb	_Mar (13)	_Apr	_May (1)	_Jun	_Jul	_Aug (7)	_Sep	_Oct	_Nov	_Dec (4)
2005	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec (1)

Flat | Threaded

<< < 1 .. 30 31 32 33 34 .. 53 > >> (Page 32 of 53)

[Sandweb-commit] CVS: sandweb/templates browse_module_header.html,1.4,1.5

From: Rob H. <for...@us...> - 2002-03-02 05:07:00

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv18452/templates

Modified Files:
	browse_module_header.html 
Log Message:
changed popup window size to 400x480


Index: browse_module_header.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/browse_module_header.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- browse_module_header.html	1 Mar 2002 18:25:03 -0000	1.4
+++ browse_module_header.html	2 Mar 2002 05:06:58 -0000	1.5
@@ -2,5 +2,5 @@
 	window.name = "mainWindow";
 	function myOpenWindow() {
-		window.open('about:blank','popUp','width=640,height=480');
+		window.open('about:blank','popUp','width=400,height=480');
 	}
 </script>

[Sandweb-commit] CVS: sandweb/lib/SandWeb UI.pm,1.29,1.30

From: Rob H. <for...@us...> - 2002-03-02 05:00:04

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv17235/lib/SandWeb

Modified Files:
	UI.pm 
Log Message:
UI->print_popup calls popup.html template instead of framework.html
template


Index: UI.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/UI.pm,v
retrieving revision 1.29
retrieving revision 1.30
diff -U2 -r1.29 -r1.30
--- UI.pm	1 Mar 2002 08:33:38 -0000	1.29
+++ UI.pm	2 Mar 2002 05:00:00 -0000	1.30
@@ -82,5 +82,5 @@
 
 	# incorporate content into framework template
-	my $output = HTML::Template->new(filename => "$template_dir/framework.html");
+	my $output = HTML::Template->new(filename => "$template_dir/popup.html");
 	$output->param(
 		TITLE => $args{'TITLE'},

[Sandweb-commit] CVS: sandweb/templates vcs_output.html,1.15,1.16 view_file.html,1.42,1.43

From: Rob H. <for...@us...> - 2002-03-02 00:12:06

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv24317/templates

Modified Files:
	vcs_output.html view_file.html 
Log Message:
download_file now supports $repo_name/$module_name instead of just
$module_name ( so, downloads actually work  :P )


Index: vcs_output.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/vcs_output.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- vcs_output.html	1 Mar 2002 08:10:12 -0000	1.15
+++ vcs_output.html	2 Mar 2002 00:12:02 -0000	1.16
@@ -1,5 +1,3 @@
-<script language="JavaScript">
-	onClose = window.refresh();
-</script>
+<a href="javascript:location.reload();" target="mainWindow">reload parent</a>
 <tr>
  <td width="100%">

Index: view_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/view_file.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -U2 -r1.42 -r1.43
--- view_file.html	28 Feb 2002 04:33:29 -0000	1.42
+++ view_file.html	2 Mar 2002 00:12:02 -0000	1.43
@@ -2,8 +2,9 @@
 <input type="hidden" name="filename" value="<TMPL_VAR NAME=FILENAME>" />
 <input type="hidden" name="location" value="<TMPL_VAR NAME=LOCATION>" />
+<input type="hidden" name="repo_name" value="<TMPL_VAR NAME=REPO_NAME>" />
 <input type="hidden" name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" />
  <tr>
   <td width="100%" align="right">
-   [<a href="<TMPL_VAR NAME=PROGNAME>/<TMPL_VAR NAME=FILENAME>?action=download_file&location=<TMPL_VAR NAME=LOCATION>&filename=<TMPL_VAR NAME=FILENAME>&module_name=<TMPL_VAR NAME=MODULE_NAME>">download</a>]
+   [<a href="<TMPL_VAR NAME=PROGNAME>/<TMPL_VAR NAME=FILENAME>?action=download_file&location=<TMPL_VAR NAME=LOCATION>&filename=<TMPL_VAR NAME=FILENAME>&module_name=<TMPL_VAR NAME=MODULE_NAME>&repo_name=<TMPL_VAR NAME=REPO_NAME>">download</a>]
    <TMPL_IF NAME=EDIT>
     [<a href="<TMPL_VAR NAME=PROGNAME>/<TMPL_VAR NAME=FILENAME>?action=edit_file&location=<TMPL_VAR NAME=LOCATION>&filename=<TMPL_VAR NAME=FILENAME>&module_name=<TMPL_VAR NAME=MODULE_NAME>&repo_name=<TMPL_VAR NAME=REPO_NAME>">edit</a>]

[Sandweb-commit] CVS: sandweb/templates browse_module_header.html,1.3,1.4

From: Rob H. <for...@us...> - 2002-03-01 18:25:06

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv23618/templates

Modified Files:
	browse_module_header.html 
Log Message:
400x400 is too small for vcs->status and diff output and such.
expanded popup to 640x480


Index: browse_module_header.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/browse_module_header.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- browse_module_header.html	1 Mar 2002 08:10:12 -0000	1.3
+++ browse_module_header.html	1 Mar 2002 18:25:03 -0000	1.4
@@ -2,5 +2,5 @@
 	window.name = "mainWindow";
 	function myOpenWindow() {
-		window.open('about:blank','popUp','width=400,height=400');
+		window.open('about:blank','popUp','width=640,height=480');
 	}
 </script>

[Sandweb-commit] CVS: sandweb/lib/SandWeb UI.pm,1.28,1.29

From: Rob H. <for...@us...> - 2002-03-01 08:33:40

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv30636/lib/SandWeb

Modified Files:
	UI.pm 
Log Message:
actually this looks pretty good overall, delete looks weird, VCS->tag
needs to be implemented correctly, and rename_file needs to be implemented.
they all need menus, and rename_file needs to be implemented in File.
I think everything will be cool then though.


Index: UI.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/UI.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -U2 -r1.28 -r1.29
--- UI.pm	1 Mar 2002 08:10:12 -0000	1.28
+++ UI.pm	1 Mar 2002 08:33:38 -0000	1.29
@@ -85,4 +85,5 @@
 	$output->param(
 		TITLE => $args{'TITLE'},
+		SUBMENU_TITLE => $args{'SUBMENU_TITLE'},
 		MENU_TITLE => $args{'MENU_TITLE'},
 		CONTENT => $args{'CONTENT'},

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.242,1.243

From: Rob H. <for...@us...> - 2002-03-01 08:33:40

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv30636/bin

Modified Files:
	sandweb.cgi 
Log Message:
actually this looks pretty good overall, delete looks weird, VCS->tag
needs to be implemented correctly, and rename_file needs to be implemented.
they all need menus, and rename_file needs to be implemented in File.
I think everything will be cool then though.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.242
retrieving revision 1.243
diff -U2 -r1.242 -r1.243
--- sandweb.cgi	1 Mar 2002 08:10:11 -0000	1.242
+++ sandweb.cgi	1 Mar 2002 08:33:38 -0000	1.243
@@ -1670,5 +1670,5 @@
 		);
 		print CGI::header( -cookie => $ck_auth );
-		$ui->print_screen(
+		$ui->print_popup(
 			TITLE=> 'SandWeb : commit file(s)',
 			MENU_TITLE => 'SandWeb',

[Sandweb-commit] javascript popups implemented

From: Rob H. <ro...@na...> - 2002-03-01 08:25:45

Hello,


I implemented a very rough version of pop-up dialogs and output
for the vcs/file toolbar, I think there are alot of approaches we
can take but here is what seemed to be the best to me ( currently
it only works in the browse_module_menu, but you'll see how easy
it is to do your own popups ) :

To start with, we need to give the current window a name :

window.name = "mainWindow";

This is so the popup will know how to submit back to us.
Next, we define a function that opens a pop-up window ( to save typing
all that stuff out all the time ) :

function myOpenWindow() {
	window.open('about:blank','popUp','width=400,height=400');
}

This creates a popup window named "popUp", initially it'll be blank.
I modified browse_module_header's <form> tag to open this window and
use it for the target of any submits that come from this form :

<form method="get" submit="<TMPL_VAR NAME=PROGNAME>" name="browse" 
 onsubmit="myOpenWindow()" target="popUp">

So, when the form is submitted the myOpenWindow function is called, 
opening a window named popUp, which received the form submit ( because
it's the target ).

I created a new public method in SandWeb::UI called print_popup. It
is basically the same as print_screen, but does not call the footer
or menu_bar ( hey nick, framework looks wierd without footer or menu_bar,
it looks like it has stuff to support it coded directly in framework.html
Is this on purpose? ).

There's no reason for users to get a menu_bar inside a popup dialog,
so you use the print_popup in place of print_screen in the CGI for
any menu that should be in a popup. This doesn't actually have anything
to do with the generation of the popup window per se, but it produces
format suitable for a popup dialog.

The final thing to do is modify the template of the command that is
being put in the popup window to do this :

<form action="<TMPL_VAR NAME=PROGNAME>" target="mainWindow" onsubmit="setTimeout('window.close()',2000)">

This is in create_file.html, what it means is that is will submit to mainWindow ( this is what we named the browse_module window, remember? ) and wait
2000 ms to close the window ( if we close right away, there isn't time to submit
to mainWindow ).

That's it!

Problems so far :

* delete_file doesn't work as you might expect it to, it needs a menu to give 
  us output in a popup

* I could leave delete_file alone actually, but that would require figuring
  out if it is possible to do this stuff on a per-<input> basis, I only
  discovered how to do this on a per-<form> basis

* vcs_output is in a pop-up, which is cool, but I haven't figured out a
  good strategy for refreshing mainWindow yet. I think it could be done
  when the popup window containing vcs_output is closed by the user, but
  I'm not positive. Right now you have to click reload if you want to
  see the results of a VCS command

* I have barely tested this, please let me know what else is wrong
  that I've missed :) I know that this will break some of the VCS command
  templates, I'll try to commit those in the next couple minutes before
  I go to sleep.



--
Rob

[Sandweb-commit] CVS: sandweb/lib/SandWeb UI.pm,1.27,1.28

From: Rob H. <for...@us...> - 2002-03-01 08:10:15

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv25884/lib/SandWeb

Modified Files:
	UI.pm 
Log Message:
* this is a start on the javascript pop-up control stuff, i'll send more info about it to the -devel list


Index: UI.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/UI.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -U2 -r1.27 -r1.28
--- UI.pm	28 Feb 2002 04:36:12 -0000	1.27
+++ UI.pm	1 Mar 2002 08:10:12 -0000	1.28
@@ -61,4 +61,40 @@
 }
 
+sub print_popup {
+	my $self = shift;
+	my %args = @_;
+	my $template_dir = $self->_get_template_dir();
+	my $log = $self->_logobj();
+
+	my @debug_msgs = ();
+	my $message = '';
+	# set debug mesg if debug is toggled
+	if ($log->get_debug_toggle()) {
+		foreach my $debug_msg ($log->get_debug_msgs()) {
+			my %debug_content;
+			$debug_content{'DEBUG_MSG'} = "DEBUG: $debug_msg";
+			push @debug_msgs, \%debug_content;
+		}
+	}
+	if ($args{'MESSAGE'}) {
+		$message = "$args{'MESSAGE'}";
+	}
+
+	# incorporate content into framework template
+	my $output = HTML::Template->new(filename => "$template_dir/framework.html");
+	$output->param(
+		TITLE => $args{'TITLE'},
+		MENU_TITLE => $args{'MENU_TITLE'},
+		CONTENT => $args{'CONTENT'},
+		DEBUG => \@debug_msgs,
+		MESSAGE => $message,
+	);
+
+	# print output
+	print $output->output;
+
+	return 1;
+}
+
 sub get_menu_bar {
 	my $self = shift;

[Sandweb-commit] CVS: sandweb/templates browse_module_header.html,1.2,1.3 create_file.html,1.15,1.16 create_folder.html,1.13,1.14 upload_file.html,1.15,1.16 vcs_output.html,1.14,1.15

From: Rob H. <for...@us...> - 2002-03-01 08:10:15

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv25884/templates

Modified Files:
	browse_module_header.html create_file.html create_folder.html 
	upload_file.html vcs_output.html 
Log Message:
* this is a start on the javascript pop-up control stuff, i'll send more info about it to the -devel list


Index: browse_module_header.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/browse_module_header.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- browse_module_header.html	22 Feb 2002 09:14:13 -0000	1.2
+++ browse_module_header.html	1 Mar 2002 08:10:12 -0000	1.3
@@ -1 +1,9 @@
-<form method="get" submit="<TMPL_VAR NAME=PROGNAME>" name="browse">
+<script language="JavaScript">
+	window.name = "mainWindow";
+	function myOpenWindow() {
+		window.open('about:blank','popUp','width=400,height=400');
+	}
+</script>
+<form method="get" submit="<TMPL_VAR NAME=PROGNAME>" name="browse" onsubmit="myOpenWindow()" target="popUp">
+
+

Index: create_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/create_file.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- create_file.html	24 Feb 2002 06:00:03 -0000	1.15
+++ create_file.html	1 Mar 2002 08:10:12 -0000	1.16
@@ -1,5 +1,5 @@
 <tr>
  <td width="100%">
-<form action="<TMPL_VAR NAME=PROGNAME>">
+<form action="<TMPL_VAR NAME=PROGNAME>" target="mainWindow" onsubmit="setTimeout('window.close()',2000)">
 <input name="action" value="create_file" type="hidden" />
 <input name="file_command" value="create_file" type="hidden" />

Index: create_folder.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/create_folder.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- create_folder.html	24 Feb 2002 06:31:26 -0000	1.13
+++ create_folder.html	1 Mar 2002 08:10:12 -0000	1.14
@@ -1,5 +1,5 @@
 <tr>
  <td width="100%">
-<form action="<TMPL_VAR NAME=PROGNAME>">
+<form action="<TMPL_VAR NAME=PROGNAME>" target="mainWindow" onsubmit="setTimeout('window.close()',2000)">
 <input name="action" value="create_folder" type="hidden" />
 <input name="file_command" value="create_folder" type="hidden" />

Index: upload_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/upload_file.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- upload_file.html	28 Feb 2002 04:33:29 -0000	1.15
+++ upload_file.html	1 Mar 2002 08:10:12 -0000	1.16
@@ -1,6 +1,5 @@
 <tr>
  <td width="100%">
-<form method="post" action="<TMPL_VAR NAME=PROGNAME>" 
-enctype="multipart/form-data">
+<form method="post" action="<TMPL_VAR NAME=PROGNAME>" target="mainWindow" onsubmit="setTimeout('window.close()',2000)" enctype="multipart/form-data">
 <input name="action" value="upload_file" type="hidden" />
 <input name="file_command" value="upload" type="hidden" />

Index: vcs_output.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/vcs_output.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- vcs_output.html	20 Feb 2002 04:26:36 -0000	1.14
+++ vcs_output.html	1 Mar 2002 08:10:12 -0000	1.15
@@ -1,2 +1,5 @@
+<script language="JavaScript">
+	onClose = window.refresh();
+</script>
 <tr>
  <td width="100%">

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.241,1.242

From: Rob H. <for...@us...> - 2002-03-01 08:10:15

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv25884/bin

Modified Files:
	sandweb.cgi 
Log Message:
* this is a start on the javascript pop-up control stuff, i'll send more info about it to the -devel list


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.241
retrieving revision 1.242
diff -U2 -r1.241 -r1.242
--- sandweb.cgi	1 Mar 2002 06:11:34 -0000	1.241
+++ sandweb.cgi	1 Mar 2002 08:10:11 -0000	1.242
@@ -1114,5 +1114,5 @@
 
 	print CGI::header( -cookie => $ck_auth );
-	$ui->print_screen(
+	$ui->print_popup(
 		TITLE=> 'SandWeb : create file',
 		MENU_TITLE => 'SandWeb',
@@ -1153,5 +1153,5 @@
 	);
 	print CGI::header( -cookie => $ck_auth );
-	$ui->print_screen(
+	$ui->print_popup(
 		TITLE => 'SandWeb : create folder',
 		MENU_TITLE => 'SandWeb',
@@ -1192,5 +1192,5 @@
 	);
 	print CGI::header( -cookie => $ck_auth );
-	$ui->print_screen(
+	$ui->print_popup(
 		TITLE=> 'SandWeb : upload file',
 		MENU_TITLE => 'SandWeb',
@@ -1651,5 +1651,5 @@
 
 			print CGI::header( -cookie => $ck_auth );
-			$ui->print_screen(
+			$ui->print_popup(
 				TITLE=> "SandWeb : VCS $vcs_command",
 				MENU_TITLE => 'SandWeb',
@@ -1706,5 +1706,5 @@
 		if ( $return{'error'} ) {
 			print CGI::header( -cookie => $ck_auth );
-			$ui->print_screen(
+			$ui->print_popup(
 				TITLE=> "SandWeb : VCS $vcs_command",
 				MENU_TITLE => 'SandWeb',
@@ -1747,5 +1747,5 @@
 
 	print CGI::header( -cookie => $ck_auth );
-	$ui->print_screen(
+	$ui->print_popup(
 		TITLE=> "SandWeb : VCS $vcs_command",
 		MENU_TITLE => 'SandWeb',
@@ -1875,5 +1875,5 @@
 	
 		print CGI::header( -cookie => $ck_auth );
-		$ui->print_screen(
+		$ui->print_popup(
 			TITLE=> "SandWeb : sandbox",
 			MENU_TITLE => 'SandWeb',

[Sandweb-commit] CVS: sandweb/templates tool_bar.html,1.4,1.5

From: Rob H. <for...@us...> - 2002-03-01 07:12:02

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv11390/templates

Modified Files:
	tool_bar.html 
Log Message:
this shouldn't have a <form> tag


Index: tool_bar.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/tool_bar.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- tool_bar.html	24 Feb 2002 06:31:26 -0000	1.4
+++ tool_bar.html	1 Mar 2002 07:11:59 -0000	1.5
@@ -1,3 +1,2 @@
- <form method="get" submit="<TMPL_VAR NAME=PROGNAME>" name="browse">
  <input type="hidden" name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" />
  <input type="hidden" name="repo_name" value="<TMPL_VAR NAME=REPO_NAME>" />

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.240,1.241

From: Nick J. <nje...@us...> - 2002-03-01 06:11:37

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv2288/bin

Modified Files:
	sandweb.cgi 
Log Message:
* updated sandbox menu to perform atomic data commits. So a failure at
 a checkout or update will not write data struct to file.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.240
retrieving revision 1.241
diff -U2 -r1.240 -r1.241
--- sandweb.cgi	1 Mar 2002 05:56:52 -0000	1.240
+++ sandweb.cgi	1 Mar 2002 06:11:34 -0000	1.241
@@ -1823,5 +1823,6 @@
 		my @vcs_output = ();
 		my @vcs_error = ();
-			if ( $repo_type eq 'CVS' ) {
+
+		if ( $repo_type eq 'CVS' ) {
 			if ( $repo_connection eq 'local' ) {
 				$vcsroot = "$repo_root";
@@ -1852,8 +1853,15 @@
 		push (@vcs_error, "$return{'error'}\n");
 		$log->debug('dump', \%return);
-		my $return = write_config();
-		if (! $return) {
-			# uh oh, problem occured
-			sandbox( ck_auth => $ck_auth );
+
+		if ($return{'errorlevel'}) {
+			# vcs action failed
+			$log->debug("failed checkout/update of module '$module_name'\n");
+			set_message("failed checking out module '$module_name'\n");
+		} else {
+			my $return = write_config();
+			if (! $return) {
+				# uh oh, problem occured
+				sandbox( ck_auth => $ck_auth );
+			}
 		}
 		my $content = $ui->get_menu(
@@ -1873,4 +1881,5 @@
 			FOOTER => '',
 			CONTENT => $content,
+			MESSAGE => $message,
 		);
 		exit 0;

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.239,1.240

From: Nick J. <nje...@us...> - 2002-03-01 05:56:55

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv357/bin

Modified Files:
	sandweb.cgi 
Log Message:
* made directory creation happen before entry into the data structure,
  so that you don't get invalid entries.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.239
retrieving revision 1.240
diff -U2 -r1.239 -r1.240
--- sandweb.cgi	1 Mar 2002 05:33:12 -0000	1.239
+++ sandweb.cgi	1 Mar 2002 05:56:52 -0000	1.240
@@ -1976,12 +1976,4 @@
 			set_message("$repo_name updated.");
 		} else {	
-			$user->create_repo(
-				name => $repo_name, 
-				server => $repo_server,
-				username => $repo_username,
-				connection => $repo_connection,
-				type => $repo_type,
-				root => $repo_root,
-			);
 			# create repo directory
 			my $file = SandWeb::File->new(
@@ -1995,4 +1987,13 @@
 				exit(0);
 			}
+			# directory created, not create repository data struct
+			$user->create_repo(
+				name => $repo_name, 
+				server => $repo_server,
+				username => $repo_username,
+				connection => $repo_connection,
+				type => $repo_type,
+				root => $repo_root,
+			);
 			set_message("$repo_name created.");
 		}

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.238,1.239

From: Nick J. <nje...@us...> - 2002-03-01 05:33:15

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv29390

Modified Files:
	sandweb.cgi 
Log Message:
* added placeholder to delete repository directory (recursive) for when
  we figure out how we are going to do it.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.238
retrieving revision 1.239
diff -U2 -r1.238 -r1.239
--- sandweb.cgi	1 Mar 2002 05:31:53 -0000	1.238
+++ sandweb.cgi	1 Mar 2002 05:33:12 -0000	1.239
@@ -2009,4 +2009,5 @@
 		}
 		$user->delete_repo( name => $repository_selected );
+		# XXX - delete repository directory RECURSIVE
 		$repo_name = '';
 		set_message("$repository_selected deleted.");

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.237,1.238

From: Nick J. <nje...@us...> - 2002-03-01 05:31:56

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv29127

Modified Files:
	sandweb.cgi 
Log Message:
* added repository directory creation when a repository is created (but
  not updated).


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.237
retrieving revision 1.238
diff -U2 -r1.237 -r1.238
--- sandweb.cgi	1 Mar 2002 04:34:00 -0000	1.237
+++ sandweb.cgi	1 Mar 2002 05:31:53 -0000	1.238
@@ -1984,6 +1984,18 @@
 				root => $repo_root,
 			);
+			# create repo directory
+			my $file = SandWeb::File->new(
+				'log_obj' => $log,
+				'filename' => $repo_name,
+				'location' => $config->{'paths'}->{'users_dir'} . "/" . $auth->get_username(),
+			);
+			if (!$file->create_folder()) {
+				set_message("unable to create repository directory");
+				sandbox_menu( ck_auth => $ck_auth );
+				exit(0);
+			}
 			set_message("$repo_name created.");
 		}
+
 	} elsif ($submit eq 'Delete') {
 		# delete repository entry

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.236,1.237

From: Rob H. <for...@us...> - 2002-03-01 04:34:03

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv19633/bin

Modified Files:
	sandweb.cgi 
Log Message:
checkout now does checkout to $user_dir/$username/$repo_name


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.236
retrieving revision 1.237
diff -U2 -r1.236 -r1.237
--- sandweb.cgi	1 Mar 2002 01:09:38 -0000	1.236
+++ sandweb.cgi	1 Mar 2002 04:34:00 -0000	1.237
@@ -1835,5 +1835,5 @@
 			root => $vcsroot,
 			repo_type => $repo_type,
-			sandbox => "$users_dir/$username",
+			sandbox => "$users_dir/$username/$repo_name",
 		);

[Sandweb-commit] CVS: sandweb/lib/SandWeb File.pm,1.45,1.46

From: Rob H. <for...@us...> - 2002-03-01 01:09:42

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv6541/lib/SandWeb

Modified Files:
	File.pm 
Log Message:
* added support for $repo_name in user's sandbox, this needed to be changed
  in _alot_ of places.. urgh :P


Index: File.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File.pm,v
retrieving revision 1.45
retrieving revision 1.46
diff -U2 -r1.45 -r1.46
--- File.pm	23 Feb 2002 04:24:37 -0000	1.45
+++ File.pm	1 Mar 2002 01:09:38 -0000	1.46
@@ -243,7 +243,10 @@
 sub delete_folder {
 	my $self = shift;
+	my %args = @_;
 	my $location = $self->{'location'};
 	my $filename = $self->{'filename'};
 	my $log = $self->{'log_obj'};
+	my $force = $args{'force'};
+	my $recurse = $args{'recurse'};
 
 	$log->debug("removing folder : $location/$filename");

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.235,1.236

From: Rob H. <for...@us...> - 2002-03-01 01:09:42

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv6541/bin

Modified Files:
	sandweb.cgi 
Log Message:
* added support for $repo_name in user's sandbox, this needed to be changed
  in _alot_ of places.. urgh :P


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.235
retrieving revision 1.236
diff -U2 -r1.235 -r1.236
--- sandweb.cgi	28 Feb 2002 07:46:19 -0000	1.235
+++ sandweb.cgi	1 Mar 2002 01:09:38 -0000	1.236
@@ -922,5 +922,5 @@
 		'log_obj' => $log,
 		'filename' => $filename,
-		'location' => "$users_dir/$username/$module_name$location",
+		'location' => "$users_dir/$username/$repo_name/$module_name$location",
 	);
 
@@ -1041,5 +1041,5 @@
 		'log_obj' => $log,
 		'filename' => $filename,
-		'location' => "$users_dir/$username/$module_name$location",
+		'location' => "$users_dir/$username/$repo_name/$module_name$location",
 	);
 	if ( $file->get_file_type() ne "Text" ) {
@@ -1052,9 +1052,9 @@
 		);
 	}
-	$log->debug("reading $users_dir/$username/$module_name$location/$filename");
+	$log->debug("reading $users_dir/$username/$repo_name/$module_name$location/$filename");
 
 	my $content = $file->file_read();
 
-	$log->debug("closing $users_dir/$username/$module_name$location/$filename");
+	$log->debug("closing $users_dir/$username/$repo_name/$module_name$location/$filename");
 	$content = $ui->get_menu( 
 		MENU => 'edit_file',
@@ -1248,5 +1248,5 @@
 		'log_obj' => $log,
 		'filename' => $filename,
-		'location' => "$users_dir/$username/$module_name$location",
+		'location' => "$users_dir/$username/$repo_name/$module_name$location",
 	);
 	$log->debug("editing file : $filename");
@@ -1255,5 +1255,5 @@
 	$log->debug("saving edited file : $filename");
 
-	$log->debug("editing $users_dir/$username/$module_name$location/$filename");
+	$log->debug("editing $users_dir/$username/$repo_name/$module_name$location/$filename");
 	$file->file_write(
 		'location' => "$location",
@@ -1312,5 +1312,5 @@
 		'log_obj' => $log,
 		'filename' => $filename,
-		'location' => "$users_dir/$username/$module_name$location",
+		'location' => "$users_dir/$username/$repo_name/$module_name$location",
 	);
 
@@ -1331,5 +1331,5 @@
 			'log_obj' => $log,
 			'filename' => $entry,
-			'location' => "$users_dir/$username/$module_name$location",
+			'location' => "$users_dir/$username/$repo_name/$module_name$location",
 		);
 
@@ -1387,5 +1387,5 @@
 		'log_obj' => $log,
 		'filename' => $filename,
-		'location' => "$users_dir/$username/$module_name$location",
+		'location' => "$users_dir/$username/$repo_name/$module_name$location",
 	);
 
@@ -1430,5 +1430,5 @@
 		'log_obj' => $log,
 		'filename' => $filename,
-		'location' => "$users_dir/$username/$module_name$location",
+		'location' => "$users_dir/$username/$repo_name/$module_name$location",
 	);
 
@@ -1480,5 +1480,5 @@
 			'log_obj' => $log,
 			'filename' => $filename,
-			'location' => "$users_dir/$username/$module_name$location",
+			'location' => "$users_dir/$username/$repo_name/$module_name$location",
 		);
 		$file->upload( 
@@ -1535,5 +1535,5 @@
 		'log_obj' => $log,
 		'filename' => $filename,
-		'location' => "$users_dir/$username/$module_name$location",
+		'location' => "$users_dir/$username/$repo_name/$module_name$location",
 	);
 
@@ -1621,10 +1621,10 @@
 		root => $repo_root,
 		repo_type => $repo_type,
-		sandbox => "$users_dir/$username/$module_name/$location",
+		sandbox => "$users_dir/$username/$repo_name/$module_name/$location",
 	);
 
 	$log->debug("Repo name: $repo_name");
 	$log->debug("Repo root: $repo_root");
-	$log->debug("VCS sandbox: $users_dir/$username/$module_name/$location");
+	$log->debug("VCS sandbox: $users_dir/$username/$repo_name/$module_name/$location");
 	$log->debug("Repo type: $repo_type");
 	$log->debug("Filename(s): @filename");

[Sandweb-commit] CVS: sandweb/lib/SandWeb Browse.pm,1.67,1.68

From: Rob H. <for...@us...> - 2002-03-01 00:59:27

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv4165/lib/SandWeb

Modified Files:
	Browse.pm 
Log Message:
* sandbox is now $users_dir/$username/$repo_name/$module_name instead
  of $users_dir/$username/$module_name


Index: Browse.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Browse.pm,v
retrieving revision 1.67
retrieving revision 1.68
diff -U2 -r1.67 -r1.68
--- Browse.pm	28 Feb 2002 03:54:29 -0000	1.67
+++ Browse.pm	1 Mar 2002 00:59:23 -0000	1.68
@@ -49,5 +49,5 @@
 	my $template_dir = $self->_get_template_dir();
 	my $log = $self->_get_log_obj;
-	my $sandbox = "$users_dir/$username/$module_name";
+	my $sandbox = "$users_dir/$username/$repo_name/$module_name";
 
 	if (! $sandbox) {

[Sandweb-commit] CVS: sandweb/lib/SandWeb Config.pm,1.23,1.24

From: Nick J. <nje...@us...> - 2002-02-28 07:46:23

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv15271/lib/SandWeb

Modified Files:
	Config.pm 
Log Message:
* added delete_module method in SandWeb::Config
* added module deletion support in sandweb.cgi
* updated sandweb.html to pass repo_name when deleting a module.

!!! - still need to delete the module from the filesystem, right now
      it just removes the data struct (NOTE: this actually makes no
	  functional difference in the code, everything works and there
	  should be no conflicts when checking out a module when the
	  directory already exists (from a previous deletion)).


Index: Config.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Config.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -U2 -r1.23 -r1.24
--- Config.pm	28 Feb 2002 04:31:32 -0000	1.23
+++ Config.pm	28 Feb 2002 07:46:20 -0000	1.24
@@ -403,4 +403,14 @@
 }
 
+sub delete_module {
+	my $self = shift;
+	my %args = @_;
+	my $log = $self->{'log_obj'};
+	my $repo = $args{'repo'} || '';
+	my $module = $args{'module'} || '';
+
+	delete $self->{'repo'}->{$repo}->{'module'}->{$module};
+}
+
 sub get_module_description {
 	my $self = shift;

[Sandweb-commit] CVS: sandweb/templates sandbox.html,1.13,1.14

From: Nick J. <nje...@us...> - 2002-02-28 07:46:23

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv15271/templates

Modified Files:
	sandbox.html 
Log Message:
* added delete_module method in SandWeb::Config
* added module deletion support in sandweb.cgi
* updated sandweb.html to pass repo_name when deleting a module.

!!! - still need to delete the module from the filesystem, right now
      it just removes the data struct (NOTE: this actually makes no
	  functional difference in the code, everything works and there
	  should be no conflicts when checking out a module when the
	  directory already exists (from a previous deletion)).


Index: sandbox.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/sandbox.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- sandbox.html	28 Feb 2002 07:20:39 -0000	1.13
+++ sandbox.html	28 Feb 2002 07:46:20 -0000	1.14
@@ -65,5 +65,5 @@
       <a href="<TMPL_VAR NAME=PROGNAME>?action=sandbox&Submit=Update&module_name=<TMPL_VAR NAME="MODULE_NAME">&repo_name=<TMPL_VAR NAME="REPOSITORY">">update</a> 
       &nbsp; | &nbsp;
-      <a href="<TMPL_VAR NAME=PROGNAME>?action=sandbox&Submit=Delete&module_name=<TMPL_VAR NAME="MODULE_NAME">">delete</a>
+      <a href="<TMPL_VAR NAME=PROGNAME>?action=sandbox&Submit=Delete&module_name=<TMPL_VAR NAME="MODULE_NAME">&repo_name=<TMPL_VAR NAME="REPOSITORY">">delete</a>
      </font>
     </td>

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.234,1.235

From: Nick J. <nje...@us...> - 2002-02-28 07:46:22

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv15271/bin

Modified Files:
	sandweb.cgi 
Log Message:
* added delete_module method in SandWeb::Config
* added module deletion support in sandweb.cgi
* updated sandweb.html to pass repo_name when deleting a module.

!!! - still need to delete the module from the filesystem, right now
      it just removes the data struct (NOTE: this actually makes no
	  functional difference in the code, everything works and there
	  should be no conflicts when checking out a module when the
	  directory already exists (from a previous deletion)).


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.234
retrieving revision 1.235
diff -U2 -r1.234 -r1.235
--- sandweb.cgi	28 Feb 2002 07:21:23 -0000	1.234
+++ sandweb.cgi	28 Feb 2002 07:46:19 -0000	1.235
@@ -1880,5 +1880,5 @@
 		# 
 		if ($user->module_exists(repo => $repo_name, module => $module_name)) {
-			#$user->delete_module(repo => $repo_name, module => $module_name);
+			$user->delete_module(repo => $repo_name, module => $module_name);
 			# XXX
 			# DELETE MODULE DIRECTORY
@@ -1886,4 +1886,5 @@
 		} else {
 			set_message("module '$module_name' does not exist.");
+			$log->debug("module list for repo '$repo_name': " . join('-', $user->get_module_list(repo => $repo_name)));
 		}
 		my $return = write_config();

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.233,1.234

From: Nick J. <nje...@us...> - 2002-02-28 07:21:26

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv8886/bin

Modified Files:
	sandweb.cgi 
Log Message:
* fixed update/checkout blocks in sandbox_commit function


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.233
retrieving revision 1.234
diff -U2 -r1.233 -r1.234
--- sandweb.cgi	28 Feb 2002 06:32:57 -0000	1.233
+++ sandweb.cgi	28 Feb 2002 07:21:23 -0000	1.234
@@ -1788,6 +1788,9 @@
 	
 	if ($submit eq 'Update') {
-		# update module
+		# vcs update module
 		$do_vcs_action = 1;
+	}
+	if ($submit eq 'Edit') {
+		# update module data
 		if ($user->module_exists(repo => $repo_name, module => $module_name)) {
 			$user->update_module(
@@ -1810,4 +1813,7 @@
 							
 	if ($do_vcs_action) {
+		#
+		# DO VCS ACTION (Update or Checkout)
+		#
 		my $username = $auth->get_username();
 		my $template_dir = $config->{'paths'}->{'template_dir'};
@@ -1832,7 +1838,15 @@
 		);
 
-		my %return = $repository->checkout( 
-			file => "$module_name",
-		);
+		my %return;
+		if ($submit eq 'Checkout') {
+			%return = $repository->checkout( 
+				file => "$module_name",
+			);
+		} elsif ($submit eq 'Update') {
+			%return = $repository->update( 
+				file => "$module_name",
+			);
+		}
+
 		push (@vcs_output, "$return{'output'}\n");
 		push (@vcs_error, "$return{'error'}\n");
@@ -1862,4 +1876,7 @@
 		exit 0;
 	} elsif ($submit eq 'Delete') {
+		# 
+		# NO VCS ACTION (Delete Module)
+		# 
 		if ($user->module_exists(repo => $repo_name, module => $module_name)) {
 			#$user->delete_module(repo => $repo_name, module => $module_name);

[Sandweb-commit] CVS: sandweb/templates sandbox.html,1.12,1.13

From: Nick J. <nje...@us...> - 2002-02-28 07:20:43

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv8817/templates

Modified Files:
	sandbox.html 
Log Message:
* got update working (does an update, not a checkout, even though they
  appear to do the same thing (that might not be the case for VCS' aside
  from CVS)).


Index: sandbox.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/sandbox.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- sandbox.html	28 Feb 2002 07:05:24 -0000	1.12
+++ sandbox.html	28 Feb 2002 07:20:39 -0000	1.13
@@ -63,5 +63,5 @@
     <td width="15%" align="center">
      <font size="2">
-      <a href="<TMPL_VAR NAME=PROGNAME>?action=sandbox&Submit=Update&module_name=<TMPL_VAR NAME="MODULE_NAME">">update</a> 
+      <a href="<TMPL_VAR NAME=PROGNAME>?action=sandbox&Submit=Update&module_name=<TMPL_VAR NAME="MODULE_NAME">&repo_name=<TMPL_VAR NAME="REPOSITORY">">update</a> 
       &nbsp; | &nbsp;
       <a href="<TMPL_VAR NAME=PROGNAME>?action=sandbox&Submit=Delete&module_name=<TMPL_VAR NAME="MODULE_NAME">">delete</a>

[Sandweb-commit] CVS: sandweb/templates sandbox.html,1.11,1.12 module_checkout.html,1.1,NONE

From: Nick J. <nje...@us...> - 2002-02-28 07:05:26

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv5507

Modified Files:
	sandbox.html 
Removed Files:
	module_checkout.html 
Log Message:
* removed now unused template
* fixed some spacing issues in sandbox.html


Index: sandbox.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/sandbox.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- sandbox.html	28 Feb 2002 06:12:31 -0000	1.11
+++ sandbox.html	28 Feb 2002 07:05:24 -0000	1.12
@@ -24,8 +24,8 @@
    <tr>
     <td width="20%" align="left">
-	 &nbsp; <input type="text" name="module_name" size="18" maxlength="30" />
+	 &nbsp; <input type="text" name="module_name" size="15" maxlength="30" />
     </td>
     <td width="40%" align="left">
-     &nbsp; <input type="text" name="module_description" size="35" maxlength="50" />
+     &nbsp; <input type="text" name="module_description" size="30" maxlength="45" />
     </td>
     <td width="25%" align="center">

--- module_checkout.html DELETED ---

3 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 30 31 32 33 34 .. 53 > >> (Page 32 of 53)

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (28)	Nov (58)	Dec (85)
2002	Jan (125)	Feb (222)	Mar (274)	Apr (51)	May (22)	Jun (50)	Jul (15)	Aug (33)	Sep (11)	Oct (29)	Nov (17)	Dec (1)
2003	Jan (100)	Feb (21)	Mar (7)	Apr (45)	May	Jun (43)	Jul (27)	Aug (24)	Sep	Oct	Nov	Dec
2004	Jan (1)	Feb	Mar (13)	Apr	May (1)	Jun	Jul	Aug (7)	Sep	Oct	Nov	Dec (4)
2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)