diff options
| -rw-r--r-- | app/assets/stylesheets/leap.scss | 22 | ||||
| -rw-r--r-- | app/views/home/_home_text.html.haml | 7 | ||||
| -rw-r--r-- | app/views/home/index.html.haml | 12 | ||||
| -rw-r--r-- | core/app/helpers/navigation_helper.rb (renamed from app/helpers/navigation_helper.rb) | 0 | ||||
| -rw-r--r-- | core/app/helpers/snippet_helper.rb | 11 | ||||
| -rw-r--r-- | core/app/views/common/_home_page_buttons.html.haml | 18 |
6 files changed, 63 insertions, 7 deletions
diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss index 6b44986..a7d6261 100644 --- a/app/assets/stylesheets/leap.scss +++ b/app/assets/stylesheets/leap.scss @@ -45,6 +45,10 @@ input.large { line-height: $baseLineHeight * 1.5; } +.p { + @extend p; +} + // // FORMS // @@ -99,6 +103,24 @@ input, textarea { } } +.home-buttons { + .span6 { + margin-bottom: 20px; + } + div { + a { + width: 10em; + margin-bottom: 4px; + display: block; + } + .info { + } + span { + } + } +} + + // // Side Navigation // diff --git a/app/views/home/_home_text.html.haml b/app/views/home/_home_text.html.haml index 1055091..4de4b5e 100644 --- a/app/views/home/_home_text.html.haml +++ b/app/views/home/_home_text.html.haml @@ -1,3 +1,6 @@ -Welcome to the LEAP web application. +%h1= t(:welcome, :provider => APP_CONFIG[:domain]) -For more information, visit #{link_to('leap.se', 'https://leap.se')}
\ No newline at end of file +%p + We provide secure communication services, including encrypted internet, email (coming soon), and chat (coming later). + += home_page_buttons diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 0b3bbf9..96a3aee 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -1,8 +1,10 @@ -.row-fluid - .span8 - = render 'home_text' - .span4 - = render '/login_or_signup' +/ .row-fluid +/ .span8 +/ = render 'home_text' +/ .span4 +/ = render '/login_or_signup' + += render 'home_text' - if Rails.env == 'development' .row-fluid diff --git a/app/helpers/navigation_helper.rb b/core/app/helpers/navigation_helper.rb index 19cb934..19cb934 100644 --- a/app/helpers/navigation_helper.rb +++ b/core/app/helpers/navigation_helper.rb diff --git a/core/app/helpers/snippet_helper.rb b/core/app/helpers/snippet_helper.rb new file mode 100644 index 0000000..6fee454 --- /dev/null +++ b/core/app/helpers/snippet_helper.rb @@ -0,0 +1,11 @@ +# +# various html snippets we use throughout. +# + +module SnippetHelper + + def home_page_buttons + render 'common/home_page_buttons' + end + +end
\ No newline at end of file diff --git a/core/app/views/common/_home_page_buttons.html.haml b/core/app/views/common/_home_page_buttons.html.haml new file mode 100644 index 0000000..ed70ff7 --- /dev/null +++ b/core/app/views/common/_home_page_buttons.html.haml @@ -0,0 +1,18 @@ +- link_class = 'btn' +- icon_color = :black + +.home-buttons + .row-fluid.first + .login.span6 + %span.link= link_to(icon('ok-sign', icon_color) + t(:login), new_session_path, :class => link_class) + %span.info= t(:login_info) + .signup.span6 + %span.link= link_to(icon('user', icon_color) + t(:signup), new_user_path, :class => link_class) + %span.info= t(:signup_info) + .row-fluid.second + .download.span6 + %span.link= link_to(icon('arrow-down', icon_color) + t(:download_client), "https://downloads.leap.se/client", :class => link_class) + %span.info= t(:download_client_info, :provider => content_tag(:b,APP_CONFIG[:domain])).html_safe + .help.span6 + %span.link= link_to(icon('question-sign', icon_color) + t(:get_help), "/tickets/new", :class => link_class) + %span.info= t(:help_info) |