Merge 98030936fa into a33e930111

app/views/admin/conference/show.html.haml

@@ -1,3 +1,31 @@
 .row
   .col-md-8
-    %h1 Dashboard for #{@conference.title}
+    %h1 Dashboard for #{@conference.title}
+  .col-md-9
+    = semantic_form_for(@conference, :url => admin_conference_path(@conference.short_title),:html => {:multipart => true}) do |f|
+      = f.input :title, :hint => "The full name of the conference, such as 'OpenSUSE Conference 2013'"
+      = f.input :short_title, :hint => "A short title, such as 'osc2013', to be used in URLs"
+      = f.input :social_tag, :hint => "The hashtag you'll use on Twitter and Google+.  Don't include the '#' sign!'"
+      = f.input :contact_email, :hint => "Contact email address for your conference. Will be used as reply-to address in emails sent out by the system."
+
+      = f.inputs :name => "Scheduling" do
+        = f.input :timezone, :as => :time_zone, :hint => "The conference time zone"
+        = f.input :start_date, :as => :string, :input_html => { :id => "conference-start-datepicker", :readonly => "readonly"  }
+        = f.input :end_date, :as => :string, :input_html => { :id => "conference-end-datepicker", :readonly => "readonly"  }
+        = f.input :registration_description, hint: 'This description will appear in the splash page in registration section'
+        = 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"  }
+
+      = f.inputs :name => "Media" do
+        - 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 :media_type, :as => :select, :label => "Conference Promo Media Type", :class=>"form-control", :collection => Conference.media_types.values, :include_blank => false, :hint => "This media-item will be used to represent this conference at various places in OSEM."
+        = f.input :media_id, :label => "Conference Promo Media ID", :as => :string
+        %p{:class => "help-block media-type", :id => "youtube-help"} Go to your YouTube video, click on "share" and copy everything behind http://youtu.be/"
+        %p{:class => "help-block media-type", :id => "slideshare-help", :style => "display:none"} Go to your SlideShare, click on "share" -> "embed" and copy the id
+        %p{:class => "help-block media-type", :id => "flickr-help", :style => "display:none"} Go to your flickr image, click on "Grab the link" -> "Show short url" and copy everything behind https://flic.kr/p/
+        %p{:class => "help-block media-type", :id => "vimeo-help", :style => "display:none"} Go to your vimeo video, click on "share" and copy everything behind http://vimeo.com/
+        %p{:class => "help-block media-type", :id => "speakerdeck-help", :style => "display:none"} Go to your SpeakerDeck, click on "share" -> "embed" and copy the data-id
+        %p{:class => "help-block media-type", :id => "instagram-help", :style => "display:none"} Go to your Instagram photo page and copy everything behind instagram.com/p/ (without trailing /# hash symbol)
+      = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

app/views/admin/supporter_levels/_supporter_level_fields.html.erb

@@ -1,7 +1,11 @@
 <div class="nested-fields">
     <%= f.inputs do %>
-        <%= f.input :title%>
+        <%= f.input :title %>
         <%= f.input :url  %>
+        <%= f.input :price_currency, collection: Money::Currency.table.map{ |x| x[1][:iso_code] }, label: 'Price Currency' %>
+        <%= f.input :amount, hint: 'Enter your price in only.For 100$ enter 100 and so on' %>
+        <%= f.input :description, hint: 'This will be displayed on supoorter level category in
+                                        splash page' %>
         <%= remove_association_link :supporter_level, f %>
     <% end %>
 </div>

app/views/admin/supporter_levels/index.html.haml

@@ -2,5 +2,6 @@
   .col-md-8
     = semantic_form_for(@conference, :url => admin_conference_supporter_level_path(@conference.short_title, @conference.supporter_levels)) do |f|
       = f.input :use_supporter_levels, :label => false
+      = f.input :ticket_description, hint: 'This will be displayed in Tickets segment of splash page'
       = dynamic_association :supporter_levels, "Supporter Levels", f
       = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

app/views/conference/show.html.haml

@@ -1,3 +1,32 @@
 = content_for :splash_logo do 
   = link_to @conference.title, "#", :class => 'navbar-brand'
-= render :partial => "home/conference_details", :locals => {:conference => @conference}
+= content_for :splash_header do
+  %ul.nav.navbar-nav
+    %li
+      %a{ href: '#registration' } Registration
+%div.container#registration.text-center
+  %div.row.col-md-12
+    %h2 Registration
+  - if !@conference.registration_description.blank?
+    %p
+      = @conference.registration_description
+  %h4 Registration period #{ conference_date_string(@conference.registration_start_date, @conference.registration_end_date)}
+  - if @conference.registration_open?
+    = link_to "Register for #{@conference.short_title}", register_conference_path(@conference.short_title), :class =>"btn btn-success btn-lg", target: '_blank'
+  %div.row
+    %h3 Tickets
+    - if !@conference.ticket_description.blank?
+      %p #{ @conference.ticket_description }
+    - if @conference.use_supporter_levels?
+      - @conference.supporter_levels.each do |s|
+        %div.col-md-6
+          - if !s.title.blank?
+            %h4 #{ s.title }
+          -if !s.description.blank?
+            %p #{ s.description }
+          - if !s.url.blank?
+            %div.btn-group
+              = link_to "Buy Ticket", s.url, class: 'btn btn-success', target: '_blank'
+              - if !s.price_cents.blank?
+                = button_tag "#{ humanized_money_with_symbol s.price}", class: 'btn btn-success'
+

app/views/home/_conference_details.html.haml

@@ -9,7 +9,7 @@
             = conference.title
             %small
               %b
-              = conference_date_string(conference)
+              = conference_date_string(conference.start_date, conference.end_date)
           - if conference.venue.name and conference.venue.website and conference.venue.address
             %p
               %small