Merge branch 'master' of http://github.com/fetsite/fetsite
This commit is contained in:
@@ -28,10 +28,11 @@
|
||||
<% end %>
|
||||
|
||||
<% @themen.each do |thema| %>
|
||||
<ul class="unstyled linkbox-list" style="max-width:70em">
|
||||
<li><%= link_to thema, {:class=>"linkbox"} do %>
|
||||
<ul class="unstyled content-list" style="max-width:70em">
|
||||
<li><%= link_to thema.title,thema %>
|
||||
<div class="contentbox">
|
||||
<%= render :partial=>"themen/small", :object=>thema %>
|
||||
<% end %>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<% end %>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<% end %>
|
||||
</ul>
|
||||
<p>
|
||||
<%= link_to "FET Login", user_omniauth_authorize_path(:ldap) %>
|
||||
<%= link_to I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>
|
||||
</p>
|
||||
<div class="alert">
|
||||
<h2>Beta Test</h2>
|
||||
@@ -22,12 +22,12 @@
|
||||
</p>
|
||||
<p><%= link_to "Steuerelemente und Komponenten", "http://getbootstrap.com/2.3.2/index.html" %></p>
|
||||
<p>Um bei der Entwicklung mitzuhelfen braucht nur Ruby on Rails installiert werden</p>
|
||||
<p><%= link_to "Getting Started" , home_startdev_path%></p>
|
||||
<p><%= link_to "Getting Started" , startdev_home_index_path %></p>
|
||||
<p> Das Kalender Feature wird überarbeitet, in Zukunft soll folgender Link nicht mehr funktionieren <%= link_to "Kalender", calendars_path %>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<%= link_to "Entwicklungsstatus" , home_dev_path %>
|
||||
<%= link_to "Entwicklungsstatus" , dev_home_index_path %>
|
||||
<%= render 'beispiele' %>
|
||||
|
||||
Verschiedene Styles
|
||||
|
||||
1
app/views/home/kontakt.html.erb
Normal file
1
app/views/home/kontakt.html.erb
Normal file
@@ -0,0 +1 @@
|
||||
<%= I18n.t "home.kontakt" %>
|
||||
@@ -1,6 +1,6 @@
|
||||
<div class="content-wrap content-column">
|
||||
<%= semantic_form_for :search,:remote=>true, :url=>search_home_index_path, :html=>{:id=>"search_form", :method=>'get'} do |f| %>
|
||||
<%= f.input :query, :input_html => { :name => 'query' } %>
|
||||
<%= semantic_form_for :search,:remote=>true, :url=>search_home_index_path, :html=>{:id=>"search_form",:class=>"navbar-search", :method=>'get'} do |f| %>
|
||||
<%= f.input :query, :input_html => { :name => 'query' } , :label=>false, :class=>"search-query" %>
|
||||
<% end %>
|
||||
<script>
|
||||
$( document ).ready(function() {
|
||||
|
||||
Reference in New Issue
Block a user