diff options
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/admin.html.erb | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb.bak | 54 |
3 files changed, 56 insertions, 2 deletions
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 97b81dfb..9f360214 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | <% end %> | 34 | <% end %> |
| 35 | </div> | 35 | </div> |
| 36 | <div id="content"> | 36 | <div id="content"> |
| 37 | <%= yield :layout %> | 37 | <%= yield %> |
| 38 | </div> | 38 | </div> |
| 39 | 39 | ||
| 40 | <div id="results"></div> | 40 | <div id="results"></div> |
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d2a624fc..2a46f091 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | </head> | 29 | </head> |
| 30 | 30 | ||
| 31 | <body lang="<%= @page.effective_lang %>"> | 31 | <body lang="<%= @page ? @page.effective_lang : 'de' %>"> |
| 32 | <div id="wrapper"> | 32 | <div id="wrapper"> |
| 33 | <div id="header"> | 33 | <div id="header"> |
| 34 | <%= image_tag("header.png") %> | 34 | <%= image_tag("header.png") %> |
diff --git a/app/views/layouts/application.html.erb.bak b/app/views/layouts/application.html.erb.bak new file mode 100644 index 00000000..3c95d75f --- /dev/null +++ b/app/views/layouts/application.html.erb.bak | |||
| @@ -0,0 +1,54 @@ | |||
| 1 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" | ||
| 2 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> | ||
| 3 | |||
| 4 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> | ||
| 5 | <head> | ||
| 6 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> | ||
| 7 | |||
| 8 | <title><%= page_title %></title> | ||
| 9 | <%= stylesheet_link_tag "ccc" %> | ||
| 10 | <%= javascript_include_tag 'jquery-1.3.2.min' %> | ||
| 11 | <%= javascript_include_tag 'shadowbox/shadowbox' %> | ||
| 12 | <%= stylesheet_link_tag "shadowbox" %> | ||
| 13 | <%= javascript_include_tag 'public' %> | ||
| 14 | |||
| 15 | <%= auto_discovery_link_tag(:atom, {:locale => :de, :controller => "rss", :action => "updates", :format => :xml}) %> | ||
| 16 | <%= auto_discovery_link_tag(:rss, {:locale => :de, :controller => "rss", :action => "updates", :format => :rdf}) %> | ||
| 17 | </head> | ||
| 18 | |||
| 19 | <body> | ||
| 20 | <div id="wrapper"> | ||
| 21 | <div id="header"> | ||
| 22 | <%= link_to_path(image_tag("header.png"), "/home") %> | ||
| 23 | </div> | ||
| 24 | <div id="search"> | ||
| 25 | <%= render :partial => "content/search" %> | ||
| 26 | </div> | ||
| 27 | <div id="left_column"> | ||
| 28 | <%= main_menu %> | ||
| 29 | |||
| 30 | <%= language_selector %> | ||
| 31 | <% if current_user && @page.node %> | ||
| 32 | <%= link_to "Edit", node_path(:id => @page.node) %> | ||
| 33 | <% end %> | ||
| 34 | |||
| 35 | <%= calendar %> | ||
| 36 | </div> | ||
| 37 | <div id="center_column"> | ||
| 38 | <%= yield :layout %> | ||
| 39 | |||
| 40 | <div id="footer"> | ||
| 41 | <br /> | ||
| 42 | <br /> | ||
| 43 | <p style="text-align: center"> | ||
| 44 | <%= link_to t(:sponsors), content_path("sponsors") %> | ||
| 45 | </p> | ||
| 46 | </div> | ||
| 47 | </div> | ||
| 48 | <div id="right_column"> | ||
| 49 | <%= tags %> | ||
| 50 | <%= featured_articles %> | ||
| 51 | </div> | ||
| 52 | </div> | ||
| 53 | </body> | ||
| 54 | </html> \ No newline at end of file | ||