New theme, MMD!

This commit is contained in:
2011-05-21 21:12:49 +01:00
parent e2fb140ce9
commit f99041472d
8 changed files with 136 additions and 72 deletions

View File

@@ -64,12 +64,12 @@
{% regroup skills by skill.group as skill_group %}
{% for group in skill_group %}
<tr class="skill_heading"><th colspan=3>{{ group.grouper }}</th</tr>
<tr class="skill_heading" id="{{ group.grouper }}"><th colspan=3>{{ group.grouper }}</th></tr>
{% for skill in group.list %}
{% if skill.in_training %}
<tr style="display:none;" class="intraining"><td>{{ skill.skill.name }} - Training to Level {{ skill.in_training }}</td><td><img src="/static/img/skills/level{{ skill.level }}.gif" alt="Level {{ skill.level }}" /></td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
<tr class="child intraining" parent="{{ group.grouper }}"><td>{{ skill.skill.name }} - Training to Level {{ skill.in_training }}</td><td><img src="/static/img/skills/level{{ skill.level }}.gif" alt="Level {{ skill.level }}" /></td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
{% else %}
<tr style="display:none;"><td>{{ skill.skill.name }} </td><td><img src="/static/img/skills/level{{ skill.level }}.gif" alt="Level {{ skill.level }}" /></td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
<tr class="child" parent="{{ group.grouper }}"><td>{{ skill.skill.name }} </td><td><img src="/static/img/skills/level{{ skill.level }}.gif" alt="Level {{ skill.level }}" /></td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
{% endif %}
{% endfor %}
{% endfor %}
@@ -81,26 +81,24 @@
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript">
$(function(){
$(".skill_heading").bind("click", function(){
$this = $(this);
$this.nextUntil(".skill_heading").toggle('fast');
if($this.hasClass("toggle_off")){
$this.removeClass("toggle_off").removeClass("toggle_on");
}else{
$this.removeClass("toggle_on").removeClass("toggle_off");
}
$(".skill_heading")
.css("cursor", "pointer")
.attr("title", "Click to expand/collapse")
.click(function(){
$('tr[parent$=' + $(this).attr('id') + ']').toggle();
});
$("#openAll").bind("click", function(e){
e.preventDefault();
$(".character_skills tr").css({ display: "table-row" });
$(".child").show();
});
$("#collapseAll").bind("click", function(e){
e.preventDefault();
$(".character_skills tr:not(.skill_heading)").css({ display: "none" });
$(".child").hide();
});
$('tr[parent]').hide();
});
</script>

View File

@@ -4,7 +4,7 @@
{% block content %}
<h3>Search All Applications</h3>
<h1>Search All Applications</h1>
<form method="GET" action="{% url hr.views.admin_applications %}">
<input type="text" name="q" />
<input type="submit" value="Search" />

View File

@@ -3,6 +3,8 @@
{% block title %}HR{% endblock %}
{% block content %}
<H1>HR</H1>
<h3>Applications</h3>
<p><a href="{% url hr.views.view_applications %}">View your current open applications</a><br/>
<a href="{% url hr.views.add_application %}">Create a application</a><br/></p>

View File

@@ -4,22 +4,21 @@ body
padding: 0;
font: 80%/1.2 helvetica, arial, sans-serif;
color: #444;
background: #000;
background: #6D825D;
}
#container
{
margin: 0 auto;
width: 800px;
background:#fff;
width: 960px;
background:#9FB190;
border-radius: 15px;
}
#header
{
background:#ccc;
background: url('http://kb.pleaseignore.com/banner/sketch_banner.png');
background-position: -25px;
height: 164px;
background: #6D825D url('/static/img/mmd-header.png');
height: 180px;
padding: 20px;
}
@@ -28,8 +27,9 @@ body
#navigation
{
float: left;
width: 800px;
background:#333;
width: 100%;
height: 45px;
background:#5F6757;
}
#navigation ul
@@ -48,13 +48,13 @@ body
{
display: block;
float: left;
padding: 5px 10px;
padding: 15px 15px;
color:#fff;
text-decoration: none;
border-right: 1px solid#fff;
border-right: 2px solid #545b4d;
}
#navigation li a:hover { background:#383; }
#navigation li a:hover { background:#486531; }
#content
{
@@ -62,13 +62,52 @@ body
padding: 20px;
}
#content h1
{
font-size: 2em;
color:#222;
text-shadow: 0px 1px 3px #555;
}
#content h2
{
color:#000;
font-size: 160%;
color:#222;
font-size: 1.5em;
margin: 0 0 .5em;
text-shadow: 0px 1px 3px #555;
}
#content a, #content a:visited, #content a:active
{
color:#486531;
}
#content a.button
{
background: none repeat scroll 0 0 #486531;
/*set up the layout just right*/
display: inline-block;
padding: 5px 10px 6px;
position: relative;
/*style the cursor and text of the button*/
color: #fff !important;
text-decoration: none;
font-weight: bold;
line-height: 1;
cursor: pointer;
/*add rounded corners in mozilla and webkit*/
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
/*Add box shadows and a bottom border with rgba colors*/
-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
text-shadow: 0 -1px 1px rgba(0,0,0,0.25);
border-bottom: 1px solid rgba(0,0,0,0.25);
}
#footer
{
background:#ccc;
@@ -94,45 +133,56 @@ body
}
table
{text-align: center;
font-weight: normal;
font-size: 11px;
color: #fff;
background-color: #666;
border: 0px;
border-collapse: collapse;
border-spacing: 0px;}
{
text-align: center;
font-weight: normal;
font-size: 11px;
color: #fff;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 15px;
}
table td
{
color: #000;
padding: 4px;
text-align: left;
border: 1px #fff solid;}
color: #000;
padding: 4px;
text-align: left;
}
table tr { background-color: #CCC; }
table tr:nth-child(odd) { background-color: #ddd; }
table tr:hover { background-color: #eed; }
table tr#alt-application { background-color: #FFA545; }
table tr {
background-color: #b6c9a6;
}
table tr:nth-child(odd) {
background-color: #c3d7b2;
}
table tr:hover {
background-color: #eed;
}
table tr#alt-application {
background-color: #FFA545;
}
table th
{background-color: #333;
{background-color: #5F6D53;
color: #fff;
padding: 4px;
text-align: left;
border-bottom: 2px #fff solid;
font-size: 12px;
font-weight: bold;}
table th a
{color: #fff;
{color: #fff !important;
}
table th a:visted
{color: #fff;
{
color: #fff !important;
}
.character_info > div { margin-bottom: 2em; }
.character_info .character_portrait, .character_info .character_corporation, .character_info .character_alliance { float: right; }
.character_info .character_corporation { clear: right; margin-left: 2em; }
@@ -146,10 +196,26 @@ table th a:visted
.toggle_off th { background-color: #000; }
.skill_controls { margin-bottom: .5em; }
.skill_controls a {
background: none repeat scroll 0 0 #CC6600;
color: #FFFFFF;
background: none repeat scroll 0 0 #486531;
/*set up the layout just right*/
display: inline-block;
padding: 4px 12px 4px;
padding: 5px 10px 6px;
position: relative;
/*style the cursor and text of the button*/
color: #fff !important;
text-decoration: none;
margin-bottom: 4px;
font-weight: bold;
line-height: 1;
cursor: pointer;
/*add rounded corners in mozilla and webkit*/
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
/*Add box shadows and a bottom border with rgba colors*/
-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
text-shadow: 0 -1px 1px rgba(0,0,0,0.25);
border-bottom: 1px solid rgba(0,0,0,0.25);
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

View File

@@ -43,9 +43,6 @@
{% endif %}
{% block content %}{% endblock %}
</div>
<div id="footer">
&nbsp;
</div>
</div>
</body>
</html>

View File

@@ -3,6 +3,7 @@
{% block title %}User Lookup{% endblock %}
{% block content %}
<h1>User Lookup</h1>
<form action="{% url sso.views.user_lookup %}" method="post">
<table>
{{ form.as_table }}

View File

@@ -47,16 +47,19 @@ function refresh_apikey(key) {
<b>Groups:</b> {{ user.groups.all|join:", " }}<br/>
</p>
<p>
<div class="skill_controls">
<a href="{% url sso.views.refresh_access %}">Update Access</a>
<a href="{% url django.contrib.auth.views.password_change %}">Change Your Password</a>
<a href="{% url sso.views.email_change %}">Change Your E-mail</a>
</div>
<a href="{% url sso.views.refresh_access %}" class="button">Update Access</a>
<a href="{% url django.contrib.auth.views.password_change %}" class="button">Change Your Password</a>
<a href="{% url sso.views.email_change %}" class="button">Change Your E-mail</a>
</p>
<br/>
<h2>Auth API Services</h2>
<p>Auth API Servies use Auth for your login information with the use of a seperate password. To reset your services password click the link below</p>
<p><a href="{% url sso.views.set_apipasswd %}">Reset Auth API Services Password</a></p>
<p><a href="{% url sso.views.set_apipasswd %}" class="button">Change External Services Password</a></p>
<br/>
{% if user.eveaccount_set.all %}
<h2>Service Accounts</h2>
@@ -88,7 +91,7 @@ function refresh_apikey(key) {
{% endif %}
<p>
<a href="{% url sso.views.service_add %}">Add Service</a>
<a href="{% url sso.views.service_add %}" class="button">Add Service</a>
</p>
<br/>
@@ -123,7 +126,7 @@ setup.</p>
</table>
{% endif %}
<p>
<a href="{% url eve_api.views.eveapi_add %}">Add a Eve API key</a>
<a href="{% url eve_api.views.eveapi_add %}" class="button">Add a Eve API key</a>
</p>
<br/>
@@ -148,11 +151,8 @@ setup.</p>
</table>
{% endif %}
<p>
<a href="{% url reddit.views.reddit_add %}">Add a Reddit account</a>
<a href="{% url reddit.views.reddit_add %}" class="button">Add a Reddit account</a>
</p>
{% endif %}
<p>If you encounter any errors during using this service, copy the massive
error message into <a href="http://pastebin.com/">Pastebin</a> and give
Matalok/Aevum Decessus a good kicking on IRC/Jabber/Email or on the Forums.</p>
{% endblock %}