-
-
-
-
-
-2015!
-
-
-Halifax, Nova Scotia
-
-July 21 – 25, 2015
-
-
-
-
-
-' + result + '
' end else - @markdown ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML.new({ - filter_html: true, - hard_wrap: true, - space_after_headers: true, - fenced_code_blocks: true, - link_attributes: { target: "_blank" } - }), { - autolink: true, - disable_indented_code_blocks: true, - superscript: true - }) - result = @markdown.render(content) + result = markdown(object, attribute) end result.html_safe end @@ -625,7 +637,7 @@ module ApplicationHelper end def nav_link(link, title) - link_to title, link, :class => (current_page?(link) ? 'current' : nil) + link_to "#{title}".html_safe, link, :class => (current_page?(link) ? 'current' : nil) end def date(date, format = :long) diff --git a/app/views/application/_header.html.haml b/app/views/application/_header.html.haml index ded44ee..488bf25 100644 --- a/app/views/application/_header.html.haml +++ b/app/views/application/_header.html.haml @@ -3,9 +3,9 @@ - style = nil - cover = nil - figure = nil - - if capable_of(:css_mixblendmode) || ENV['RAILS_ENV'] == 'test' + - if capable_of(:css_mixblendmode) - cover = "" - - elsif capable_of(:svg) + - elsif capable_of(:svg) && Rails.env != 'test' - banner_image = 'application/banner_image.svg' - else - style = "background-image: url(#{image})" diff --git a/app/views/application/_login_confirmation_sent.html.haml b/app/views/application/_login_confirmation_sent.html.haml index bcd6caa..8d03d41 100644 --- a/app/views/application/_login_confirmation_sent.html.haml +++ b/app/views/application/_login_confirmation_sent.html.haml @@ -2,4 +2,4 @@ = columns(medium: 12) do %h2=_'articles.permission_denied.headings.confirmation_sent','Confirmation Sent' = columns(medium: 6) do - =paragraph _('articles.permission_denied.paragraphs.confirmation_sent', :p) + =m('articles.permission_denied.paragraphs.confirmation_sent', :p) diff --git a/app/views/conferences/_email_confirm.html.haml b/app/views/conferences/_email_confirm.html.haml index a2f0f59..c0472c7 100644 --- a/app/views/conferences/_email_confirm.html.haml +++ b/app/views/conferences/_email_confirm.html.haml @@ -3,4 +3,4 @@ = columns(medium: 12) do %h2=_'articles.conference_registration.headings.email_confirm','Please confirm your email address' = columns(medium: 12) do - =paragraph _('articles.conference_registration.paragraphs.email_confirm', :p) + =m('articles.conference_registration.paragraphs.email_confirm', :p) diff --git a/app/views/conferences/broadcast.html.haml b/app/views/conferences/broadcast.html.haml index 5710dc3..31e1ad7 100644 --- a/app/views/conferences/broadcast.html.haml +++ b/app/views/conferences/broadcast.html.haml @@ -5,12 +5,12 @@ - if @email_sent == :yes %p=_('articles.conference_registration.paragraphs.participants_emailed',"All participants of #{@this_conference.title} have been emailed.", :vars => {:conference_title => @this_conference.title}) - if @email_sent != :yes - =paragraph(_'articles.conference_registration.paragraphs.Email_Participants','This page is used to contact all participants. Text can be entered as [Markdown](http://daringfireball.net/projects/markdown/basics). Pressing \'test\' will send the email only to you, make sure you do this and use caution in general before pressing \'send\'') + =m('articles.conference_registration.paragraphs.Email_Participants','This page is used to contact all participants. Text can be entered as [Markdown](http://daringfireball.net/projects/markdown/basics). Pressing \'test\' will send the email only to you, make sure you do this and use caution in general before pressing \'send\'') - if @email_sent == :yes || @email_sent == :preview %h2=_'articles.conference_registration.headings.Preview' .email-preview %h3=@subject - =paragraph @content + =markdown @content - if @email_sent != :yes = form_tag broadcast_path(@this_conference.slug), class: 'composition' do - if @email_sent == :preview diff --git a/app/views/shared/_navbar.html.haml b/app/views/shared/_navbar.html.haml index 0eda2c7..e24721c 100644 --- a/app/views/shared/_navbar.html.haml +++ b/app/views/shared/_navbar.html.haml @@ -1,19 +1,21 @@ -%nav#main-nav - = link_to '/', :class => 'logo' do - = svg_sprite('icons', "bb-icon-logo", "Logo") - = svg_sprite('icons', "bb-icon-logo-text", "Logo Text") - .nav - = nav_link home_path, (@conference ? @conference.title : 'Bike!Bike!') - = nav_link about_path, (_'page_titles.About_BikeBike') - = nav_link policy_path, (_'page_titles.Safe_Space_Policy') - .actions - - if @conference.registration_open - - if params[:action] != 'register' && !@registration - = link_to register_path(@conference.slug), class: [:button, :register] do - =_'conference.actions.Register' - - else - = render 'shared/donate_button', :email_address => (@conference.paypal_email_address || @conference.email_address) - - if current_user - = form_tag :logout, class: :logout do - =hidden_field_tag :url, request.fullpath - =button_tag :Log_out \ No newline at end of file +%nav + #main-nav + .inner-nav + = link_to '/', :class => 'logo' do + = svg_sprite('icons', "bb-icon-logo", "Logo") + = svg_sprite('icons', "bb-icon-logo-text", "Logo Text") + .nav + = nav_link home_path, (@conference ? @conference.title : 'Bike!Bike!') + = nav_link about_path, (_'page_titles.About_BikeBike') + = nav_link policy_path, (_'page_titles.Safe_Space_Policy') + .actions + - if @conference.registration_open + - if params[:action] != 'register' && !@registration + = link_to register_path(@conference.slug), class: [:button, :register] do + =_'conference.actions.Register' + - else + = render 'shared/donate_button', :email_address => (@conference.paypal_email_address || @conference.email_address) + - if current_user + = form_tag :logout, class: :logout do + =hidden_field_tag :url, request.fullpath + =button_tag :Log_out \ No newline at end of file diff --git a/app/views/user_mailer/broadcast.html.haml b/app/views/user_mailer/broadcast.html.haml index b1145ba..0463213 100644 --- a/app/views/user_mailer/broadcast.html.haml +++ b/app/views/user_mailer/broadcast.html.haml @@ -1 +1 @@ -=paragraph @content \ No newline at end of file +=markdown @content \ No newline at end of file diff --git a/app/views/workshops/index.html.haml b/app/views/workshops/index.html.haml index f9c3032..b6fc089 100644 --- a/app/views/workshops/index.html.haml +++ b/app/views/workshops/index.html.haml @@ -13,7 +13,7 @@ %li =link_to view_workshop_path(@this_conference.slug, w.id) do %h4=_!(w.title) - =paragraph _!(w.info) + =markdown _!(w.info) = link_to (_'actions.workshops.create','New Workshop'), create_workshop_path(@this_conference.slug), class: :button = row do %ul.workshop-previews @@ -23,4 +23,4 @@ = columns(medium: 6) do =link_to view_workshop_path(@this_conference.slug, w.id) do %h4=_!(w.title) - =paragraph _!(w.info) + =markdown _!(w.info) diff --git a/app/views/workshops/new.html.haml b/app/views/workshops/new.html.haml index 77e7bdb..6365028 100644 --- a/app/views/workshops/new.html.haml +++ b/app/views/workshops/new.html.haml @@ -4,7 +4,7 @@ = form_tag save_workshop_path(@this_conference.slug), class: 'composition' do = (hidden_field_tag :workshop_id, @workshop.id) if @workshop = columns(medium: 12) do - =paragraph(_'articles.workshops.paragraphs.new_workshop','Please accurately describe your workshop in detail. This will help hosts decide if they wish to add it to the schedule and when it should best be scheduled. Enter normal text but if you want to get fancy you can use [Markdown](http://daringfireball.net/projects/markdown/basics).').html_safe + =m('articles.workshops.paragraphs.new_workshop','Please accurately describe your workshop in detail. This will help hosts decide if they wish to add it to the schedule and when it should best be scheduled. Enter normal text but if you want to get fancy you can use [Markdown](http://daringfireball.net/projects/markdown/basics).') .text-field.input-field.big = label_tag :title = text_field_tag :title, @title, :required => true diff --git a/app/views/workshops/show.html.haml b/app/views/workshops/show.html.haml index 515e151..1a4c6e6 100644 --- a/app/views/workshops/show.html.haml +++ b/app/views/workshops/show.html.haml @@ -3,7 +3,7 @@ = row do = columns(medium: 12) do %h2=_!@workshop.title - =paragraph _!(@workshop.info) || '' + =markdown _!(@workshop.info) || '' = columns(medium: 6) do %h3=_'articles.workshops.headings.facilitators' .facilitators @@ -28,7 +28,7 @@ - if @workshop.notes = columns(medium: 12) do %h3=_'articles.workshops.headings.notes','Notes' - =paragraph _!(@workshop.notes) + =markdown _!(@workshop.notes) = columns(medium: 12) do .actions = (link_to (_'actions.workshops.Edit'), edit_workshop_path(@this_conference.slug, @workshop.id), :class => 'button modify') if @workshop.can_edit?(current_user) diff --git a/config/locales/data/html_records/1.html b/config/locales/data/html_records/1.html deleted file mode 100644 index b9af7a9..0000000 --- a/config/locales/data/html_records/1.html +++ /dev/null @@ -1,519 +0,0 @@ - - - -Duis bibendum, felis sed interdum venenatis, turpis enim blandit mi, in porttitor pede justo eu massa. Donec dapibus. Duis at velit eu est congue elementum. In hac habitasse platea dictumst. Morbi vestibulum, velit id pretium iaculis, diam erat fermentum justo, nec condimentum neque sapien placerat ante. Nulla justo. Aliquam quis turpis eget elit sodales scelerisque. Mauris sit amet eros. Suspendisse accumsan tortor quis turpis. Sed ante.
-Lorem Ipsum
- -Lorem Ipsum
- -This page is used to contact all participants. Text can be entered as [Markdown](http://daringfireball.net/projects/markdown/basics). Pressing 'test' will send the email only to you, make sure you do this and use caution in general before pressing 'send'
- - -Bike!Bike! is an international annual gathering organized by and for community bicycle projects. The conference is a space for participants from shops and related advocacy groups to converge in a different city each year over a 4 day period to have workshops and strengthen our social network.
-Bike!Bike! 2015: An international reunion meant to be a swap-meet for experiences and ideas about community bike projects. From collectives that use the bicycle as an excuse to change society, economy and the environment. Non-profit groups that have a community bike shops, cooperatives and other projects that promote the use of the bicycle and that come together to turn their communities into a place where riding is easier, more inclusive, safer and more fun. The list below uses the criteria found in the old Bicycle Organization Organization Project for what constitutes a community bike shop. The bike project need not meet all these criteria. Rather, it is a general list of qualities which are common among many bicycle projects.
-You don’t have to be an expert or belong to a huge group, you just need to be willing to share what you know about organization, mechanics, social impact, inequality alternatives, better access to bicycles or knowledge and social issues in your community or city.
-Workshops are organized and run by attendees, they can be about anything that might concern community bicycle projects and can be in any format including presentations, hands-on workshops, discussion groups, and bicycle rides. If you would like to host you own workshop you can enter details after registering. What ends up in the final schedule and when they happen are decided on by the conference hosts.
-Traditionally conference hosts arrange shared accommodations, one to two meals a day, and bicycles will be available for registered attendees however you should check the conference details on the current conference. More information on how you can arrange your own accommodation and other recommended places to visit should also be provided to you by the hosts on the conference page or in hard copy upon arrival.
-Yes. Please!
-In order to set a common ground, we state our shared beliefs and desires for the space which is Bike!Bike!. We rally around these ideas for inspiration and to ensure that if there is behaviour which does not make us feel safe, we have something to point to. By agreeing to a commitment of mutual respect, we hope that if conflict does arise, we will remember what we have agreed to, and act accordingly.
-The host city has the responsibility of mediating safer space issues. They will decide what constitutes a warning and what constitutes expulsion from the conference.
--Sorry, we couldn't find the page you were looking for. If you really believe that it should exist please contact admin@bikebike.org or file an issue on github: https://github.com/bikebike/BikeBike/issues -
-Safer Space Agreement
-In order to set a common ground, we state our shared beliefs and desires for the space which is Bike!Bike!. We rally around these ideas for inspiration and to ensure that if there is behaviour which does not make us feel safe, we have something to point to. By agreeing to a commitment of mutual respect, we hope that if conflict does arise, we will remember what we have agreed to, and act accordingly.
-The host city has the responsibility of mediating safer space issues. They will decide what constitutes a warning and what constitutes expulsion from the conference.
-By clicking the "I Agree" button, you are pledging to do your best to uphold Bike!Bike!'s safer space agreement. Thank you!
- - -You are about to confirm your payment of 50.00 for registration.
- - -Check Out who's coming and what they've paid so far. See at a glance how much accommodation is needed and what people prefer to eat.
-Thank you for completing your registration. We'll see you at Bike!Bike! Payment is by donation and can be done now or upon arrival but to help us fund the conference, we ask that you pay the registration donation as soon as you can.
-