[p5w] create tollbar.tmpl, and use <TMPL_INCLUDE> to include it in al…

…l templates. Make it reuseable for all wiki pages (i hope). Add "History" and "Back to ..." buttons on it.
ronaldxs · Sep 10, 2008 · 303653a · 303653a
1 parent 81a04cf
commit 303653a
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 68 deletions.
diff --git a/p5w/skin/action_not_authorized.tmpl b/p5w/skin/action_not_authorized.tmpl
@@ -5,9 +5,7 @@
         <link rel="stylesheet" type="text/css" href="spartan.css" />
     </head>
     <body>
-        <ul id="toolbar">
-            &nbsp;
-        </ul>
+        <TMPL_INCLUDE NAME="toolbar.tmpl">
         <div id="content">
             <h1>Not logged in</h1>
             <p>You need to be logged in to <TMPL_VAR NAME=DISALLOWED_ACTION>.</p>

diff --git a/p5w/skin/edit.tmpl b/p5w/skin/edit.tmpl
@@ -5,13 +5,7 @@
         <link rel="stylesheet" type="text/css" href="spartan.css" />
     </head>
     <body>
-        <ul id="toolbar">
-            <TMPL_IF NAME=LOGGED_IN>
-                <li><a href="?action=log_out">Log out</a></li>
-            <TMPL_ELSE>
-                <li><a href="?action=log_in">Log in</a></li>
-            </TMPL_IF>
-        </ul>
+        <TMPL_INCLUDE NAME="toolbar.tmpl">
         <div id="content">
             <h1><TMPL_VAR NAME=TITLE></h1>
             <form method="POST">

diff --git a/p5w/skin/log_in.tmpl b/p5w/skin/log_in.tmpl
@@ -5,9 +5,7 @@
         <link rel="stylesheet" type="text/css" href="spartan.css" />
     </head>
     <body onload="document.login.user_name.focus()">
-        <ul id="toolbar">
-            &nbsp;
-        </ul>
+        <TMPL_INCLUDE NAME="toolbar.tmpl">
         <div id="content">
             <h1>Log in</h1>
             <p>Everything you say can, and will, be used against you. Please

diff --git a/p5w/skin/login_failed.tmpl b/p5w/skin/login_failed.tmpl
@@ -5,9 +5,7 @@
         <link rel="stylesheet" type="text/css" href="spartan.css" />
     </head>
     <body>
-        <ul id="toolbar">
-            &nbsp;
-        </ul>
+        <TMPL_INCLUDE NAME="toolbar.tmpl">
         <div id="content">
             <h1>Login failed</h1>
             <p>Something went wrong. Sorry.</p>

diff --git a/p5w/skin/login_succeeded.tmpl b/p5w/skin/login_succeeded.tmpl
@@ -5,9 +5,7 @@
         <link rel="stylesheet" type="text/css" href="spartan.css" />
     </head>
     <body>
-        <ul id="toolbar">
-            &nbsp;
-        </ul>
+        <TMPL_INCLUDE NAME="toolbar.tmpl">
         <div id="content">
             <h1>Login successful</h1>
             <p>You got in!</p>

diff --git a/p5w/skin/logout_succeeded.tmpl b/p5w/skin/logout_succeeded.tmpl
@@ -5,9 +5,7 @@
         <link rel="stylesheet" type="text/css" href="spartan.css" />
     </head>
     <body>
-        <ul id="toolbar">
-            &nbsp;
-        </ul>
+        <TMPL_INCLUDE NAME="toolbar.tmpl">
         <div id="content">
             <h1>Logout successful</h1>
             <p>You got out!</p>

diff --git a/p5w/skin/not_found.tmpl b/p5w/skin/not_found.tmpl
@@ -5,14 +5,7 @@
         <link rel="stylesheet" type="text/css" href="spartan.css" />
     </head>
     <body>
-        <ul id="toolbar">
-            <li><a href="?action=edit">Edit</a></li>
-            <TMPL_IF NAME=LOGGED_IN>
-                <li><a href="?action=log_out">Log out</a></li>
-            <TMPL_ELSE>
-                <li><a href="?action=log_in">Log in</a></li>
-            </TMPL_IF>
-        </ul>
+        <TMPL_INCLUDE NAME="toolbar.tmpl">
         <div id="content">
             <h1>Page not found</h1>
             The page <TMPL_VAR NAME=PAGE> was not found.

diff --git a/p5w/skin/page_history.tmpl b/p5w/skin/page_history.tmpl
@@ -5,13 +5,7 @@
         <link rel="stylesheet" type="text/css" href="spartan.css" />
     </head>
     <body>
-        <ul id="toolbar">
-            <TMPL_IF NAME=LOGGED_IN>
-                <li><a href="?action=log_out">Log out</a></li>
-            <TMPL_ELSE>
-                <li><a href="?action=log_in">Log in</a></li>
-            </TMPL_IF>
-        </ul>
+        <TMPL_INCLUDE NAME="toolbar.tmpl">
         <div id="content">
             <h1>History of '<TMPL_VAR NAME=PAGE>'</h1>
 

diff --git a/p5w/skin/recent_changes.tmpl b/p5w/skin/recent_changes.tmpl
@@ -5,13 +5,7 @@
         <link rel="stylesheet" type="text/css" href="spartan.css" />
     </head>
     <body>
-        <ul id="toolbar">
-            <TMPL_IF NAME=LOGGED_IN>
-                <li><a href="?action=log_out">Log out</a></li>
-            <TMPL_ELSE>
-                <li><a href="?action=log_in">Log in</a></li>
-            </TMPL_IF>
-        </ul>
+        <TMPL_INCLUDE NAME="toolbar.tmpl">
         <div id="content">
             <h1>Recent changes</h1>
 

diff --git a/p5w/skin/toolbar.tmpl b/p5w/skin/toolbar.tmpl
@@ -0,0 +1,19 @@
+<ul id="toolbar">
+    <TMPL_IF NAME=LOGGED_IN>
+        <TMPL_IF NAME=VIEW_PAGE>
+            <li><a href="?page=<TMPL_VAR NAME=TITLE>&action=edit">Edit</a></li>
+            <li><a href="?page=<TMPL_VAR NAME=TITLE>&action=view_history">History</a></li>
+        <TMPL_ELSE>
+
+            <TMPL_IF NAME=PAGE>
+                <li><a href="?page=<TMPL_VAR NAME=PAGE>">Back to <TMPL_VAR NAME=PAGE></a></li>
+            <TMPL_ELSE>
+                <li><a href="/">Back to Main Page</a></li>
+            </TMPL_IF>
+
+        </TMPL_IF>
+        <li><a href="?action=log_out">Log out</a></li>
+    <TMPL_ELSE>
+        <li><a href="?action=log_in">Log in</a></li>
+    </TMPL_IF>
+</ul>
diff --git a/p5w/skin/unknown_action.tmpl b/p5w/skin/unknown_action.tmpl
@@ -5,13 +5,7 @@
         <link rel="stylesheet" type="text/css" href="spartan.css" />
     </head>
     <body>
-        <ul id="toolbar">
-            <TMPL_IF NAME=LOGGED_IN>
-                <li><a href="?action=log_out">Log out</a></li>
-            <TMPL_ELSE>
-                <li><a href="?action=log_in">Log in</a></li>
-            </TMPL_IF>
-        </ul>
+        <TMPL_INCLUDE NAME="toolbar.tmpl">
         <div id="content">
             <h1>Unknown action</h1>
             Unknown action "<TMPL_VAR NAME=ACTION>".

diff --git a/p5w/skin/view.tmpl b/p5w/skin/view.tmpl
@@ -5,14 +5,7 @@
         <link rel="stylesheet" type="text/css" href="spartan.css" />
     </head>
     <body>
-        <ul id="toolbar">
-            <li><a href="?page=<TMPL_VAR NAME=TITLE>&action=edit">Edit</a></li>
-            <TMPL_IF NAME=LOGGED_IN>
-                <li><a href="?action=log_out">Log out</a></li>
-            <TMPL_ELSE>
-                <li><a href="?action=log_in">Log in</a></li>
-            </TMPL_IF>
-        </ul>
+        <TMPL_INCLUDE NAME="toolbar.tmpl">
         <div id="content">
             <h1><TMPL_VAR NAME=TITLE></h1>
             <TMPL_VAR NAME=CONTENT>

diff --git a/p5w/skin/view_diff.tmpl b/p5w/skin/view_diff.tmpl
@@ -5,13 +5,7 @@
         <link rel="stylesheet" type="text/css" href="spartan.css" />
     </head>
     <body>
-        <ul id="toolbar">
-            <TMPL_IF NAME=LOGGED_IN>
-                <li><a href="?action=log_out">Log out</a></li>
-            <TMPL_ELSE>
-                <li><a href="?action=log_in">Log in</a></li>
-            </TMPL_IF>
-        </ul>
+        <TMPL_INCLUDE NAME="toolbar.tmpl">
         <div id="content">
             <h1>Diff of <TMPL_VAR NAME=PAGE></h1>
 

diff --git a/p5w/wiki b/p5w/wiki
@@ -308,7 +308,9 @@ sub view_page {
     my $template = HTML::Template->new(
         filename => $TEMPLATE_PATH.'view.tmpl');
 
-    $template->param(TITLE => $page);
+    $template->param(TITLE => $page,);
+    $template->param(VIEW_PAGE => 1) unless $revision;
+
     my $contents;
     if ( my ($path) = $page =~ m[ ^ $PUGS_PREFIX \b (.*) $ ]x ) {
         if ( -d (my $file = $PUGS_PATH.$path) ) {
@@ -487,7 +489,9 @@ sub log_in {
              eq $users{$user_name}->{password} ) {
 
             my $template = HTML::Template->new(
-                filename => $TEMPLATE_PATH.'login_succeeded.tmpl');
+                filename => $TEMPLATE_PATH.'login_succeeded.tmpl'
+            );
+            $template->param(LOGGED_IN => 1);
 
             my $session_id = md5_base64(time);
             my $session_cookie = $cgi->cookie(