diff options
author | elijah <elijah@riseup.net> | 2014-05-09 11:28:36 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2014-05-09 11:28:36 -0700 |
commit | 8de03ee7f6efc145aae6a3d0d5f55a52f32ad91a (patch) | |
tree | 9d2e26e2dfe7547f122bb71698cdec990f138b61 /files/webapp | |
parent | a7c8d617726284c3243c8044153cd40074736662 (diff) |
make demo more different than bitmask.net #5520
Diffstat (limited to 'files/webapp')
-rw-r--r-- | files/webapp/locales/en.yml | 6 | ||||
-rw-r--r-- | files/webapp/stylesheets/tail.scss | 12 | ||||
-rw-r--r-- | files/webapp/views/common/_action_buttons.html.haml | 13 | ||||
-rw-r--r-- | files/webapp/views/home/_content.html.haml | 7 | ||||
-rw-r--r-- | files/webapp/views/home/_masthead.html.haml | 8 | ||||
-rw-r--r-- | files/webapp/views/layouts/_footer.html.haml | 8 |
6 files changed, 22 insertions, 32 deletions
diff --git a/files/webapp/locales/en.yml b/files/webapp/locales/en.yml index 5198a8e..9875314 100644 --- a/files/webapp/locales/en.yml +++ b/files/webapp/locales/en.yml @@ -1,6 +1,2 @@ en: - client_info: "" - signup_info: "<strong>Android users:</strong> sign up for a new account here.<br/> - <strong>Desktop users</strong>: its best to signup with the bitmask application, but you can do so here too." - report_issue: "Report Issue" - report_issue_info: "Bitmask is Free Software and is actively being developed. Please let us know if you run into any flaws." + client_info: ""
\ No newline at end of file diff --git a/files/webapp/stylesheets/tail.scss b/files/webapp/stylesheets/tail.scss index 477cbe1..b4f02b9 100644 --- a/files/webapp/stylesheets/tail.scss +++ b/files/webapp/stylesheets/tail.scss @@ -94,6 +94,18 @@ body.home { } } +.colorband { + border-top: 1px solid white; + border-bottom: 1px solid #bce8f1; + background-color: #d9edf7; + .row-fluid { + @extend #main; + } + .introtext { + padding: 20px; + margin: 0; + } +} // // SMALL SCREEN diff --git a/files/webapp/views/common/_action_buttons.html.haml b/files/webapp/views/common/_action_buttons.html.haml deleted file mode 100644 index 470f55b..0000000 --- a/files/webapp/views/common/_action_buttons.html.haml +++ /dev/null @@ -1,13 +0,0 @@ -.row-fluid.second - .signup.span4 - %h3= t(:signup) - %p.info= t(:signup_info).html_safe - %p.link= link_to(icon('user', icon_color) + t(:signup), signup_path, :class => 'btn') - .help.span4 - %h3= t(:report_issue) - %p.info= t(:report_issue_info) - %p.link= link_to(icon('question-sign', icon_color) + t(:get_help), new_ticket_path, :class => 'btn') - .login.span4 - %h3= t(:login) - %p.info= t(:login_info) - %p.link= link_to(icon('ok-sign', icon_color) + t(:login), login_path, :class => 'btn') diff --git a/files/webapp/views/home/_content.html.haml b/files/webapp/views/home/_content.html.haml index 179b9b5..ae4f342 100644 --- a/files/webapp/views/home/_content.html.haml +++ b/files/webapp/views/home/_content.html.haml @@ -1,7 +1,6 @@ .row-fluid .span12 - %p.introtext.lead - We provide secure communication using the Bitmask application. We currently offer encrypted internet (VPN) only. Encrytped email is coming soon, and encrypted chat is in the works. For details visit <a href="https://bitmask.net">bitmask.net</a>. - - = render 'common/home_page_buttons' # , :divider => 'home/bitmask' + = render 'common/home_page_buttons' + %p.alert.alert-info(style="margin-top: 2em") + <b>Note:</b> This service is intended for demonstration purposes only. Your account might be deleted without warning. diff --git a/files/webapp/views/home/_masthead.html.haml b/files/webapp/views/home/_masthead.html.haml index bd8ea3e..ec4a58d 100644 --- a/files/webapp/views/home/_masthead.html.haml +++ b/files/webapp/views/home/_masthead.html.haml @@ -2,5 +2,9 @@ .text .title Bitmask <small>DEMO</small> .tagline Encrypted communication for mere mortals<br/>(superheroes welcome, too). -.navcontainer - .navheader +.colorband + .container-fluid + .row-fluid + .span12 + .introtext.lead + <b>demo.bitmask.net</b> offers free service to anyone trying the <a href="https://bitmask.net">Bitmask application</a>. We currently support encrypted internet (VPN), with encrypted email coming soon.
\ No newline at end of file diff --git a/files/webapp/views/layouts/_footer.html.haml b/files/webapp/views/layouts/_footer.html.haml deleted file mode 100644 index 509ca6f..0000000 --- a/files/webapp/views/layouts/_footer.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -.full-height - = link_to icon('home') + t(:home), home_path - = link_to icon('eye-close') + t(:privacy_policy), privacy_policy_path - = link_to icon('file') + t(:terms_of_service), terms_of_service_path - - if lookup_context.exists?('pages/about') - = link_to icon('info-sign') + t(:about), about_path - - if lookup_context.exists?('pages/contact') - = link_to icon('comment') + t(:contact), contact_path |