Index: trunk/webapp/abs_webapp_dev/settings.py =================================================================== diff --git a/trunk/webapp/abs_webapp_dev/settings.py b/trunk/webapp/abs_webapp_dev/settings.py --- a/trunk/webapp/abs_webapp_dev/settings.py (revision 199) +++ b/trunk/webapp/abs_webapp_dev/settings.py (revision 200) @@ -98,7 +98,7 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', - #'django.middleware.csrf.CsrfViewMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', # Uncomment the next line for simple clickjacking protection: Index: trunk/webapp/abs_webapp_dev/urls.py =================================================================== diff --git a/trunk/webapp/abs_webapp_dev/urls.py b/trunk/webapp/abs_webapp_dev/urls.py --- a/trunk/webapp/abs_webapp_dev/urls.py (revision 199) +++ b/trunk/webapp/abs_webapp_dev/urls.py (revision 200) @@ -17,6 +17,7 @@ url(r'^admin/', include(admin.site.urls)), url(r'^abscontrol/', include('abscontrol.urls')), url(r'^accounts/login/$', 'django.contrib.auth.views.login'), + url(r'^$', 'abscontrol.views.index'), ) Index: trunk/webapp/abscontrol/views.py =================================================================== diff --git a/trunk/webapp/abscontrol/views.py b/trunk/webapp/abscontrol/views.py --- a/trunk/webapp/abscontrol/views.py (revision 199) +++ b/trunk/webapp/abscontrol/views.py (revision 200) @@ -4,6 +4,7 @@ from django.utils.encoding import smart_str from django.core.servers.basehttp import FileWrapper import mimetypes +from django.contrib.auth.decorators import login_required from datetime import datetime @@ -70,6 +71,7 @@ arrayUes = ["0.533333","0.00000","1.06667","0.00000"] +@login_required(login_url='/accounts/login/') def index(request): #latest_poll_list = profileAntenna.objects.all().order_by('-pub_date')[:5] profile_list = Profile.objects.filter(state=1) Index: trunk/webapp/static/css/style.css =================================================================== diff --git a/trunk/webapp/static/css/style.css b/trunk/webapp/static/css/style.css --- a/trunk/webapp/static/css/style.css (revision 199) +++ b/trunk/webapp/static/css/style.css (revision 200) @@ -569,9 +569,81 @@ background: #666; color: #fff; } +#Main_Head { + margin: 0 auto; + height: 100%; + border: 1px solid #ddd !important; + box-shadow: 1px 1px 2px #ddd; + border-radius: 5px; + display: block; } + +.Main_Title { + font-size: 2em; + letter-spacing: 0.06em; + color: #444; + text-shadow: 2px 2px #ccc; } + /****************************************************************************************/ /****** FOOTER *************/ /****************************************************************************************/ footer p { font-family: 'Roboto Condensed', sans-serif; - font-size: 0.98em; } \ No newline at end of file + font-size: 0.98em; } + +/****************************************************************************************/ +/****** LOGIN *************/ +/****************************************************************************************/ +#contentLogin { + margin: 0; + padding: 0; + border: 0px solid #1cc; } + +#MainColumnLogin { + margin: 2px auto; + border: 0px solid #f00 !important; + box-shadow: 1px 1px 2px #ddd; + border-radius: 2px; + background-color: #eee; + width: 100%; + padding: 5px 0px; +} + +.row_reg { + margin: 5px auto; + display: block; + width: 90%; + border: 0px solid #1cc !important; + line-height: 22px; +} + +.row_reg label, .row_reg input[type=text] { + float: left; + line-height: 22px; +} + +#id_username, #id_password { + width: 160px; + line-height: 22px; +} + +.row_reg label { + width: 400px; + text-align: right; + padding-right: 10px; + border: 0px solid #d22 !important; +} + +.row_reg input[type=submit], .row_reg input[type=button] { + margin-left: 410px; + width: 80px; +} + +#lblTitleLogin { + width: 100%; + text-align: center; + font-size: 1.2em; + font-weight: normal; + color: #222; + border: 0px solid #f00 !important; + background-color: #ccc; +} \ No newline at end of file Index: trunk/webapp/templates/abscontrol/index.html =================================================================== diff --git a/trunk/webapp/templates/abscontrol/index.html b/trunk/webapp/templates/abscontrol/index.html --- a/trunk/webapp/templates/abscontrol/index.html (revision 199) +++ b/trunk/webapp/templates/abscontrol/index.html (revision 200) @@ -5,6 +5,14 @@ {% if profile_list %} {% endif %} +{% endblock %} +{% block header %} + {% endblock %} {% block content %}
Index: trunk/webapp/templates/base.html =================================================================== diff --git a/trunk/webapp/templates/base.html b/trunk/webapp/templates/base.html --- a/trunk/webapp/templates/base.html (revision 199) +++ b/trunk/webapp/templates/base.html (revision 200) @@ -26,14 +26,11 @@
- {% block header %} - - {% endblock %} + {% block header %} +
+ +
+ {% endblock %}
{% block content %}
Index: trunk/webapp/templates/registration/login.html =================================================================== diff --git a/trunk/webapp/templates/registration/login.html b/trunk/webapp/templates/registration/login.html --- a/trunk/webapp/templates/registration/login.html (revision 199) +++ b/trunk/webapp/templates/registration/login.html (revision 200) @@ -2,27 +2,38 @@ {% load url from future %} {% block content %} - -{% if form.errors %} -

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

-{% endif %} - -
-{% csrf_token %} - - - - - - - - - -
{{ form.username.label_tag }}{{ form.username }}
{{ form.password.label_tag }}{{ form.password }}
- - - -
- -{% endblock %} - +
+
+ {% if form.errors %} +

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

+ {% endif %} +
+
+
+ {% csrf_token %} +
+ +
+
+
+
+ + {{ form.username }} +
+
+
+
+ + {{ form.password }} +
+
+
+
+ +
+
+ +
+
+
+{% endblock %} \ No newline at end of file