ABS/abscontrol Commit - r198:199 · Jicamarca Repository

- Primera implementacion del Login del proyecto. (Funcionalidad no completada)

jsalyrosas -

r198:199

parent child

Context file:

r198:199

Collapse all files

trunk/webapp/templates/registration/login.html created 10644 +28 0

@@ -0,0 +1,28
	1	{% extends "base.html" %}
		No newline at end of file
	2	{% load url from future %}
		No newline at end of file
	3
		No newline at end of file
	4	{% block content %}
		No newline at end of file
	5
		No newline at end of file
	6	{% if form.errors %}
		No newline at end of file
	7	<p>Your username and password didn't match. Please try again.</p>
		No newline at end of file
	8	{% endif %}
		No newline at end of file
	9
		No newline at end of file
	10	<form method="post" action="{% url 'django.contrib.auth.views.login' %}">
		No newline at end of file
	11	{% csrf_token %}
		No newline at end of file
	12	<table>
		No newline at end of file
	13	<tr>
		No newline at end of file
	14	<td>{{ form.username.label_tag }}</td>
		No newline at end of file
	15	<td>{{ form.username }}</td>
		No newline at end of file
	16	</tr>
		No newline at end of file
	17	<tr>
		No newline at end of file
	18	<td>{{ form.password.label_tag }}</td>
		No newline at end of file
	19	<td>{{ form.password }}</td>
		No newline at end of file
	20	</tr>
		No newline at end of file
	21	</table>
		No newline at end of file
	22
		No newline at end of file
	23	<input type="submit" value="login" />
		No newline at end of file
	24	<input type="hidden" name="next" value="{{ next }}" />
		No newline at end of file
	25	</form>
		No newline at end of file
	26
		No newline at end of file
	27	{% endblock %}
		No newline at end of file
	28	No newline at end of file

trunk/webapp/abs_webapp_dev/urls.py +2 0

             from django.conf.urls import patterns, include, url
             from django.conf import settings
   No newline at end of file
             # Uncomment the next two lines to enable the admin:
             from django.contrib import admin
             admin.autodiscover()
   No newline at end of file
             urlpatterns = patterns('',
                 # Examples:
                 # url(r'^$', 'abs_webapp_dev.views.home', name='home'),
                 # url(r'^abs_webapp_dev/', include('abs_webapp_dev.foo.urls')),
   No newline at end of file
                 # Uncomment the admin/doc line below to enable admin documentation:
                 # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
   No newline at end of file
                 # Uncomment the next line to enable the admin:
                 url(r'^admin/', include(admin.site.urls)),
                 url(r'^abscontrol/', include('abscontrol.urls')),
+                url(r'^accounts/login/$', 'django.contrib.auth.views.login'),
              No newline at end of file
+  No newline at end of file
             )
   No newline at end of file
             if settings.DEBUG:
                 urlpatterns = patterns('',
                 url(r'^media/(?P<path>.*)$', 'django.views.static.serve',{'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
             ) + urlpatterns

trunk/webapp/templates/abscontrol/index.html +2 -3

             {% extends "base.html" %}
   No newline at end of file
             {% block title %}ABS CONTROL:::::{% endblock %}
             {% block scripting %}
             	{% if profile_list %}
             	<script src="/static/static/js/profiles.js"></script>
             	{% endif %}
             {% endblock %}
             {% block content %}
             <div id="content">
                 {% block topcolumn %}
                 <div id="topcolumn">
                     <div id="lsProfiles">
                         <div id="infoProfiles">
                             <label for="lblProfile" class="lblInfo">Profiles: </label>
                             {% if profile_list %}
                             <select name="lsProfiles" id="listProfiles">
                                 <option value="-1">Choose ...</option>
                             {% for entry in profile_list %}
                             	{% if objProfile %}
                             		{% if objProfile.id == entry.id %}
                                 <option value="{{ entry.id }}" selected>{{ entry.name }}</option>
                                 	{% else %}
                                 <option value="{{ entry.id }}">{{ entry.name }}</option>
                                 	{% endif %}
                                 {% else %}
                                 <option value="{{ entry.id }}">{{ entry.name }}</option>
                                 {% endif %}
                             {% endfor %}
                             </select>
                             {% else %}
                             <label for="lblMessage" class="lblInfo">No profiles.</label>
                             {% endif %}
                         </div>
                     </div>
                     {% block mnu_profile %}
                     <div id="mnuProfiles">
                     <nav class="MnuHorizontal" id="navProfiles">
                         <ul>
                             <li><a href="{% url abscontrol.views.new %}">New</a></li>
  No newline at end of file
-                            <li><a href="/abscontrol/new">New</a></li>
  No newline at end of file
                             {% if objProfile %}
                             <li><a href="/abscontrol/edit/{{ objProfile.id }}">Edit</a></li>
                             <li><a href="#">Save</a></li>
                             {% endif %}
                             <li><a href="{% url abscontrol.views.importProfile %}">Import</a></li>
  No newline at end of file
-                            <li><a href="#">Save as</a></li>
              No newline at end of file
-                            <li><a href="/abscontrol/import">Import</a></li>
  No newline at end of file
                             {% if objProfile %}
                             <li><a href="#" id="lnkExport" alt="{{ objProfile.id }}">Export</a></li>
                             <li><a href="#" id="lnkSendFile" alt="{{ objProfile.id }}">Send</a></li>
                             {% endif %}
                         </ul>
                         <div class="cleardivs"></div>
                     </nav>
                     </div>
                     {% endblock %}
                     <div class="cleardivs"></div>
                 </div>
                 {% endblock %}
                 {% block maincolumn %}
                 <div id="maincolumn" style="height: 50px"></div>
                 {% endblock %}
                 <div class="cleardivs"></div>
             </div>
             {% endblock %}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages