andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/Inachos/fetsite

Browse Source
This commit is contained in:
Andreas Stephanides
2013-08-15 11:47:57 +02:00
parent b00e0709ca ecb0275c44
commit b9206ed091
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/stylesheets/application.css.scss
View File

@@ -40,3 +40,14 @@ margin-bottom: 20px
width:100%; width:100%;
} }
.navbar .nav li {
min-width:60%;
}
.navbar .nav .divider {
border-style: solid;
border-width: 1px 0px 0px 0px;
border-color: grey;
min-width: 100%;
}

17
app/views/layouts/menu.html.erb
View File

@@ -1,6 +1,6 @@
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container-fluid"> <div class="container">
<a class="brand" href="#"><%= t 'home.mtitle'%></a> <a class="brand" href="#"><%= t 'home.mtitle'%></a>
<a class ="btn btn-navbar" data-toggle="collapse" data-parent="#menudiv" data-target=".nav-collapse"> <a class ="btn btn-navbar" data-toggle="collapse" data-parent="#menudiv" data-target=".nav-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
@@ -15,6 +15,14 @@
<li><%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %></li> <li><%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %></li>
<li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %></li> <li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %></li>
<li><%= link_to "Kalender", calendars_path %></li> <li><%= link_to "Kalender", calendars_path %></li>
<li class="divider"></li>
<li><%if I18n.locale == :en %>
<%= link_to "Deutsch" ,switch_locale_url(:de)%>
<% elsif I18n.locale == :de %>
<%= link_to "English" ,switch_locale_url(:en)%>
<%end %>
</li>
<% if user_signed_in? %> <% if user_signed_in? %>
<li>Logged in as : <%= current_user.email %> <li>Logged in as : <%= current_user.email %>
<%= link_to('Logout', destroy_user_session_path, :method => :delete) %> <%= link_to('Logout', destroy_user_session_path, :method => :delete) %>
@@ -24,18 +32,11 @@
<%= link_to('Login', new_user_session_path) %> <%= link_to('Login', new_user_session_path) %>
</li> </li>
<% end %> <% end %>
<li><%if I18n.locale == :en %>
<%= link_to "Deutsch" ,switch_locale_url(:de)%>
<% elsif I18n.locale == :de %>
<%= link_to "English" ,switch_locale_url(:en)%>
<%end %>
</li>
<li> <li>
<%= link_to 'Admin' , config_path%> <%= link_to 'Admin' , config_path%>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

7
db/schema.rb
View File

@@ -104,14 +104,11 @@ ActiveRecord::Schema.define(:version => 20130813145651) do
t.integer "modul_id" t.integer "modul_id"
end end
create_table "lvas_semesters", :id => false, :force => true do |t| create_table "lvas_semesters", :force => true do |t|
t.integer "lva_id" t.integer "lva_id"
t.integer "semester_id" t.integer "semester_id"
end end
add_index "lvas_semesters", ["lva_id", "semester_id"], :name => "index_lvas_semesters_on_lva_id_and_semester_id"
add_index "lvas_semesters", ["semester_id"], :name => "index_lvas_semesters_on_semester_id"
create_table "modul_translations", :force => true do |t| create_table "modul_translations", :force => true do |t|
t.integer "modul_id" t.integer "modul_id"
t.string "locale" t.string "locale"
@@ -225,7 +222,7 @@ ActiveRecord::Schema.define(:version => 20130813145651) do
t.text "text" t.text "text"
t.datetime "created_at", :null => false t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false t.datetime "updated_at", :null => false
t.integer "theman_id" t.integer "themen_id"
end end
add_index "thema_translations", ["locale"], :name => "index_thema_translations_on_locale" add_index "thema_translations", ["locale"], :name => "index_thema_translations_on_locale"