_user_navigation.html.erb in iqvoc-4.13.0

- old
+ new
@@ -1,62 +1,52 @@
-<li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+<li class="nav-item dropdown">
+  <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
     <%= current_user.initials %>
-    <i class="fa fa-angle-down"></i>
   </a>
-  <ul class="user-widget dropdown-menu">
-    <li class="user-widget-header">
+  <div class="user-widget dropdown-menu dropdown-menu-right">
+    <div class="user-widget-header">
       <b class="fullname"><%= current_user.name %></b>
       <div class="email"><%= current_user.email %></div>
-    </li>
+    </div>
 
-    <li role="separator" class="divider"></li>
+    <div class="dropdown-divider"></div>
 
-    <li class="user-widget-item<%= ' active' if current_page? edit_user_path(current_user) %>">
-      <%= link_to t("txt.views.layouts.application.profile"), edit_user_path(current_user) %>
-    </li>
+    <% css_class = (current_page? edit_user_path(current_user)) ? 'dropdown-item active' : 'dropdown-item'  %>
+    <%= link_to t("txt.views.layouts.application.profile"), edit_user_path(current_user), class: css_class %>
 
     <% if can? :use, :administration %>
-    <li role="separator" class="divider"></li>
+      <div class="dropdown-divider"></div>
       <% if can? :manage, User %>
-        <li class="user-widget-item<%= ' active' if current_page? users_path %>">
-          <%= link_to t("txt.views.navigation.users"), users_path %>
-        </li>
+        <% css_class = (current_page? users_path) ? 'dropdown-item active' : 'dropdown-item'  %>
+        <%= link_to t("txt.views.navigation.users"), users_path, class: css_class %>
       <% end %>
 
       <% if can? :manage, Iqvoc.config %>
-        <li class="user-widget-item<%= ' active' if current_page? instance_configuration_path %>">
-          <%= link_to t("txt.views.navigation.instance_configuration"), instance_configuration_path %>
-        </li>
+        <% css_class = (current_page? instance_configuration_path) ? 'dropdown-item active' : 'dropdown-item'  %>
+        <%= link_to t("txt.views.navigation.instance_configuration"), instance_configuration_path, class: css_class %>
       <% end %>
 
       <% if can? :import, Concept::Base %>
-        <li class="user-widget-item<%= ' active' if current_page? imports_path %>">
-          <%= link_to t("txt.views.navigation.import"), imports_path %>
-        </li>
+        <% css_class = (current_page? imports_path) ? 'dropdown-item active' : 'dropdown-item'  %>
+        <%= link_to t("txt.views.navigation.import"), imports_path, class: css_class %>
       <% end %>
 
       <% if can? :export, Concept::Base %>
-        <li class="user-widget-item<%= ' active' if current_page? exports_path %>">
-          <%= link_to t("txt.views.navigation.export"), exports_path %>
-        </li>
+        <% css_class = (current_page? exports_path) ? 'dropdown-item active' : 'dropdown-item'  %>
+        <%= link_to t("txt.views.navigation.export"), exports_path, class: css_class %>
       <% end %>
 
       <% if can? :sync, :triplestore %>
-        <li class="user-widget-item<%= ' active' if current_page? triplestore_sync_path %>">
-          <%= link_to t("txt.views.navigation.sync"), triplestore_sync_path %>
-        </li>
+        <% css_class = (current_page? triplestore_sync_path) ? 'dropdown-item active' : 'dropdown-item'  %>
+        <%= link_to t("txt.views.navigation.sync"), triplestore_sync_path, class: css_class %>
       <% end %>
 
       <% if can? :reset, :thesaurus %>
-        <li class="user-widget-item<%= ' active' if current_page? reset_path %>">
-          <%= link_to t("txt.views.navigation.reset"), reset_path %>
-        </li>
+        <% css_class = (current_page? reset_path) ? 'dropdown-item active' : 'dropdown-item'  %>
+        <%= link_to t("txt.views.navigation.reset"), reset_path, class: css_class %>
       <% end %>
     <% end %>
 
-    <li role="separator" class="divider"></li>
-    <li class="user-widget-item">
-      <%= link_to t("txt.views.layouts.application.logout"), user_session_path,  method: :delete, class: 'logout' %>
-    </li>
-  </ul>
+    <div class="dropdown-divider"></div>
+    <%= link_to t("txt.views.layouts.application.logout"), user_session_path,  method: :delete, class: 'dropdown-item logout' %>
+  </div>
 </li>