From 99ab938bc03c81519b11ef1a63c54f9e0d510c35 Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Sat, 31 Oct 2009 21:54:34 +0100
Subject: beta badge and link to old ccc.de page

---
 app/views/content/_main_navigation.html.erb |   2 +-
 app/views/layouts/application.html.erb      |   8 +++++++-
 config/locales/de.yml                       |   1 +
 config/locales/en.yml                       |   3 ++-
 public/images/header.png                    | Bin 10700 -> 15331 bytes
 public/stylesheets/ccc.css                  |  15 +++++++--------
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/views/content/_main_navigation.html.erb b/app/views/content/_main_navigation.html.erb
index 676b827..67d4ecc 100644
--- a/app/views/content/_main_navigation.html.erb
+++ b/app/views/content/_main_navigation.html.erb
@@ -1,4 +1,4 @@
-<div id="main_navigation">
+<div class="main_navigation">
   <ul>
     <% menu_items.each do |item| %>
     <li><%= link_to_path item.title, item.path %></li>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 5e7ad3c..9e31344 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -26,11 +26,17 @@
       <div id="left_column">
         <%= main_menu %>
         
+        <div class="main_navigation">
+          <ul>
+            <li><a class="inactive" href="http://213.73.89.124/"><%= t(:old_ccc_de) %></a></li>
+          </ul>
+        </div>
+        
         <%= language_selector %>
         <% if current_user && @page.node %>
           <%= link_to "Edit", node_path(:id => @page.node) %>
         <% end %>
-        
+      
         <%= calendar %>
       </div>
       <div id="center_column">
diff --git a/config/locales/de.yml b/config/locales/de.yml
index ce0b578..8c96637 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2,6 +2,7 @@
 # by Clemens Kofler (clemens@railway.at)
 
 de:
+  old_ccc_de: das alte ccc.de
   date:
     formats:
       default: "%d.%m.%Y"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f265c06..3ca82b6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2,4 +2,5 @@
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
-  hello: "Hello world"
\ No newline at end of file
+  hello: "Hello world"
+  old_ccc_de: the old ccc.de
\ No newline at end of file
diff --git a/public/images/header.png b/public/images/header.png
index d54bc2c..343b182 100644
Binary files a/public/images/header.png and b/public/images/header.png differ
diff --git a/public/stylesheets/ccc.css b/public/stylesheets/ccc.css
index 6d3585e..d2b52be 100644
--- a/public/stylesheets/ccc.css
+++ b/public/stylesheets/ccc.css
@@ -45,33 +45,32 @@ div#header img {
   border: none;
 }
 
-div#main_navigation ul {
+div.main_navigation ul {
   margin-left: 0;
   padding-left: 0;
 }
 
-div#main_navigation li {
+div.main_navigation li {
   list-style-type: none;
 }
 
-div#main_navigation a {
+div.main_navigation a {
   text-decoration: none;
-  font-size: 18px;
-  color: #d1d1d1;
+  font-size: 14px;
 }
 
-div#main_navigation a:hover {
+div.main_navigation a:hover {
   color: #535353;
 }
 
-div#main_navigation a.active {
+div.main_navigation a.active {
   color: #535353;
   text-decoration: underline;
   text-transform: lowercase;
   font-size: 14px;
 }
 
-div#main_navigation a.inactive {
+div.main_navigation a.inactive {
   color: #535353;
   text-transform: lowercase;
   font-size: 14px;
-- 
cgit v1.3