From 438e2ebfdfd146812a8dc4914f082b39c0e0a280 Mon Sep 17 00:00:00 2001 From: Godwin Date: Fri, 18 Sep 2015 16:28:01 -0700 Subject: [PATCH] Style updates for workshops --- app/assets/stylesheets/_application.scss | 9 ++ app/views/workshops/index.html.haml | 19 +-- .../Be-the-first-to-like-a-workshop--.html | 2 +- ...-conferences.MyBikeBike.workshops.1-1.html | 4 +- ...-conferences.MyBikeBike.workshops.1-2.html | 4 +- ...p--conferences.MyBikeBike.workshops.1.html | 4 +- .../html_records/Broadcast-message--.html | 2 +- ...age--conferences.MyBikeBike.broadcast.html | 4 +- .../data/html_records/Create-workshop--.html | 2 +- ...p--conferences.MyBikeBike.workshops-1.html | 4 +- ...hop--conferences.MyBikeBike.workshops.html | 4 +- .../html_records/Edit-a-conference--.html | 2 +- ...nference--conferences.MyBikeBike.edit.html | 108 +++++++++++++++++- .../data/html_records/Like-a-workshop--.html | 2 +- ...-conferences.MyBikeBike.workshops.1-1.html | 4 +- ...-conferences.MyBikeBike.workshops.1-2.html | 4 +- ...p--conferences.MyBikeBike.workshops.1.html | 4 +- .../html_records/See-a-more-info-link--.html | 2 +- .../html_records/See-a-register-link--.html | 2 +- ...tart-registration-from-landing-page--.html | 4 +- ...ge--conferences.MyBikeBike.register-1.html | 4 +- ...ge--conferences.MyBikeBike.register-3.html | 2 +- ...from-landing-page--email_confirmation.html | 4 +- ...nding-page--registration_confirmation.html | 2 +- .../data/html_records/View-stats--.html | 2 +- ...ats--conferences.MyBikeBike.stats.xls.html | 2 +- 26 files changed, 155 insertions(+), 51 deletions(-) diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index 219a3ae..2d72ba9 100644 --- a/app/assets/stylesheets/_application.scss +++ b/app/assets/stylesheets/_application.scss @@ -1864,6 +1864,15 @@ html[data-lingua-franca-example="html"] { &:last-child { border-bottom: 0; } + + ul { + padding-left: 2.5em; + margin-bottom: 1.5em; + } + + li { + border: 0; + } } } diff --git a/app/views/workshops/index.html.haml b/app/views/workshops/index.html.haml index b6fc089..ca3c646 100644 --- a/app/views/workshops/index.html.haml +++ b/app/views/workshops/index.html.haml @@ -7,20 +7,7 @@ %p=_'articles.workshops.paragraphs.Workshops', :p = columns(medium: 6) do %h3=_'articles.workshops.headings.Your_Workshops' - %ul.workshop-previews - - @my_workshops.each do |w| - - if w.title - %li - =link_to view_workshop_path(@this_conference.slug, w.id) do - %h4=_!(w.title) - =markdown _!(w.info) - = link_to (_'actions.workshops.create','New Workshop'), create_workshop_path(@this_conference.slug), class: :button + = render 'workshops/workshop_previews', :workshops => @my_workshops + = link_to (_'actions.workshops.create','New Workshop'), create_workshop_path(@this_conference.slug), class: [:button, :modify] = row do - %ul.workshop-previews - - @workshops.each do |w| - - if w.title - %li - = columns(medium: 6) do - =link_to view_workshop_path(@this_conference.slug, w.id) do - %h4=_!(w.title) - =markdown _!(w.info) + = render 'workshops/workshop_previews', :workshops => @workshops \ No newline at end of file diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html index 698c6c7..15715ca 100644 --- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html +++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html @@ -46,7 +46,7 @@

Guadalajara, Jalisco, Mexico

-August 17 – 21, 2015 +August 19 – 23, 2015
diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html index c4d2591..f15625b 100644 --- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html +++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html @@ -51,7 +51,7 @@
-

Vestibulum Ante Ipsum Primis In Faucibus Orci Luctus Et Ultrices Posuere Cubilia Curae; Donec Pharetra, Magna Vestibulum Aliquet Ultrices, Erat Tortor Sollicitudin Mi, Sit Amet Lobortis Sapien Sapien Non Mi

+

Phasellus Id Sapien In Sapien Iaculis Congue

You are interested in this workshop
@@ -59,7 +59,7 @@
-

Nulla ut erat id mauris vulputate elementum. Nullam varius. Nulla facilisi.

+

Quisque porta volutpat erat. Quisque erat eros, viverra eget, congue eget, semper rutrum, nulla. Nunc purus.

Facilitators

diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html index 907a6bb..ea6706f 100644 --- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html +++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html @@ -51,7 +51,7 @@
-

Vestibulum Ante Ipsum Primis In Faucibus Orci Luctus Et Ultrices Posuere Cubilia Curae; Donec Pharetra, Magna Vestibulum Aliquet Ultrices, Erat Tortor Sollicitudin Mi, Sit Amet Lobortis Sapien Sapien Non Mi

+

Phasellus Id Sapien In Sapien Iaculis Congue

No one is interested in this workshop yet
@@ -59,7 +59,7 @@
-

Nulla ut erat id mauris vulputate elementum. Nullam varius. Nulla facilisi.

+

Quisque porta volutpat erat. Quisque erat eros, viverra eget, congue eget, semper rutrum, nulla. Nunc purus.

Facilitators

diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html index 907a6bb..ea6706f 100644 --- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html +++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html @@ -51,7 +51,7 @@
-

Vestibulum Ante Ipsum Primis In Faucibus Orci Luctus Et Ultrices Posuere Cubilia Curae; Donec Pharetra, Magna Vestibulum Aliquet Ultrices, Erat Tortor Sollicitudin Mi, Sit Amet Lobortis Sapien Sapien Non Mi

+

Phasellus Id Sapien In Sapien Iaculis Congue

No one is interested in this workshop yet
@@ -59,7 +59,7 @@
-

Nulla ut erat id mauris vulputate elementum. Nullam varius. Nulla facilisi.

+

Quisque porta volutpat erat. Quisque erat eros, viverra eget, congue eget, semper rutrum, nulla. Nunc purus.

Facilitators

diff --git a/config/locales/data/html_records/Broadcast-message--.html b/config/locales/data/html_records/Broadcast-message--.html index 02be57a..765ed4a 100644 --- a/config/locales/data/html_records/Broadcast-message--.html +++ b/config/locales/data/html_records/Broadcast-message--.html @@ -46,7 +46,7 @@

San Marcos, Texas

-August 17 – 21, 2015 +August 19 – 23, 2015
diff --git a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html index 170cf49..59908c6 100644 --- a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html +++ b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html @@ -78,7 +78,7 @@ @@ -94,7 +94,7 @@ diff --git a/config/locales/data/html_records/Create-workshop--.html b/config/locales/data/html_records/Create-workshop--.html index 02be57a..765ed4a 100644 --- a/config/locales/data/html_records/Create-workshop--.html +++ b/config/locales/data/html_records/Create-workshop--.html @@ -46,7 +46,7 @@

San Marcos, Texas

-August 17 – 21, 2015 +August 19 – 23, 2015
diff --git a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops-1.html b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops-1.html index 58be65a..7deba42 100644 --- a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops-1.html +++ b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops-1.html @@ -56,9 +56,11 @@

Your Workshops

-New Workshop + +New Workshop
+
diff --git a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.html b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.html index 58be65a..7deba42 100644 --- a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.html +++ b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.html @@ -56,9 +56,11 @@

Your Workshops

-New Workshop + +New Workshop
+
diff --git a/config/locales/data/html_records/Edit-a-conference--.html b/config/locales/data/html_records/Edit-a-conference--.html index c0eed1e..7902db6 100644 --- a/config/locales/data/html_records/Edit-a-conference--.html +++ b/config/locales/data/html_records/Edit-a-conference--.html @@ -46,7 +46,7 @@

Portland, Oregon

-August 17 – 21, 2015 +August 19 – 23, 2015
diff --git a/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html b/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html index a7c43cf..d4169ac 100644 --- a/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html +++ b/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html @@ -57,7 +57,7 @@
- +

Curabitur non nulla sit amet nisl tempus convallis quis ac lectus.

Type something
@@ -72,4 +72,108 @@
\ No newline at end of file + + + + + +
+ + + + + + + \ No newline at end of file diff --git a/config/locales/data/html_records/Like-a-workshop--.html b/config/locales/data/html_records/Like-a-workshop--.html index 698c6c7..15715ca 100644 --- a/config/locales/data/html_records/Like-a-workshop--.html +++ b/config/locales/data/html_records/Like-a-workshop--.html @@ -46,7 +46,7 @@

Guadalajara, Jalisco, Mexico

-August 17 – 21, 2015 +August 19 – 23, 2015
diff --git a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-1.html b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-1.html index 206e9e2..ec35fca 100644 --- a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-1.html +++ b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-1.html @@ -51,7 +51,7 @@
-

Integer Aliquet, Massa Id Lobortis Convallis, Tortor Risus Dapibus Augue, Vel Accumsan Tellus Nisi Eu Orci

+

Donec Vitae Nisi

You and 4 others are interested in this workshop
@@ -59,7 +59,7 @@
-

Sed sagittis. Nam congue, risus semper porta volutpat, quam pede lobortis ligula, sit amet eleifend pede libero quis orci. Nullam molestie nibh in lectus.

+

Maecenas ut massa quis augue luctus tincidunt. Nulla mollis molestie lorem. Quisque ut erat.

Facilitators

diff --git a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-2.html b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-2.html index 8338375..32a5334 100644 --- a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-2.html +++ b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-2.html @@ -51,7 +51,7 @@
-

Integer Aliquet, Massa Id Lobortis Convallis, Tortor Risus Dapibus Augue, Vel Accumsan Tellus Nisi Eu Orci

+

Donec Vitae Nisi

4 people are interested in this workshop
@@ -59,7 +59,7 @@
-

Sed sagittis. Nam congue, risus semper porta volutpat, quam pede lobortis ligula, sit amet eleifend pede libero quis orci. Nullam molestie nibh in lectus.

+

Maecenas ut massa quis augue luctus tincidunt. Nulla mollis molestie lorem. Quisque ut erat.

Facilitators

diff --git a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1.html b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1.html index 8338375..32a5334 100644 --- a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1.html +++ b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1.html @@ -51,7 +51,7 @@
-

Integer Aliquet, Massa Id Lobortis Convallis, Tortor Risus Dapibus Augue, Vel Accumsan Tellus Nisi Eu Orci

+

Donec Vitae Nisi

4 people are interested in this workshop
@@ -59,7 +59,7 @@
-

Sed sagittis. Nam congue, risus semper porta volutpat, quam pede lobortis ligula, sit amet eleifend pede libero quis orci. Nullam molestie nibh in lectus.

+

Maecenas ut massa quis augue luctus tincidunt. Nulla mollis molestie lorem. Quisque ut erat.

Facilitators

diff --git a/config/locales/data/html_records/See-a-more-info-link--.html b/config/locales/data/html_records/See-a-more-info-link--.html index 33cc0d9..7ff4709 100644 --- a/config/locales/data/html_records/See-a-more-info-link--.html +++ b/config/locales/data/html_records/See-a-more-info-link--.html @@ -50,7 +50,7 @@

Halifax, Nova Scotia

-August 17 – 21, 2015 +August 19 – 23, 2015
diff --git a/config/locales/data/html_records/See-a-register-link--.html b/config/locales/data/html_records/See-a-register-link--.html index 57a3394..e1e1b93 100644 --- a/config/locales/data/html_records/See-a-register-link--.html +++ b/config/locales/data/html_records/See-a-register-link--.html @@ -41,7 +41,7 @@

Sackville, New Brunswick

-August 17 – 21, 2015 +August 19 – 23, 2015
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--.html b/config/locales/data/html_records/Start-registration-from-landing-page--.html index 638ca02..c8d427c 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--.html @@ -41,7 +41,7 @@

Halifax, Nova Scotia

-August 17 – 21, 2015 +August 19 – 23, 2015
@@ -62,7 +62,7 @@ Curabitur non nulla sit amet nisl tempus convallis quis ac lectus.

My Awesome Workshop

-

Curabitur at ipsum ac tellus semper interdum. Mauris ullamcorper purus sit amet nulla. Quisque arcu libero, rutrum ac, lobortis vel, dapibus at, diam.

+

Duis consequat dui nec nisi volutpat eleifend. Donec ut dolor. Morbi vel lectus in quam fringilla rhoncus.

diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html index 4aa380e..062a058 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html @@ -81,7 +81,7 @@

-Confirm now +Confirm now

@@ -95,7 +95,7 @@
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html index 0f23dd2..cf38157 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html @@ -90,7 +90,7 @@ diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html b/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html index 4aa380e..062a058 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html @@ -81,7 +81,7 @@

-Confirm now +Confirm now

@@ -95,7 +95,7 @@ diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html b/config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html index 0f23dd2..cf38157 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html @@ -90,7 +90,7 @@ diff --git a/config/locales/data/html_records/View-stats--.html b/config/locales/data/html_records/View-stats--.html index 637e7e7..5cb45ec 100644 --- a/config/locales/data/html_records/View-stats--.html +++ b/config/locales/data/html_records/View-stats--.html @@ -46,7 +46,7 @@

Anchorage, Alaska

-August 17 – 21, 2015 +August 19 – 23, 2015
diff --git a/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.xls.html b/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.xls.html index dfffb3b..41a3ec2 100644 --- a/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.xls.html +++ b/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.xls.html @@ -28,7 +28,7 @@ Excel Spreadsheet - +
- +
-© Bike!Bike! 2015 +© Bike!Bike! 2015
-© Bike!Bike! 2015 +© Bike!Bike! 2015
-© Bike!Bike! 2015 +© Bike!Bike! 2015
-© Bike!Bike! 2015 +© Bike!Bike! 2015
-© Bike!Bike! 2015 +© Bike!Bike! 2015
Jeff someguy@bikebike.org Somewhere2015-09-17 00:08:002015-09-18 23:25:18 English 2015-09-28 00:00:00 2015-09-28 00:00:00