Making it pretty

This commit is contained in:
Raynaldo Rivera
2014-10-05 18:34:02 -07:00
parent a021141b47
commit b748c223c8
25 changed files with 231 additions and 142 deletions

View File

@@ -1,5 +1,4 @@
{% load staticfiles %}
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
@@ -29,16 +28,17 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">{{ ALLIANCE_NAME }}</a>
<a class="navbar-brand" href="{% url 'auth_dashboard' %}">{{ ALLIANCE_NAME }}</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
{% if user.is_authenticated %}
<li><a href="/logoutuser/">Logout</a></li>
<li><a href="{% url 'auth_logout_user' %}">Logout</a></li>
{% else %}
<li><a href="/loginuser/">Login</a></li>
<li><a href="{% url 'auth_login_user' %}">Login</a></li>
{% endif %}
</ul>
</div>
</div>
</div>
</div>
@@ -49,10 +49,10 @@
{% if user.is_authenticated %}
<div class="col-sm-3 col-md-2 sidebar">
<ul class="nav nav-sidebar">
<li><a href="/">Overview</a></li>
<li><a href="/characters">Characters</a></li>
<li><a href="/apikeymanagment">Api Keys</a></li>
<li><a href="/applications">Applications</a></li>
<li><a href="{% url 'auth_dashboard' %}">Overview</a></li>
<li><a href="{% url 'auth_characters' %}">Characters</a></li>
<li><a href="{% url 'auth_api_key_management' %}">Api Keys</a></li>
<li><a href="{% url 'auth_applications' %}">Applications</a></li>
<li><a href="#">Help</a></li>
</ul>
</div>
@@ -60,6 +60,7 @@
{% block content %}
{% endblock content %}
</div>
</div>
<!-- Bootstrap core JavaScript

View File

@@ -1,15 +1,52 @@
{% extends "public/base.html" %}
{% load staticfiles %}
<style>
body {
background: url('{% static 'img/index_bg.jpg' %}') no-repeat scroll;
background-size: 100% 100%;
}
{% block title %}Alliance Auth{% endblock %}
div {
height: 200px;
width: 400px;
{% block page_title %}Something something here{% endblock page_title %}
position: fixed;
top: 60%;
left: 50%;
margin-top: -100px;
margin-left: -200px;
}
{% block content %}
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
</style>
<h1 class="page-header">Dashboard</h1>
<div class="container">
<p>WAT</p>
</div>
</div>
{% endblock content %}
<html>
<head lang="en">
<meta charset="UTF-8">
<title>The 99 Percent Eve Alliance</title>
</head>
<body>
<div id="content">
<p style="text-align:center">
<a href="{% url 'auth_dashboard' %}">
<img src="{% static 'img/index_images/auth.png' %}" border="0">
</a>
</p>
<p style="text-align:center">
<a href="/forums/">
<img src="{% static 'img/index_images/forums.png' %}" border="0">
</a>
</p>
<p style="text-align:center">
<a href="/killboard/">
<img src="{% static 'img/index_images/killboard.png' %}" border="0">
</a>
</p>
<p style="text-align:center">
<a href="https://youtube.com/">
<img src="{% static 'img/index_images/media.png' %}" border="0">
</a>
</p>
</div>
</body>
</html>

View File

@@ -9,13 +9,16 @@
<div class="row-fluid">
<div class="center-block" style="center">
<p>
<form class="form-signin" role="form" action="/loginuser/" method="POST">
{% if error %}
<div class="alert alert-danger" role="alert">Username/Password Invalid</div>
{% endif %}
<form class="form-signin" role="form" action="{% url 'auth_login_user' %}" method="POST">
{% csrf_token %}
<h2 class="form-signin-heading">Please sign in</h2>
{{form.as_p}}
<button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
</form>
<p><a href="/register/">Register Here</a>
<p><a href="{% url 'auth_register' %}">Register Here</a>
</p>
</div>
</div>

View File

@@ -9,7 +9,10 @@
<div class="row-fluid">
<div class="center-block" style="center">
<p>
<form action="/register/" method="POST">
{% if error %}
<div class="alert alert-danger" role="alert">Username Already Registered</div>
{% endif %}
<form action="{% url 'auth_register' %}" method="POST">
{% csrf_token %}
<h2 class="form-signin-heading">Register Account</h2>
<p>

View File

@@ -12,7 +12,7 @@
<div class="row-fluid">
<div class="center-block" style="center">
<p>
<form action="/apikeymanagment/" method="POST">
<form action="{% url 'auth_api_key_management' %}" method="POST">
{% csrf_token %}
<h2 class="form-signin-heading">Update Api:</h2>
<p>

View File

@@ -10,9 +10,9 @@
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
<h3> Really dumb right now</h3>
<p> Click button to add user to services</p>
<a href="/activateforum/"><button type="button" class="btn btn-default">Activate Forum</button></a>
<a href="/activatejabber/"><button type="button" class="btn btn-default">Activate Jabber</button></a>
<a href="/activatemumble/"><button type="button" class="btn btn-default">Activate Jabber</button></a>
<a href="{% url 'auth_activate_forum' %}"><button type="button" class="btn btn-default">Activate Forum</button></a>
<a href="{% url 'auth_activate_jabber' %}"><button type="button" class="btn btn-default">Activate Jabber</button></a>
<a href="{% url 'auth_activate_mumble' %}"><button type="button" class="btn btn-default">Activate Jabber</button></a>
</div>

View File

@@ -25,7 +25,7 @@
</div>
</div>
<div class="col-md-offset-8">
<a href="/maincharacterchange/{{character.character_id}}"><button type="button" class="btn btn-primary">Make Primary</button></a>
<a href="/main_character_change/{{character.character_id}}"><button type="button" class="btn btn-primary">Make Primary</button></a>
</div>
</div>
</div>

View File

@@ -0,0 +1,15 @@
{% extends "public/base.html" %}
{% block title %}Alliance Auth{% endblock %}
{% block page_title %}Something something here{% endblock page_title %}
{% block content %}
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
<h1 class="page-header">Dashboard</h1>
<div class="container">
<p>WAT</p>
</div>
</div>
{% endblock content %}