Merge pull request #10 from ombushop/feature/admin-bar-ui

Feature/admin bar ui
ombushop · Sep 18, 2015 · e1ab324 · e1ab324
2 parents 164d2de + 00d09d4
commit e1ab324
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/layout/theme.liquid b/layout/theme.liquid
@@ -145,21 +145,28 @@
     <!-- end facebook code -->
 
       <!-- admin bar -->
-
-
       {% if current_user %}
-        {% if current_user.is_admin? or current_user.is_wholesale? or current_user.is_customer? %}
-        <div id="admin-bar" class="top-bar">
-          <div id="login-bar">
-            <span class="shop-name"><i class="icon-shopping-cart icon-white"></i> {{ current_user.shop.name }}</span> <span class="user-email"><i class="icon-user icon-white"></i> {{ current_user.email }} {% if current_user.is_wholesale? %}(mayorista) {% endif %}</span>
+        {% if current_user.is_admin? or current_user.is_wholesale? or current_user.is_customer? or current_user.has_partner? %}
+        <div id="bar-container">
+          <ul id="login-nav">
             {% if current_user.is_admin? %}
-              <div class="btn-group">
-                <a href="/admin/overview" title="Ir al administrador" class="btn btn-inverse" target="_blank"><i class="icon-briefcase icon-white"></i> Admin</a>
-                <a href="{{ current_path }}" title="Recargar la tienda" class="btn active btn-inverse"><i class="icon-shopping-cart icon-white"></i> Tienda</a>
-              </div>
+              <li class="btn-group">
+                <a href="/admin/overview" title="Ir al administrador" class="btn btn-inverse"><i class="icon-cog icon-white"></i> Admin {{ current_user.shop.name }}</a>
+                <a href="{{ current_path }}" title="Recargar la tienda" class="btn active btn-inverse"><i class="icon-shopping-cart icon-white"></i> Tienda {{ current_user.shop.name }}</a>
+              </li>
             {% endif %}
-            <a href="/logout" class="btn btn-inverse"><i class="icon-off icon-white"></i> Salir</a>
-          </div>
+            <li tabindex="1" class="menu btn btn-inverse dropdown-toggles">
+                <i class="icon-user icon-white"></i> {{ current_user.email }} {% if current_user.is_wholesale? %}(mayorista) {% endif %}
+                <span class="caret"></span>
+              <ul class="dropdown-menu">
+                {% if current_user.has_partner? or current_user.is_wholesale? %}
+                {% else %}
+                  <li><a href="/admin/account">Mi cuenta</a></li>
+                {% endif %}
+                <li><a href="/logout">Salir</a></li>
+              </ul>
+            </li>
+          </ul>
         </div>
         {% endif %}
       {% endif %}