db_upgrade rework, admin_header, cleanup

[wfpl-cms.git] / template.html
diff --git a/template.html b/template.html

index 2c853c1..288065f 100644 (file)
--- a/template.html
+++ b/template.html
@@ -10,16 +10,17 @@
         <link rel="stylesheet" href="css.css?m=~css.css mtime~" />
         <!--~$meta_description nonempty {~--><meta name="description" content="~$meta_description attr~" /><!--~}~-->
         <!--~$meta_keywords nonempty {~--><meta name="keywords" content="~$meta_keywords attr~" /><!--~}~-->
+       <!--~$cms_css~-->
         <!--~$head~-->
  </head>
  
  <body id="~$basename~_body" class="real_body_tag">
         <div class="centerer ~$layout_centerer_class~">
-               <!--~$admin_links {~-->
-                       <div id="admin_links">You are logged in as an administrator. &nbsp; <a href="admin_pages?~$edit_page_id {~edit_id=~$edit_page_id~~}~~$edit_page_id unset {~&amp;new=1&amp;new_filename=~$basename~~}~">Edit this page</a> &mdash; <a href="admin">Control panel</a> &mdash; <a href="logout">Log out</a></div>
-               <!--~}~-->
  
                 <header id="site_header">
+                       <!--~$admin_links {~-->
+                               <div id="admin_links">You are logged in as an administrator. &nbsp; <a href="admin_pages?~$edit_page_id {~edit_id=~$edit_page_id~~}~~$edit_page_id unset {~&amp;new=1&amp;new_filename=~$basename~~}~">Edit this page</a> &mdash; <a href="admin">Control panel</a> &mdash; <a href="logout">Log out</a></div>
+                       <!--~}~-->
                         <!--~$cms_header~-->
                 </header>
                 <!--~$navbar_items once_if {~-->