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

Started making use of gravatar icons.

Browse Source
This commit is contained in:
tomtom5152
2015-01-29 20:00:07 +00:00
parent 6838444501
commit 6c322e39cb
5 changed files with 11661 additions and 10579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10847
RIGS/static/css/print.css
View File

File diff suppressed because it is too large Load Diff

11336
RIGS/static/css/screen.css
View File

File diff suppressed because it is too large Load Diff

34
RIGS/static/scss/screen.scss
View File

@@ -8,39 +8,43 @@
@import "jq-ui-bootstrap/_tooltip";
body, .pad-top {
padding-top: 50px;
padding-top: 50px;
}
#content {
padding: 40px 15px;
padding: 40px 15px;
}
#userdropdown > li {
padding: 0 0.3em;
padding: 0 0.3em;
&.media {
display: inline-flex;
}
.media-object {
max-width: 3em;
}
}
.table tbody>tr>td.vert-align
{
vertical-align: middle;
.table tbody > tr > td.vert-align {
vertical-align: middle;
}
.align-right {
text-align: right;
text-align: right;
}
textarea {
width: 100%;
resize: vertical;
width: 100%;
resize: vertical;
}
.btn-page, .btn-pad { // .btn-page should be refactored out to .btn-page in the future
margin: 0 0 0.5em;
.btn-page, .btn-pad {
// .btn-page should be refactored out to .btn-page in the future
margin: 0 0 0.5em;
}
.custom-combobox {
display: block;
display: block;
}
.event-mic-photo {
max-width: 2em;
}

5
RIGS/templates/RIGS/event_table.html
View File

@@ -71,9 +71,12 @@
{% endif %}
</dl>
</td>
<td class="text-center">
<td class="text-right">
{% if event.mic or not event.is_rig %}
{{ event.mic.initials }}
<div>
<img src="{{ event.mic.profile_picture }}" class="event-mic-photo"/>
</div>
{% else %}
<span class="glyphicon glyphicon-exclamation-sign"></span>
{% endif %}

16
templates/base.html
View File

@@ -64,11 +64,11 @@
Hi {{ user.first_name }}
<b class="caret"></b>
</a>
<ul class="dropdown-menu nav media-list pull-right">
<ul class="dropdown-menu nav media-list pull-right" id="userdropdown">
<li class="media">
<span class="pull-left">
<img src="{{ request.user.profile_picture }}" class="media-object"/>
</span>
<div class="media-left">
<img src="{{ request.user.profile_picture }}" class="media-object"/>
</div>
<div class="media-body">
<b>{{ request.user.first_name }} {{ request.user.last_name }}</b>
@@ -110,7 +110,7 @@
</div>
<div id="sidebar" class="column">
{% block sidebar %}
{% block sidebar %}
{% endblock %}
</div>
</div>
@@ -143,10 +143,10 @@
jQuery('#modal').load(jQuery(this).attr('href'), function (e) {
jQuery('#modal').modal();
});
jQuery('#modal').on('hide.bs.modal', function(e) {
if(modaltarget != "" && modalobject != "") {
jQuery('#modal').on('hide.bs.modal', function (e) {
if (modaltarget != "" && modalobject != "") {
jQuery(modaltarget).val(modalobject[0]['pk']);
jQuery(modaltarget+'-input').val(modalobject[0]['fields']['name']);
jQuery(modaltarget + '-input').val(modalobject[0]['fields']['name']);
}
})
});