Skip to content

Commit 2dc4a14

Browse files
tyranjatyranja
authored
remove links in header and sub-menu in home page (#1577)
* remove links in header and sub-menu in home page * make navbar responsive
1 parent f53ca92 commit 2dc4a14

6 files changed

Lines changed: 35 additions & 42 deletions

File tree

‎Gemfile.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,7 @@ PLATFORMS
510510
aarch64-linux
511511
arm64-darwin-22
512512
arm64-darwin-23
513+
arm64-darwin-25
513514
x86_64-linux
514515

515516
DEPENDENCIES

‎app/views/layouts/_header.html.erb‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<header>
33
<%# TODO: hidden <h1>Speakerinnen</h1>%>
4-
<nav class="navbar navbar-expand-lg py-0 navbar-dark <%= controller_path =~ /admin\// ? "admin__header--color": "header" %>" >
4+
<nav class="navbar navbar-expand-xl py-0 navbar-dark <%= controller_path =~ /admin\// ? "admin__header--color": "header" %>" >
55
<div class="container-fluid">
66
<%= link_to(root_path, id: 'header__home-link', class: 'navbar-brand p-0') do %>
77
<%= image_tag("logo_header#{'_' + current_region.to_s if current_region}.png",
@@ -10,18 +10,10 @@
1010
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
1111
<span class="fa fa-bars"></span>
1212
</button>
13-
<div class="collapse navbar-collapse d-lg-flex justify-content-between" id="navbarNavDropdown">
13+
<div class="collapse navbar-collapse d-xl-flex justify-content-between" id="navbarNavDropdown">
1414
<ul class="navbar-nav mr-auto">
15-
<li class="nav-item active dropdown pt-3 pe-5">
16-
<a class="dropdown-toggle dropdown-item px-4" href=<%= about_path %> id="navbarDropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
17-
<%= t(:about_speakerinnen_list, scope: 'pages.header') %>
18-
</a>
19-
<div class="dropdown-menu dropdown-menu-dark" aria-labelledby="navbarDropdownMenuLink">
20-
<%= render "layouts/header_links#{'_' + current_region.to_s if current_region}" %>
21-
</div>
22-
</li>
2315
<% unless params[:controller] == 'pages' %>
24-
<li class="nav-item active pt-2 pe-5 ">
16+
<li class="nav-item active px-3 pt-2">
2517
<%= form_tag(profiles_path, method: 'get', class: "text-capitalize small") do %>
2618
<%= text_field_tag('search', params[:search], id: 'header_search',class: 'form-control typeahead me-sm-2',
2719
type: 'text', placeholder: t(:search_placeholder, scope: 'pages.home')) %>
@@ -30,34 +22,45 @@
3022
</li>
3123
<% end %>
3224
</ul>
33-
<ul class="navbar-nav">
34-
<li class="nav-item nav active dropdown pt-3">
35-
<a class="dropdown-toggle dropdown-item px-4" id="navbarDropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
36-
<%= I18n.locale == :de ? 'DE' : 'EN' %>
37-
</a>
38-
<div class="dropdown-menu dropdown-menu-dark" aria-labelledby="navbarDropdownMenuLink">
39-
<%= I18n.locale == :de ? link_to('EN', params.to_unsafe_h.merge(:locale => :en), class: "choose-en dropdown-item") :
40-
(link_to 'DE', params.to_unsafe_h.merge(:locale => :de), class: "choose-de dropdown-item") %>
41-
</div>
25+
<ul class="navbar-nav align-items-xl-center pb-3 pb-xl-0">
26+
<li class="nav-item active dropdown px-3 pt-3">
27+
<a class="dropdown-toggle dropdown-item" href=<%= about_path %> id="navbarDropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
28+
<%= t(:about_speakerinnen_list, scope: 'pages.header') %>
29+
</a>
30+
<div class="dropdown-menu dropdown-menu-dark" aria-labelledby="navbarDropdownMenuLink">
31+
<%= render "layouts/header_links#{'_' + current_region.to_s if current_region}" %>
32+
</div>
33+
</li>
34+
35+
<li class="nav-item d-flex align-items-center px-3 pt-3">
36+
<%= link_to 'EN', params.to_unsafe_h.merge(locale: :en),
37+
class: "nav-link py-0 #{'text-primary' if I18n.locale == :en}" %>
38+
<span class="mx-1">|</span>
39+
<%= link_to 'DE', params.to_unsafe_h.merge(locale: :de),
40+
class: "nav-link py-0 #{'text-primary' if I18n.locale == :de}" %>
41+
</li>
42+
43+
<li class="nav-item active px-3 pt-3">
44+
<%= link_to(t(:donate_button , scope: 'pages.home'), donate_path, class: "dropdown-item")%>
4245
</li>
4346
<% if profile_signed_in? %>
44-
<li class="nav-item active px-4 pt-3">
47+
<li class="nav-item active px-3 pt-3">
4548
<%= link_to(t(:my_profile, scope: 'layouts.application'), profile_path(current_profile), class: "dropdown-item")%>
4649
</li>
47-
<li class="nav-item active px-4 pt-3">
50+
<li class="nav-item active px-3 pt-3">
4851
<%= link_to(t(:logout, scope: 'layouts.application'), destroy_profile_session_path, method: :delete, class: "dropdown-item") %>
4952
</li>
5053
<% else %>
51-
<li class="nav-item active px-4 pt-3">
54+
<li class="nav-item active px-3 pt-3">
5255
<%= link_to t(:login, scope: 'layouts.application'), new_profile_session_path, class: "dropdown-item" %>
5356
</li>
54-
<li class="nav-item active px-4 pt-3">
57+
<li class="nav-item active px-3 pt-3">
5558
<%= link_to t(:signup, scope: 'layouts.application'), sign_up_path, class: "dropdown-item" %>
5659
</li>
5760
<% end %>
5861

5962
<% if admin?(current_profile) %>
60-
<li class="nav-item active px-4 pt-3">
63+
<li class="nav-item active px-3 pt-3">
6164
<%= link_to 'Admin', admin_root_path, class: "dropdown-item" %>
6265
</li>
6366
<% end %>

‎app/views/layouts/_header_links.html.erb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<%= link_to 'Blog', 'https://blog.speakerinnen.org/', target: '_blank', class: 'dropdown-item' %>
2-
<%= link_to 'Fiftypercent', 'https://50prozent.speakerinnen.org/', target: '_blank', class: 'dropdown-item'%>
31
<%= link_to 'Speakerinnen Vorarlberg', 'https://vorarlberg.speakerinnen.org/', target: '_blank', class: 'dropdown-item' %>
42
<%= link_to 'Speakerinnen Oberösterreich', 'https://ooe.speakerinnen.org/', target: '_blank', class: 'dropdown-item' %>
53
<%= link_to t(:about, scope: 'pages.home'), about_path, class: 'dropdown-item' %>

‎app/views/pages/home.html.erb‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,4 @@
110110
<div id="startpage-categories__list" class="container p-0">
111111
<%= render "shared/categories" %>
112112
</div>
113-
114-
<%# Action Cards %>
115-
<div class="container bg--light-grey">
116-
<div class="row sub-menu">
117-
<%= render partial: 'shared/sub_menu' %>
118-
</div>
119-
</div>
120113
</section>

‎spec/system/localization_spec.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
it 'stays on start page' do
77
visit root_path
88

9-
click_on(class: 'choose-de')
9+
click_on('DE')
1010

1111
expect(page).to have_link('Einloggen')
1212
expect(page).to have_button('Finde deine Speakerin')
1313

14-
click_on(class: 'choose-en')
14+
click_on('EN')
1515

1616
expect(page).to have_link('Log in')
1717
expect(page).to have_button('Find your speaker')
@@ -21,7 +21,7 @@
2121
visit profile_path(id: ada.id)
2222
expect(page).to have_content('Request Ada Lovelace as a Speaker')
2323

24-
click_on(class: 'choose-de')
24+
click_on('DE')
2525

2626
expect(page).to have_content('Ada Lovelace als Speakerin anfragen')
2727
end
@@ -30,7 +30,7 @@
3030
visit profiles_path(search: 'Marie')
3131
expect(page).to have_content('Marie')
3232

33-
click_on(class: 'choose-de')
33+
click_on('DE')
3434

3535
expect(page).to have_content('Marie')
3636
end

‎spec/system/navigation_spec.rb‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@
2222
expect(page).to have_css('#header__logo')
2323
expect(page).to have_link(I18n.t('layouts.application.signup'))
2424
expect(page).to have_link(I18n.t('layouts.application.login'))
25-
expect(page).to have_link('EN') if language == 'de'
26-
expect(page).to have_link('DE') if language == 'en'
27-
expect(page).to have_no_link('DE') if language == 'de'
28-
expect(page).to have_no_link('EN') if language == 'en'
25+
expect(page).to have_link('EN')
26+
expect(page).to have_link('DE')
2927
expect(page).to have_no_link('Admin')
3028
end
3129

0 commit comments

Comments
 (0)