projects / webmin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2d1c259)
Added a link in the HTML editor window to swich to plain text mode
authorJamie Cameron <jcameron@webmin.com>
Fri, 4 May 2007 21:10:03 +0000 (21:10 +0000)
committerJamie Cameron <jcameron@webmin.com>
Fri, 4 May 2007 21:10:03 +0000 (21:10 +0000)
file/CHANGELOG patch | blob | history
file/edit_html.cgi patch | blob | history
file/lang/en patch | blob | history

diff --git a/file/CHANGELOG b/file/CHANGELOG
index 054740c..f0f688d 100644 (file)
--- a/file/CHANGELOG
+++ b/file/CHANGELOG
@@ -33,3 +33,4 @@ Added a button for creating a new HTML file.
 Replaced the HTMLarea widget for editing .html files with Xinha.
 ---- Changes since 1.340 ----
 When editing an HTML file, the <head> section is preserved.
+Added a link in the HTML editor window to swich to plain text mode.
diff --git a/file/edit_html.cgi b/file/edit_html.cgi
index 8ccf55d..8588ee1 100755 (executable)
--- a/file/edit_html.cgi
+++ b/file/edit_html.cgi
@@ -5,8 +5,14 @@ require './file-lib.pl';
 do '../ui-lib.pl';
 $disallowed_buttons{'edit'} && &error($text{'ebutton'});
 &ReadParse();
+
+# Work out editing mode
+if ($in{'text'} || $in{'file'} && $in{'file'} !~ /\.(htm|html|shtml)$/i) {
+       $text_mode = 1;
+       }
+
 &popup_header($in{'file'} ? $text{'html_title'} : $text{'html_title2'},
-             undef, "onload='initEditor()'");
+             undef, $text_mode ? undef : "onload='initEditor()'");
 
 # Output HTMLarea init code
 print <<EOF;
@@ -32,9 +38,10 @@ $data = &read_file_contents($in{'file'});
 
 # Output text area
 print &ui_form_start("save_html.cgi", "form-data");
+print &ui_hidden("text", $text_mode);
 if ($in{'file'}) {
        # Editing existing file
-       print &ui_hidden("file", $in{'file'}),"\n";
+       print &ui_hidden("file", $in{'file'});
        $pc = 95;
        }
 else {
@@ -43,10 +50,24 @@ else {
              &ui_textbox("file", $in{'dir'}, 70),"<br>\n";
        $pc = 90;
        }
-print "<textarea rows=20 cols=80 style='width:100%;height:$pc%' name=body id=body>";
-print &html_escape($data);
-print "</textarea>\n";
-print &ui_submit($text{'html_save'});
+if ($text_mode) {
+       # Show plain textarea
+       print "<textarea rows=20 cols=80 style='width:100%;height:$pc%' name=body>";
+       print &html_escape($data);
+       print "</textarea>\n";
+       print &ui_submit($text{'html_save'});
+       }
+else {
+       # Show HTML editor
+       print "<textarea rows=20 cols=80 style='width:100%;height:$pc%' name=body id=body>";
+       print &html_escape($data);
+       print "</textarea>\n";
+       print "<table width=100%><tr>\n";
+       print "<td>",&ui_submit($text{'html_save'}),"</td>\n";
+       print "<td align=right><a href='edit_html.cgi?file=".
+            &urlize($in{'file'})."&text=1'>$text{'edit_textmode'}</a></td>\n";
+       print "</tr> </table>\n";
+       }
 print &ui_form_end();
 
 &popup_footer();
diff --git a/file/lang/en b/file/lang/en
index cbd8700..ec5cc4e 100644 (file)
--- a/file/lang/en
+++ b/file/lang/en
@@ -52,6 +52,7 @@ edit_efollow=You are not allowed to write to the symbolic link '$1'
 edit_notfound=The text $1 was not found
 edit_saveclose=Save & Close
 edit_elength=File was truncated!
+edit_textmode=Switch to plain text mode
 
 info_file=File
 info_path=Path:
Webmin PERL server management