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

Add logo to conference page

Browse source
This commit is contained in:
Matt Barringer 2013-01-17 15:56:56 +01:00
parent caa0dec6c4
commit 1d7670d74e
12 changed files with 61 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/osem.css
View file

@ -7,6 +7,10 @@ html, body,.container,.content {
height: 60px;
}
.well {
background-color: white;
border: 1px solid #299A0B;
}
.container, .content {
position: relative;
}

9
app/models/conference.rb
View file

@ -1,7 +1,7 @@
class Conference < ActiveRecord::Base
attr_accessible :title, :short_title, :social_tag, :contact_email, :timezone, :html_export_path,
:start_date, :end_date, :rooms_attributes, :tracks_attributes,
:event_types_attributes, :registration_start_date, :registration_end_date
:event_types_attributes, :registration_start_date, :registration_end_date, :logo
has_paper_trail
@ -21,6 +21,13 @@ class Conference < ActiveRecord::Base
accepts_nested_attributes_for :event_types, :allow_destroy => true
accepts_nested_attributes_for :email_settings
has_attached_file :logo,
:styles => {:thumb => "100x100>", :large => "300x300>" }
validates_attachment_content_type :logo,
:content_type => [/jpg/, /jpeg/, /png/, /gif/],
:size => { :in => 0..500.kilobytes }
validates_presence_of :title,
:short_title,
:social_tag

3
app/views/admin/conference/show.html.haml
View file

@ -13,5 +13,8 @@
= f.input :end_date, :as => :string, :input_html => { :id => "conference-end-datepicker", :readonly => "readonly" }
= f.input :registration_start_date, :as => :string, :input_html => { :id => "conference-reg-start-datepicker", :readonly => "readonly" }
= f.input :registration_end_date, :as => :string, :input_html => { :id => "conference-reg-end-datepicker", :readonly => "readonly" }
- if !@conference.logo.blank?
= image_tag @conference.logo(:thumb)
= f.input :logo, :label => "Conference Logo", :hint => "This will be displayed on the front page."
= f.input :html_export_path, :hint => "The path for static HTML exports"
= f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

36
app/views/home/index.html.haml
View file

@ -1,20 +1,28 @@
.container-fluid
%h1.center-text
%h1.center-text{:style => "padding-bottom: 30px"}
Upcoming Conferences
- @conferences.each do |conference|
- if conference.cfp_open? || conference.registration_open?
.well
%h2.center-text
= conference.title
%h4.center-text
= conference.date_range_string
.center-text
%i
%a= link_to conference.venue.name, conference.venue.website
,
= conference.venue.address
.row-fluid
.span3.offset3
= image_tag conference.logo(:original)
.span3
%h2.center-text
= conference.title
%h4.center-text
= conference.date_range_string
.center-text
%i
%a= link_to conference.venue.name, conference.venue.website
,
= conference.venue.address
.row-fluid
.span12
.center-text
= conference.venue.description
.row-fluid{:style => "padding-top: 30px;"}
.span4
.span3
- if conference.registration_open?
- if conference.user_registered?(current_user)
= link_to "Modify Registration", register_conference_path(conference.short_title), :class => "btn btn-success btn-large"
@ -23,9 +31,9 @@
= link_to "Register", register_conference_path(conference.short_title), :class => "btn btn-success btn-large"
- else
%b Registration is closed.
.span4.offset4.pull-right
.span9
- if conference.cfp_open?
- if !current_user.nil? && current_user.person.proposal_count(conference) > 0
= link_to "View My Proposals", conference_proposal_index_path(conference.short_title), :class => "btn btn-success btn-large"
= link_to "View My Proposals", conference_proposal_index_path(conference.short_title), :class => "btn btn-success btn-large pull-right"
- else
= link_to "Submit Proposal", conference_proposal_index_path(conference.short_title), :class => "btn btn-success btn-large"
= link_to "Submit Proposal", conference_proposal_index_path(conference.short_title), :class => "btn btn-success btn-large pull-right"