Merge remote-tracking branch 'origin/feature-gitlabheader'

Conflicts:
	circle/dashboard/static/dashboard/dashboard.less

circle/dashboard/static/dashboard/dashboard.less

@@ -10,6 +10,21 @@ html {
   min-height: 100%;
   min-height: 100%;
 }
 }
 
 
+.navbar-nav img {
+  width: 46px;
+  height: 46px;
+  margin-top: -4px;
+}
+
+.profile-avatar {
+  width: 24px;
+  height: 24px;
+}
+
+.navbar-fixed-top {
+  border: 0px;
+}
+
 /* Set widths on the navbar form inputs since otherwise they're 100% wide */
 /* Set widths on the navbar form inputs since otherwise they're 100% wide */
 .navbar-form input[type="text"],
 .navbar-form input[type="text"],
 .navbar-form input[type="password"] {
 .navbar-form input[type="password"] {
@@ -32,7 +47,7 @@ html {
 
 
 
 
 #dashboard-menu {
 #dashboard-menu {
-  margin-right: 15px;
+  margin-right: 0px;
 }
 }
 
 
 /* we need this for mobile view */
 /* we need this for mobile view */
@@ -56,6 +71,9 @@ html {
     padding-bottom: 12.5px;
     padding-bottom: 12.5px;
   }
   }
 
 
+  #dashboard-menu > li:last-child > a {
+    padding: 4px 0 0 0;
+  }
 }
 }
 
 
 .no-margin {
 .no-margin {
@@ -110,6 +128,11 @@ html {
   background-color: black!important;
   background-color: black!important;
 }
 }
 
 
+.timeline img{
+  border-radius: 50%;
+  margin-bottom: 2px;
+}
+
 .timeline a {
 .timeline a {
   color: black;
   color: black;
 }
 }
@@ -1321,3 +1344,7 @@ textarea[name="new_members"] {
   padding-top: 5px;
   padding-top: 5px;
   padding-bottom: 5px;
   padding-bottom: 5px;
 }
 }
+
+.acl-table td:first-child {
+  text-align: center;
+}

circle/dashboard/templates/dashboard/_display-name.html

 {% load i18n %}
 {% load i18n %}
 
 
 {% if user and user.pk %}
 {% if user and user.pk %}
+  {% if show_pic %}
+    <img class="profile-avatar" src="{{ user.profile.get_avatar_url }}" />
+  {% endif%}
+
   {% if user.get_full_name %}{{ user.get_full_name }}{% else %}{{ user.username }}{% endif %}{% if new_line %}<br />{% endif %}
   {% if user.get_full_name %}{{ user.get_full_name }}{% else %}{{ user.username }}{% endif %}{% if new_line %}<br />{% endif %}
 
 
   {% if show_org %}
   {% if show_org %}
@@ -10,4 +14,5 @@
       ({% trans "username" %}: {{ user.username }})
       ({% trans "username" %}: {{ user.username }})
     {% endif %}
     {% endif %}
   {% endif %}
   {% endif %}
+
 {% endif %}
 {% endif %}

circle/dashboard/templates/dashboard/_manage_access.html

 {% load i18n %}
 {% load i18n %}
 <form action="{{ acl.url }}" method="post">{% csrf_token %}
 <form action="{{ acl.url }}" method="post">{% csrf_token %}
-    <table class="table table-striped table-with-form-fields" id="{{table_id}}">
+    <table class="table table-striped table-with-form-fields acl-table" id="{{table_id}}">
     <thead>
     <thead>
         <tr>
         <tr>
         <th></th>
         <th></th>
@@ -13,7 +13,7 @@
         {% for i in acl.users %}
         {% for i in acl.users %}
         <tr>
         <tr>
         <td>
         <td>
-            <i class="fa fa-user"></i>
+          <img class="profile-avatar" src="{{ i.user.profile.get_avatar_url }}"/>
         </td>
         </td>
         <td>
         <td>
             <a href="{% url "dashboard.views.profile" username=i.user.username %}"
             <a href="{% url "dashboard.views.profile" username=i.user.username %}"

circle/dashboard/templates/dashboard/base.html

@@ -87,6 +87,11 @@
         <li>{% trans "Loading..." %}</li>
         <li>{% trans "Loading..." %}</li>
       </ul>
       </ul>
     </li>
     </li>
+    <li class="hidden-xs">
+      <a href="{% url "dashboard.views.profile-preferences" %}">
+        <img class="profile-avatar" src="{{ user.profile.get_avatar_url }}" />
+      </a>
+    </li>
   </ul>
   </ul>
 
 
 {% else %}
 {% else %}

circle/dashboard/templates/dashboard/group-detail.html

@@ -90,7 +90,7 @@
               {% for i in users %}
               {% for i in users %}
                 <tr>
                 <tr>
                   <td>
                   <td>
-                    <i class="fa fa-user"></i>
+                    <img class="profile-avatar" src="{{ i.profile.get_avatar_url}}"/>
                   </td>
                   </td>
                   <td>
                   <td>
                     <a href="{% url "dashboard.views.profile" username=i.username %}" title="{{ i.username }}"
                     <a href="{% url "dashboard.views.profile" username=i.username %}" title="{{ i.username }}"

circle/dashboard/templates/dashboard/profile.html

@@ -24,7 +24,6 @@
             {% trans "Back" %}</a>
             {% trans "Back" %}</a>
         </div>
         </div>
         <h3 class="no-margin">
         <h3 class="no-margin">
-          <i class="fa fa-user"></i>
           {% include "dashboard/_display-name.html" with user=profile show_org=True %}
           {% include "dashboard/_display-name.html" with user=profile show_org=True %}
         </h3>
         </h3>
       </div>
       </div>

circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html

@@ -21,7 +21,7 @@
 </strong>
 </strong>
 {% endspaceless %}{% if a.times < 2 %}&nbsp;<span title="{{ a.started }}">{{ a.started|arrowfilter:LANGUAGE_CODE }}</span>{% endif %}{% if a.user %},
 {% endspaceless %}{% if a.times < 2 %}&nbsp;<span title="{{ a.started }}">{{ a.started|arrowfilter:LANGUAGE_CODE }}</span>{% endif %}{% if a.user %},
   <a class="no-style-link" href="{% url "dashboard.views.profile" username=a.user.username %}">
   <a class="no-style-link" href="{% url "dashboard.views.profile" username=a.user.username %}">
-    {% include "dashboard/_display-name.html" with user=a.user show_org=True %}
+    {% include "dashboard/_display-name.html" with user=a.user show_org=True show_pic=True %}
   </a>
   </a>
 {% endif %}
 {% endif %}
 {% if a.is_abortable_for_user %}
 {% if a.is_abortable_for_user %}