Commits

Joe Heck  committed 9683e91

updating login page

  • Participants
  • Parent commits bcd3d20
  • Branches mobileui

Comments (0)

Files changed (2)

File eyeswebapp/core/urls.py

 from django.views.generic.simple import direct_to_template
 
 urlpatterns = patterns('core.views',
-    (r'^$', 'index'),
+    (r'^$', 'index'),  # shows list of monitoring plugins
     (r'^monitor/(\d+)/$', 'monitor_detail'),  # , name='monitor_detail'
     (r'^host/(\d+)/$', 'host_detail'),  # , name='host_detail'
     (r'^datastore/(\d+)/$', 'datastore_detail'),  # , name='datastore_detail'
     (r'^datastore/(\d+)/png$', 'datastore_image'),  # , name='datastore_image'
+    (r'^host_list/$', 'host_list'),  # shows list of monitoring plugins
+    # ajax views
+    (r'^ajax_monitor/(\w+)/$', 'ajax_monitor'),  # ajax view to invoke a monitor plugindirectly
+    # test URLs
     (r'^visualtest/$', 'visual_test'),
-
-    (r'^monitor_list/$', 'monitor_list'),  # shows list of monitoring plugins
-    (r'^host_list/$', 'host_list'),  # shows list of monitoring plugins
+    (r'^monitor_list/$', 'monitor_list'),  # testing for new monitor...
     (r'^testmonitor/(\w+)/$', 'test_monitor'),  # trial a monitor - probably nuke...
-    (r'^ajax_monitor/(\w+)/$', 'ajax_monitor'),  # ajax view to invoke a monitor directly
 )

File eyeswebapp/templates/registration/login.html

 {% block content %}
 
 {% if form.errors %}
-<p>Your username and password didn't match. Please try again.</p>
+<ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="a">
+	<li data-role="list-divider">Information</li>
+	<li>Your username and password didn't match. Please try again.</li>
+</ul>
 {% endif %}
 
-<form method="post" action="{% url django.contrib.auth.views.login %}">{% csrf_token %}
-<table>
-<tr>
-    <td>{{ form.username.label_tag }}</td>
-    <td>{{ form.username }}</td>
-</tr>
-<tr>
-    <td>{{ form.password.label_tag }}</td>
-    <td>{{ form.password }}</td>
-</tr>
-</table>
-
-<input type="submit" value="login" />
-<input type="hidden" name="next" value="{{ next }}" />
+<form method='POST' action="{% url django.contrib.auth.views.login %}">
+	{% csrf_token %}
+	{% for field in form %}
+	<div data-role="fieldcontain">
+		{{field.errors}}
+		{{field.label_tag}} {{field}}
+	</div>	
+	{% endfor %}
+	<input type="hidden" name="next" value="{{ next }}" />
+	<div data-role="fieldcontain">
+		<input type="submit" value="login">
+	</div>
 </form>
 
 {% endblock %}