From cdcbce6803aef2da44d8047c26a9947fe367e1ed Mon Sep 17 00:00:00 2001 From: Bernhard Stampfer Date: Tue, 27 Jan 2015 17:26:55 +0100 Subject: [PATCH 1/3] Fixes bug in Neuigkeiten mobile view, see picture If display width forced header (Rubrik / User+Date) to display in two lines whole content of Neuigkeit was squeezed to the width of the whitespace left to the lower line --- app/views/neuigkeiten/show.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb index 8e33317..e96a52e 100755 --- a/app/views/neuigkeiten/show.html.erb +++ b/app/views/neuigkeiten/show.html.erb @@ -23,6 +23,7 @@ end

<%= notice %>

+
<%= ff_icon(@neuigkeit.rubrik.icon) unless @neuigkeit.rubrik.icon.nil? or @neuigkeit.rubrik.icon.empty? %> <%= @neuigkeit.rubrik.name %> @@ -30,6 +31,7 @@ end <%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %> <%= @neuigkeit.author.text+ " "+ I18n.t("neuigkeit.am")+" " + I18n.l(@neuigkeit.try(:datum).try(:to_date)) unless @neuigkeit.try(:datum).try(:to_date).nil? %> +
<% unless @neuigkeit.picture.big_thumb.to_s.empty? %>
From db0a50acf2015d206b47f84f9184e3af1eec78f9 Mon Sep 17 00:00:00 2001 From: Bernhard Stampfer Date: Wed, 28 Jan 2015 09:18:26 +0100 Subject: [PATCH 2/3] LVA ECTS/Std right-aligned Uses style="overflow:auto" to keep the Box arround the Modul sized correctly, even if left and right aligned text uses more than one line. This seems to hide the bulltes in chromium for some reason (shown in firefox) --- app/views/lvas/_lva_semester.html.erb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/views/lvas/_lva_semester.html.erb b/app/views/lvas/_lva_semester.html.erb index 85b076e..f0c1bc6 100755 --- a/app/views/lvas/_lva_semester.html.erb +++ b/app/views/lvas/_lva_semester.html.erb @@ -1,5 +1,8 @@ - -
- <%=lva.lvanr.to_s %> <%= link_to lva.full_name, lva_path(lva)%> <%= lva.ects %> ECTS / <%= lva.stunden %> Std
- -
+
+ + <%=lva.lvanr.to_s %> <%= link_to lva.full_name, lva_path(lva)%> + + + <%= lva.ects %> ECTS / <%= lva.stunden %> Std + +
From 17317143671cad38b3a830d8c648547bf621e4f4 Mon Sep 17 00:00:00 2001 From: Bernhard Stampfer Date: Wed, 28 Jan 2015 09:35:08 +0100 Subject: [PATCH 3/3] Layout changes for blue1 Ist das so ok, oder soll ich besser ein neues theme machen? --- app/views/home/_beispiele.html.erb | 2 +- app/views/themes/blue1/home/index.html.erb | 19 ++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/app/views/home/_beispiele.html.erb b/app/views/home/_beispiele.html.erb index 23d90c4..042288c 100644 --- a/app/views/home/_beispiele.html.erb +++ b/app/views/home/_beispiele.html.erb @@ -7,7 +7,7 @@ <%= link_to I18n.t("beispiel.add"), new_beispiel_path, :class=>"linkbox"%>
-