better fix for empty actions list issue

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 51e7a194f704f0955566fefb7311e588ff18ab78..f33d6e66eb7de041d43734b0a4ec4ef3aa7b9b7c 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -160,22 +160,30 @@ sub genpage ($$$) { #{{{
        
        my $template=HTML::Template->new(blind_cache => 1,
                filename => "$config{templatedir}/page.tmpl");
        
        my $template=HTML::Template->new(blind_cache => 1,
                filename => "$config{templatedir}/page.tmpl");

-       
+       my $actions=0;
+

        if (length $config{cgiurl}) {
                $template->param(editurl => cgiurl(do => "edit", page => $page));
                $template->param(prefsurl => cgiurl(do => "prefs"));
                if ($config{rcs}) {
                        $template->param(recentchangesurl => cgiurl(do => "recentchanges"));
                }
        if (length $config{cgiurl}) {
                $template->param(editurl => cgiurl(do => "edit", page => $page));
                $template->param(prefsurl => cgiurl(do => "prefs"));
                if ($config{rcs}) {
                        $template->param(recentchangesurl => cgiurl(do => "recentchanges"));
                }

+               $actions++;

        }
 
        if (length $config{historyurl}) {
                my $u=$config{historyurl};
                $u=~s/\[\[file\]\]/$pagesources{$page}/g;
                $template->param(historyurl => $u);
        }
 
        if (length $config{historyurl}) {
                my $u=$config{historyurl};
                $u=~s/\[\[file\]\]/$pagesources{$page}/g;
                $template->param(historyurl => $u);

+               $actions++;

        }
        if ($config{discussion}) {
                $template->param(discussionlink => htmllink($page, "Discussion", 1, 1));
        }
        if ($config{discussion}) {
                $template->param(discussionlink => htmllink($page, "Discussion", 1, 1));

+               $actions++;
+       }
+
+       if ($actions) {
+               $template->param(have_actions => 1);

        }
 
        if (exists $hooks{pagetemplate}) {
        }
 
        if (exists $hooks{pagetemplate}) {

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 930d173c23f0027358a6d3e9a23e69b59f41bbbb..c2430f044a46f3ab73cb1bc8bd21eb5a3d70b04c 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -20,31 +20,27 @@
 </TMPL_IF>
 </div>
 
 </TMPL_IF>
 </div>
 

+<TMPL_IF NAME="HAVE_ACTIONS">

 <div id="actions">
 <ul>
 <TMPL_IF NAME="EDITURL">
 <li><a href="<TMPL_VAR EDITURL>">Edit</a></li>
 </TMPL_IF>
 <div id="actions">
 <ul>
 <TMPL_IF NAME="EDITURL">
 <li><a href="<TMPL_VAR EDITURL>">Edit</a></li>
 </TMPL_IF>

-

 <TMPL_IF NAME="RECENTCHANGESURL">
 <li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li>
 </TMPL_IF>
 <TMPL_IF NAME="RECENTCHANGESURL">
 <li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li>
 </TMPL_IF>

-

 <TMPL_IF NAME="HISTORYURL">
 <li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
 </TMPL_IF>
 <TMPL_IF NAME="HISTORYURL">
 <li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
 </TMPL_IF>

-

 <TMPL_IF NAME="PREFSURL">
 <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
 </TMPL_IF>
 <TMPL_IF NAME="PREFSURL">
 <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
 </TMPL_IF>

-

 <TMPL_IF NAME="DISCUSSIONLINK">
 <li><TMPL_VAR DISCUSSIONLINK><br /></li>
 </TMPL_IF>
 <TMPL_IF NAME="DISCUSSIONLINK">
 <li><TMPL_VAR DISCUSSIONLINK><br /></li>
 </TMPL_IF>

-
-<li></li>

 </ul>
 </div>
 </ul>
 </div>

+</TMPL_IF>

 
 <div id="content">
 <TMPL_VAR CONTENT>
 
 <div id="content">
 <TMPL_VAR CONTENT>