From 286fb014d260525b331334aea149605d21f2d955 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides
Date: Sun, 16 Mar 2014 13:32:27 +0100
Subject: [PATCH] kontakt added
---
app/controllers/home_controller.rb | 2 ++
app/views/home/index.html.erb | 4 ++--
app/views/layouts/menu.html.erb | 3 ++-
config/locales/de.yml | 1 +
config/routes.rb | 14 ++++++++------
5 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 4333ec6..019cff1 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -6,6 +6,8 @@ class HomeController < ApplicationController
end
def dev
+ end
+ def kontakt
end
def startdev
render 'setup_fetsite_dev'
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 67f30b9..87417d4 100755
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -23,12 +23,12 @@
<%= link_to "Steuerelemente und Komponenten", "http://getbootstrap.com/2.3.2/index.html" %>
Um bei der Entwicklung mitzuhelfen braucht nur Ruby on Rails installiert werden
- <%= link_to "Getting Started" , home_startdev_path%>
+ <%= link_to "Getting Started" , startdev_home_index_path %>
Das Kalender Feature wird überarbeitet, in Zukunft soll folgender Link nicht mehr funktionieren <%= link_to "Kalender", calendars_path %>
- <%= link_to "Entwicklungsstatus" , home_dev_path %>
+ <%= link_to "Entwicklungsstatus" , dev_home_index_path %>
<%= render 'beispiele' %>
Verschiedene Styles
diff --git a/app/views/layouts/menu.html.erb b/app/views/layouts/menu.html.erb
index d6ea8f5..1702221 100644
--- a/app/views/layouts/menu.html.erb
+++ b/app/views/layouts/menu.html.erb
@@ -17,7 +17,8 @@
<%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path %>
<%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path %>
<%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %>
- <%= link_to I18n.t("home.search"), search_home_index_path %>
+ <%= link_to I18n.t("home.search"), search_home_index_path %>
+ <%= link_to I18n.t("home.kontakt"), kontakt_home_index_path %>
<%= link_to 'Admin' , config_path%>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 7305808..3005cde 100755
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -12,6 +12,7 @@ de:
back: "Zurück"
sure_del: "Sicher endgültig löschen?"
home:
+ kontakt: "Kontakt"
mtitle: "Menu"
login: "FET Login"
willkommen: "Willkommen bei der Fachschaft Elektrotechnik"
diff --git a/config/routes.rb b/config/routes.rb
index b97e959..9b08b5d 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -98,12 +98,14 @@ end
# get 'rubriken/:id/verwalten',:controller=>:rubriken,:action=>:verwalten, :as=>'verwalten_rubrik'
# get 'rubriken/verwalten',:controller=>:rubriken,:action=>:alle_verwalten, :as=>'rubriken_verwalten'
- resources :home, :only=>[:index]
- get 'home/dev', :controller=>:home, :action=>:dev, :as=>'home_dev'
- get 'home/startdev', :controller=>:home, :action=>:startdev, :as=>'home_startdev'
- get 'home/linksnotimplemented', :controller=>:home, :action=>:linksnotimplemented, :as=>'home_linksnotimplemented'
-
-
+ resources :home, :only=>[:index] do
+ collection do
+ get 'dev'
+ get 'startdev'
+ get 'linksnotimplemented'
+ get 'kontakt'
+ end
+ end
resources :themen do
get :fragen