From 2124dba3e85c5b25ab13611bc1a0053e1c35ab04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 24 Aug 2013 17:30:52 +0200 Subject: [PATCH] update header and footer links --- app/views/layouts/_header.html.haml | 15 +++++++-------- app/views/shared/_links.haml | 5 ++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index bf5d4de8f..c2984b64b 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -3,12 +3,11 @@ -# the COPYRIGHT file. %header - - unless current_user - .container{:style => "position:relative;"} - = link_to content_tag(:div, nil, :class => 'diaspora_header_logo branding-header-logo'), root_path + - unless current_user + .container{style: "position:relative;"} + = link_to content_tag(:div, nil, class: 'diaspora_header_logo branding-header-logo'), root_path - %ul#landing_nav - %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora" - %li= link_to 'github', "https://github.com/diaspora/diaspora" - %li= link_to t('.blog'), 'http://blog.diasporafoundation.org/' - %li= link_to t('.login'), new_user_session_path, :class => 'login' + %ul#landing_nav + - unless current_page?(controller: :registrations, action: :new) + %li= link_to t('devise.shared.links.sign_up'), new_user_registration_path, class: 'login' + %li= link_to t('devise.shared.links.sign_in'), new_user_session_path, class: 'login' diff --git a/app/views/shared/_links.haml b/app/views/shared/_links.haml index 074ec453d..052aa956c 100644 --- a/app/views/shared/_links.haml +++ b/app/views/shared/_links.haml @@ -1,6 +1,5 @@ -%li= link_to '@joindiaspora', "http://twitter.com/joindiaspora" -%li= link_to 'github', "https://github.com/diaspora/diaspora" -%li= link_to t('layouts.header.blog'), "http://blog.diasporafoundation.org/" +%li= link_to 'diasporafoundation.org', "https://diasporafoundation.org" +%li= link_to 'wiki', "https://wiki.diasporafoundation.org" %li= link_to t('layouts.application.whats_new'), changelog_url %li= link_to(t('layouts.header.code') + " " + pod_version, "#{root_path.chomp('/')}/source.tar.gz", {:title => t('layouts.application.source_package')}) unless request.url.match(/joindiaspora.com/) %li= link_to(t('layouts.application.toggle'), toggle_mobile_path)