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| %>
<%= fetprofile.fetmail %>
<%= fetprofile.desc %>
-<%= fetprofile.active %>
-| Name | -Desc | -Datum | -- | - | - |
|---|---|---|---|---|---|
| <%= 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?' } %> | -
<%= gallery.desc %> +
+<%= notice %>
-<%= render 'fetprofiles/tabs' %> --<%= @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 %> -
+<%= notice %>
++ <%= @gremium.desc %> +
+
+ <%= m.fetprofile.name %>
<%= render(m) %>
+
<%= image_tag neuigkeit.picture.thumb.url unless neuigkeit.picture.url.nil? %>