diff --git a/app/assets/stylesheets/themes/default/components/_tabs.scss b/app/assets/stylesheets/themes/default/components/_tabs.scss index e1f5542..17a0660 100644 --- a/app/assets/stylesheets/themes/default/components/_tabs.scss +++ b/app/assets/stylesheets/themes/default/components/_tabs.scss @@ -5,7 +5,7 @@ .tabbed { $tabs-border-width: 1px; $tabs-border-colour: $light-blue; - $tabs-padding-horizontal: 16px; + $tabs-padding-horizontal: 13px; $tabs-height: 35px; ul.tabs { diff --git a/app/models/group.rb b/app/models/group.rb index 1b80099..f7d61ec 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -22,6 +22,7 @@ class Group < ActiveRecord::Base PREDICTORS = 8 STAFF = 10 GATHER_MODERATORS = 14 + COMP_MOD_COUNCIL = 16 attr_protected :id, :updated_at, :created_at, :founder_id validates_length_of :name, :maximum => 20 @@ -94,4 +95,12 @@ class Group < ActiveRecord::Base end gathermods end + + def self.compmodcouncil + compmodcouncil = [] + (find(COMP_MOD_COUNCIL).groupers).each do |g| + compmodcouncil << g unless compmodcouncil.include? g + end + compmodcouncil + end end diff --git a/app/views/about/staff.html.erb b/app/views/about/staff.html.erb index 8a75512..02c441a 100644 --- a/app/views/about/staff.html.erb +++ b/app/views/about/staff.html.erb @@ -22,6 +22,7 @@
+ | Username | +Task | +Age | +|
---|---|---|---|---|
<%= flag grouper.user.country %> | +<%= namelink grouper.user %> | +<%= h grouper.user.email_s %> | ++ <% if grouper.task %> + <%= h grouper.task %> + <% else %> + <%= h grouper.group.name.singularize %> + <% end %> + | +<%= h grouper.user.age %> | +