diff options
| author | Charlie Root <root@web.ccc.local> | 2025-01-28 22:47:15 +0100 |
|---|---|---|
| committer | Charlie Root <root@web.ccc.local> | 2025-01-28 22:47:15 +0100 |
| commit | c4296b59a7f9d667d295f9c37b71f7849b818fb3 (patch) | |
| tree | ccbace3a183c075991a0dfeb1dd9e6f25e901cf3 /app/views/layouts | |
| parent | dfbaadf0210b02a8bb54380c2c50302413dcf6d6 (diff) | |
Big overhaul patch and style changes
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/application.html.erb | 17 | ||||
| -rw-r--r-- | app/views/layouts/pages.html.erb | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3c95d75f..e6efccf8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb | |||
| @@ -4,6 +4,11 @@ | |||
| 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 | <meta name="viewport" content="width=device-width,initial-scale=1"/> | ||
| 8 | <meta name="description" content="Der Chaos Computer Club ist eine galaktische Gemeinschaft von Lebewesen für Informationsfreiheit und Technikfolgenabschätzung."> | ||
| 9 | |||
| 10 | <meta property="og:image" content="https://www.ccc.de/images/chaosknoten.svg" /> | ||
| 11 | <meta property="og:description" content="Der Chaos Computer Club ist eine galaktische Gemeinschaft von Lebewesen für Informationsfreiheit und Technikfolgenabschätzung." /> | ||
| 7 | 12 | ||
| 8 | <title><%= page_title %></title> | 13 | <title><%= page_title %></title> |
| 9 | <%= stylesheet_link_tag "ccc" %> | 14 | <%= stylesheet_link_tag "ccc" %> |
| @@ -16,7 +21,7 @@ | |||
| 16 | <%= auto_discovery_link_tag(:rss, {:locale => :de, :controller => "rss", :action => "updates", :format => :rdf}) %> | 21 | <%= auto_discovery_link_tag(:rss, {:locale => :de, :controller => "rss", :action => "updates", :format => :rdf}) %> |
| 17 | </head> | 22 | </head> |
| 18 | 23 | ||
| 19 | <body> | 24 | <body lang="<%= @page.effective_lang %>"> |
| 20 | <div id="wrapper"> | 25 | <div id="wrapper"> |
| 21 | <div id="header"> | 26 | <div id="header"> |
| 22 | <%= link_to_path(image_tag("header.png"), "/home") %> | 27 | <%= link_to_path(image_tag("header.png"), "/home") %> |
| @@ -27,22 +32,16 @@ | |||
| 27 | <div id="left_column"> | 32 | <div id="left_column"> |
| 28 | <%= main_menu %> | 33 | <%= main_menu %> |
| 29 | 34 | ||
| 30 | <%= language_selector %> | ||
| 31 | <% if current_user && @page.node %> | 35 | <% if current_user && @page.node %> |
| 32 | <%= link_to "Edit", node_path(:id => @page.node) %> | 36 | <%= link_to "Edit", node_path(:id => @page.node) %> |
| 33 | <% end %> | 37 | <% end %> |
| 34 | 38 | ||
| 35 | <%= calendar %> | 39 | <%= calendar %> |
| 36 | </div> | 40 | </div> |
| 37 | <div id="center_column"> | 41 | <div id="center_column"> |
| 38 | <%= yield :layout %> | 42 | <%= yield :layout %> |
| 39 | 43 | ||
| 40 | <div id="footer"> | 44 | <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> | 45 | </div> |
| 47 | </div> | 46 | </div> |
| 48 | <div id="right_column"> | 47 | <div id="right_column"> |
| @@ -51,4 +50,4 @@ | |||
| 51 | </div> | 50 | </div> |
| 52 | </div> | 51 | </div> |
| 53 | </body> | 52 | </body> |
| 54 | </html> \ No newline at end of file | 53 | </html> |
diff --git a/app/views/layouts/pages.html.erb b/app/views/layouts/pages.html.erb index 327e0eb6..70ceece9 100644 --- a/app/views/layouts/pages.html.erb +++ b/app/views/layouts/pages.html.erb | |||
| @@ -4,6 +4,8 @@ | |||
| 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 | <meta name="viewport" content="width=device-width,initial-scale=1" /> | ||
| 8 | <meta property="og:image" content="https://www.ccc.de/images/chaosknoten.svg" /> | ||
| 7 | <title>Pages: <%= controller.action_name %></title> | 9 | <title>Pages: <%= controller.action_name %></title> |
| 8 | <%= stylesheet_link_tag 'scaffold' %> | 10 | <%= stylesheet_link_tag 'scaffold' %> |
| 9 | </head> | 11 | </head> |