diff --git a/media/css/tables.css b/media/css/tables.css
index 20a50a6..b4475dc 100644
--- a/media/css/tables.css
+++ b/media/css/tables.css
@@ -15,7 +15,6 @@ table {
}
table,caption {
- margin: 0 auto;
border-right: 1px solid #CCC;
border-left: 1px solid #CCC
}
@@ -25,16 +24,24 @@ caption,th,td {
padding: 10px
}
-caption,thead th,tfoot th,tfoot td {
- background-color: #E63C1E;
+caption,thead th {
+ background-color: #858585;
color: #FFF;
font-weight: bold;
text-transform: uppercase
}
+tfoot th,tfoot td {
+ background-color: #858585;
+ color: #FFF;
+ font-size: 1px;
+ font-weight: bold;
+ text-transform: uppercase
+}
+
thead th {
- background-color: #C30;
- color: #FFB3A6;
+ background-color: #858585;
+ color: white;
text-align: center
}
@@ -77,3 +84,8 @@ tbody td+td+td+td a:active,tbody td+td+td+td a:hover,tbody td+td+td+td a:focus,t
color: #E63C1E
}
+body a:active, body a:hover, body a:focus, body a:visited {
+ color: #E63C1E;
+ text-decoration: none;
+}
+
diff --git a/settings.py b/settings.py
index bfb2b9c..0532af1 100644
--- a/settings.py
+++ b/settings.py
@@ -1,7 +1,6 @@
import os
# Django settings for login project.
-LIVE = False
DEBUG = True
TEMPLATE_DEBUG = DEBUG
@@ -12,7 +11,7 @@ ADMINS = (
MANAGERS = ADMINS
-if LIVE:
+if not DEBUG:
DATABASE_ENGINE = 'mysql' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
DATABASE_NAME = 'dreddit_sso' # Or path to database file if using sqlite3.
DATABASE_USER = 'dreddit_sso' # Not used with sqlite3.
@@ -51,7 +50,7 @@ MEDIA_ROOT = '/home/nikdoof/dev/corpsso/media'
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash if there is a path component (optional in other cases).
# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = '/media/'
+MEDIA_URL = '/static/'
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
@@ -94,6 +93,8 @@ INSTALLED_APPS = (
AUTH_PROFILE_MODULE = 'sso.SSOUser'
+LOGIN_REDIRECT_URL = "/profile"
+
### EVE Corp Info
EVE_CORP_ID = 1018389948
diff --git a/sso/urls.py b/sso/urls.py
index 6350117..6c3fc55 100644
--- a/sso/urls.py
+++ b/sso/urls.py
@@ -3,6 +3,7 @@ from django.conf.urls.defaults import *
from sso import views
urlpatterns = patterns('',
+ ('^$', views.index),
(r'^profile/$', views.profile),
(r'^profile/add/eveapi', views.eveapi_add),
(r'^profile/del/eveapi/$', views.eveapi_del),
diff --git a/sso/views.py b/sso/views.py
index 335d9e8..4145a29 100644
--- a/sso/views.py
+++ b/sso/views.py
@@ -14,7 +14,7 @@ from sso.forms import EveAPIForm, ServiceAccountForm
import settings
def index(request):
- pass
+ return render_to_response('sso/index.html')
@login_required
def profile(request):
diff --git a/templates/base.html b/templates/base.html
index 3ba60d4..29891cc 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -8,6 +8,7 @@
font-family: Verdana;
}
+
{% block content %}{% endblock %}
diff --git a/templates/profile.html b/templates/profile.html
index 1f5ab8a..57795cc 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -13,8 +13,11 @@
Service Accounts
{% if srvaccounts %}
-
+
+
| Service | Username | Password | Active | Actions |
|---|
+
+
{% for acc in srvaccounts %}
| {{ acc.service }} |
{{ acc.username }} |
@@ -23,19 +26,26 @@
Delete |
{% endfor %}
+
+| |
{% endif %}
{% if profile.corp_user %}
+
Add Service
+
{% endif %}
Eve API Keys
{% if eveaccounts %}
-
+
+
| User ID | API Key | Description | Active | Actions |
|---|
+
+
{% for acc in eveaccounts %}
| {{ acc.api_user_id }} |
{{ acc.api_key }} |
@@ -43,10 +53,12 @@
{{ acc.api_status }} |
Delete |
+
{% endfor %}
+| |
{% endif %}
-
+
Add a Eve API key
-
+
{% endblock %}
diff --git a/templates/sso/index.html b/templates/sso/index.html
new file mode 100644
index 0000000..d6e6c56
--- /dev/null
+++ b/templates/sso/index.html
@@ -0,0 +1,7 @@
+{% extends "base.html" %}
+
+{% block title %}Dredd.it SSO{% endblock %}
+
+{% block content %}
+Login
+{% endblock %}
diff --git a/urls.py b/urls.py
index d186ecb..c97c2e2 100644
--- a/urls.py
+++ b/urls.py
@@ -1,5 +1,6 @@
from django.conf.urls.defaults import *
from django.contrib import admin
+from django.contrib.auth.views import login
import settings
admin.autodiscover()
@@ -14,7 +15,7 @@ urlpatterns = patterns('',
('', include('sso.urls')),
)
-if not settings.DEBUG:
+if settings.DEBUG:
urlpatterns += patterns('',
- (r'^media/(?P.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
+ (r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
)