nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5612 from Flaburgan/hide-signup-button-when-registration-are-disabled

Browse source 
Hide sign up button when registration are disabled
This commit is contained in:
Steffen van Bergerem 2015-02-02 00:25:58 +01:00
commit b4ff1f97e7
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -92,6 +92,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
* Port contacts page to backbone [#5473](https://github.com/diaspora/diaspora/pull/5473) * Port contacts page to backbone [#5473](https://github.com/diaspora/diaspora/pull/5473)
* Replace CSS vendor prefixes automatically [#5532](https://github.com/diaspora/diaspora/pull/5532) * Replace CSS vendor prefixes automatically [#5532](https://github.com/diaspora/diaspora/pull/5532)
* Use sentence case consistently throughout UI [#5588](https://github.com/diaspora/diaspora/pull/5588) * Use sentence case consistently throughout UI [#5588](https://github.com/diaspora/diaspora/pull/5588)
* Hide sign up button when registrations are disabled [#5612](https://github.com/diaspora/diaspora/pull/5612)
## Bug fixes ## Bug fixes
* orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158) * orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)

2
app/views/layouts/_header.html.haml
View file

@ -8,7 +8,7 @@
= link_to content_tag(:div, nil, class: 'diaspora_header_logo branding-header-logo'), root_path = link_to content_tag(:div, nil, class: 'diaspora_header_logo branding-header-logo'), root_path
%ul#landing_nav %ul#landing_nav
- unless current_page?(controller: :registrations, action: :new) - if AppConfig.settings.enable_registrations? && !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_up'), new_user_registration_path, class: 'login'
%li= link_to t('devise.shared.links.sign_in'), new_user_session_path, class: 'login' %li= link_to t('devise.shared.links.sign_in'), new_user_session_path, class: 'login'
#lightbox #lightbox