From 4b377fd01878a6214ec590368185cc16c2fc466e Mon Sep 17 00:00:00 2001
From: pcanterino <>
Date: Thu, 24 Aug 2006 19:48:37 +0000
Subject: [PATCH] Trying to simplify some of Dev-Editor's functions:

If you want to copy or rename/move a file or a directory or save a file using a
different name, the form field for the new filename is prefilled with the old
one. Additionally, the entered path is no more relative to the directory of the
original file.
---
 devedit.pl               | 3 +--
 modules/Command.pm       | 2 +-
 templates/copydir.htm    | 2 +-
 templates/copyfile.htm   | 2 +-
 templates/editfile.htm   | 2 +-
 templates/renamefile.htm | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/devedit.pl b/devedit.pl
index 39588cf..7ad34c0 100644
--- a/devedit.pl
+++ b/devedit.pl
@@ -6,7 +6,7 @@
 # Dev-Editor's main program
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
-# Last modified: 2005-06-14
+# Last modified: 2006-08-24
 #
 
 use strict;
@@ -58,7 +58,6 @@ my $new_virtual  = '';
 
 if($newfile ne '' && $newfile !~ /^\s+$/)
 {
- $curdir  = upper_path($file) if($curdir eq '');
  my $path = $curdir.'/'.$newfile;
 
  # Extract file and directory name...
diff --git a/modules/Command.pm b/modules/Command.pm
index d779a6c..28c6777 100644
--- a/modules/Command.pm
+++ b/modules/Command.pm
@@ -966,7 +966,7 @@ sub exec_about($$)
 
   $tpl->parse_if_block('users',1);
 
-  # ID's of user and group
+  # IDs of user and group
 
   $tpl->fillin('UID',$uid);
   $tpl->fillin('GID',$gid);
diff --git a/templates/copydir.htm b/templates/copydir.htm
index f98f63b..6cbc65a 100644
--- a/templates/copydir.htm
+++ b/templates/copydir.htm
@@ -21,7 +21,7 @@
 <input type="hidden" name="file" value="{FILE}">
 
 <p>Copy directory '{FILE}' to:<br>
-{DIR} <input type="text" name="newfile"></p>
+<input type="text" name="newfile" value="{FILE}"></p>
 
 <p><input type="submit" value="Copy directory!"></p>
 </form>
diff --git a/templates/copyfile.htm b/templates/copyfile.htm
index ac1dd10..868f733 100644
--- a/templates/copyfile.htm
+++ b/templates/copyfile.htm
@@ -21,7 +21,7 @@
 <input type="hidden" name="file" value="{FILE}">
 
 <p>Copy file '{FILE}' to:<br>
-{DIR} <input type="text" name="newfile"> <input type="checkbox" name="confirmed" id="overwrite"><label for="overwrite">Overwrite existing file</label></p>
+<input type="text" name="newfile" value="{FILE}"> <input type="checkbox" name="confirmed" id="overwrite"><label for="overwrite">Overwrite existing file</label></p>
 
 <p><input type="submit" value="Copy file!"></p>
 </form>
diff --git a/templates/editfile.htm b/templates/editfile.htm
index 99c71a6..bbbcebf 100644
--- a/templates/editfile.htm
+++ b/templates/editfile.htm
@@ -23,7 +23,7 @@
 
 <p><textarea name="filecontent" rows="25" cols="120">{CONTENT}</textarea></p>
 
-<p><input type="checkbox" name="saveas" id="newfile" value="1"><label for="newfile">Save as new file: {DIR} </label><input type="text" name="newfile" value="" onchange="if(this.form.newfile.value != '') this.form.saveas.checked = true; else this.form.saveas.checked = false;"></p>
+<p><input type="checkbox" name="saveas" id="newfile" value="1"><label for="newfile">Save as new file: </label><input type="text" name="newfile" value="{FILE}" onchange="if(this.form.newfile.value != '') this.form.saveas.checked = true; else this.form.saveas.checked = false;"></p>
 
 <p><input type="submit" value="Save file and end editing"> <input type="submit" name="continue" value="Save file and continue editing"> <input type="reset" value="Discard changes"></p>
 </form>
diff --git a/templates/renamefile.htm b/templates/renamefile.htm
index 512d45c..d9415da 100644
--- a/templates/renamefile.htm
+++ b/templates/renamefile.htm
@@ -21,7 +21,7 @@
 <input type="hidden" name="file" value="{FILE}">
 
 <p>Move/Rename file '{FILE}' to:<br>
-{DIR} <input type="text" name="newfile"> <input type="checkbox" name="confirmed" id="overwrite"><label for="overwrite">Overwrite existing file</label></p>
+<input type="text" name="newfile" value="{FILE}"> <input type="checkbox" name="confirmed" id="overwrite"><label for="overwrite">Overwrite existing file</label></p>
 
 <p><input type="submit" value="Move/Rename file!"></p>
 </form>
-- 
2.34.1