diff --git a/app/eve_api/templates/eve_api/alliance.html b/app/eve_api/templates/eve_api/alliance.html index 65eaf42..bff0fcf 100644 --- a/app/eve_api/templates/eve_api/alliance.html +++ b/app/eve_api/templates/eve_api/alliance.html @@ -15,8 +15,16 @@

Corporations

- - + + +
NameMembersAverage SPAPI CoverageDirector Key?
+ + + {% for corp in corporations %} {% endfor %} diff --git a/app/eve_api/templates/eve_api/character.html b/app/eve_api/templates/eve_api/character.html index 57225ea..e412c20 100644 --- a/app/eve_api/templates/eve_api/character.html +++ b/app/eve_api/templates/eve_api/character.html @@ -4,44 +4,58 @@ {% load naturaltimediff %} {% block content %} -
-

{{ character.name }}

+ -
- -
- -
- {{ character.corporation.ticker }} - -
- - {% if character.corporation.alliance %} -
- {{ character.corporation.alliance.ticker }} - -
- {% endif %} +
+
+

Attributes

-
-

Attributes

- -
    -
  • Race: {{ character.get_race_display }}
  • -
  • Gender: {{ character.get_gender_display }}
  • -
  • Corporation: {{ character.corporation.name }}
  • -
  • Joined Corporation: {{ character.corporation_date|date:"Y/m/d H:i:s" }} ({{ character.corporation_date|naturaltimediff }})
  • +
      +
    • Race: {{ character.get_race_display }}
    • +
    • Gender: {{ character.get_gender_display }}
    • +
    • Corporation: {{ character.corporation.name }}
    • +
    • Joined Corporation: {{ character.corporation_date|date:"Y/m/d H:i:s" }}
    • {% if character.corporation.alliance %} -
    • Alliance: {{ character.corporation.alliance.name }}
    • +
    • Alliance: {{ character.corporation.alliance.name }}
    • {% endif %} -
    • Security Status: {{ character.security_status|floatformat:2 }}
    • -
    • Director: {{ character.director }}
    • +
    • Security Status: {{ character.security_status|floatformat:2 }}
    • +
    • Director: {{ character.director }}
    • {% if character.current_training %} -
    • Training: {{ character.current_training.skill.name}} to Level {{ character.current_training.in_training }}
    • +
    • Training: {{ character.current_training.skill.name}} to Level {{ ch$ {% endif %} -
    -
+ +
+
+
+ +
+
+ + +
+ {% if character.corporation.alliance %} + +
+ +
+ {% endif %} +
+
+
+
+

Stats

diff --git a/app/eve_api/templates/eve_api/character_list.html b/app/eve_api/templates/eve_api/character_list.html index c88534d..859d561 100644 --- a/app/eve_api/templates/eve_api/character_list.html +++ b/app/eve_api/templates/eve_api/character_list.html @@ -2,23 +2,29 @@ {% load humanize %} {% block content %} -

Character List

+
NameMembersAverage SPAPI CoverageDirector Key?
{{ corp }}{{ corp.member_count }}{{ corp.average_sp|intcomma }}{{ corp.api_key_coverage|floatformat:2 }}%{{ corp.director_api_keys.count }}
- -{% for acc in accounts %} -{% if acc.characters.count %} - -{% for char in acc.characters.all %} - - - - - - -{% endfor %} -{% endif %} -{% endfor %} + + + + + {% for acc in accounts %} + {% if acc.characters.count %} + + {% for char in acc.characters.all %} + + + + + + + {% endfor %} + {% endif %} + {% endfor %} +
Character NameCorporationAllianceSkillpointsTraining
Key {{ acc.pk }} {% if acc.training == 0 %}(No Character Training){% endif %}
{{ char.name }}{{ char.corporation }}{% if char.corporation.alliance %}{{ char.corporation.alliance }}{% endif %}{{ char.total_sp|intcomma }} SP{% if char.current_training %}{{ char.current_training.skill.name }} to Level {{ char.current_training.in_training }}{% endif %}
Character NameCorporationAllianceSkillpointsTraining
Key {{ acc.pk }} {% if acc.training == 0 %}(No Character Training){% endif %}
{{ char.name }}{{ char.corporation }}{% if char.corporation.alliance %}{{ char.corporation.alliance }}{% endif %}{{ char.total_sp|intcomma }} SP{% if char.current_training %}{{ char.current_training.skill.name }} to Level {{ char.current_training.in_training }}{% endif %}
{% endblock %} diff --git a/app/eve_api/templates/eve_api/log.html b/app/eve_api/templates/eve_api/log.html index ca3d719..6d0f77c 100644 --- a/app/eve_api/templates/eve_api/log.html +++ b/app/eve_api/templates/eve_api/log.html @@ -3,14 +3,30 @@ {% block title %}EVE API Access Logs{% endblock %} {% block content %} -

Access Logs for API Key {{ userid }}

- - -{% for log in logs %} - - - - -{% endfor %} + + +
Service IDDate / TimeAPI
{{ log.service }}{{ log.time_access }}{{ log.document }}
+ + + + + {% for log in logs %} + + + + + + {% endfor %} +
Service IDDate / TimeAPI
{{ log.service }}{{ log.time_access }}{{ log.document }}
+ + + + {% endblock %} diff --git a/app/groups/templates/groups/group_list.html b/app/groups/templates/groups/group_list.html index 8638906..1e8a4ca 100644 --- a/app/groups/templates/groups/group_list.html +++ b/app/groups/templates/groups/group_list.html @@ -2,13 +2,26 @@ {% block content %} -

Groups List

+

This is the list of your current groups, and groups you can request to be a member of.

- + + + + +
{% if group_list %} + + + {% for id, group, description, status, requestable, fixed, pending, moderated in group_list %} @@ -18,6 +31,7 @@ {% if status == 'Admin' or request.user.is_superuser %}{% if not fixed %}Admin{% endif %}{% endif %} {% endfor %} +
Group NameDescriptionStatusActions
{{ group }} {{ description }}
{% else %} No groups are available. diff --git a/app/sso/templates/sso/emailchange.html b/app/sso/templates/sso/emailchange.html index 91b0188..5f4d8f7 100644 --- a/app/sso/templates/sso/emailchange.html +++ b/app/sso/templates/sso/emailchange.html @@ -3,14 +3,18 @@ {% block title %}Change your E-mail address{% endblock %} {% block content %} +
- -{{ form.as_table }} -
-
-{% csrf_token %} - +
+ + {{ form.as_table }} +
+ {% csrf_token %} + +
{% endblock %} diff --git a/app/sso/templates/sso/profile.html b/app/sso/templates/sso/profile.html index 2068a7c..7a1e64e 100644 --- a/app/sso/templates/sso/profile.html +++ b/app/sso/templates/sso/profile.html @@ -8,12 +8,125 @@ {% block content %} - - + -function refresh_apikey(key) { + + + + +
+ + +
+

+ Username: {{ user.username }}
+ Email: {{ user.email }}
+ Primary Character: {{ user.get_profile.primary_character }}
+ Groups: {{ user.groups.all|join:", " }}
+

+

+ Update Access + Change Password + Change E-mail + Change Primary Character +

+
+ + +
+

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

+ +

Change External Services Password

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

Service Accounts

+

Services not fully integrated into Auth, and which a seperate username/password is required.

+ {% if user.serviceaccount_set.all %} + + + {% for acc in user.serviceaccount_set.all %} + + + + + + + {% endfor %} +
ServiceUsernameURLActiveActions
{{ acc.service }}{{ acc.service_uid }}{{ acc.service.url }}{% if acc.active %}Yes{% else %}No{% endif %} + {% if acc.active %} + {% if acc.service.settings.require_password %}Reset / {% endif %} + Delete + {% if acc.service.provide_login %} +  / Login + {% endif %} + {% endif %} +
+ {% endif %} +

+ Add Service +

+{% endif %} +
+ + +
+

Eve API Keys

+

Adding an Eve API key will allow you to access any services allowed for your + corporation. Limited keys are accepted for service validation. API keys + are stored for on-going authentication. As the assigned owner of a key you may + remove them at any time, but this may affect any existing services you have + setup.

+ {% if user.eveaccount_set.all %} + + + + + + {% for acc in user.eveaccount_set.all %} + + + + + + + + + + {% endfor %} + +
User IDAPI KeyDescriptionTypeActiveLast UpdatedActions
{{ acc.api_user_id }}{{ acc.api_key|slice:":10" }}…{{ acc.description }}{{ acc.get_api_keytype_display }}{% if acc.api_keytype == 4 %} *{% endif %}{{ acc.get_api_status_display }}{{ acc.api_last_updated|naturaltimediff }}{% ifswitch api-disableprocessing %}{% else %}Refresh,  + Update Key, {% endifswitch %} + Logs{% ifswitch eve-keydelete %},  + Delete{% endifswitch %}
+ {% endif %} + +

Warning Character API Keys are not included in any authorization checks, you will not be able to submit applications or access any services with them.

+

+ {% ifswitch api-disableprocessing %} + {% else %} + Add a Eve API key + {% endifswitch %} +

+ + - - -

Your Profile

- -

-Username: {{ user.username }}
-Email: {{ user.email }}
-Primary Character: {{ user.get_profile.primary_character }}
-Groups: {{ user.groups.all|join:", " }}
-

-

-Update Access -Change Password -Change E-mail -Change Primary Character -

- -
- -

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

- -

Change External Services Password

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

Service Accounts

-

Services not fully integrated into Auth, and which a seperate username/password is required.

-{% if user.serviceaccount_set.all %} - - -{% for acc in user.serviceaccount_set.all %} - - - - - - -{% endfor %} -
ServiceUsernameURLActiveActions
{{ acc.service }}{{ acc.service_uid }}{{ acc.service.url }}{% if acc.active %}Yes{% else %}No{% endif %} - {% if acc.active %} - {% if acc.service.settings.require_password %}Reset / {% endif %} - Delete - {% if acc.service.provide_login %} -  / Login - {% endif %} - {% endif %} -
-{% endif %} - -

-Add Service -

- -
-{% endif %} - -

Eve API Keys

-

Adding an Eve API key will allow you to access any services allowed for your -corporation. Limited keys are accepted for service validation. API keys -are stored for on-going authentication. As the assigned owner of a key you may -remove them at any time, but this may affect any existing services you have -setup.

-{% if user.eveaccount_set.all %} - - -{% for acc in user.eveaccount_set.all %} - - - - - - - -{% endfor %} -
User IDAPI KeyDescriptionTypeActiveLast UpdatedActions
{{ acc.api_user_id }}{{ acc.api_key }}{{ acc.description }}{{ acc.get_api_keytype_display }}{% if acc.api_keytype == 4 %} *{% endif %}{{ acc.get_api_status_display }}{{ acc.api_last_updated|naturaltimediff }}{% ifswitch api-disableprocessing %}{% else %}Refresh,  - Update Key, {% endifswitch %} - Logs{% ifswitch eve-keydelete %},  - Delete{% endifswitch %} -
-{% endif %} -

* - Character API Keys are not included in any authorization checks, you will not be able to submit applications or access any services with them.

-

-{% ifswitch api-disableprocessing %} -{% else %} -Add a Eve API key -{% endifswitch %} -

- -
+ } + +
{% if "reddit"|installed %} {% ifswitch reddit %} -

Reddit Accounts

-

This is a list of all your current linked Reddit accounts

-{% if user.redditaccount_set.all %} -

To validate your Reddit account, login on Reddit then click the link next to the account, fill in some text in the message and click send.

- - -{% for acc in user.redditaccount_set.all %} - - - - -{% endfor %} -
UsernameCreated DateValidated
{{ acc.username }}{{ acc.date_created }}{% if acc.validated %}Yes{% else %}No (Validate){% endif %}
-{% endif %} -

-Add a Reddit account -

-

-Reddit account tagging is {% if user.get_profile.tag_reddit_accounts %}Enabled{% else %}Disabled{% endif %}. {% if user.get_profile.tag_reddit_accounts %}Disable{% else %}Enable{% endif %} + +

+

Reddit Accounts

+

This is a list of all your current linked Reddit accounts

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

To validate your Reddit account, login on Reddit then click the link next to the account, fill in some text in the message and click send.

+ + + + + + {% for acc in user.redditaccount_set.all %} + + + + + + {% endfor %} + +
UsernameCreated DateValidated
{{ acc.username }}{{ acc.date_created }}{% if acc.validated %}Yes{% else %}No (Validate){% endif %}
+ {% endif %} +

+ Add a Reddit account +

+ +

Reddit account tagging is {% if user.get_profile.tag_reddit_accounts %}Enabled{% else %}Disabled{% endif %}. {% if user.get_profile.tag_reddit_accounts %}Disable{% else %}Enable{% endif %}

+
{% endifswitch %} {% endif %} +
+ + + + {% endblock %} diff --git a/app/templates/base.html b/app/templates/base.html index 5d7e8ef..606ef9f 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -1,31 +1,64 @@ {% load installed %} - TEST Auth - + + + + + {% block HeadTag %}{% endblock %} -
- - +
+ + + +
+
+ {% if messages %} + {% for message in messages %} +
+ x +

{{ message }}

+
+ {% endfor %} + {% endif %} + {% block content %}{% endblock %} +
+ +
diff --git a/app/templates/piston/authorize_token.html b/app/templates/piston/authorize_token.html index cf68c64..5ed7ea9 100644 --- a/app/templates/piston/authorize_token.html +++ b/app/templates/piston/authorize_token.html @@ -3,20 +3,23 @@ {% block title %}OAuth Access Authorization{% endblock %} {% block content %} + -

Access Authorization

+

You have come here because you are in the process of allowing a external application to access your private Auth data. If you are not, then please close this window. Otherwise, please confirm below if you wish to give access to your private Auth data. This can be revoked at any time from the main Auth panel.

-

You have come here because you are in the process of allowing a external application to access your private Auth data. If you are not, then please close this window. Otherwise, please confirm below if you wish to give access to your private Auth data. This can be revoked at any time from the main Auth panel.

+

{{ consumer.name }}

+

{{ consumer.description }}

-

{{ consumer.name }}

-

{{ consumer.description }}

- -
- + +
+
{{ form.as_table }} -
- {% csrf_token %} - -
+ + {% csrf_token %} + + + {% endblock %} diff --git a/app/templates/piston/callback_view.html b/app/templates/piston/callback_view.html index ec4ec47..8532790 100644 --- a/app/templates/piston/callback_view.html +++ b/app/templates/piston/callback_view.html @@ -4,10 +4,12 @@ {% block content %} -

Access Authorization

+ -

Access is now enabled for the requesting application. It seems the application did not provide a way to give it the required information so you need to provide this to it. This has happened either due to it being a desktop application or not being configured properly.

+

Access is now enabled for the requesting application. It seems the application did not provide a way to give it the required information so you need to provide this to it. This has happened either due to it being a desktop application or not being configured properly.

-

Token/PIN: {{ token.verifier }}

+

Token/PIN: {{ token.verifier }}

{% endblock %} diff --git a/app/templates/registration/activate.html b/app/templates/registration/activate.html index fbbcd19..7d1c2c4 100644 --- a/app/templates/registration/activate.html +++ b/app/templates/registration/activate.html @@ -1,7 +1,12 @@ {% extends "registration/registration_base.html" %} + {% block title %}{% if account %}Activation complete{% else %}Activation problem{% endif %}{% endblock %} + {% block content %} {% if account %} +

Thanks {{ account }}, activation complete! You may now login using the username and password you set at registration.

{% else %}

Oops – it seems that your activation key is invalid. Please check the url again.

diff --git a/app/templates/registration/login.html b/app/templates/registration/login.html index 0594cbf..f71eafc 100644 --- a/app/templates/registration/login.html +++ b/app/templates/registration/login.html @@ -3,25 +3,40 @@ {% block content %} {% if form.errors %} -

Your username and password didn't match. Please try again.

+
+ x +

Your username or password was incorrect, please try again.

+
{% endif %}
- - - - - - - - - -
{{ form.username.label_tag }}{{ form.username }}
{{ form.password.label_tag }}{{ form.password }}
-

Forgot your password? Need an account?

+
+ Login +
+ {{ form.username.label_tag }} +
+ {{ form.username }} +
+
+
+ {{ form.password.label_tag }} +
+ {{ form.password }} +
+
- - -{% csrf_token %} + + + {% csrf_token %} +
{% endblock %} diff --git a/app/templates/registration/logout.html b/app/templates/registration/logout.html index a0d45e3..ba0dc05 100644 --- a/app/templates/registration/logout.html +++ b/app/templates/registration/logout.html @@ -1,5 +1,8 @@ {% extends "registration/registration_base.html" %} {% block title %}Logged out{% endblock %} +{% block HeadTag %} + +{% endblock %} {% block content %}

Successfully logged out!

{% endblock %} diff --git a/app/templates/registration/registration_form.html b/app/templates/registration/registration_form.html index a20c123..04eeba0 100644 --- a/app/templates/registration/registration_form.html +++ b/app/templates/registration/registration_form.html @@ -1,15 +1,22 @@ {% extends "registration/registration_base.html" %} + {% block title %}Register for an account{% endblock %} + {% block content %} -

Registration

+ +

Please complete this form to register for a new Auth account, please be aware that you are required to confirm your email account so please use a valid address.

-

Problematic Providers

+ +

Problematic Providers

In addition, some providers maybe blocked form auth due to their draconian spam detection routines, which has flagged this server numerous times for no reason. These include AT&T services, Cox, and a few other mainland US ISPs. If you have a Google Mail account please consider using that instead of your ISP email account.

+
- - {{ form }} -
-{% csrf_token %} - + + {{ form }} +
+ {% csrf_token %} +
{% endblock %}