summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhukl <contact@smyck.org>2012-02-18 15:47:36 +0100
committerhukl <contact@smyck.org>2012-02-18 15:47:36 +0100
commit59365680b89a7d5a60a1d8e324a63757efaf325f (patch)
tree68de450495659eac4ec91cee2ab60afa200d11a2
parentddec53563c5b3727d94cae35e17b318b0b2cd2e8 (diff)
remove reference to old website
-rw-r--r--app/views/layouts/application.html.erb18
1 files changed, 6 insertions, 12 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 678180d..3c95d75 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -4,18 +4,18 @@
4<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 4<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
5 <head> 5 <head>
6 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 6 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
7 7
8 <title><%= page_title %></title> 8 <title><%= page_title %></title>
9 <%= stylesheet_link_tag "ccc" %> 9 <%= stylesheet_link_tag "ccc" %>
10 <%= javascript_include_tag 'jquery-1.3.2.min' %> 10 <%= javascript_include_tag 'jquery-1.3.2.min' %>
11 <%= javascript_include_tag 'shadowbox/shadowbox' %> 11 <%= javascript_include_tag 'shadowbox/shadowbox' %>
12 <%= stylesheet_link_tag "shadowbox" %> 12 <%= stylesheet_link_tag "shadowbox" %>
13 <%= javascript_include_tag 'public' %> 13 <%= javascript_include_tag 'public' %>
14 14
15 <%= auto_discovery_link_tag(:atom, {:locale => :de, :controller => "rss", :action => "updates", :format => :xml}) %> 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}) %> 16 <%= auto_discovery_link_tag(:rss, {:locale => :de, :controller => "rss", :action => "updates", :format => :rdf}) %>
17 </head> 17 </head>
18 18
19 <body> 19 <body>
20 <div id="wrapper"> 20 <div id="wrapper">
21 <div id="header"> 21 <div id="header">
@@ -26,23 +26,17 @@
26 </div> 26 </div>
27 <div id="left_column"> 27 <div id="left_column">
28 <%= main_menu %> 28 <%= main_menu %>
29 29
30 <div class="main_navigation">
31 <ul>
32 <li><a class="inactive" href="http://dasalte.ccc.de/"><%= t(:old_ccc_de) %></a></li>
33 </ul>
34 </div>
35
36 <%= language_selector %> 30 <%= language_selector %>
37 <% if current_user && @page.node %> 31 <% if current_user && @page.node %>
38 <%= link_to "Edit", node_path(:id => @page.node) %> 32 <%= link_to "Edit", node_path(:id => @page.node) %>
39 <% end %> 33 <% end %>
40 34
41 <%= calendar %> 35 <%= calendar %>
42 </div> 36 </div>
43 <div id="center_column"> 37 <div id="center_column">
44 <%= yield :layout %> 38 <%= yield :layout %>
45 39
46 <div id="footer"> 40 <div id="footer">
47 <br /> 41 <br />
48 <br /> 42 <br />