diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 194f5be..a2c8f7f 100755 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -12,6 +12,7 @@ *= require_tree . *= require jquery.fileupload-ui * require 'bootstrap' + */ $linkColor: #03006E; @@ -55,4 +56,4 @@ border-style: solid; border-width: 1px 0px 0px 0px; border-color: grey; min-width: 100%; -} \ No newline at end of file +} diff --git a/app/views/fetprofiles/index.html.erb b/app/views/fetprofiles/index.html.erb index 1bfac8c..f6889e8 100644 --- a/app/views/fetprofiles/index.html.erb +++ b/app/views/fetprofiles/index.html.erb @@ -17,16 +17,17 @@ <% @fetprofiles.each do |fetprofile| %>
+ <%= link_to fetprofile do %>
<%= image_tag fetprofile.picture.portrait.url %>
-

<%= link_to fetprofile.name, fetprofile %>

+

<%= fetprofile.name %>

<%= fetprofile.fetmail %>

<%= fetprofile.desc %>

-

<%= fetprofile.active %>

-
+ +
<% end %> <% end %>
diff --git a/app/views/galleries/index.html.erb b/app/views/galleries/index.html.erb index 562128c..5512beb 100644 --- a/app/views/galleries/index.html.erb +++ b/app/views/galleries/index.html.erb @@ -1,26 +1,28 @@

Listing galleries

- - - - - - - - - -<% @galleries.each do |gallery| %> - - - - - - - - -<% end %> -
NameDescDatum
<%= gallery.name %><%= gallery.desc %><%= gallery.datum %><%= link_to 'Show', gallery %><%= link_to 'Edit', edit_gallery_path(gallery) %><%= link_to 'Destroy', gallery, method: :delete, data: { confirm: 'Are you sure?' } %>
+ <%= %> +
+
+
+ <% @galleries.each do |gallery| %> + <%= link_to gallery do %> +
+
+ <%= image_tag gallery.fotos.first.datei.big_thumb.url %> +
+
+

<%= gallery.datum %> - <%= gallery.name %>

+

<%= gallery.desc %> +

+
+
+ <% end %> + <%= link_to 'Edit', edit_gallery_path(gallery) %> + <% end %> +
+
+
diff --git a/app/views/gremien/show.html.erb b/app/views/gremien/show.html.erb index 3638fe7..039dd86 100644 --- a/app/views/gremien/show.html.erb +++ b/app/views/gremien/show.html.erb @@ -1,20 +1,41 @@ -

<%= notice %>

-<%= render 'fetprofiles/tabs' %> -

- <%= @gremium.name %> -

-

-<%= @gremium.desc %> -

- -<% @gremium.memberships.order(:typ).active.each do |m| %> - <%= image_tag m.fetprofile.picture.portrait %> - <%= m.fetprofile.name + " ist" + render(m) %> -<% end %> -

- <%= Gremium::TYPEN[@gremium.typ.to_i].to_s %> -

+
+
+
+ <%= render 'fetprofiles/tabs' %> +

<%= notice %>

+
+
+
+
+

+ <%= @gremium.name %> +

+ <% Gremium::TYPEN[@gremium.typ.to_i].to_s %> +

+ <%= @gremium.desc %> +

+
+
-<%= link_to 'Edit', edit_gremium_path(@gremium) %> | + <% @gremium.memberships.order(:typ).active.each_slice(4) do |r| %> +
<% r.each do |m| %> + <%= link_to m.fetprofile do %> +
+ <%= image_tag m.fetprofile.picture.portrait %> +

+ <%= m.fetprofile.name %>
<%= render(m) %> +

+
+ <% end %> + <% end %> +
+ <% end %> + + + <%= link_to 'Edit', edit_gremium_path(@gremium) %> | +
+
+ + diff --git a/app/views/neuigkeiten/_neuigkeit.html.erb b/app/views/neuigkeiten/_neuigkeit.html.erb index 57efadc..d42e2f5 100755 --- a/app/views/neuigkeiten/_neuigkeit.html.erb +++ b/app/views/neuigkeiten/_neuigkeit.html.erb @@ -1,15 +1,15 @@ - +<%= link_to neuigkeit do %>


<%= image_tag neuigkeit.picture.thumb.url unless neuigkeit.picture.url.nil? %>

<%= neuigkeit.rubrik.name %> <%= "am "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %>
-

<%= link_to neuigkeit.title,neuigkeit_path(neuigkeit) %>

+

<%= neuigkeit.title%>

<%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%> - <%= link_to "more" , neuigkeit_path(neuigkeit) %>

+<% end %>