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

div kleinigkeiten(FAQ Link)

Browse Source
This commit is contained in:
Andreas Stephanides
2014-06-04 23:16:25 +05:30
parent 63e4bf8f29
commit babbfb7d73
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/rubriken_controller.rb
View File

@@ -8,7 +8,7 @@ class RubrikenController < ApplicationController
@rubriken = Rubrik.where(:public=>true) @rubriken = Rubrik.where(:public=>true)
end end
@neuigkeiten = @rubriken.collect(&:neuigkeiten).map(&:recent).flatten @neuigkeiten = @rubriken.collect(&:neuigkeiten).map(&:recent).flatten
@calentries= @rubriken.collect(&:calendar).collect(&:calentries).flatten @calentries= @rubriken.collect(&:calentries).flatten
end end
def intern def intern

2
app/models/fetprofile.rb
View File

@@ -15,7 +15,7 @@
# #
class Fetprofile < ActiveRecord::Base class Fetprofile < ActiveRecord::Base
attr_accessible :active, :desc, :fetmailalias, :nachname, :picture, :short, :vorname, :memberships_attributes, :remove_picture, :picture_cache, :plz, :street, :city, :instant,:skype, :telnr, :hdynr, :birth_day,:birth_month, :birth_year,:geschlecht attr_accessible :active, :desc, :fetmailalias, :nachname, :picture, :short, :vorname, :memberships_attributes, :remove_picture, :picture_cache, :plz, :street, :city, :instant,:skype, :telnr, :hdynr, :birth_day, :birth_month, :birth_year,:geschlecht
has_many :memberships, dependent: :delete_all has_many :memberships, dependent: :delete_all
has_many :gremien, :through=> :membership has_many :gremien, :through=> :membership
mount_uploader :picture, PictureUploader mount_uploader :picture, PictureUploader

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

@@ -29,7 +29,8 @@
<div class="span8"> <div class="span8">
<h2><%= sem.name %></h2> <h2><%= sem.name %></h2>
</div> </div>
<div class="span4"><div class="pull-right"><%= link_to I18n.t("lva.addrem"), edit_semester_path(sem), :class=>"btn-small"%></div> <div class="span4">
<div class="pull-right"><!--<% link_to I18n.t("lva.addrem"), edit_semester_path(sem), :class=>"btn-small"%>--></div>
</div></div> </div></div>
<% sem.lvas.each do |lva| %> <% sem.lvas.each do |lva| %>
<div class="row-fluid"> <div class="row-fluid">

5
app/views/themes/blue1/home/index.html.erb
View File

@@ -28,6 +28,10 @@
</div> </div>
<%= link_to "Entwicklungsstatus" , dev_home_index_path %> <%= link_to "Entwicklungsstatus" , dev_home_index_path %>
<p>
<%= link_to "FAQS", faqs_themengruppen_path,class: :btn %>
</p>
<%= render 'beispiele' %> <%= render 'beispiele' %>
</div> </div>
<div class="span6"> <div class="span6">
@@ -44,6 +48,7 @@ Verschiedene Styles
<li> <%= link_to "2003", home_index_path({:theme=>"2003"}) %></li> <li> <%= link_to "2003", home_index_path({:theme=>"2003"}) %></li>
<li> <%= link_to "white_1", home_index_path({:theme=>"white_1"}) %></li> <li> <%= link_to "white_1", home_index_path({:theme=>"white_1"}) %></li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>