gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes from comments

Browse source
This commit is contained in:
Stella Rouzi 2014-08-06 22:23:10 +03:00
parent d7c7d878f2
commit 5a1dae866a
7 changed files with 23 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/models/user.rb
View file

@ -114,17 +114,6 @@ class User < ActiveRecord::Base
proposals(conference).count
end
# Returns user submissions (in any conference)
def submissions
submissions = []
Conference.all.each do |c|
unless self.proposals(c).blank?
submissions << self.proposals(c)
end
end
submissions
end
def biography_word_count
if biography.nil?
0

8
app/views/admin/conference/_recent_registrations.html.haml
View file

@ -10,10 +10,10 @@
- recent_registrations.each_with_index do |registration, index|
%tbody
%tr
%td #{index + 1}
%td= link_to "#{registration.name}", admin_user_path(registration.user.id)
%td= link_to "#{registration.conference.title}", admin_conference_path(registration.conference.short_title)
%td #{registration.created_at.strftime('%m/%d/%Y')}
%td= index + 1
%td= link_to registration.name, admin_user_path(registration.user.id)
%td= link_to registration.conference.title, admin_conference_path(registration.conference.short_title)
%td= registration.created_at.strftime('%m/%d/%Y')
- else
%h5.text-warning.text-center
No registrations!

8
app/views/admin/conference/_recent_submissions.html.haml
View file

@ -11,13 +11,13 @@
- recent_events.each_with_index do |event, index|
%tbody
%tr
%td #{index + 1}
%td= index + 1
- if event.submitter
%td= link_to "#{event.submitter.name}", admin_user_path(event.submitter.id)
%td= link_to event.submitter.name, admin_user_path(event.submitter.id)
- else
%td Unknown Submitter
%td= link_to "#{event.title}", admin_conference_event_path(event.conference.short_title, event)
%td= link_to "#{event.conference.title}", admin_conference_path(event.conference.short_title)
%td= link_to event.title, admin_conference_event_path(event.conference.short_title, event)
%td= link_to event.conference.title, admin_conference_path(event.conference.short_title)
%td
.span{'class'=>label_for(event.state)} #{event.state.humanize}
- else

6
app/views/admin/conference/_recent_users.html.haml
View file

@ -10,9 +10,9 @@
- recent_users.each_with_index do |user, index|
%tbody
%tr
%td #{index}
%td= link_to "#{user.email}", admin_user_path(user.id)
%td #{user.created_at.strftime('%m/%d/%Y')}
%td= index + 1
%td= link_to user.email, admin_user_path(user.id)
%td= user.created_at.strftime('%m/%d/%Y')
%td
- if user.confirmed?
%span.label.label-success Confirmed

4
app/views/admin/conference/_top_submitter.html.haml
View file

@ -9,10 +9,10 @@
= image_tag(key.gravatar_url(size: '25'), title: "Yo #{key.name}!", :alt => '', 'class'=>'img-circle img-responsive text-center')
.col-md-10
%h4
= link_to "#{key.name}", admin_user_path(key)
= link_to key.name, admin_user_path(key)
%div
%small
= link_to "#{pluralize(value, 'submission')}", admin_user_path(key)
= link_to pluralize(value, 'submission'), admin_user_path(key, tab: 'submissions-content')
- else
%h4.text-warning
No submissions!

9
app/views/admin/users/_submissions.html.haml
View file

@ -1,7 +1,7 @@
.row
.col-md-12.page-header
%h2
Submissions (#{@user.submissions.length}) for #{@user.name}
Submissions (#{@user.events.length}) for #{@user.name}
.col-md-12
.well
%table.table.table-bordered.table-striped.table-hover#submissions
@ -14,8 +14,7 @@
%th Rating
%th Created At
%tbody
- @user.submissions.each do |submission|
- event = submission[0]
- @user.events.each do |event|
%tr
%td= event.id
%td= link_to event.conference.short_title, admin_conference_path(event.conference.short_title)
@ -26,10 +25,10 @@
- if event.conference.call_for_papers && event.conference.call_for_papers.rating && event.conference.call_for_papers.rating > 0
- event.conference.call_for_papers.rating.times do |counter|
- if event.average_rating.to_f.round == counter+1
= label_tag "label_rating", "", :class => "avgrating", :avgrate => true
= label_tag 'label_rating', '', class: 'avgrating', avgrate: true
= javascript_tag "$('label[avgrate=true]').prevAll().andSelf().addClass('bright');"
- else
= label_tag "label_rating", "", :class => "avgrating"
= label_tag 'label_rating', '', class: 'avgrating'
%td= event.created_at
:javascript

11
app/views/admin/users/show.html.haml
View file

@ -2,12 +2,13 @@
.col-md-12
.tabbable
%ul.nav.nav-tabs
%li.active
%li{class: "#{'active' unless params[:tab] == 'submissions-content'}"}
= link_to 'User Info', '#user-info-content', 'data-toggle'=>'tab'
- unless @user.submissions.blank?
%li= link_to 'Submissions', '#submissions-content', 'data-toggle'=>'tab'
- unless @user.events.blank?
%li{class: "#{'active' if params[:tab] == 'submissions-content'}"}
= link_to 'Submissions', '#submissions-content', 'data-toggle'=>'tab'
.tab-content
#user-info-content.tab-pane.active
#user-info-content.tab-pane{class: "#{'active' unless params[:tab] == 'submissions-content'}"}
- if can? :edit, @user
.pull-right
= link_to "Edit", edit_admin_user_path(@user), class: 'btn btn-primary'
@ -22,5 +23,5 @@
= show_roles(@user.get_roles)
- else
%td= @user.send(attr)
#submissions-content.tab-pane
#submissions-content.tab-pane{class: "#{'active' if params[:tab] == 'submissions-content'}"}
= render 'submissions'