Added more changes

This commit is contained in:
Raynaldo Rivera
2014-10-14 20:57:25 -07:00
parent dbcade4146
commit bae1670c01
7 changed files with 114 additions and 193 deletions

View File

@@ -19,7 +19,6 @@
<link href="{% static 'css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
<link href="{% static 'css/sb-admin-2.css' %}" rel="stylesheet">
{% block extra_css %}{% endblock extra_css %}
</head>
<body>
@@ -27,12 +26,15 @@
<div id="wrapper">
<!-- Navigation -->
<nav class="navbar navbar-inverse navbar-static-top" role="navigation" style="margin-bottom: 0">
<div class="navbar-header">
<a class="navbar-brand" href="{% url 'auth_dashboard' %}">{{ ALLIANCE_NAME }}</a>
<nav class="navbar navbar-inverse navbar-static-top" role="navigation">
<div class="navbar-header ">
<a class="navbar-brand ">
<div class="fa fa-cog fa-spin"></div>
{{ ALLIANCE_NAME }}
</a>
</div>
<!-- /.navbar-header -->
<ul class="nav navbar-top-links navbar-right">

View File

@@ -7,42 +7,53 @@
{% block extra_css %}{% endblock extra_css %}
{% block content %}
<div class="col-lg-12">
<div class="col-lg-12 container">
<h1 class="page-header text-center">Characters</h1>
<div class="container-fluid">
<div class="col-lg-12 container" id="example">
{% if authinfo.main_char_id %}
{% else %}
<div class="alert alert-danger" role="alert">No primary character set</div>
{% endif %}
{% for character in characters %}
<div class="well profile col-md-6 center-block">
<div class="col-sm-12">
<div class="col-xs-12 col-sm-8">
<h3>{{character.character_name}}</h3>
<p><strong>Alliance: </strong> {{character.alliance_name}} </p>
<p><strong>Corporation: </strong>{{character.corporation_name}}</p>
<p><strong>Corporation Ticker: </strong> {{character.corporation_ticker}} </p>
</div>
<div class="col-xs-8 col-sm-4 text-center">
<figure>
<img src="https://image.eveonline.com/Character/{{character.character_id}}_128.jpg" alt="" class="img-responsive">
<br>
<a href="/main_character_change/{{character.character_id}}">
{% ifequal character.character_id authinfo.main_char_id %}
<button type="button" class="btn btn-disable" disabled>Make Primary</button>
{% else %}
<button type="button" class="btn btn-primary">Make Primary</button>
{% endifequal %}
</a>
</figure>
</div>
</div>
<div class="col-xs-offset-8 col-sm-4 text-center">
<div class="row">
{% for character in characters %}
<div class="col-lg-6">
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">
<div class="row">
<div class="col-md-12">
<div class="text-left col-md-8">
{{character.character_name}}
</div>
<div class="text-right col-md-4">
{% ifequal character.character_id authinfo.main_char_id %}
<button type="button" class="btn btn-default btn-xs" disabled>Make Primary</button>
{% else %}
<button type="button" class="btn btn-primary btn-xs">Make Primary</button>
{% endifequal %}
</div>
</div>
</div>
</div>
</div>
<div class="panel-body">
<div class="col-lg-5 col-sm-2"><img class=
"ra-avatar img-responsive" src=
"https://image.eveonline.com/Character/{{character.character_id}}_128.jpg"></div>
<div class="col-lg-7 col-sm-2">
<p><strong>Alliance: </strong> {{character.alliance_name}} </p>
<p><strong>Corporation: </strong>{{character.corporation_name}}</p>
<p><strong>Corporation Ticker: </strong> {{character.corporation_ticker}} </p>
</div>
</div>
</div>
</div>
</div>
{% endfor %}
{% endfor %}
</div>
</div>
</div>

View File

@@ -1,15 +1,66 @@
{% extends "public/base.html" %}
{% block title %}Alliance Auth{% endblock %}
{% block title %}Alliance Auth{% endblock%}
{% block page_title %}Something something here{% endblock page_title %}
{% block content %}
<div class="col-lg-12">
<div class="col-lg-12">
<h1 class="page-header text-center">Dashboard</h1>
<div class="container">
<p>WAT</p>
{% if perms.auth.alliance_member %}
<div class="col-lg-12 container" id="example">
<div class="panel panel-default">
<div class="panel-heading">Alliance Announcment:</div>
<div class="panel-body">Something something dark side </div>
</div>
<div class="row">
<div class="col-lg-6">
{% for character in characters %}
{% ifequal character.character_id authinfo.main_char_id %}
<div class="panel panel-default">
<div class="panel-heading">Main character:</div>
<div class="panel-body">
<div class="col-lg-5 col-sm-2"><img class=
"ra-avatar img-responsive" src=
"https://image.eveonline.com/Character/{{character.character_id}}_128.jpg"></div>
<div class="col-lg-7 col-sm-2">
<h4 class="">{{character.character_name}}</h4>
<p>{{character.corporation_name}}</p>
<p>{{character.alliance_name}}</p>
</div>
</div>
</div>
{% endifequal %}
{% endfor %}
</div>
<div class="col-lg-6">
<div class="panel panel-default">
<div class="panel-heading">Groups:</div>
<div class="panel-body">
<div style="height: 128px;overflow:-moz-scrollbars-vertical;overflow-y:auto;">
<table class="table table-striped">
{% for group in user.groups.all %}
<tr>
<td>
<p class="">{{ group.name }}</p>
</td>
</tr>
{% endfor %}
</table>
</div>
</div>
</div>
</div>
</div>
</div>
{% else %}
<p> Not part of the alliance</p>
{% endif %}
</div>
{% endblock content %}