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

Merge pull request #4 from bernis/master

Browse Source 
Die spans/offsets + Optische Veränderungen (Hauptseite)
This commit is contained in:
Thomas Blazek
2015-01-21 10:37:48 +01:00
parent 028cf58952 a196b56669
commit 0280ebb6a1
3 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/home/_beispiele.html.erb
View File

@@ -1,19 +1,19 @@
<div class="contentbox"> <div class="contentbox">
<div class="row-fluid"> <div class="row-fluid">
<div class="span8"> <div class="span6">
<h4><%= I18n.t("home.newexamples") %></h4> <h4 style="margin:5px;"><%= I18n.t("home.newexamples") %></h4>
</div> </div>
<div class="span4"> <div class="span6">
<%= link_to I18n.t("beispiel.add"), new_beispiel_path, :class=>"btn"%> <%= link_to I18n.t("beispiel.add"), new_beispiel_path, :class=>"linkbox"%>
</div> </div>
</div> </div>
<ul class="unstyled linkbox-list"> <ul class="unstyled linkbox-list" style="margin-top:5px;margin-bottom:5px;">
<% @beispiele.each do |b| %> <% @beispiele.each do |b| %>
<li> <li>
<%= link_to b.lva, {:class=> :linkbox} do %> <%= link_to b.lva, {:class=> :linkbox} do %>
<div class="row-fluid"> <div class="row-fluid">
<div class="span8"> <div class="span8" style="word-wrap:break-word;">
<b><%=b.name%></b> (<%=b.lva.full_name%>) <b><%=b.name%></b><br> (<%=b.lva.full_name%>)
</div> </div>
<div class="span4"> <div class="span4">
<%= b.updated_at.to_s%> <%= b.updated_at.to_s%>

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

@@ -1,9 +1,9 @@
<div class="content-wrap content-column"> <div class="content-wrap content-column" style="max-width:100em;">
<h1><%= I18n.t('home.willkommen') %></h1> <h1><%= I18n.t('home.willkommen') %></h1>
<%= render partial: "themen/small", object: @starttopic %> <%= render partial: "themen/small", object: @starttopic %>
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span6"> <div class="span5">
<ul class="linklist"> <ul class="linklist">
<li> <li>
@@ -49,8 +49,8 @@
<%= render 'beispiele' %> <%= render 'beispiele' %>
</div> </div>
<div class="span6"> <div class="span7">
<ul class="unstyled linkbox-list" style="max-width:70em"> <ul class="unstyled linkbox-list" style="margin:5px;">
<% @neuigkeiten.each do |n| %> <% @neuigkeiten.each do |n| %>
<li><%= render n if can?(:show, n) %> </li> <li><%= render n if can?(:show, n) %> </li>
<% end %> <% end %>

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

@@ -23,8 +23,7 @@
<body> <body>
<div id="maincontainer" class="container-fluid"> <div id="maincontainer" class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span1 "></div> <div class="span10 offset1 header_span">
<div class="span10 header_span">
<div class="header_wrap"> <div class="header_wrap">
<div class="header"> <div class="header">
@@ -40,25 +39,14 @@
</div> </div>
</div> </div>
<div class="span1 "></div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span1"> <div class="span10 offset1" id="contentdiv">
</div>
<div class="span10" id="contentdiv">
<%= yield %> <%= yield %>
</div> </div>
<div class="span1">
</div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span1"> <div class="span10 offset1" id="contentdiv">
</div>
<div class="span10" id="contentdiv">
</div>
<div class="span1">
</div> </div>
</div> </div>
</div> </div>