From 205f2238b879a0588c7a6d81458d75cfe8839a93 Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 9 May 2014 09:51:25 +0200 Subject: Change copy and add headings to buttons for 0.5.1 #5637 --- files/webapp/locales/en.yml | 6 +++++- files/webapp/views/common/_action_buttons.html.haml | 13 +++++++++++++ files/webapp/views/home/_content.html.haml | 4 ++-- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 files/webapp/views/common/_action_buttons.html.haml diff --git a/files/webapp/locales/en.yml b/files/webapp/locales/en.yml index 9875314..5198a8e 100644 --- a/files/webapp/locales/en.yml +++ b/files/webapp/locales/en.yml @@ -1,2 +1,6 @@ en: - client_info: "" \ No newline at end of file + client_info: "" + signup_info: "Android users: sign up for a new account here.
+ Desktop users: 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." diff --git a/files/webapp/views/common/_action_buttons.html.haml b/files/webapp/views/common/_action_buttons.html.haml new file mode 100644 index 0000000..470f55b --- /dev/null +++ b/files/webapp/views/common/_action_buttons.html.haml @@ -0,0 +1,13 @@ +.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 8609d10..179b9b5 100644 --- a/files/webapp/views/home/_content.html.haml +++ b/files/webapp/views/home/_content.html.haml @@ -1,7 +1,7 @@ .row-fluid .span12 %p.introtext.lead - Bitmask is an open source application to provide easy and secure encrypted communication. You can choose among several different service providers, or start your own. Currently, Bitmask supports encrypted internet and encrypted email (with more services in the works). + 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 bitmask.net. - = render 'common/home_page_buttons', :divider => 'home/bitmask' + = render 'common/home_page_buttons' # , :divider => 'home/bitmask' -- cgit v1.2.3