arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-19 12:59:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge conflict from master

Browse Source
This commit is contained in:
Tom Price
2015-04-21 19:57:45 +01:00
parent 98f0005d67 ef1e4bc9a5
commit 3b1137c2d6
15 changed files with 12358 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
RIGS/templates/RIGS/profile_detail.html
View File

@@ -3,17 +3,23 @@
{% block title %}RIGS Profile {{object.pk}}{% endblock %}
{% block content %}
<div class="col-sm-10 col-sm-offset-1">
<div class="col-sm-10">
<div class="col-md-10 col-md-offset-1">
<div class="col-sm-12">
<div class="col-sm-6">
<h3>{{object.name}}</h3>
</div>
{% if object.pk == user.pk %}
<div class="col-sm-2">
<div class="pull-right">
<a href="{% url 'profile_update_self' %}" class="btn btn-primary">
Edit <span class="glyphicon glyphicon-pencil"></span>
<div class="col-sm-6 text-right">
<div class="btn-group btn-page">
<a href="{% url 'profile_update_self' %}" class="btn btn-default">
Edit Profile <span class="glyphicon glyphicon-pencil"></span>
</a>
</div>
<a href="{% url 'password_change' %}" class="btn btn-default">
Change Password <span class="glyphicon glyphicon-lock"></span>
</a>
</div>
</div>
{% endif %}
<div class="col-sm-8 ">