diff --git a/app/eve_api/templates/eve_api/character.html b/app/eve_api/templates/eve_api/character.html index c9f566a..e0ea979 100644 --- a/app/eve_api/templates/eve_api/character.html +++ b/app/eve_api/templates/eve_api/character.html @@ -64,12 +64,12 @@ {% regroup skills by skill.group as skill_group %} {% for group in skill_group %} - {{ group.grouper }} + {{ group.grouper }} {% for skill in group.list %} {% if skill.in_training %} - {{ skill.skill.name }} - Training to Level {{ skill.in_training }}Level {{ skill.level }}{{ skill.skillpoints|intcomma }} SP + {{ skill.skill.name }} - Training to Level {{ skill.in_training }}Level {{ skill.level }}{{ skill.skillpoints|intcomma }} SP {% else %} - {{ skill.skill.name }} Level {{ skill.level }}{{ skill.skillpoints|intcomma }} SP + {{ skill.skill.name }} Level {{ skill.level }}{{ skill.skillpoints|intcomma }} SP {% endif %} {% endfor %} {% endfor %} @@ -81,26 +81,24 @@ diff --git a/app/hr/templates/hr/applications/admin/view_list.html b/app/hr/templates/hr/applications/admin/view_list.html index c835356..347a716 100644 --- a/app/hr/templates/hr/applications/admin/view_list.html +++ b/app/hr/templates/hr/applications/admin/view_list.html @@ -4,7 +4,7 @@ {% block content %} -

Search All Applications

+

Search All Applications

diff --git a/app/hr/templates/hr/index.html b/app/hr/templates/hr/index.html index f3ac1fd..10a3267 100644 --- a/app/hr/templates/hr/index.html +++ b/app/hr/templates/hr/index.html @@ -3,6 +3,8 @@ {% block title %}HR{% endblock %} {% block content %} +

HR

+

Applications

View your current open applications
Create a application

diff --git a/app/media/css/style.css b/app/media/css/style.css index 72e490b..a913503 100644 --- a/app/media/css/style.css +++ b/app/media/css/style.css @@ -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; - display: inline-block; - padding: 4px 12px 4px; - text-decoration: none; - margin-bottom: 4px; + 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*/ + 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); + + } diff --git a/app/media/img/mmd-header.png b/app/media/img/mmd-header.png new file mode 100644 index 0000000..02d9d18 Binary files /dev/null and b/app/media/img/mmd-header.png differ diff --git a/app/templates/base.html b/app/templates/base.html index a65a32e..6d26431 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -43,9 +43,6 @@ {% endif %} {% block content %}{% endblock %} - diff --git a/app/templates/sso/lookup/userlookup.html b/app/templates/sso/lookup/userlookup.html index e2d4db8..e4e3b55 100644 --- a/app/templates/sso/lookup/userlookup.html +++ b/app/templates/sso/lookup/userlookup.html @@ -3,6 +3,7 @@ {% block title %}User Lookup{% endblock %} {% block content %} +

User Lookup

{{ form.as_table }} diff --git a/app/templates/sso/profile.html b/app/templates/sso/profile.html index 5ab5c45..ec23037 100644 --- a/app/templates/sso/profile.html +++ b/app/templates/sso/profile.html @@ -47,16 +47,19 @@ function refresh_apikey(key) { Groups: {{ user.groups.all|join:", " }}

-

-Update Access -Change Your Password -Change Your E-mail -
+Update Access +Change Your Password +Change Your E-mail

+
+

Auth API Services

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

-

Reset Auth API Services Password

+ +

Change External Services Password

+ +
{% if user.eveaccount_set.all %}

Service Accounts

@@ -88,7 +91,7 @@ function refresh_apikey(key) { {% endif %}

-Add Service +Add Service


@@ -123,7 +126,7 @@ setup.

{% endif %}

-Add a Eve API key +Add a Eve API key


@@ -148,11 +151,8 @@ setup.

{% endif %}

-Add a Reddit account +Add a Reddit account

{% endif %} -

If you encounter any errors during using this service, copy the massive -error message into Pastebin and give -Matalok/Aevum Decessus a good kicking on IRC/Jabber/Email or on the Forums.

{% endblock %}