fix living etc pages, get consitent meanings across site
This commit is contained in:
Torsten
parent
0a3f10bd6e
commit
09500b8223
108
Gemfile.lock
108
Gemfile.lock
|
|
@ -1,6 +1,6 @@
|
|||
GIT
|
||||
remote: https://github.com/HubFeenixMakers/merged
|
||||
revision: bafe142a3bdc26d74a951d3ea5a045ba57b042d6
|
||||
revision: 75915b3fe20b1d0dbb8269875c1d19f89f36cf78
|
||||
specs:
|
||||
merged (0.1.0)
|
||||
active_hash
|
||||
|
|
@ -23,47 +23,47 @@ GIT
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actioncable (7.0.4.1)
|
||||
actionpack (= 7.0.4.1)
|
||||
activesupport (= 7.0.4.1)
|
||||
actioncable (7.0.4.2)
|
||||
actionpack (= 7.0.4.2)
|
||||
activesupport (= 7.0.4.2)
|
||||
nio4r (~> 2.0)
|
||||
websocket-driver (>= 0.6.1)
|
||||
actionmailbox (7.0.4.1)
|
||||
actionpack (= 7.0.4.1)
|
||||
activejob (= 7.0.4.1)
|
||||
activerecord (= 7.0.4.1)
|
||||
activestorage (= 7.0.4.1)
|
||||
activesupport (= 7.0.4.1)
|
||||
actionmailbox (7.0.4.2)
|
||||
actionpack (= 7.0.4.2)
|
||||
activejob (= 7.0.4.2)
|
||||
activerecord (= 7.0.4.2)
|
||||
activestorage (= 7.0.4.2)
|
||||
activesupport (= 7.0.4.2)
|
||||
mail (>= 2.7.1)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
actionmailer (7.0.4.1)
|
||||
actionpack (= 7.0.4.1)
|
||||
actionview (= 7.0.4.1)
|
||||
activejob (= 7.0.4.1)
|
||||
activesupport (= 7.0.4.1)
|
||||
actionmailer (7.0.4.2)
|
||||
actionpack (= 7.0.4.2)
|
||||
actionview (= 7.0.4.2)
|
||||
activejob (= 7.0.4.2)
|
||||
activesupport (= 7.0.4.2)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
rails-dom-testing (~> 2.0)
|
||||
actionpack (7.0.4.1)
|
||||
actionview (= 7.0.4.1)
|
||||
activesupport (= 7.0.4.1)
|
||||
actionpack (7.0.4.2)
|
||||
actionview (= 7.0.4.2)
|
||||
activesupport (= 7.0.4.2)
|
||||
rack (~> 2.0, >= 2.2.0)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||
actiontext (7.0.4.1)
|
||||
actionpack (= 7.0.4.1)
|
||||
activerecord (= 7.0.4.1)
|
||||
activestorage (= 7.0.4.1)
|
||||
activesupport (= 7.0.4.1)
|
||||
actiontext (7.0.4.2)
|
||||
actionpack (= 7.0.4.2)
|
||||
activerecord (= 7.0.4.2)
|
||||
activestorage (= 7.0.4.2)
|
||||
activesupport (= 7.0.4.2)
|
||||
globalid (>= 0.6.0)
|
||||
nokogiri (>= 1.8.5)
|
||||
actionview (7.0.4.1)
|
||||
activesupport (= 7.0.4.1)
|
||||
actionview (7.0.4.2)
|
||||
activesupport (= 7.0.4.2)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
|
|
@ -72,22 +72,22 @@ GEM
|
|||
activesupport (>= 5.0.0)
|
||||
active_record_union (1.3.0)
|
||||
activerecord (>= 4.0)
|
||||
activejob (7.0.4.1)
|
||||
activesupport (= 7.0.4.1)
|
||||
activejob (7.0.4.2)
|
||||
activesupport (= 7.0.4.2)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (7.0.4.1)
|
||||
activesupport (= 7.0.4.1)
|
||||
activerecord (7.0.4.1)
|
||||
activemodel (= 7.0.4.1)
|
||||
activesupport (= 7.0.4.1)
|
||||
activestorage (7.0.4.1)
|
||||
actionpack (= 7.0.4.1)
|
||||
activejob (= 7.0.4.1)
|
||||
activerecord (= 7.0.4.1)
|
||||
activesupport (= 7.0.4.1)
|
||||
activemodel (7.0.4.2)
|
||||
activesupport (= 7.0.4.2)
|
||||
activerecord (7.0.4.2)
|
||||
activemodel (= 7.0.4.2)
|
||||
activesupport (= 7.0.4.2)
|
||||
activestorage (7.0.4.2)
|
||||
actionpack (= 7.0.4.2)
|
||||
activejob (= 7.0.4.2)
|
||||
activerecord (= 7.0.4.2)
|
||||
activesupport (= 7.0.4.2)
|
||||
marcel (~> 1.0)
|
||||
mini_mime (>= 1.1.0)
|
||||
activesupport (7.0.4.1)
|
||||
activesupport (7.0.4.2)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
|
|
@ -280,20 +280,20 @@ GEM
|
|||
rack (2.2.6.2)
|
||||
rack-test (2.0.2)
|
||||
rack (>= 1.3)
|
||||
rails (7.0.4.1)
|
||||
actioncable (= 7.0.4.1)
|
||||
actionmailbox (= 7.0.4.1)
|
||||
actionmailer (= 7.0.4.1)
|
||||
actionpack (= 7.0.4.1)
|
||||
actiontext (= 7.0.4.1)
|
||||
actionview (= 7.0.4.1)
|
||||
activejob (= 7.0.4.1)
|
||||
activemodel (= 7.0.4.1)
|
||||
activerecord (= 7.0.4.1)
|
||||
activestorage (= 7.0.4.1)
|
||||
activesupport (= 7.0.4.1)
|
||||
rails (7.0.4.2)
|
||||
actioncable (= 7.0.4.2)
|
||||
actionmailbox (= 7.0.4.2)
|
||||
actionmailer (= 7.0.4.2)
|
||||
actionpack (= 7.0.4.2)
|
||||
actiontext (= 7.0.4.2)
|
||||
actionview (= 7.0.4.2)
|
||||
activejob (= 7.0.4.2)
|
||||
activemodel (= 7.0.4.2)
|
||||
activerecord (= 7.0.4.2)
|
||||
activestorage (= 7.0.4.2)
|
||||
activesupport (= 7.0.4.2)
|
||||
bundler (>= 1.15.0)
|
||||
railties (= 7.0.4.1)
|
||||
railties (= 7.0.4.2)
|
||||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
|
|
@ -301,9 +301,9 @@ GEM
|
|||
loofah (~> 2.19, >= 2.19.1)
|
||||
rails_gravatar (1.0.4)
|
||||
actionview
|
||||
railties (7.0.4.1)
|
||||
actionpack (= 7.0.4.1)
|
||||
activesupport (= 7.0.4.1)
|
||||
railties (7.0.4.2)
|
||||
actionpack (= 7.0.4.2)
|
||||
activesupport (= 7.0.4.2)
|
||||
method_source
|
||||
rake (>= 12.2)
|
||||
thor (~> 1.0)
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 234 KiB After Width: | Height: | Size: 217 KiB |
|
|
@ -17,6 +17,7 @@
|
|||
}
|
||||
|
||||
.prose{
|
||||
max-width: 100%;
|
||||
color: inherit;
|
||||
--tw-prose-bullets: #6b7280;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
subheader: ''
|
||||
button_link: ''
|
||||
button_text: ''
|
||||
:updated_at: 2023-01-23 20:50:18.099346501 +02:00
|
||||
:updated_by: maijanposteja@gmail.com
|
||||
:updated_at: 2023-01-25 17:03:36.978214748 +02:00
|
||||
:updated_by: torsten@villataika.fi
|
||||
:id: 6
|
||||
:image_id: 71
|
||||
- :section_id: 52
|
||||
|
|
@ -37,8 +37,8 @@
|
|||
subheader: ''
|
||||
button_link: ''
|
||||
button_text: ''
|
||||
:updated_at: 2023-01-23 20:21:32.725746169 +02:00
|
||||
:updated_by: maijanposteja@gmail.com
|
||||
:updated_at: 2023-01-25 17:03:40.690983773 +02:00
|
||||
:updated_by: torsten@villataika.fi
|
||||
:id: 7
|
||||
:image_id: 102
|
||||
- :section_id: 52
|
||||
|
|
@ -349,10 +349,10 @@
|
|||
:image_id: 77
|
||||
- :section_id: 53
|
||||
:index: 1
|
||||
:header: ''
|
||||
:text: 'Volunteers have a dedicated corridor for themselves. We have a place for
|
||||
about 5-15 workaways at a time (bit more in the summer, bit less in the winter
|
||||
due to the heating situation). '
|
||||
:header: Kitchen + living room
|
||||
:text: "Volunteers have a dedicated corridor for themselves, where you share a kitchen
|
||||
and living room space.\r\n\r\nMeals are often taken together, mostly depending
|
||||
on how many cooks are available."
|
||||
:options:
|
||||
background: none
|
||||
text_color: none
|
||||
|
|
@ -361,13 +361,13 @@
|
|||
order: left
|
||||
button_link: ''
|
||||
button_text: ''
|
||||
:updated_at: 2023-01-23 19:58:18.016054139 +02:00
|
||||
:updated_by: maijanposteja@gmail.com
|
||||
:updated_at: 2023-01-25 16:47:41.820478507 +02:00
|
||||
:updated_by: torsten@villataika.fi
|
||||
:id: 28
|
||||
:image_id: 99
|
||||
- :section_id: 53
|
||||
:index: 2
|
||||
:header: ''
|
||||
:header: Rooms etc
|
||||
:text: Accommodation is in shared rooms (2-4 persons), with shared showers & toilets,
|
||||
and a common kitchen and lounge. We provide bed sheets and a towel for you.
|
||||
:options:
|
||||
|
|
@ -378,14 +378,16 @@
|
|||
subheader: ''
|
||||
button_link: ''
|
||||
button_text: ''
|
||||
:updated_at: 2023-01-23 19:58:27.856336520 +02:00
|
||||
:updated_by: maijanposteja@gmail.com
|
||||
:updated_at: 2023-01-25 16:48:50.024949323 +02:00
|
||||
:updated_by: torsten@villataika.fi
|
||||
:id: 29
|
||||
:image_id: 100
|
||||
- :section_id: 46
|
||||
:index: 2
|
||||
:header: ''
|
||||
:text: ''
|
||||
:header: Eating
|
||||
:text: "The Hub provides ingredients and space, sometimes ready food from Events.\r\nShared
|
||||
meals are very common if not daily. Off course someone always needs to cook and
|
||||
clean, but normally people work it out.\r\n"
|
||||
:options:
|
||||
background: none
|
||||
text_color: none
|
||||
|
|
@ -394,13 +396,13 @@
|
|||
subheader: ''
|
||||
button_link: ''
|
||||
button_text: ''
|
||||
:updated_at: 2023-01-24 18:52:33.638953015 +02:00
|
||||
:updated_by: maijanposteja@gmail.com
|
||||
:updated_at: 2023-01-25 16:52:24.078793636 +02:00
|
||||
:updated_by: torsten@villataika.fi
|
||||
:id: 30
|
||||
:image_id: 110
|
||||
- :section_id: 46
|
||||
:index: 1
|
||||
:header: ''
|
||||
:header: Provided
|
||||
:text: "Whole of the Hub Feenix is a vegetarian area, so no other food is allowed
|
||||
in the house. \r\nBasic food is included in the workaway deal, such as rice, pasta,
|
||||
seasons veggies, beans, lentils, bread, porridge flakes, tea & coffee."
|
||||
|
|
@ -412,8 +414,8 @@
|
|||
subheader: ''
|
||||
button_link: ''
|
||||
button_text: ''
|
||||
:updated_at: 2023-01-24 18:52:01.390954455 +02:00
|
||||
:updated_by: maijanposteja@gmail.com
|
||||
:updated_at: 2023-01-25 16:51:05.320207298 +02:00
|
||||
:updated_by: torsten@villataika.fi
|
||||
:id: 31
|
||||
:image_id: 112
|
||||
- :section_id: 62
|
||||
|
|
|
|||
|
|
@ -247,12 +247,12 @@
|
|||
- :name: workaway keittiö
|
||||
:type: jpg
|
||||
:tags: ''
|
||||
:width: 675
|
||||
:height: 660
|
||||
:size: 233
|
||||
:width: 622
|
||||
:height: 622
|
||||
:size: 216
|
||||
:id: 99
|
||||
:updated_at: 2023-01-23 19:18:12.899286906 +02:00
|
||||
:updated_by: maijanposteja@gmail.com
|
||||
:updated_at: 2023-01-25 16:48:30.133927084 +02:00
|
||||
:updated_by: torsten@villataika.fi
|
||||
- :name: workaway room 2_copy
|
||||
:type: jpg
|
||||
:tags: ''
|
||||
|
|
|
|||
|
|
@ -85,28 +85,11 @@
|
|||
:updated_by: maijanposteja@gmail.com
|
||||
:id: 41
|
||||
:options: {}
|
||||
- :template: section_full_up
|
||||
:index: 1
|
||||
:page_id: 8
|
||||
:updated_at: 2023-01-23 14:28:24.317938221 +02:00
|
||||
:updated_by: maijanposteja@gmail.com
|
||||
:id: 43
|
||||
:options:
|
||||
background: white
|
||||
text_color: none
|
||||
margin: '0'
|
||||
subheader: ''
|
||||
text_align: center
|
||||
item_align: center
|
||||
button_link: "/workaway_deal"
|
||||
button_text: Workaway deal
|
||||
:header: Before coming here
|
||||
:text: Read the info section!
|
||||
- :template: section_cards
|
||||
:index: 4
|
||||
:index: 2
|
||||
:page_id: 7
|
||||
:updated_at: 2023-01-23 21:31:56.405637515 +02:00
|
||||
:updated_by: maijanposteja@gmail.com
|
||||
:updated_at: 2023-01-25 17:04:54.467275443 +02:00
|
||||
:updated_by: torsten@villataika.fi
|
||||
:id: 46
|
||||
:options:
|
||||
subheader: ''
|
||||
|
|
@ -143,10 +126,11 @@
|
|||
also a surprising amount of local culture is really worth the visit."
|
||||
:card_template: card_normal_round
|
||||
- :template: section_cards
|
||||
:index: 2
|
||||
:index: 3
|
||||
:page_id: 7
|
||||
:header: ''
|
||||
:text: ''
|
||||
:header: Facilities
|
||||
:text: The Hub also provides extra facilities. We are in the country so eg a shared
|
||||
car is available.
|
||||
:options:
|
||||
margin: 20
|
||||
order: left
|
||||
|
|
@ -155,15 +139,15 @@
|
|||
columns: '3'
|
||||
subheader: ''
|
||||
text_align: left
|
||||
:updated_at: 2023-01-21 19:05:40.887385808 +02:00
|
||||
:updated_by: maijanposteja@gmail.com
|
||||
:updated_at: 2023-01-25 17:04:40.052561299 +02:00
|
||||
:updated_by: torsten@villataika.fi
|
||||
:id: 52
|
||||
:card_template: card_normal_square
|
||||
- :template: section_cards
|
||||
:index: 1
|
||||
:page_id: 7
|
||||
:updated_at: 2023-01-23 19:57:55.549246464 +02:00
|
||||
:updated_by: maijanposteja@gmail.com
|
||||
:updated_at: 2023-01-25 17:04:51.625389248 +02:00
|
||||
:updated_by: torsten@villataika.fi
|
||||
:id: 53
|
||||
:options:
|
||||
subheader: ''
|
||||
|
|
@ -176,14 +160,16 @@
|
|||
text_align: left
|
||||
columns: '2'
|
||||
:header: Living
|
||||
:text: ''
|
||||
:text: "Volunteers live in their own shared community. There is usually between
|
||||
6-12, rarely less or more.\r\nWhile you get to know many people this way, communal
|
||||
also requires everyone to participate (socially, cleaning etc)"
|
||||
:image_id: 0
|
||||
:card_template: card_wide_square
|
||||
- :template: section_cards
|
||||
:index: 3
|
||||
:index: 4
|
||||
:page_id: 7
|
||||
:updated_at: 2023-01-21 19:45:06.296912879 +02:00
|
||||
:updated_by: maijanposteja@gmail.com
|
||||
:updated_at: 2023-01-25 16:56:12.118008081 +02:00
|
||||
:updated_by: torsten@villataika.fi
|
||||
:id: 54
|
||||
:card_template: card_normal_square
|
||||
:options:
|
||||
|
|
@ -192,8 +178,8 @@
|
|||
subheader: ''
|
||||
text_color: none
|
||||
text_align: left
|
||||
:header: Facilities
|
||||
:text: ''
|
||||
:header: ''
|
||||
:text: 'Also these are things you can use in and around the Hub. '
|
||||
- :template: section_cards
|
||||
:index: 1
|
||||
:page_id: 11
|
||||
|
|
@ -264,9 +250,9 @@
|
|||
be possible -talk to Torsten about that too.\r\n\r\nQUESTIONS\r\nAlways feel free
|
||||
to ask, if you need help or information! There are no silly questions!\r\n"
|
||||
- :template: section_full_image
|
||||
:index: 3
|
||||
:index: 2
|
||||
:page_id: 8
|
||||
:header: Where we are
|
||||
:header: Here we are, bottom left
|
||||
:text: ''
|
||||
:options:
|
||||
background: none
|
||||
|
|
@ -279,12 +265,12 @@
|
|||
shade_color: none
|
||||
button_link: ''
|
||||
button_text: ''
|
||||
:updated_at: 2023-01-25 02:39:42.266319574 +02:00
|
||||
:updated_at: 2023-01-25 16:41:17.767687999 +02:00
|
||||
:updated_by: torsten@villataika.fi
|
||||
:id: 58
|
||||
:image_id: 61
|
||||
- :template: section_cards
|
||||
:index: 2
|
||||
:index: 1
|
||||
:page_id: 8
|
||||
:updated_at: 2023-01-25 02:39:51.879367031 +02:00
|
||||
:updated_by: torsten@villataika.fi
|
||||
|
|
@ -317,9 +303,9 @@
|
|||
:text: 'There are plenty of options when it comes to finding something exciting
|
||||
to do near the Hub, here are a few - '
|
||||
- :template: section_text
|
||||
:index: 1
|
||||
:page_id: 10
|
||||
:updated_at: 2023-01-25 03:35:57.967024551 +02:00
|
||||
:index: 5
|
||||
:page_id: 7
|
||||
:updated_at: 2023-01-25 16:55:02.224622788 +02:00
|
||||
:updated_by: torsten@villataika.fi
|
||||
:id: 61
|
||||
:options: {}
|
||||
|
|
@ -346,7 +332,7 @@
|
|||
Yoga and so on..."
|
||||
:image_id: 0
|
||||
- :template: section_cards
|
||||
:index: 5
|
||||
:index: 4
|
||||
:page_id: 8
|
||||
:updated_at: 2023-01-24 18:58:50.923978171 +02:00
|
||||
:updated_by: maijanposteja@gmail.com
|
||||
|
|
@ -403,7 +389,7 @@
|
|||
disturbance to anyone, for example by making unnecessary noice. Loud working and
|
||||
other loud noises must be avoided in the night time between 22-8 o’clock.\r\n"
|
||||
- :template: section_large_image
|
||||
:index: 4
|
||||
:index: 3
|
||||
:page_id: 8
|
||||
:updated_at: 2023-01-23 23:32:17.915968380 +02:00
|
||||
:updated_by: maijanposteja@gmail.com
|
||||
|
|
@ -458,7 +444,7 @@
|
|||
- :template: section_cards
|
||||
:index: 4
|
||||
:page_id: 11
|
||||
:updated_at: 2023-01-25 16:39:32.625743500 +02:00
|
||||
:updated_at: 2023-01-25 16:42:41.264212352 +02:00
|
||||
:updated_by: torsten@villataika.fi
|
||||
:id: 72
|
||||
:card_template: card_full_image
|
||||
|
|
@ -473,8 +459,9 @@
|
|||
a successful application usually contains the following:\r\n- your reason to join
|
||||
the Hub\r\n- details about you\r\n- the work you could contribute\r\n- your timing
|
||||
/ itinerary\r\n \r\nWe have a three week minimum and usually two month maximum
|
||||
stay. We are aware that some people want to move to Finland, and can negotiate
|
||||
once you are here, but make no promises over 2 months."
|
||||
stay. \r\nWe are aware that some people want to move to Finland, and can negotiate
|
||||
once you are here, but make no promises over 2 months.\r\nSee more info in the
|
||||
menu below"
|
||||
- :template: section_cards
|
||||
:index: 1
|
||||
:page_id: 14
|
||||
|
|
|
|||
Loading…
Reference in New Issue