bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andreas Stephanides
2013-11-05 10:36:11 +01:00
parent 663da5422f 329d9f4072
commit 1efb5a2967
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/home/index.html.erb
View File

@@ -18,4 +18,4 @@ Bezüglich Design und Steuerung sind Vorschläge erwünscht.
<p><%= I18n.t('home.hallobeiderfet') %></p> <p><%= I18n.t('home.hallobeiderfet') %></p>
<%= render 'beispiele' %> <%= render 'beispiele' %>
<%= link_to "Entwicklungsstatus" , home_dev_path %> <%= link_to "Entwicklungsstatus" , home_dev_path %>
<%= render 'layouts/login' %>

3
app/views/layouts/application.html.erb
View File

@@ -21,17 +21,20 @@
<h1 style="display:block">Fachschaft Elektrotechnik</h1> <h1 style="display:block">Fachschaft Elektrotechnik</h1>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span2 earlymax"> <div class="span2 earlymax">
<div id="menudiv"><%= render :template => 'layouts/menu' %></div> <div id="menudiv"><%= render :template => 'layouts/menu' %></div>
<%= render 'layouts/login' %>
</div> </div>
<div class="span10" id="contentdiv"> <div class="span10" id="contentdiv">
<%= yield %> <%= yield %>
</div> </div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>