sandweb-commit Mailing List for SandWeb (Page 46)

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 .. 44 45 46 47 48 .. 53 > >> (Page 46 of 53)

[Sandweb-commit] CVS: sandweb/lib/SandWeb File.pm,1.31,1.32

From: Rob H. <for...@us...> - 2002-01-18 07:49:34

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

Modified Files:
	File.pm 
Log Message:
upload now returns you to the file you were viewing


Index: File.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -U2 -r1.31 -r1.32
--- File.pm	2002/01/18 07:40:07	1.31
+++ File.pm	2002/01/18 07:49:31	1.32
@@ -135,10 +135,4 @@
 
 close UPLOADFILE;
-
-print "content-type:text/html\n\n";
-print "all done!";
-print "$filehandle";
-
-exit 1;
 }

[Sandweb-commit] CVS: sandweb/lib/SandWeb File.pm,1.30,1.31

From: Rob H. <for...@us...> - 2002-01-18 07:40:10

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

Modified Files:
	File.pm 
Log Message:
hmm.. the current version of the upload template is probably unsuitable
for browse menu, anyway. removing from the menu for now.


Index: File.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File.pm,v
retrieving revision 1.30
retrieving revision 1.31
diff -U2 -r1.30 -r1.31
--- File.pm	2002/01/18 07:37:33	1.30
+++ File.pm	2002/01/18 07:40:07	1.31
@@ -332,5 +332,4 @@
 		'remove',
 		'rename',
-		'upload',
 	);
 }

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.110,1.111

From: Rob H. <for...@us...> - 2002-01-18 07:37:38

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

Modified Files:
	sandweb.cgi 
Log Message:
file upload now works from the file menu.

it probably does NOT work from the browse menu (yet).


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.110
retrieving revision 1.111
diff -U2 -r1.110 -r1.111
--- sandweb.cgi	2002/01/02 22:35:30	1.110
+++ sandweb.cgi	2002/01/18 07:37:33	1.111
@@ -601,5 +601,5 @@
 		print header( -cookie => $cookie );
 		$ui->print_screen(
-			TITLE=> 'SandWeb : Create Folder',
+			TITLE => 'SandWeb : Create Folder',
 			MENU_TITLE => 'SandWeb',
 			SUBMENU_TITLE => 'create folder',
@@ -611,8 +611,16 @@
 	}
 	elsif ( $file_command eq 'upload' ) {
+		my $filehandle = upload('filehandle');
+		if ( $filehandle) {
+			$filename =~ s/.*[\/\\](.*)/$1/;
+			$file->upload(
+				filehandle => $filehandle,
+			);
+		}
 		my $content = $ui->get_menu( 
 			MENU => 'upload_file',
 			LOCATION => $location,
 			PROGNAME => $progname,
+			FILENAME => $filename,
 			FULLPATH => "$users_dir/$username/$location",
 		);

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

From: Rob H. <for...@us...> - 2002-01-18 07:37:37

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

Modified Files:
	File.pm 
Log Message:
file upload now works from the file menu.

it probably does NOT work from the browse menu (yet).


Index: File.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File.pm,v
retrieving revision 1.29
retrieving revision 1.30
diff -U2 -r1.29 -r1.30
--- File.pm	2002/01/07 07:14:41	1.29
+++ File.pm	2002/01/18 07:37:33	1.30
@@ -118,4 +118,29 @@
 }
 
+sub upload {
+	my $self = shift;
+	my %args = @_;
+	my $location = $self->{'location'};
+	my $filename = $self->{'filename'};
+	my $log = $self->{'log_obj'};
+
+	my $filehandle = $args{'filehandle'};
+
+open UPLOADFILE, "> $location/$filename";
+
+while ( <$filehandle> )
+{
+        print UPLOADFILE;
+}
+
+close UPLOADFILE;
+
+print "content-type:text/html\n\n";
+print "all done!";
+print "$filehandle";
+
+exit 1;
+}
+
 sub download {
 	my $self = shift;

[Sandweb-commit] CVS: sandweb/templates upload_file.html,1.2,1.3

From: Rob H. <for...@us...> - 2002-01-18 07:37:37

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

Modified Files:
	upload_file.html 
Log Message:
file upload now works from the file menu.

it probably does NOT work from the browse menu (yet).


Index: upload_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/upload_file.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- upload_file.html	2001/12/18 09:07:38	1.2
+++ upload_file.html	2002/01/18 07:37:34	1.3
@@ -5,7 +5,8 @@
 <input name="location" value="<TMPL_VAR NAME=LOCATION>" type="hidden" />
 <input name="fullpath" value="<TMPL_VAR NAME=FULLPATH>" type="hidden" />
+<input name="filename" value="<TMPL_VAR NAME=FILENAME>" type="hidden" />
 Enter a file to upload:<br />
 <TMPL_VAR NAME=ERROR>
-<input name="uploaded_file" type="file" /><br />
+<input name="filehandle" type="file" /><br />
 <input name="done" type="submit" /><br />
 </form>

[Sandweb-commit] CVS: sandweb/templates edit_file.html,1.8,1.9 view_file.html,1.14,1.15

From: Rob H. <for...@us...> - 2002-01-07 07:17:38

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

Modified Files:
	edit_file.html view_file.html 
Log Message:
<textarea> tags are so lame. the content tag just needs to be
right-justified inside the template. blah.



Index: edit_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/edit_file.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- edit_file.html	2001/12/30 12:24:04	1.8
+++ edit_file.html	2002/01/07 07:17:35	1.9
@@ -15,5 +15,5 @@
     <pre>
 <textarea name="data" cols="80" rows="24">
- <TMPL_VAR NAME=CONTENT>
+<TMPL_VAR NAME=CONTENT>
       </textarea>
     </pre>

Index: view_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/view_file.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- view_file.html	2002/01/07 07:14:42	1.14
+++ view_file.html	2002/01/07 07:17:35	1.15
@@ -15,5 +15,5 @@
 <pre>
 <textarea name="data" cols="80" rows="24">
- <TMPL_VAR NAME=DATA>
+<TMPL_VAR NAME=DATA>
 </textarea>
 </pre>

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

From: Rob H. <for...@us...> - 2002-01-07 07:14:44

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

Modified Files:
	view_file.html 
Log Message:

implemented a temporary solution for download in the view_file template;
I disabled the download pulldown that's on the browse menu for now.

The problem is that the way I'm passing the filename seems to require
that it's an <A HREF> rather than a <FORM>. ack. 


Index: view_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/view_file.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- view_file.html	2001/12/30 12:24:04	1.13
+++ view_file.html	2002/01/07 07:14:42	1.14
@@ -6,5 +6,5 @@
   <form submit="<TMPL_VAR NAME=PROGNAME>">
     <input type="hidden" name="action" value="file" />
-    <input type="submit" name="file_command" value="download" />
+    <a href="<TMPL_VAR NAME=PROGNAME>/<TMPL_VAR NAME=FILENAME>?action=file&file_command=download&location=<TMPL_VAR NAME=LOCATION>&filename=<TMPL_VAR NAME=FILENAME>">download</a>
     <input type="submit" name="file_command" value="upload" />
     <input type="submit" name="file_command" value="edit" />

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

From: Rob H. <for...@us...> - 2002-01-07 07:14:44

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

Modified Files:
	File.pm 
Log Message:

implemented a temporary solution for download in the view_file template;
I disabled the download pulldown that's on the browse menu for now.

The problem is that the way I'm passing the filename seems to require
that it's an <A HREF> rather than a <FORM>. ack. 


Index: File.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -U2 -r1.28 -r1.29
--- File.pm	2002/01/02 23:42:25	1.28
+++ File.pm	2002/01/07 07:14:41	1.29
@@ -145,5 +145,5 @@
         }
 
-        print "content-type:$mime_type\n\n";
+        print "Content-Type:$mime_type\n\n";
 
 	if (open FILE,"< $location/$filename") {
@@ -308,5 +308,4 @@
 		'rename',
 		'upload',
-		'download',
 	);
 }

[Sandweb-commit] CVS: sandweb/lib/SandWeb/Repository CVS.pm,1.19,1.20

From: Rob H. <for...@us...> - 2002-01-07 05:19:52

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

Modified Files:
	CVS.pm 
Log Message:
added color for cvs updated. looks MUCH more readable now.



Index: CVS.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/CVS.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -U2 -r1.19 -r1.20
--- CVS.pm	2001/12/23 04:48:06	1.19
+++ CVS.pm	2002/01/07 05:19:48	1.20
@@ -516,6 +516,26 @@
 	if ($merge) { push @param, " -j" };
 
-	my $output = `cd $sandbox && cvs -d $root @param \"$file\" 2>&1`;
+	my @output_lines = ();
+	my @raw_output = `cd $sandbox && cvs -d $root @param \"$file\" 2>&1`;
 	my $errorlevel = $?;
+
+	foreach my $line (@raw_output) {
+		if ($line =~ /^M/) {
+			$line =~ s/^M/\<font color\=\"blue\"\>Merged\<\/font\>/;
+		} 
+		elsif ($line =~ /^U/) {
+			$line =~ s/^U/\<font color\=\"green\"\>Updated\<\/font\>/;
+		}
+		elsif ($line =~ /^C/) {
+			$line =~ s/^C/\<font color\=\"red\"\>Conflict\<\/font\>/;
+		}
+		elsif ($line =~ /warning/) {
+			$line =~ s/warning/\<font color\=\"red\"\>warning\<\/font\>/;
+		}
+		chomp $line;
+		push (@output_lines, "$line\n");
+	}
+
+	my $output = join(/ /, "@output_lines");
 
 	my %return = (

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

From: Rob H. <for...@us...> - 2002-01-02 23:42:30

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

Modified Files:
	File.pm 
Log Message:
did some work on file download, works better now but
for some reason prompts you to download sandweb.cgi
if you try to "Save As" in the browser. Odd.



Index: File.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -U2 -r1.27 -r1.28
--- File.pm	2001/12/22 22:01:54	1.27
+++ File.pm	2002/01/02 23:42:25	1.28
@@ -129,5 +129,4 @@
 
 	$log->debug("downloading file : $location/$filename");
-	open FILE,"< $users_dir/$username/$location/$filename";
 
 	my $mime_type = _get_mime_type(
@@ -138,6 +137,8 @@
 		'log_obj' => "$log",
 	);
+
 	$log->debug("MIME type looks like : $mime_type");
 
+
         unless ($mime_type) {
         	$mime_type = "binary/unknown";
@@ -145,7 +146,14 @@
 
         print "content-type:$mime_type\n\n";
-        foreach my $line (@file) {
-        	print "$line";
-        }
+
+	if (open FILE,"< $location/$filename") {
+		while (<FILE>) {
+			print $_;
+		}
+	} else {
+		$log->debug("Can't download $location/$filename : $!");
+	}
+	close FILE;
+	
 }

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

From: Rob H. <for...@us...> - 2002-01-02 22:51:55

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

Modified Files:
	vcs_output.html 
Log Message:
added more debugging, and fixed location bug



Index: vcs_output.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/vcs_output.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- vcs_output.html	2002/01/02 20:19:47	1.4
+++ vcs_output.html	2002/01/02 22:51:52	1.5
@@ -1,4 +1,4 @@
 <p>
-  Current location : <a href="<TMPL_VAR NAME=PROGNAME>?action=browse_menu&path=<TMPL_VAR NAME=LOCATION>"><TMPL_VAR NAME=LOCATION></a>
+  Current location : <a href="<TMPL_VAR NAME=PROGNAME>?action=browse_menu&path=/<TMPL_VAR NAME=LOCATION>">/<TMPL_VAR NAME=LOCATION></a>
   <br />
   Current filename : <TMPL_VAR NAME=FILENAME>

[Sandweb-commit] CVS: sandweb/lib/SandWeb Browse.pm,1.25,1.26

From: Rob H. <for...@us...> - 2002-01-02 22:51:55

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

Modified Files:
	Browse.pm 
Log Message:
added more debugging, and fixed location bug



Index: Browse.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Browse.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -U2 -r1.25 -r1.26
--- Browse.pm	2002/01/02 22:35:30	1.25
+++ Browse.pm	2002/01/02 22:51:52	1.26
@@ -103,6 +103,9 @@
 
 
-	opendir(SANDBOX, "$sandbox/$path") || $log->debug("can't opendir $sandbox/$path : $!");
-	$log->debug("opened dir : $sandbox/$path");
+	if ( opendir(SANDBOX, "$sandbox/$path") ) {
+		$log->debug("Opened folder : $sandbox/$path");
+	} else {
+		$log->debug("Cannot open folder $sandbox/$path : $!");
+	}
 	my @entries = readdir(SANDBOX);
 	chomp @entries;

[Sandweb-commit] CVS: sandweb/lib/SandWeb Browse.pm,1.24,1.25

From: Rob H. <for...@us...> - 2002-01-02 22:35:33

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

Modified Files:
	Browse.pm 
Log Message:

added debugging to browse, to help me debug a problem :)



Index: Browse.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Browse.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -U2 -r1.24 -r1.25
--- Browse.pm	2001/12/21 07:15:59	1.24
+++ Browse.pm	2002/01/02 22:35:30	1.25
@@ -14,9 +14,14 @@
 	my $class = shift;
 	my %args = @_;
+	my $username = $args{'username'};
+	my $template_dir = $args{'template_dir'};
+	my $users_dir = $args{'users_dir'};
+	my $log_obj = $args{'log_obj'};
 
 	my $self = bless {
-	   'username' => $args{'username'},
-	   'template_dir' => $args{'template_dir'},
-	   'users_dir' => $args{'users_dir'},
+		'username' => $username,
+		'template_dir' => $template_dir,
+		'users_dir' => $users_dir,
+		'log_obj' => $log_obj,
 	}, $class;
 
@@ -38,4 +43,5 @@
 	my $users_dir = $self->_get_users_dir();
 	my $template_dir = $self->_get_template_dir();
+	my $log = $self->_get_log_obj;
 	my $sandbox = "$users_dir/$username";
 	my @vcs_commands = split (/ /, $vcs_commands );
@@ -97,5 +103,6 @@
 
 
-	opendir(SANDBOX, "$sandbox/$path") || die "can't opendir $sandbox/$path : $!";
+	opendir(SANDBOX, "$sandbox/$path") || $log->debug("can't opendir $sandbox/$path : $!");
+	$log->debug("opened dir : $sandbox/$path");
 	my @entries = readdir(SANDBOX);
 	chomp @entries;
@@ -171,5 +178,5 @@
 	}
 	} else {
-	$content->param(STATUS => 'No files.');
+		$content->param(STATUS => 'No files.');
 	}
 
@@ -208,4 +215,9 @@
 	my $self = shift;
 	return $self->{'template_dir'};
+}
+
+sub _get_log_obj {
+	my $self = shift;
+	return $self->{'log_obj'};
 }

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.109,1.110

From: Rob H. <for...@us...> - 2002-01-02 22:35:33

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

Modified Files:
	sandweb.cgi 
Log Message:

added debugging to browse, to help me debug a problem :)



Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.109
retrieving revision 1.110
diff -U2 -r1.109 -r1.110
--- sandweb.cgi	2002/01/02 20:19:46	1.109
+++ sandweb.cgi	2002/01/02 22:35:30	1.110
@@ -319,14 +319,15 @@
 	$log->debug("creating Repository object");
 	my $repository = SandWeb::Repository->new( 
-						root => "$vcsroot",
-						repo_type => $repo_type,
-						sandbox => $sandbox,
+						'root' => "$vcsroot",
+						'repo_type' => $repo_type,
+						'sandbox' => $sandbox,
 	);
 
 	$log->debug("creating Browse object");
 	my $browse = SandWeb::Browse->new( 
-					username => $username,
-					template_dir => $template_dir,
-					users_dir => $users_dir,
+					'username' => $username,
+					'template_dir' => $template_dir,
+					'users_dir' => $users_dir,
+					'log_obj' => $log,
 	);

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

From: Rob H. <for...@us...> - 2002-01-02 20:19:49

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

Modified Files:
	vcs_output.html 
Log Message:

added current location/current filename to top of page. MUCH more usable now.



Index: vcs_output.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/vcs_output.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- vcs_output.html	2001/12/30 12:26:51	1.3
+++ vcs_output.html	2002/01/02 20:19:47	1.4
@@ -1,3 +1,7 @@
 <p>
+  Current location : <a href="<TMPL_VAR NAME=PROGNAME>?action=browse_menu&path=<TMPL_VAR NAME=LOCATION>"><TMPL_VAR NAME=LOCATION></a>
+  <br />
+  Current filename : <TMPL_VAR NAME=FILENAME>
+  <br />
   <form>
     <input name="<TMPL_VAR NAME=LOCATION>" type="hidden">
@@ -5,5 +9,4 @@
     <input name="<TMPL_VAR NAME=PROGNAME>" type="hidden">
   </form>
- <TMPL_VAR NAME=FILENAME>
  <font color="#FF0000"><TMPL_VAR NAME=VCS_ERROR></font>
 <pre>

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.108,1.109

From: Rob H. <for...@us...> - 2002-01-02 20:19:49

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

Modified Files:
	sandweb.cgi 
Log Message:

added current location/current filename to top of page. MUCH more usable now.



Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.108
retrieving revision 1.109
diff -U2 -r1.108 -r1.109
--- sandweb.cgi	2001/12/22 22:01:54	1.108
+++ sandweb.cgi	2002/01/02 20:19:46	1.109
@@ -775,4 +775,5 @@
 			MENU => 'vcs_output',
                         LOCATION => $location,
+			FILENAME => "@filename",
                         PROGNAME => $progname,
                         FULLPATH => "$users_dir/$username/$location",

[Sandweb-commit] CVS: sandweb/templates vcs_output.html,1.2,1.3

From: Rob H. <for...@us...> - 2001-12-30 12:26:53

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

Modified Files:
	vcs_output.html 
Log Message:
first line had an extra space prepended; fixed


Index: vcs_output.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/vcs_output.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- vcs_output.html	2001/11/27 00:47:17	1.2
+++ vcs_output.html	2001/12/30 12:26:51	1.3
@@ -7,6 +7,6 @@
  <TMPL_VAR NAME=FILENAME>
  <font color="#FF0000"><TMPL_VAR NAME=VCS_ERROR></font>
-  <pre>
- <TMPL_VAR NAME=VCS_OUTPUT>
-  </pre>
+<pre>
+<TMPL_VAR NAME=VCS_OUTPUT>
+</pre>
 </p>

[Sandweb-commit] CVS: sandweb/templates edit_file.html,1.7,1.8 view_file.html,1.12,1.13

From: Rob H. <for...@us...> - 2001-12-30 12:24:12

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

Modified Files:
	edit_file.html view_file.html 
Log Message:
synchronized look&feel between edit/view pages. much nicer now.


Index: edit_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/edit_file.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- edit_file.html	2001/12/18 09:07:38	1.7
+++ edit_file.html	2001/12/30 12:24:04	1.8
@@ -1,4 +1,9 @@
 <p>
-  <TMPL_VAR NAME=FILENAME>
+<p>
+  Current location : <a href="<TMPL_VAR NAME=PROGNAME>?action=browse_menu&path=<
+TMPL_VAR NAME=LOCATION>"><TMPL_VAR NAME=LOCATION></a>
+  <br />
+  Current filename : <TMPL_VAR NAME=FILENAME>
+  <br />
   <form submit="<TMPL_VAR NAME=PROGNAME>">
     <input name="action" value="file" type="hidden" />
@@ -9,5 +14,5 @@
     <input type="submit" name="save" value="Save" />
     <pre>
-      <textarea name="data" cols="80" rows="24">
+<textarea name="data" cols="80" rows="24">
  <TMPL_VAR NAME=CONTENT>
       </textarea>

Index: view_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/view_file.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- view_file.html	2001/12/22 22:00:19	1.12
+++ view_file.html	2001/12/30 12:24:04	1.13
@@ -13,7 +13,9 @@
 <TMPL_VAR NAME=ERROR>
 <br>
+<pre>
 <textarea name="data" cols="80" rows="24">
  <TMPL_VAR NAME=DATA>
 </textarea>
+</pre>
   </form>
 </p>

[Sandweb-commit] CVS: sandweb/lib/SandWeb Repository.pm,1.15,1.16

From: Rob H. <for...@us...> - 2001-12-23 04:48:10

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

Modified Files:
	Repository.pm 
Log Message:
turned on context diff by default, and documented it.
if we can parse this data, colorize the parts prefaced
by "+ " and "- ", we will have "colorized context diff"
functionality.



Index: Repository.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- Repository.pm	2001/12/18 09:07:38	1.15
+++ Repository.pm	2001/12/23 04:48:06	1.16
@@ -190,8 +190,10 @@
 	my $rev = $args{'rev'};
 	my $recurse = $args{'recurse'};
+	my $context = "1";
 	my $repo_type = $self->get_repo_type();
 	my $root = $self->get_root();
 	my $sandbox = $self->get_sandbox();
 	my %return = {};
+
 	my $vcs = SandWeb::Repository::CVS->new(
 		root => $root,
@@ -205,4 +207,5 @@
 			rev => $rev,
 			recurse => $recurse,
+			context => $context,
 			file => $file,
 		);

[Sandweb-commit] CVS: sandweb/lib/SandWeb/Repository CVS.pm,1.18,1.19

From: Rob H. <for...@us...> - 2001-12-23 04:48:09

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

Modified Files:
	CVS.pm 
Log Message:
turned on context diff by default, and documented it.
if we can parse this data, colorize the parts prefaced
by "+ " and "- ", we will have "colorized context diff"
functionality.



Index: CVS.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/CVS.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- CVS.pm	2001/12/18 07:47:26	1.18
+++ CVS.pm	2001/12/23 04:48:06	1.19
@@ -170,4 +170,5 @@
 	my $rev = $args{'rev'};
 	my $recurse = $args{'recurse'};
+	my $context = $args{'context'};
 	my $file = $args{'file'};
 
@@ -178,4 +179,5 @@
 	if ($date) { push @param, " $date" };
 	if ($rev) { push @param, " -r $rev" };
+	if ($context) { push @param, " -c" };
 	if ($recurse) { push @param, " -R" };

[Sandweb-commit] CVS: sandweb/doc/API Repository.txt,1.8,1.9

From: Rob H. <for...@us...> - 2001-12-23 04:48:09

Update of /cvsroot/sandweb/sandweb/doc/API
In directory usw-pr-cvs1:/tmp/cvs-serv26984/doc/API

Modified Files:
	Repository.txt 
Log Message:
turned on context diff by default, and documented it.
if we can parse this data, colorize the parts prefaced
by "+ " and "- ", we will have "colorized context diff"
functionality.



Index: Repository.txt
===================================================================
RCS file: /cvsroot/sandweb/sandweb/doc/API/Repository.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- Repository.txt	2001/08/07 23:18:31	1.8
+++ Repository.txt	2001/12/23 04:48:06	1.9
@@ -382,4 +382,10 @@
 	(False=CVS: diff -l)
 
+	context (type: boolean)
+		Displays the diff in "context" format, much more 
+		human readable than the default style.
+
+		Default value: true.
+		(CVS: checkout -R)
 
         -D d1   Diff revision or date against working file.

[Sandweb-commit] CVS: sandweb/lib/SandWeb File.pm,1.26,1.27

From: Rob H. <for...@us...> - 2001-12-22 22:01:57

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

Modified Files:
	File.pm 
Log Message:
better debugging and error reporting when a file can't be removed by
the user.


Index: File.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -U2 -r1.26 -r1.27
--- File.pm	2001/12/21 01:12:47	1.26
+++ File.pm	2001/12/22 22:01:54	1.27
@@ -192,8 +192,14 @@
 	my $filename = $self->{'filename'};
 	my $log = $self->{'log_obj'};
+	my $return;
 
 	$log->debug("removing file : $location/$filename");
 
-	my $return = unlink("$location/$filename" );
+	if ( unlink("$location/$filename") ) {
+		$return = 1;
+	} else {
+		$log->debug("could not remove $location/$filename : $!");
+		$return = 0;
+	}
 
 	return $return;

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.107,1.108

From: Rob H. <for...@us...> - 2001-12-22 22:01:57

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

Modified Files:
	sandweb.cgi 
Log Message:
better debugging and error reporting when a file can't be removed by
the user.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.107
retrieving revision 1.108
diff -U2 -r1.107 -r1.108
--- sandweb.cgi	2001/12/21 08:29:02	1.107
+++ sandweb.cgi	2001/12/22 22:01:54	1.108
@@ -426,5 +426,9 @@
 					$file->remove_folder();
 				} else {
-					$file->remove_file();
+					if ( $file->remove_file() ) {
+						set_error("$filename removed.");
+					} else {
+						set_error("Cannot remove $filename.");
+					}
 				}
 			}

[Sandweb-commit] CVS: sandweb/templates view_file.html,1.11,1.12

From: Rob H. <for...@us...> - 2001-12-22 22:00:22

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

Modified Files:
	view_file.html 
Log Message:
hmm, not sure what I was thinking last night, but that textfield
tag was completely malformed. it works now.


Index: view_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/view_file.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- view_file.html	2001/12/21 08:33:47	1.11
+++ view_file.html	2001/12/22 22:00:19	1.12
@@ -12,5 +12,8 @@
     <input type="hidden" name="filename" value="<TMPL_VAR NAME=FILENAME>" />
 <TMPL_VAR NAME=ERROR>
-<pre> <TMPL_VAR NAME=DATA></pre>
+<br>
+<textarea name="data" cols="80" rows="24">
+ <TMPL_VAR NAME=DATA>
+</textarea>
   </form>
 </p>

[Sandweb-commit] CVS: sandweb/templates browse.html,1.46,1.47

From: Nick J. <nje...@us...> - 2001-12-21 22:17:40

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

Modified Files:
	browse.html 
Log Message:
* added preceeding space to file size area.

what happened to the Command menu?


Index: browse.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/browse.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -U2 -r1.46 -r1.47
--- browse.html	2001/12/21 22:13:30	1.46
+++ browse.html	2001/12/21 22:17:37	1.47
@@ -100,4 +100,5 @@
 				</td>
 				<td>
+					&nbsp
 					<TMPL_VAR NAME=FILESIZE>/<font size="2"><i>B</i></font>
 				</td>

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

Flat | Threaded

<< < 1 .. 44 45 46 47 48 .. 53 > >> (Page 46 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)