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

Lots of tidying up, moved inline CSS into SCSS

Browse Source
This commit is contained in:
David Taylor
2016-10-08 19:32:45 +01:00
parent ac7e85c24a
commit 008edd8bee
7 changed files with 116 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@@ -147,3 +147,25 @@ ins {
}; };
} }
} }
html.embedded{
min-height:100%;
body{
min-height:100%;
padding:0;
}
.embed_container{
border:5px solid #e9e9e9;
padding-top:12px;
min-height:100%;
width:100%;
}
.source{
background: url('/static/imgs/pyrigs-avatar.png') no-repeat;
background-size: 16px 16px;
padding-left: 20px;
}
}

24
RIGS/templates/RIGS/event_embed.html
View File

@@ -3,15 +3,6 @@
{% block content %} {% block content %}
<style>
.source{
background: url({% static "imgs/pyrigs-avatar.png" %}) no-repeat;
background-size: 16px 16px;
padding-left: 20px;
}
</style>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="source"> R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></span> <span class="source"> R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></span>
@@ -19,7 +10,6 @@
<div class="col-sm-12"> <div class="col-sm-12">
<span class="pull-right"> <span class="pull-right">
{% if object.mic %} {% if object.mic %}
<div class="text-center"> <div class="text-center">
{{ object.mic.initials }}<br/> {{ object.mic.initials }}<br/>
@@ -29,18 +19,14 @@
<span class="glyphicon glyphicon-exclamation-sign"></span> <span class="glyphicon glyphicon-exclamation-sign"></span>
{% endif %} {% endif %}
</span> </span>
<h3> <h3>
<a {% if perms.RIGS.view_event %}href="{% url 'event_detail' object.pk %}" target="_top"{% endif %}> <a {% if perms.RIGS.view_event %}href="{% url 'event_detail' object.pk %}" target="_top"{% endif %}>
{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %} {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
| {{ object.name }} </a> | {{ object.name }} </a>
{% if object.venue %} {% if object.venue %}
<small>at {{ object.venue }}</small> <small>at {{ object.venue }}</small>
{% endif %} {% endif %}
</h3> </h3>
<p> <p>
@@ -96,7 +82,8 @@
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
{% if object.has_end_time%}{% if object.start_date != object.end_date or object.start_time != object.end_time %} {% if object.has_end_time%}
{% if object.start_date != object.end_date or object.start_time != object.end_time %}
<tr> <tr>
<th>Event ends</th> <th>Event ends</th>
<td> <td>
@@ -104,10 +91,11 @@
{{ object.end_date|date:"(Y-m-d)" }} {{ object.end_date|date:"(Y-m-d)" }}
</td> </td>
</tr> </tr>
{% endif %}{% endif %} {% endif %}
{% endif %}
</table> </table>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}

17
templates/base_embed.html
View File

@@ -1,12 +1,12 @@
{% load static from staticfiles %} {% load static from staticfiles %}
{% load raven %} {% load raven %}
<!DOCTYPE html> <!DOCTYPE html>
<html <html
dir="{% if LANGUAGE_BIDI %}rtl{% else %}ltr{% endif %}" dir="{% if LANGUAGE_BIDI %}rtl{% else %}ltr{% endif %}"
xml:lang="{% firstof LANGUAGE_CODE 'en' %}" xml:lang="{% firstof LANGUAGE_CODE 'en' %}"
lang="{% firstof LANGUAGE_CODE 'en' %}"> lang="{% firstof LANGUAGE_CODE 'en' %}"
class="embedded">
<head> <head>
<base target="_blank" /> <base target="_blank" />
<!-- Open all links in a new tab, not in the iframe --> <!-- Open all links in a new tab, not in the iframe -->
@@ -14,7 +14,6 @@
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400italic,700,300,400' rel='stylesheet' <link href='https://fonts.googleapis.com/css?family=Open+Sans:400italic,700,300,400' rel='stylesheet'
type='text/css'> type='text/css'>
<link rel="stylesheet" type="text/css" href="{% static "css/screen.css" %}"> <link rel="stylesheet" type="text/css" href="{% static "css/screen.css" %}">
<script src="https://code.jquery.com/jquery-1.8.3.min.js" <script src="https://code.jquery.com/jquery-1.8.3.min.js"
@@ -22,18 +21,6 @@
<script src="https://cdn.ravenjs.com/1.3.0/jquery,native/raven.min.js"></script> <script src="https://cdn.ravenjs.com/1.3.0/jquery,native/raven.min.js"></script>
<script>Raven.config('{% sentry_public_dsn %}').install()</script> <script>Raven.config('{% sentry_public_dsn %}').install()</script>
<style>
body, html{
padding:0;
height:100%;
}
.embed_container{
border:5px solid #e9e9e9;
padding-top:12px;
min-height:100%;
width:100%;
}
</style>
</head> </head>
<body> <body>

11
templates/registration/login.html
View File

@@ -2,14 +2,9 @@
{% block title %}Login{% endblock %} {% block title %}Login{% endblock %}
{% block extra-head %}
{% if next %}
<link rel="alternate" type="application/json+oembed"
href="{{request.scheme}}://{{request.META.HTTP_HOST}}{{next}}oembed"
title="RIGS Event Embed" />
{% endif %}
{% endblock %}
{% block content %} {% block content %}
<div class="text-center">
<h1>R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></h1>
</div>
{% include 'registration/loginform.html' %} {% include 'registration/loginform.html' %}
{% endblock %} {% endblock %}

4
templates/registration/login_embed.html
View File

@@ -4,7 +4,7 @@
{% block title %}Login{% endblock %} {% block title %}Login{% endblock %}
{% block content %} {% block content %}
<div style="text-align:center;"> <div class="text-center">
<h1>R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></h1> <h1>R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></h1>
</div> </div>
@@ -22,7 +22,7 @@
{% render_field form.password class+="form-control" placeholder=form.password.label %} {% render_field form.password class+="form-control" placeholder=form.password.label %}
</div> </div>
<input type="submit" value="Login" class="btn btn-primary"/> <input type="submit" value="Login" class="btn btn-primary pull-right"/>
<input type="hidden" name="next" value="{{ next }}"/> <input type="hidden" name="next" value="{{ next }}"/>
</form> </form>
</div> </div>

2
templates/registration/loginform.html
View File

@@ -12,9 +12,11 @@
<label for="{{ form.password.id_for_label }}">{{ form.password.label }}</label> <label for="{{ form.password.id_for_label }}">{{ form.password.label }}</label>
{% render_field form.password class+="form-control" placeholder=form.password.label %} {% render_field form.password class+="form-control" placeholder=form.password.label %}
</div> </div>
<div class="text-right">
<a href="{% url 'registration_register' %}" class="btn">Register</a> <a href="{% url 'registration_register' %}" class="btn">Register</a>
<a href="{% url 'password_reset' %}" class="btn">Forgotten Password</a> <a href="{% url 'password_reset' %}" class="btn">Forgotten Password</a>
<input type="submit" value="Login" class="btn btn-primary"/> <input type="submit" value="Login" class="btn btn-primary"/>
<input type="hidden" name="next" value="{{ next }}"/> <input type="hidden" name="next" value="{{ next }}"/>
</div>
</form> </form>
</div> </div>