top.rhtml in Pimki-1.7.092

- old
+ new
@@ -1,57 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title>
-    <% if @web && @page && @page.name == "HomePage" && %( show published print ).include?(@action_name) %>
-      <%= @web.name %>
-    <% elsif @web %>
-      <%= @title %> in <%= @web.name %>
-    <% else %>
-      <%= @title %>
-    <% end %>
-  </title>
-
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-  <style type="text/css">
-    h1#pageName, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, #TextileHelp h3 { 
-      color: #<%= @web ? @web.color : "393" %>; 
-    }
-
-    #Container, #Content {
-      width: <%= @content_width || "600" %>px;
-    }
-    <%= sub_template("static_style_sheet") if @inline_style %>
-  </style>
-
-  <link rel="Stylesheet" href="../static_style_sheet/" type="text/css" media="screen" />
-
-  <style type="text/css">
-    <%= @style_additions %>
-    <%= @web ? web.additional_style : "" %>
-  </style>
-</head>
-
-<% if @web && @page && @web.enable_dclick_edit && @action_name!='edit' %>
-  <body ondblclick="location.href='../edit/<%= @page.name %>'">
-<% else %>
-  <body>
-<% end %>
-
-<%= sub_template "menu" unless @hide_menu %>
-
-<div id="Container">
-  <div id="Content">
-  
-  <h1 id="pageName">
-    <% if @web && @page && @page.name == "HomePage" && %( show published print ).include?(@action_name) %>
-      <%= @web.name %>
-    <% elsif @web %>
-      <small><%= @web.name %></small><br />
-      <%= @title %>
-    <% else %>
-      <%= @title %>
-    <% end %>
-  </h1>
-
-  <%= sub_template "navigation" unless @web.nil? || @hide_navigation %>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title>
+    <% if @web && @page && @page.name == "HomePage" && %( show published print ).include?(@action_name) %>
+      <%= @web.name %>
+    <% elsif @web %>
+      <%= @title %> in <%= @web.name %>
+    <% else %>
+      <%= @title %>
+    <% end %>
+  </title>
+
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+  <style type="text/css">
+    h1#pageName, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, #TextileHelp h3 { 
+      color: #<%= @web ? @web.color : "393" %>; 
+    }
+
+    #Container, #Content {
+      width: <%= @content_width || "600" %>px;
+    }
+    <%= sub_template("static_style_sheet") if @inline_style %>
+  </style>
+
+  <link rel="Stylesheet" href="../static_style_sheet/" type="text/css" media="screen" />
+
+  <style type="text/css">
+    <%= @style_additions %>
+    <%= @web ? web.additional_style : "" %>
+  </style>
+</head>
+
+<% if @web && @page && @web.enable_dclick_edit && !%( new edit revision bliki bliki_new bliki_edit bliki_revision published ).include?(@action_name)  %>
+  <body ondblclick="location.href='../edit/<%= @page.name %>'">
+<% else %>
+  <body>
+<% end %>
+
+<%= sub_template "menu" if web && web.enable_menu && !@hide_menu %>
+
+<div id="Container">
+  <div id="Content">
+
+<div id="Head">
+  <h1 id="pageName">
+    <% if @web && @page && @page.name == "HomePage" && %( show published print ).include?(@action_name) %>
+      <%= @web.name %>
+    <% elsif @web %>
+      <small><%= @web.name %></small><br />
+      <%= @title %>
+    <% else %>
+      <%= @title %>
+    <% end %>
+  </h1>
+
+  <%= ('<hr />' + sub_template("navigation")) unless @web.nil? || @hide_navigation %>
+</div>