Download as
Browse Code »

Commit 6de27be9637c984eaad4887156dc3b7ae6d5cf10

Authored by Heitor
Committed by Rafael Reggiani Manzo
1 parent b4fcf54e
Exists in colab and in 2 other branches master, stable

Refactor navbar to a partial on application view 

This will isolate upcoming changes on the menu items.

Signed-off-by: Rafael Reggiani Manzo <rr.manzo@protonmail.com>
Showing 2 changed files with 44 additions and 43 deletions   Show diff stats
app/views/layouts/application.html.erb
  Diff comments   View file @6de27be
... ... @@ -45,49 +45,7 @@
45 45 </head>
46 46 <body>
47 47  
48   - <div class="navbar navbar-default">
49   - <div class="navbar-inner">
50   - <div class="container-fluid">
51   - <div class="navbar-header">
52   - <button type="button" class="navbar-toggle collapsed" data-target="#nav-collapse" data-toggle="collapse">
53   - <span class="icon-bar"></span>
54   - <span class="icon-bar"></span>
55   - <span class="icon-bar"></span>
56   - </button>
57   - <a><%= link_to image_tag('logo.png'), root_path, class: 'navbar-brand' %></a>
58   - </div>
59   - <div class="collapse navbar-collapse" id="nav-collapse">
60   - <ul class="nav navbar-nav">
61   - <li><%= link_to t('home'), root_path %></li>
62   - <li><%= link_to Project.model_name.human, projects_path %></li>
63   - <li><%= link_to Repository.model_name.human, repositories_path %></li>
64   - <li><%= link_to KalibroConfiguration.model_name.human, kalibro_configurations_path %></li>
65   - <li><%= link_to ReadingGroup.model_name.human, reading_groups_path %></li>
66   - </ul>
67   - <ul class="nav navbar-nav navbar-right">
68   - <% if user_signed_in? %>
69   - <li><%= link_to t('edit_account'), edit_user_registration_path %></li>
70   - <li><%= link_to t('sign_out'), destroy_user_session_path, :method => :delete %></li>
71   - <% else %>
72   - <li><%= link_to t('sign_in'), new_user_session_path %></li>
73   - <li><%= link_to t('sign_up'), new_user_registration_path %></li>
74   - <% end %>
75   - <li class="dropdown">
76   - <a class="dropdown-toggle" aria-expanded="true" role="button" data-toggle="dropdown" href="#">
77   - <%= t('language') %>
78   - <span class="caret"></span>
79   - </a>
80   - <ul class="dropdown-menu" role="menu">
81   - <% I18n.available_locales.each do |locale| %>
82   - <li><%= link_to(locale.to_s, url_for(locale: locale), data: { no_turbolink: true }) %></li>
83   - <% end %>
84   - </ul>
85   - </li>
86   - </ul>
87   - </div><!--/.nav-collapse -->
88   - </div>
89   - </div>
90   - </div>
  48 + <%= render partial: 'shared/navbar' %>
91 49  
92 50 <div class="container-fluid">
93 51 <div class="row">
... ...
app/views/shared/_navbar.html.erb 0 → 100644
  Diff comments   View file @6de27be
... ... @@ -0,0 +1,43 @@
  1 +<div class="navbar navbar-default">
  2 + <div class="navbar-inner">
  3 + <div class="container-fluid">
  4 + <div class="navbar-header">
  5 + <button type="button" class="navbar-toggle collapsed" data-target="#nav-collapse" data-toggle="collapse">
  6 + <span class="icon-bar"></span>
  7 + <span class="icon-bar"></span>
  8 + <span class="icon-bar"></span>
  9 + </button>
  10 + <a><%= link_to image_tag('logo.png'), root_path, class: 'navbar-brand' %></a>
  11 + </div>
  12 + <div class="collapse navbar-collapse" id="nav-collapse">
  13 + <ul class="nav navbar-nav">
  14 + <li><%= link_to t('home'), root_path %></li>
  15 + <li><%= link_to Project.model_name.human, projects_path %></li>
  16 + <li><%= link_to Repository.model_name.human, repositories_path %></li>
  17 + <li><%= link_to KalibroConfiguration.model_name.human, kalibro_configurations_path %></li>
  18 + <li><%= link_to ReadingGroup.model_name.human, reading_groups_path %></li>
  19 + </ul>
  20 + <ul class="nav navbar-nav navbar-right">
  21 + <% if user_signed_in? %>
  22 + <li><%= link_to t('edit_account'), edit_user_registration_path %></li>
  23 + <li><%= link_to t('sign_out'), destroy_user_session_path, :method => :delete %></li>
  24 + <% else %>
  25 + <li><%= link_to t('sign_in'), new_user_session_path %></li>
  26 + <li><%= link_to t('sign_up'), new_user_registration_path %></li>
  27 + <% end %>
  28 + <li class="dropdown">
  29 + <a class="dropdown-toggle" aria-expanded="true" role="button" data-toggle="dropdown" href="#">
  30 + <%= t('language') %>
  31 + <span class="caret"></span>
  32 + </a>
  33 + <ul class="dropdown-menu" role="menu">
  34 + <% I18n.available_locales.each do |locale| %>
  35 + <li><%= link_to(locale.to_s, url_for(locale: locale), data: { no_turbolink: true }) %></li>
  36 + <% end %>
  37 + </ul>
  38 + </li>
  39 + </ul>
  40 + </div><!--/.nav-collapse -->
  41 + </div>
  42 + </div>
  43 +</div>
0 44 \ No newline at end of file
... ...