diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 46292b06..94514be9 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -11,4 +11,6 @@ def about def welcome end + def gdpr + end end diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 17dac8e0..ceb05804 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -50,27 +50,37 @@ = image_tag('follow_your_dreams.gif') .profile-main - - if @group.not_full? && @group.active? && show_join_group_button?(current_person, @group) - .group-join-box - = render 'join' + .flex-index + .group-info.flex-index-main + - if @group.not_full? && @group.active? && show_join_group_button?(current_person, @group) + .group-join-box + = render 'join' + + %p.tags + - if @group.full? + %span.tag.tag-full + Full + - if @group.inactive? + %span.tag.tag-inactive + Inactive + - if @group.allow_male_students? + %span.tag.tag-mixed + Mixed group + - if @group.level? + %p + %strong Level: + = @group.level + - if @group.activities? + %p.group-description + = markdown(@group.activities) + + .group-notices.flex-index-sidebar + %h3 Latest group upates + %ul + %li + %time 2018-05-21 + %p we can't meet, meetup time - %p.tags - - if @group.full? - %span.tag.tag-full - Full - - if @group.inactive? - %span.tag.tag-inactive - Inactive - - if @group.allow_male_students? - %span.tag.tag-mixed - Mixed group - - if @group.level? - %p - %strong Level: - = @group.level - - if @group.activities? - %p.group-description - = markdown(@group.activities) %ul.group-tabs %li.group-tab diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 698f3b3d..720ba41b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -78,6 +78,9 @@

💻 Code on GitHub

🚀 Deployed on Uberspace

+
+

🔒️ GDPR section

+
diff --git a/app/views/pages/gdpr.html.haml b/app/views/pages/gdpr.html.haml new file mode 100644 index 00000000..72d55764 --- /dev/null +++ b/app/views/pages/gdpr.html.haml @@ -0,0 +1,4 @@ +.about-page + .flex-index + %section.flex-index-main + %h1 General Data Protection Regulation diff --git a/config/routes.rb b/config/routes.rb index 9e540cf9..b0476e01 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,6 +11,7 @@ get '/about' => 'pages#about' get '/welcome' => 'pages#welcome' get '/conduct' => 'pages#conduct' + get '/gdpr' => 'pages#gdpr' #resources routing declare all of the common routes for the certain controller (index, new, edit etc...) resources :groups do