diff options
| author | Azul <azul@riseup.net> | 2014-05-09 09:51:25 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2014-05-09 10:50:56 +0200 |
| commit | 205f2238b879a0588c7a6d81458d75cfe8839a93 (patch) | |
| tree | 7b8b0e13309e58dfdcefa691067a8e0dd073d4e6 /files/webapp | |
| parent | 60d10ea54f27beb375ebc7469574825fed28d154 (diff) | |
Change copy and add headings to buttons for 0.5.1 #5637
Diffstat (limited to 'files/webapp')
| -rw-r--r-- | files/webapp/locales/en.yml | 6 | ||||
| -rw-r--r-- | files/webapp/views/common/_action_buttons.html.haml | 13 | ||||
| -rw-r--r-- | files/webapp/views/home/_content.html.haml | 4 |
3 files changed, 20 insertions, 3 deletions
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: "<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." 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 - <strong>Bitmask</strong> is an open source application to provide easy and secure encrypted communication. You can choose among <a href="#providers">several different service providers</a>, or <a href="https://leap.se/en/doc/platform">start your own</a>. 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 <a href="https://bitmask.net">bitmask.net</a>. - = render 'common/home_page_buttons', :divider => 'home/bitmask' + = render 'common/home_page_buttons' # , :divider => 'home/bitmask' |