diff --git a/app/assets/images/merged/132.jpg b/app/assets/images/merged/132.jpg new file mode 100644 index 0000000..38a2b59 Binary files /dev/null and b/app/assets/images/merged/132.jpg differ diff --git a/app/assets/images/merged/133.jpg b/app/assets/images/merged/133.jpg new file mode 100644 index 0000000..68bcedc Binary files /dev/null and b/app/assets/images/merged/133.jpg differ diff --git a/app/assets/images/merged/134.jpg b/app/assets/images/merged/134.jpg new file mode 100644 index 0000000..758e216 Binary files /dev/null and b/app/assets/images/merged/134.jpg differ diff --git a/app/assets/images/merged/45.jpg b/app/assets/images/merged/45.jpg index b1739eb..38a2b59 100644 Binary files a/app/assets/images/merged/45.jpg and b/app/assets/images/merged/45.jpg differ diff --git a/merged/cards.yml b/merged/cards.yml index 4b8231a..7b6a6c4 100644 --- a/merged/cards.yml +++ b/merged/cards.yml @@ -205,13 +205,13 @@ - :section_id: 15 :index: 4 :header: In-house activities - :text: 'There´s also a lot happening in Hub Feenix: for example yoga classes, language - lessons, ecstatic dance evenings etc.' + :text: If you like, in Hub Feenix you can participate weekly yoga classes, meditation, + language lessons, ecstatic dance etc. :options: background: light_orange text_color: none text_align: center - :updated_at: 2023-04-09 00:38:53.554495905 +03:00 + :updated_at: 2023-04-22 23:22:05.381254009 +03:00 :updated_by: hannaholma@gmail.com :id: 17 :image_id: 2 @@ -313,9 +313,9 @@ text_align: left order: left subheader: '' - button_link: '' - button_text: '' - :updated_at: 2023-03-26 13:23:50.809694927 +03:00 + button_link: "/accessibility" + button_text: Accessibility + :updated_at: 2023-04-22 22:18:54.714538149 +03:00 :updated_by: hannaholma@gmail.com :id: 24 :image_id: 100 @@ -488,28 +488,28 @@ :image_id: 41 - :section_id: 7 :index: 6 - :header: Skating & cross-country or downhill sking + :header: Skating & sking :text: In the winter you can borrow or skates or cross-country skis from the Hub. Also Finland's southest downhill sking center Påminne is only 10 mins drive away. :options: background: none text_color: none text_align: center - :updated_at: 2023-04-08 00:51:36.018606357 +03:00 + :updated_at: 2023-04-22 20:24:12.953761886 +03:00 :updated_by: hannaholma@gmail.com :id: 35 - :image_id: 35 + :image_id: 27 - :section_id: 7 :index: 7 - :header: Horse riding - :text: It's also possible to go riding in the forest with Hub's own horses (with - a separate fee). And you can always come to say hello to them and our two sheep! + :header: Riding in the forest + :text: 'It''s also possible to go riding on the peaceful forest paths with Hub''s + own horses (with a separate fee). You don´t need experience of riding before. ' :options: background: none text_color: none text_align: center - :updated_at: 2023-01-24 03:22:24.814964351 +02:00 - :updated_by: maijanposteja@gmail.com + :updated_at: 2023-04-22 23:57:06.424935488 +03:00 + :updated_by: hannaholma@gmail.com :id: 36 :image_id: 43 - :section_id: 24 @@ -591,11 +591,11 @@ :id: 44 :image_id: 82 - :section_id: 30 - :index: 1 + :index: 2 :header: '' - :text: You can take a train from Karjaa/Karis to Helsinki. The trip takes around + :text: 'You can take a train from Karjaa/Karis to Helsinki. The trip takes around 55 minutes and you can book your ticket on www.vr.fi. The price for the ticket - in one way is around 10-15 € or you can rent a car. + in one way is around 10-15 €. ' :options: background: light_blue text_color: solid_black @@ -604,29 +604,10 @@ order: right button_link: '' button_text: '' - :updated_at: 2023-02-18 22:40:34.311819621 +02:00 + :updated_at: 2023-04-22 23:30:48.934191682 +03:00 :updated_by: hannaholma@gmail.com :id: 45 :image_id: 54 -- :section_id: 30 - :index: 2 - :header: '' - :text: You can rent a Hub Feenix car. The journey will take around one hour. You - should just plan your place of parking before because the city of Helsinki is - more crowded and cost of parking is really diverse around 4 €/ hour in the centrum. - You can find some free parking places a little bit out of the city. - :options: - background: light_blue - text_color: solid_black - text_align: center - order: left - subheader: '' - button_link: '' - button_text: '' - :updated_at: 2023-02-18 22:24:01.223882709 +02:00 - :updated_by: hannaholma@gmail.com - :id: 46 - :image_id: 56 - :section_id: 31 :index: 1 :header: Helsinki Cathedral @@ -983,9 +964,9 @@ text_align: center order: left subheader: '' - button_link: '' - button_text: '' - :updated_at: 2023-04-08 19:32:19.063282734 +03:00 + button_link: "/art_supply_stores" + button_text: Where to buy supplies + :updated_at: 2023-04-22 22:00:48.133888671 +03:00 :updated_by: hannaholma@gmail.com :id: 69 :image_id: 120 @@ -1260,9 +1241,9 @@ text_align: center order: left subheader: '' - button_link: '' - button_text: '' - :updated_at: 2023-04-08 20:41:12.057821918 +03:00 + button_link: "/local_activities" + button_text: Activities + :updated_at: 2023-04-22 23:52:39.057653691 +03:00 :updated_by: hannaholma@gmail.com :id: 87 :image_id: 126 @@ -1312,3 +1293,36 @@ :updated_by: hannaholma@gmail.com :id: 90 :image_id: 131 +- :section_id: 7 + :index: 8 + :header: Horses and sheep + :text: You can always pop by and say hello to Hub Feenix joyous sheep Lumi (Snow) + and Tähti (Star) and the three horses Valo, Nikke and Rico! + :options: + background: none + text_color: none + text_align: center + button_link: "/living_here" + button_text: Living here + :updated_at: 2023-04-22 23:58:40.528799733 +03:00 + :updated_by: hannaholma@gmail.com + :id: 91 + :image_id: 133 +- :section_id: 30 + :index: 1 + :header: '' + :text: 'From Monday to Friday there are buses from Meltola (the bus stop only 100m + from Hub Feenix) to Karjaa. You can also ask for a ride in Hub Feenix Lift Enquiry + group in Signal! ' + :options: + background: light_blue + text_color: solid_black + text_align: center + order: left + subheader: '' + button_link: '' + button_text: '' + :updated_at: 2023-04-22 23:38:57.486814709 +03:00 + :updated_by: hannaholma@gmail.com + :id: 92 + :image_id: 134 diff --git a/merged/images.yml b/merged/images.yml index 6608463..f7905db 100644 --- a/merged/images.yml +++ b/merged/images.yml @@ -399,8 +399,8 @@ :height: 1458 :size: 252 :id: 45 - :updated_at: 2023-01-24 18:47:07.064175931 +02:00 - :updated_by: maijanposteja@gmail.com + :updated_at: 2023-04-22 20:12:27.288267604 +03:00 + :updated_by: hannaholma@gmail.com - :name: winder wonderland :type: jpg :tags: '' @@ -1175,3 +1175,30 @@ :id: 131 :updated_at: 2023-04-10 16:52:51.689465675 +03:00 :updated_by: hannaholma@gmail.com +- :name: sheeo greeting_copy + :type: jpg + :tags: '' + :width: 673 + :height: 1458 + :size: 252 + :id: 132 + :updated_at: 2023-04-22 20:13:26.603621818 +03:00 + :updated_by: hannaholma@gmail.com +- :name: horses& sheep winter + :type: jpg + :tags: '' + :width: 4128 + :height: 3096 + :size: 5090 + :id: 133 + :updated_at: 2023-04-22 20:16:43.810839284 +03:00 + :updated_by: hannaholma@gmail.com +- :name: Buss5-1024x651 + :type: jpg + :tags: '' + :width: 1024 + :height: 651 + :size: 229 + :id: 134 + :updated_at: 2023-04-22 23:37:26.248693464 +03:00 + :updated_by: hannaholma@gmail.com diff --git a/merged/sections.yml b/merged/sections.yml index 2d86765..17bb22b 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -60,26 +60,6 @@ :index: 3 :image_id: 3 :updated_by: torsten@villataika.fi -- :template: section_full_image - :header: HUB FEENIX - :text: 'Only an hour west of Helsinki, the Feenix rises from an old sanatorium. - The Hub is a place to create, learn and regenerate. ' - :image_name: house - :id: 4 - :options: - fixed: 'on' - shade_color: black_25 - text_color: white - text_align: center - item_align: left - image_align: center - button_link: '' - button_text: '' - :updated_at: 2023-04-07 00:32:07.404414335 +03:00 - :page_id: 2 - :index: 1 - :image_id: 4 - :updated_by: hannaholma@gmail.com - :template: section_large_image :index: 4 :page_id: 1 @@ -281,7 +261,7 @@ - :template: section_cards :index: 1 :page_id: 5 - :updated_at: 2023-04-09 00:39:52.156953302 +03:00 + :updated_at: 2023-04-22 23:24:35.871406016 +03:00 :updated_by: hannaholma@gmail.com :id: 15 :card_template: card_gap_square @@ -357,7 +337,7 @@ - :template: section_half_image :index: 3 :page_id: 4 - :updated_at: 2023-04-07 13:32:41.627476862 +03:00 + :updated_at: 2023-04-22 22:16:10.402432127 +03:00 :updated_by: hannaholma@gmail.com :id: 19 :card_template: '' @@ -368,8 +348,8 @@ text_color: none text_align: left background: light_gray - button_link: '' - button_text: '' + button_link: "/art_supply_stores" + button_text: Where to buy supplies :image_id: 115 :header: What to bring :text: "**Clothing** \r\n- It can get pretty cold during winter, so make sure to @@ -383,7 +363,7 @@ and go to sauna in the garden!\r\n\r\n**Your own equipment and materials** \r\n- We may have some materials you can use or buy, but in general the artists in residence bring their own materials. There´s a list of the most popular art supply stores - in Helsinki and online on this website!\r\n\r\n" + in Helsinki and online on this website!\r\n\r\n\r\n\r\n" - :template: section_cards :index: 1 :page_id: 7 @@ -422,9 +402,9 @@ :text: We've dedicated a page for the main seasons, you can fill in the dots between. :image_id: - :template: section_half_image - :index: 9 + :index: 1 :page_id: 14 - :updated_at: 2023-04-08 00:53:58.810929470 +03:00 + :updated_at: 2023-04-22 23:49:30.421469272 +03:00 :updated_by: hannaholma@gmail.com :id: 22 :card_template: '' @@ -436,8 +416,8 @@ text_align: left margin: none item_align: center - button_link: '' - button_text: '' + button_link: "/facilities" + button_text: Facilities fixed: 'off' image_align: center shade_color: white_25 @@ -535,7 +515,7 @@ :header: Winter Wonderland :text: '' - :template: section_story - :index: 3 + :index: 2 :page_id: 2 :updated_at: 2023-01-28 15:05:55.208568115 +02:00 :updated_by: torsten@villataika.fi @@ -545,7 +525,7 @@ :header: Latest Story :text: '' - :template: section_pictures - :index: 4 + :index: 3 :page_id: 2 :updated_at: 2023-01-28 15:05:45.843146663 +02:00 :updated_by: torsten@villataika.fi @@ -557,7 +537,7 @@ - :template: section_cards :index: 2 :page_id: 10 - :updated_at: 2023-02-18 23:44:01.469833333 +02:00 + :updated_at: 2023-04-22 23:38:29.102373844 +03:00 :updated_by: hannaholma@gmail.com :id: 30 :card_template: card_wide_square @@ -757,13 +737,6 @@ :updated_by: hannaholma@gmail.com :id: 41 :options: {} -- :template: section_spacer - :index: 1 - :page_id: 14 - :updated_at: 2023-04-01 23:16:50.869557232 +03:00 - :updated_by: hannaholma@gmail.com - :id: 42 - :options: {} - :template: section_half_image :index: 4 :page_id: 13 @@ -786,9 +759,9 @@ order: left background: light_gray subheader: '' - button_link: '' - button_text: '' - :updated_at: 2023-04-09 00:28:16.809018000 +03:00 + button_link: "/how_to_apply" + button_text: How to apply + :updated_at: 2023-04-22 22:07:35.730489546 +03:00 :updated_by: hannaholma@gmail.com :id: 43 :card_template: '' @@ -834,7 +807,7 @@ :header: Art supply stores in Helsinki :text: "... and some web shops too:" - :template: section_full_image - :index: 2 + :index: 1 :page_id: 2 :updated_at: 2023-04-07 00:39:11.913782270 +03:00 :updated_by: hannaholma@gmail.com