about summary refs log tree commit diff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-14 22:11:56 +0100
committerGitHub <noreply@github.com>2019-03-14 22:11:56 +0100
commitc2fa0f7c40bcc4064e8baaa221665eadd391c001 (patch)
tree74a5e58f2c724746d2e929b9df0e5682f17a2637 /app/views/layouts
parentfa75324059c7a146354470691888dc0e1de0342f (diff)
parent09ac5e7528ba3bfe90c20002f47c863d9afc6fcd (diff)
Merge pull request #960 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/public.html.haml5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index f26271cdc..1d3519b8a 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -7,8 +7,7 @@
             = link_to root_url, class: 'brand' do
               = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
 
-            - if Setting.profile_directory
-              = link_to t('directories.directory'), explore_path, class: 'nav-link optional'
+            = link_to t('directories.directory'), explore_path, class: 'nav-link optional' if Setting.profile_directory
             = link_to t('about.about_this'), about_more_path, class: 'nav-link optional'
             = link_to t('about.apps'), 'https://joinmastodon.org/apps', class: 'nav-link optional'
           .nav-center
@@ -17,7 +16,7 @@
               = link_to t('settings.back'), root_url, class: 'nav-link nav-button webapp-btn'
             - else
               = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn nav-link nav-button'
-              = link_to t('auth.register'), open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started', class: 'webapp-btn nav-link nav-button'
+              = link_to t('auth.register'), available_sign_up_path, class: 'webapp-btn nav-link nav-button'
 
     .container= yield