attachments interface visibility toggling

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index ae06922d4b0528a171ae29c1c5559e682c75789e..a58f696ebf203c841e9e3c39a883c80886eddf74 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -18,6 +18,7 @@ sub checkconfig () { #{{{
 sub formbuilder_setup (@) { #{{{
        my %params=@_;
        my $form=$params{form};
 sub formbuilder_setup (@) { #{{{
        my %params=@_;
        my $form=$params{form};

+       my $q=$params{cgi};

 
        if ($form->field("do") eq "edit") {
                $form->field(name => 'attachment', type => 'file');
 
        if ($form->field("do") eq "edit") {
                $form->field(name => 'attachment', type => 'file');


@@ -25,6 +26,20 @@ sub formbuilder_setup (@) { #{{{
                # are not added to the normal formbuilder button list.
                $form->tmpl_param("field-upload" => '<input name="_submit" type="submit" value="Upload Attachment" />');
                $form->tmpl_param("field-link" => '<input name="_submit" type="submit" value="Insert Links" />');
                # are not added to the normal formbuilder button list.
                $form->tmpl_param("field-upload" => '<input name="_submit" type="submit" value="Upload Attachment" />');
                $form->tmpl_param("field-link" => '<input name="_submit" type="submit" value="Insert Links" />');

+
+               # Add the javascript from the toggle plugin;
+               # the attachments interface uses it to toggle visibility.
+               require IkiWiki::Plugin::toggle;
+               $form->tmpl_param("javascript" => $IkiWiki::Plugin::toggle::javascript);
+               # Start with the attachments interface toggled invisible,
+               # but if it was used, keep it open.
+               if ($form->submitted ne "Upload Attachment" &&
+                   ! length $q->param("attachment_select")) {
+                       $form->tmpl_param("attachments-class" => "toggleable");
+               }
+               else {
+                       $form->tmpl_param("attachments-class" => "toggleable-open");
+               }

        }
        elsif ($form->title eq "preferences") {
                my $session=$params{session};
        }
        elsif ($form->title eq "preferences") {
                my $session=$params{session};


@@ -136,7 +151,7 @@ sub formbuilder (@) { #{{{
                }
                $form->field(name => 'editcontent',
                        value => $form->field('editcontent')."\n\n".$add,
                }
                $form->field(name => 'editcontent',
                        value => $form->field('editcontent')."\n\n".$add,

-                       force => 1);
+                       force => 1) if length $add;

        }
        
        # Generate the attachment list only after having added any new
        }
        
        # Generate the attachment list only after having added any new

diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 1a27beb6f7dcdce9fd85c3d93b80b217f56757a2..fdb142c709e27fa2cca269439d3e64cfbd6127cb 100644 (file)
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -60,10 +60,10 @@ Optional comment about this change:<br />
 </TMPL_IF>
 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR HELPONFORMATTINGLINK>
 </TMPL_IF>
 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR HELPONFORMATTINGLINK>

+<a class="toggle" href="#attachments">Attachments</a>

 <TMPL_IF NAME="FIELD-ATTACHMENT">
 <TMPL_IF NAME="FIELD-ATTACHMENT">

-<div id=attachments>
-<br />
-<table><caption>Attachments</caption>
+<div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
+<table>

 <tr><td colspan=5><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>
 <TMPL_LOOP NAME="ATTACHMENT_LIST">
 <tr><td><TMPL_VAR FIELD-SELECT><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr>
 <tr><td colspan=5><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>
 <TMPL_LOOP NAME="ATTACHMENT_LIST">
 <tr><td><TMPL_VAR FIELD-SELECT><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr>


@@ -86,3 +86,5 @@ Optional comment about this change:<br />
 <TMPL_VAR PAGE_PREVIEW>
 </div>
 </TMPL_IF>
 <TMPL_VAR PAGE_PREVIEW>
 </div>
 </TMPL_IF>

+
+<TMPL_VAR JAVASCRIPT>