diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0ad531c..5e688fc 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -31,7 +31,7 @@ module ApplicationHelper ["/about" , "About"], ] end def member_memu - items =[["/forum" ,"Forum"] , [main_app.settings_members_path , "Settings"]] + items =[ [main_app.settings_members_path , "Settings"]] if !Rails.env.production? items << [merged.pages_path(), "CMS" ] end diff --git a/app/views/layouts/_footer.haml b/app/views/layouts/_footer.haml index ac9ec21..d9274b3 100644 --- a/app/views/layouts/_footer.haml +++ b/app/views/layouts/_footer.haml @@ -32,9 +32,12 @@ %li.border-white.border-x.py-2.px-4.hover:bg-gray-50.hover:border-gray-700 %a.text-gray-700.transition.hover:opacity-75{:href => "/about"} About + %li.border-white.border-x.py-2.px-4.hover:bg-gray-50.hover:border-gray-700 + %a.text-gray-700.transition.hover:opacity-75{:href => "/our_values"} + Our Values %li.border-white.border-x.py-2.px-4.hover:bg-gray-50.hover:border-gray-700 %a.text-gray-700.transition.hover:opacity-75{:href => "/code_of_conduct"} - Code of Conduct + Code of Conduct .col-span-2.sm:col-span-1 %p.font-medium.text-gray-900 Event Spaces %nav.mt-6{"aria-label" => "Footer Navigation - Hub Feenix"} diff --git a/merged/sections.yml b/merged/sections.yml index 9f51382..966847e 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -965,37 +965,21 @@ - :template: section_full_up :index: 1 :page_id: 11 - :updated_at: 2023-03-24 21:18:10.586303104 +02:00 - :updated_by: maijanposteja@gmail.com + :updated_at: 2023-04-19 14:37:23.053611051 +03:00 + :updated_by: torsten@villataika.fi :id: 52 :card_template: '' :options: - background: light_orange + background: none text_color: solid_black - margin: none + margin: large subheader: '' text_align: left item_align: center button_link: '' button_text: '' :header: Hub Feenix - :text: "**Space for the new - A chance to renew**\r\n**Joy of life open for everyone**\r\n\r\n\r\n\r\n####**OUR - VALUES**####\r\n\r\n**Love of life** is behind the founding of Hub Feenix and - all its activities. \r\n**Stillness** is the foundation for all that is new, fresh - and true.\r\n**Real joy of life** comes from **clarity, honesty** and **having - a greater purpose: to serve life.** \r\n\r\n\r\n####**OUR PRINCIPLES**####\r\n\r\n**Inner - gratitude and appreciation** are the base of everything. \r\n**Nature** is a mirror - of what we all really are inside - natural beings.\r\n**Self-knowledge** is a - continuous, honest self-encounter, which enables renewal and inner change.\r\n**Courage** - is to **trust in life** and to **be responsible** for oneself and one's own life. - \r\n\r\n\r\n####**OUR PROCEDURES**####\r\n\r\n**Practicing presence** makes it - possible to be awake and become alive.\r\n**Practicality in spirituality** is - action when it is needed rather than talking about spiritual issues. \r\nIn Hub - Feenix **non-violence** is observed in both actions and words. \r\nWe are practicing - and learning **the skill of taking and giving feedback**, as well as **communicating - directly** without anger or manipulation. \r\nTaking care of the premises and - property of Hub Feenix is everyone’s **responsibility.**\r\n**Giving** and **joy - of doing** makes things happen!\r\n" + :text: "**Space for the new - A chance to renew**\r\n**Joy of life open for everyone**\r\n\r\n\r\n\r\n\r\n" - :template: section_half_image :index: 1 :page_id: 12 @@ -1364,3 +1348,66 @@ jotka parhaillaan etsivät uutta suuntaa elämälleen. Saatavilla on myös kokonaan omia isompia ja pienempiä asuntoja. :image_id: 60 +- :template: section_full_up + :index: 2 + :page_id: 11 + :header: OUR VALUES + :text: "**Love of life** is behind the founding of Hub Feenix and all its activities. + \r\n**Stillness** is the foundation for all that is new, fresh and true.\r\n**Real + joy of life** comes from **clarity, honesty** and **having a greater purpose: + to serve life.** \r\n" + :options: + background: none + text_color: none + margin: large + text_align: left + item_align: center + subheader: '' + button_link: '' + button_text: '' + :updated_at: 2023-04-19 14:39:11.715209215 +03:00 + :updated_by: torsten@villataika.fi + :id: 72 +- :template: section_full_up + :index: 3 + :page_id: 11 + :header: OUR PRINCIPLES + :text: "**Inner gratitude and appreciation** are the base of everything. \r\n**Nature** + is a mirror of what we all really are inside - natural beings.\r\n**Self-knowledge** + is a continuous, honest self-encounter, which enables renewal and inner change.\r\n**Courage** + is to **trust in life** and to **be responsible** for oneself and one's own life. " + :options: + background: none + text_color: none + margin: large + text_align: left + item_align: center + subheader: '' + button_link: '' + button_text: '' + :updated_at: 2023-04-19 14:34:28.339175524 +03:00 + :updated_by: torsten@villataika.fi + :id: 73 +- :template: section_full_up + :index: 4 + :page_id: 11 + :header: OUR PROCEDURES + :text: "**Practicing presence** makes it possible to be awake and become alive.\r\n**Practicality + in spirituality** is action when it is needed rather than talking about spiritual + issues. \r\nIn Hub Feenix **non-violence** is observed in both actions and words. + \r\nWe are practicing and learning **the skill of taking and giving feedback**, + as well as **communicating directly** without anger or manipulation. \r\nTaking + care of the premises and property of Hub Feenix is everyone’s **responsibility.**\r\n**Giving** + and **joy of doing** makes things happen!\r\n" + :options: + background: none + text_color: none + margin: large + text_align: left + item_align: center + subheader: '' + button_link: '' + button_text: '' + :updated_at: 2023-04-19 14:35:44.071216551 +03:00 + :updated_by: torsten@villataika.fi + :id: 74