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

CSS changes

Browse Source
This commit is contained in:
Thomas Blazek
2013-08-10 22:47:32 +02:00
parent 86913257af
commit 57a7e49a34
7 changed files with 76 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/stylesheets/formtastic-changes.css.scss
View File

@@ -6,16 +6,6 @@ width:90%;
height:20em; height:20em;
} }
form.formtastic .input label.control-label {
div.form-group { font-weight:bold;
border-width: 1px;
border-style: none;
padding: 10px;
// border-radius: 10px;
} }
div.verwalten-block {
border-width: 1px;
border-style: solid;
padding: 5px;
border-radius:10px;
}

8
app/assets/stylesheets/lvas.css.scss
View File

@@ -1,3 +1,11 @@
// Place all the styles related to the lvas controller here. // Place all the styles related to the lvas controller here.
// They will automatically be included in application.css. // They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/ // You can use Sass (SCSS) here: http://sass-lang.com/
div.lva-semester {
border: solid;
border-width: 1px;
margin: 1px;
padding: 5px;
border-color: green;
}

15
app/assets/stylesheets/studien.css.scss
View File

@@ -1,3 +1,18 @@
// Place all the styles related to the studia controller here. // Place all the styles related to the studia controller here.
// They will automatically be included in application.css. // They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/ // You can use Sass (SCSS) here: http://sass-lang.com/
div.verwalten-block {
border-width: 1px;
border-style: solid;
padding: 5px;
border-radius:10px;
margin: 2px;
}
div.studien-semester {
border-width: 1px;
border-style: solid;
padding: 5px;
border-radius:10px;
border-color: blue;
margin: 2px;
}

4
app/views/lvas/_form.html.erb
View File

@@ -28,13 +28,13 @@
<div class="span3"> <div class="span3">
<h1> BILD </h1> <h1> BILD </h1>
<%= f.input :modul,:label=>'<b>Modul</b>'.html_safe, :as=>:check_boxes%> <%= f.input :modul, :as=>:check_boxes%>
</div> </div>
</div> </div>
</div> </div>
<div class="span3"> <div class="span3">
<%= f.input :semester, :label=>'<b>Semester</b>'.html_safe, :as=>:check_boxes%> <%= f.input :semester, :as=>:check_boxes%>
</div> </div>
<% end %> <% end %>

5
app/views/lvas/_lva_semester.html.erb
View File

@@ -1,10 +1,9 @@
<p class="lva_semester"> <div class="lva-semester">
<b><%= link_to lva.name, lva_path(lva)%></b><br> <b><%= link_to lva.name, lva_path(lva)%></b><br>
Module: /<% lva.modul.each do |m| %> <%= link_to m.name + ' / ', modul_path(m) unless m.modulgruppen.map{|x| x.studium}.index(@studium).nil? && !@studium.nil? %><% end %> Module: /<% lva.modul.each do |m| %> <%= link_to m.name + ' / ', modul_path(m) unless m.modulgruppen.map{|x| x.studium}.index(@studium).nil? && !@studium.nil? %><% end %>
<br> <br>
<%="LVa-Nr " + lva.lvanr.to_s %> <%="LVa-Nr " + lva.lvanr.to_s %>
<%= lva.ects %> ECTS / <%= lva.stunden %> Std <% " / " + lva.beispiele.count.to_s + " Beispiele"%> <br> <%= lva.ects %> ECTS / <%= lva.stunden %> Std <% " / " + lva.beispiele.count.to_s + " Beispiele"%> <br>
<%= link_to "Edit", edit_lva_path(lva) %> | <%= link_to "Beispiel hinzufügen", new_beispiel_path(:lva_id=>lva.id) %> <%= link_to "Edit", edit_lva_path(lva) %> | <%= link_to "Beispiel hinzufügen", new_beispiel_path(:lva_id=>lva.id) %>
</p class="lva_semester"> </div class="lva-semester">
<% #toolbar_html(@toolbar_elements) %>

6
app/views/studien/semesteransicht.html.erb
View File

@@ -11,16 +11,16 @@
<% @studium.semester.each do |sem| %> <% @studium.semester.each do |sem| %>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="modulgruppe_phase_1"> <div class="studien-semester">
<div class="container-fluid"> <div class="container-fluid">
<h2><%= sem.name %></h2> <h2><%= sem.name %></h2>
<% sem.lvas.each_slice(2) do |row| %> <% sem.lvas.each_slice(4) do |row| %>
<div class="row-fluid"> <div class="row-fluid">
<% row.each do |l| %> <% row.each do |l| %>
<div class="span<%= 12/row.length%>"> <div class="span3">
<%= render :partial=>'lvas/lva_semester', :locals =>{:lva => l}%> <%= render :partial=>'lvas/lva_semester', :locals =>{:lva => l}%>
</div> </div>
<% end %> <% end %>

81
app/views/studien/verwalten.html.erb
View File

@@ -5,7 +5,7 @@
<h1><%= I18n.t("studien.verwaltung") %></h1> <%= link_to I18n.t("filter.reset"), studien_verwalten_path(:std_verw=>nil, :mg_verw=>nil, :m_verw=>nil, :lva_verw=>nil, :b_verw=>nil), :class=>"btn" %> <h1><%= I18n.t("studien.verwaltung") %></h1> <%= link_to I18n.t("filter.reset"), studien_verwalten_path(:std_verw=>nil, :mg_verw=>nil, :m_verw=>nil, :lva_verw=>nil, :b_verw=>nil), :class=>"btn" %>
<%= I18n.t("filter.explanation").html_safe %> <%= I18n.t("filter.explanation").html_safe %>
<h2>Studien </h2> <h2>Studien </h2>
<div class="verwalten-block"> <div class="verwalten-block">
| |
@@ -24,15 +24,16 @@
<% end %> <% end %>
</ul> </ul>
<%= link_to 'Neues Studium', new_studium_path, :class=>'btn'%>
</div> </div>
<%= link_to 'Neues Studium', new_studium_path, :class=>'btn'%>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span4"> <div class="span4">
<h2>Modulgruppen </h2> <h2>Modulgruppen </h2>
<div class="verwalten-block"> <div class="verwalten-block">
<% @modulgruppen.each do |mg| %> <% @modulgruppen.each do |mg| %>
<%= link_to mg.name, mg %> | <%= (mg.valid?) ? "Gültig" : "Problemfall" %><br> <%= link_to mg.name, mg %> | <%= (mg.valid?) ? "Gültig" : "Problemfall" %><br>
@@ -50,14 +51,16 @@
<li> <%= link_to mg.name, studien_verwalten_path(:mg_verw=>mg)%> </li> <li> <%= link_to mg.name, studien_verwalten_path(:mg_verw=>mg)%> </li>
<% end %> <% end %>
</ul> </ul>
<%= link_to "Neue Modulgruppe", new_studium_modulgruppe_path(Studium.first), :class=>"btn" unless Studium.first.nil?%>
</div></div> </div>
<%= link_to "Neue Modulgruppe", new_studium_modulgruppe_path(Studium.first), :class=>"btn" unless Studium.first.nil?%>
</div>
</div> </div>
</div> </div>
<div class="span4"> <div class="span4">
<h2>Module </h2> <h2>Module </h2>
<div class="verwalten-block"> <div class="verwalten-block">
@@ -78,14 +81,14 @@
<li> <%= link_to m.name, studien_verwalten_path(:m_verw=>m)%> </li> <li> <%= link_to m.name, studien_verwalten_path(:m_verw=>m)%> </li>
<% end %> <% end %>
</ul> </ul>
<%= link_to "Neues Modul", new_modul_path, :class=>"btn"%>
</div> </div>
<%= link_to "Neues Modul", new_modul_path, :class=>"btn"%>
</div> </div>
</div> </div>
</div> </div>
<div class="span4"> <div class="span4">
<h2>Lvas </h2> <h2>Lvas </h2>
<div class="verwalten-block"> <div class="verwalten-block">
@@ -95,20 +98,22 @@
<% end %> <% end %>
<div class="btn-toolbar"> <div class="btn-toolbar">
<div class="btn-group"> <div class="btn-group">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
<%= params[:lva_verw].nil? ? I18n.t("filter.lva") : Lva.find(params[:lva_verw]).name %> <%= params[:lva_verw].nil? ? I18n.t("filter.lva") : Lva.find(params[:lva_verw]).name %>
<span class="caret"></span> <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <%= link_to 'Alle Lvas', studien_verwalten_path(:lva_verw=>nil) %></li> <li> <%= link_to 'Alle Lvas', studien_verwalten_path(:lva_verw=>nil) %></li>
<% for lva in @lvas %> <% for lva in @lvas %>
<li> <%= link_to lva.name, studien_verwalten_path(:lva_verw=>lva)%> </li> <li> <%= link_to lva.name, studien_verwalten_path(:lva_verw=>lva)%> </li>
<% end %> <% end %>
</ul> </ul>
<%= link_to "Neue LVa", new_lva_path, :class=>'btn'%>
</div></div> </div>
<%= link_to "Neue LVa", new_lva_path, :class=>'btn'%>
</div>
</div> </div>
</div> </div>
@@ -128,8 +133,8 @@
<ul> <ul>
<% @messages.flatten.each do |m| %> <% @messages.flatten.each do |m| %>
<% if !m.strip.empty? %> <% if !m.strip.empty? %>
<li><%= m.html_safe %></li> <li><%= m.html_safe %></li>
<% end %> <% end %>
<% end %> <% end %>
</ul> </ul>
<b><font color="green"><%= I18n.t("verwalten.fehler.keine").html_safe if @messages.empty?%></font></b> <b><font color="green"><%= I18n.t("verwalten.fehler.keine").html_safe if @messages.empty?%></font></b>
@@ -141,21 +146,23 @@
<% @beispiele.each do |b| %> <% @beispiele.each do |b| %>
<%= link_to b.name, b %> <%= link_to b.name, b %>
<% end %> <% end %>
<div class="btn-toolbar"> <div class="btn-toolbar">
<div class="btn-group"> <div class="btn-group">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
<%= params[:b_verw].nil? ? I18n.t("filter.beispiel") : Beispiel.find(params[:b_verw]).name %> <%= params[:b_verw].nil? ? I18n.t("filter.beispiel") : Beispiel.find(params[:b_verw]).name %>
<span class="caret"></span> <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <%= link_to 'Alle Beispiele', studien_verwalten_path(:b_verw=>nil) %></li> <li> <%= link_to 'Alle Beispiele', studien_verwalten_path(:b_verw=>nil) %></li>
<% for b in @beispiele %> <% for b in @beispiele %>
<li> <%= link_to b.name, studien_verwalten_path(:b_verw=>b)%> </li> <li> <%= link_to b.name, studien_verwalten_path(:b_verw=>b)%> </li>
<% end %> <% end %>
</ul> </ul>
</div>
<%= link_to "Neues Beispiel", new_beispiel_path, :class=>"btn"%> <%= link_to "Neues Beispiel", new_beispiel_path, :class=>"btn"%>
</div></div> </div>
</div> </div>
</div> </div>