arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-23 16:32:15 +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

17
templates/base_embed.html
View File

@@ -1,12 +1,12 @@
{% load static from staticfiles %}
{% load raven %}
<!DOCTYPE html>
<html
dir="{% if LANGUAGE_BIDI %}rtl{% else %}ltr{% endif %}"
xml:lang="{% firstof LANGUAGE_CODE 'en' %}"
lang="{% firstof LANGUAGE_CODE 'en' %}">
lang="{% firstof LANGUAGE_CODE 'en' %}"
class="embedded">
<head>
<base target="_blank" />
<!-- 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'
type='text/css'>
<link rel="stylesheet" type="text/css" href="{% static "css/screen.css" %}">
<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>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>
<body>

11
templates/registration/login.html
View File

@@ -2,14 +2,9 @@
{% 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 %}
<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' %}
{% endblock %}

4
templates/registration/login_embed.html
View File

@@ -4,7 +4,7 @@
{% block title %}Login{% endblock %}
{% 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>
</div>
@@ -22,7 +22,7 @@
{% render_field form.password class+="form-control" placeholder=form.password.label %}
</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 }}"/>
</form>
</div>

10
templates/registration/loginform.html
View File

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