Merge branch 'profile-fixes' into 'master'

Profile fixes

See merge request !305

circle/bower.json

@@ -12,7 +12,7 @@
   ],
   ],
   "dependencies": {
   "dependencies": {
     "bootstrap": "~3.2.0",
     "bootstrap": "~3.2.0",
-    "fontawesome": "~4.2.0",
+    "fontawesome": "~4.3.0",
     "jquery": "~2.1.1",
     "jquery": "~2.1.1",
     "no-vnc": "*",
     "no-vnc": "*",
     "jquery-knob": "~1.2.9",
     "jquery-knob": "~1.2.9",

circle/dashboard/static/dashboard/dashboard.less

@@ -651,9 +651,11 @@ textarea[name="new_members"] {
   padding-left: 28px;
   padding-left: 28px;
 }
 }
 
 
-.dashboard-profile-vm-list a, .dashboard-profile-vm-list a:hover {
-  text-decoration: none;
-  color: #555;
+.dashboard-profile-vm-list, .dashboard-profile-group-list {
+  a, a:hover {
+    text-decoration: none;
+    color: #555;
+  }
 }
 }
 
 
 #group-detail-user-table td:nth-child(2) a,
 #group-detail-user-table td:nth-child(2) a,

circle/dashboard/templates/dashboard/profile.html

@@ -11,24 +11,28 @@
   <div class="col-md-{% if perms.auth.change_user %}8{% else %}12{% endif %}">
   <div class="col-md-{% if perms.auth.change_user %}8{% else %}12{% endif %}">
     <div class="panel panel-default">
     <div class="panel panel-default">
       <div class="panel-heading">
       <div class="panel-heading">
-        {% if request.user.is_superuser %}
-          <a href="{{ login_token }}"
-             class="pull-right btn btn-danger btn-xs"
-             title="{% trans "Log in as this user. Recommended to open in an incognito window." %}">
-             {% trans "Login as this user" %}</a>
-        {% endif %}
-        <a class="pull-right btn btn-default btn-xs" href="{% url "dashboard.views.user-list" %}">{% trans "Back" %}</a>
+        <div class="pull-right">
+          {% if request.user.is_superuser %}
+          <a href="{{ login_token }}" class="btn btn-danger btn-xs"
+            title="{% trans "Log in as this user. Recommended to open in an incognito window." %}">
+            <i class="fa fa-user-secret"></i>
+            {% trans "Login as this user" %}
+          </a>
+          {% endif %}
+          <a class="btn btn-default btn-xs" href="{% url "dashboard.views.user-list" %}">
+            {% trans "Back" %}</a>
+        </div>
         <h3 class="no-margin">
         <h3 class="no-margin">
           <i class="fa fa-user"></i>
           <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>
       <div class="panel-body">
       <div class="panel-body">
-        <div>
-          <div class="" style="float: left">
+        <div class="row">
+          <div class="col-sm-4">
             <img id="dashboard-profile-avatar" src="{{ avatar_url }}" class="img-rounded"/>
             <img id="dashboard-profile-avatar" src="{{ avatar_url }}" class="img-rounded"/>
           </div>
           </div>
-          <div class="" style="padding-left: 215px;">
+          <div class="col-sm-8">
             <p>{% trans "Username" %}: {{ profile.username }}</p>
             <p>{% trans "Username" %}: {{ profile.username }}</p>
             <p>{% trans "Organization ID" %}: {{ profile.profile.org_id|default:"-" }}</p>
             <p>{% trans "Organization ID" %}: {{ profile.profile.org_id|default:"-" }}</p>
             <p>{% trans "First name" %}: {{ profile.first_name|default:"-" }}</p>
             <p>{% trans "First name" %}: {{ profile.first_name|default:"-" }}</p>
@@ -48,7 +52,6 @@
             <a href="{% url "dashboard.views.profile-preferences" %}">{% trans "Change my preferences" %}</a>
             <a href="{% url "dashboard.views.profile-preferences" %}">{% trans "Change my preferences" %}</a>
             {% endif %}
             {% endif %}
           </div>
           </div>
-          <div class="clearfix"></div>
         </div>
         </div>
 
 
         {% if perm_group_list %}
         {% if perm_group_list %}
@@ -57,11 +60,11 @@
             <i class="fa fa-group"></i> {% trans "Groups" %}
             <i class="fa fa-group"></i> {% trans "Groups" %}
           </h4>
           </h4>
           <ul class="dashboard-profile-group-list">
           <ul class="dashboard-profile-group-list">
-          {% for g in groups %}
-            <li>{{ g.name }}</li>
+            {% for g in groups %}
+            <li><a href="{{ g.profile.get_absolute_url }}">{{ g.name }}</a></li>
             {% empty %}
             {% empty %}
             {% trans "This user is not in any group." %}
             {% trans "This user is not in any group." %}
-          {% endfor %}
+            {% endfor %}
           </ul>
           </ul>
         {% endif %}
         {% endif %}