nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use nav-tabs for ToS

Browse source
This commit is contained in:
Steffen van Bergerem 2015-06-04 16:40:46 +02:00 committed by Jonne Haß
parent 797ae8a918
commit 93dd3a3a72
3 changed files with 239 additions and 231 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/application.scss
View file

@ -31,6 +31,9 @@
@import 'new_styles/registration'; @import 'new_styles/registration';
@import 'new_styles/forms'; @import 'new_styles/forms';
/* terms */
@import 'terms';
/* profile and settings pages */ /* profile and settings pages */
@import 'new_styles/settings'; @import 'new_styles/settings';

3
app/assets/stylesheets/terms.scss Normal file
View file

@ -0,0 +1,3 @@
#terms {
.nav-tabs { margin-top: 40px; }
}

34
app/views/terms/default.haml
View file

@ -16,23 +16,26 @@
/ CC BY-SA 3.0 Creative Commons license. / CC BY-SA 3.0 Creative Commons license.
/ If you modify or copy this file, please do not remove this license text. / If you modify or copy this file, please do not remove this license text.
%div{class: "container", style: "margin-top: 50px;"} .container#terms
%div{class: "row"} %div{role: "tabpanel"}
%div{class: "col-md-3"} .row
%h3 .col-md-8.col-md-offset-2
%ul.nav.nav-tabs.nav-justified{role: "tablist"}
%li.active{role: "presentation"}
%a{href: "#tos", role: "tab", aria: {controls: "tos"}, data: {toggle: "tab"}}
Terms of Service Terms of Service
%h4 %li{role: "presentation"}
%a{href: "/terms#privacy"} %a{href: "#privacy", role: "tab", aria: {controls: "privacy"}, data: {toggle: "tab"}}
Privacy Policy Privacy Policy
%div{class: "col-md-9", style: "margin-top: 20px;"}
%p
Last Updated: 17th August, 2014
%hr .row
.col-md-8.col-md-offset-2.tab-content
%a{name: "terms"} .tab-pane.active#tos{role: "tabpanel"}
.page-header
%h1 %h1
#{AppConfig.settings.pod_name} - Terms of Service #{AppConfig.settings.pod_name} - Terms of Service
%small
Last Updated: 17th August, 2014
%p %p
Here are the important things you need to know about accessing and using the <strong>#{AppConfig.settings.pod_name}</strong> (#{AppConfig.environment.url}) website and service (collectively, "Service"). These are our terms of service ("Terms"). Please read them carefully. Here are the important things you need to know about accessing and using the <strong>#{AppConfig.settings.pod_name}</strong> (#{AppConfig.environment.url}) website and service (collectively, "Service"). These are our terms of service ("Terms"). Please read them carefully.
@ -61,7 +64,7 @@
Privacy Policy Privacy Policy
%p %p
For information about how we collect and use information about users of the Service, please check out our <a href="/terms#privacy">privacy policy</a>. For information about how we collect and use information about users of the Service, please check out our <a href="#privacy" aria-controls="privacy" data-toggle="tab">privacy policy</a>.
%h2 %h2
Third-Party Services Third-Party Services
@ -202,10 +205,9 @@
%p %p
Questions or comments about the Service may be directed to us at the email address <a href="mailto:#{AppConfig.admins.podmin_email}">#{AppConfig.admins.podmin_email}</a>. Questions or comments about the Service may be directed to us at the email address <a href="mailto:#{AppConfig.admins.podmin_email}">#{AppConfig.admins.podmin_email}</a>.
%a{name: "privacy"}
%hr
.tab-pane#privacy{role: "tabpanel"}
.page-header
%h1 %h1
#{AppConfig.settings.pod_name} - Privacy Policy #{AppConfig.settings.pod_name} - Privacy Policy