From 81f35fe6b615ec6202e797d08b1bd7dda5b984c9 Mon Sep 17 00:00:00 2001 From: gremlinLee <90wertigo> Date: Sun, 30 Nov 2014 22:39:06 +0200 Subject: [PATCH] My task. Login: admin, password: admin. I have done four steps of django tutorial. --- mysite/db.sqlite3 | Bin 0 -> 40960 bytes mysite/manage.py | 10 +++ mysite/mysite/__init__.py | 0 mysite/mysite/settings.py | 86 ++++++++++++++++++++++ mysite/mysite/urls.py | 7 ++ mysite/mysite/wsgi.py | 14 ++++ mysite/polls/__init__.py | 0 mysite/polls/admin.py | 21 ++++++ mysite/polls/migrations/0001_initial.py | 41 +++++++++++ mysite/polls/migrations/__init__.py | 0 mysite/polls/models.py | 28 +++++++ mysite/polls/templates/polls/detail.html | 12 +++ mysite/polls/templates/polls/index.html | 9 +++ mysite/polls/templates/polls/results.html | 9 +++ mysite/polls/tests.py | 3 + mysite/polls/urls.py | 10 +++ mysite/polls/views.py | 44 +++++++++++ mysite/templates/admin/base_site.html | 9 +++ mysite/templates/admin/index.html | 82 +++++++++++++++++++++ requirements.txt | 1 + 20 files changed, 386 insertions(+) create mode 100644 mysite/db.sqlite3 create mode 100755 mysite/manage.py create mode 100644 mysite/mysite/__init__.py create mode 100644 mysite/mysite/settings.py create mode 100644 mysite/mysite/urls.py create mode 100644 mysite/mysite/wsgi.py create mode 100644 mysite/polls/__init__.py create mode 100644 mysite/polls/admin.py create mode 100644 mysite/polls/migrations/0001_initial.py create mode 100644 mysite/polls/migrations/__init__.py create mode 100644 mysite/polls/models.py create mode 100644 mysite/polls/templates/polls/detail.html create mode 100644 mysite/polls/templates/polls/index.html create mode 100644 mysite/polls/templates/polls/results.html create mode 100644 mysite/polls/tests.py create mode 100644 mysite/polls/urls.py create mode 100644 mysite/polls/views.py create mode 100644 mysite/templates/admin/base_site.html create mode 100644 mysite/templates/admin/index.html create mode 100644 requirements.txt diff --git a/mysite/db.sqlite3 b/mysite/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..0e4c1a258878855e035fb8c1e21a2e7260857ea8 GIT binary patch literal 40960 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 SZ1UVvOHB~_Jf2(G{Qm(Tl{rrU literal 0 HcmV?d00001 diff --git a/mysite/manage.py b/mysite/manage.py new file mode 100755 index 0000000..8a50ec0 --- /dev/null +++ b/mysite/manage.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mysite.settings") + + from django.core.management import execute_from_command_line + + execute_from_command_line(sys.argv) diff --git a/mysite/mysite/__init__.py b/mysite/mysite/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/mysite/mysite/settings.py b/mysite/mysite/settings.py new file mode 100644 index 0000000..d7c795e --- /dev/null +++ b/mysite/mysite/settings.py @@ -0,0 +1,86 @@ +""" +Django settings for mysite project. + +For more information on this file, see +https://docs.djangoproject.com/en/1.7/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.7/ref/settings/ +""" + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +import os +BASE_DIR = os.path.dirname(os.path.dirname(__file__)) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = '(zw2ktyg4cq=x5#v+df58kgu##l(s%e890(jv0=bjkzh0%h2af' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +TEMPLATE_DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = ( + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'polls', +) + +MIDDLEWARE_CLASSES = ( + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +) + +ROOT_URLCONF = 'mysite.urls' + +WSGI_APPLICATION = 'mysite.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.7/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + +# Internationalization +# https://docs.djangoproject.com/en/1.7/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.7/howto/static-files/ + +STATIC_URL = '/static/' + +TEMPLATE_DIRS = [os.path.join(BASE_DIR, 'templates')] diff --git a/mysite/mysite/urls.py b/mysite/mysite/urls.py new file mode 100644 index 0000000..65fd802 --- /dev/null +++ b/mysite/mysite/urls.py @@ -0,0 +1,7 @@ +from django.conf.urls import patterns, include, url +from django.contrib import admin + +urlpatterns = patterns('', + url(r'^polls/', include('polls.urls', namespace="polls")), + url(r'^admin/', include(admin.site.urls)), +) \ No newline at end of file diff --git a/mysite/mysite/wsgi.py b/mysite/mysite/wsgi.py new file mode 100644 index 0000000..15c7d49 --- /dev/null +++ b/mysite/mysite/wsgi.py @@ -0,0 +1,14 @@ +""" +WSGI config for mysite project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/ +""" + +import os +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mysite.settings") + +from django.core.wsgi import get_wsgi_application +application = get_wsgi_application() diff --git a/mysite/polls/__init__.py b/mysite/polls/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/mysite/polls/admin.py b/mysite/polls/admin.py new file mode 100644 index 0000000..3a875e1 --- /dev/null +++ b/mysite/polls/admin.py @@ -0,0 +1,21 @@ +from django.contrib import admin +from models import Question, Choice + + +class ChoiceInline(admin.TabularInline): + model = Choice + extra = 3 + + +class QuestionAdmin(admin.ModelAdmin): + list_display = ('question_text', 'pub_date', 'was_published_recently') + list_filter = ['pub_date'] + search_fields = ['question_text'] + fieldsets = [ + (None, {'fields': ['question_text']}), + ('Date information', {'fields': ['pub_date'], 'classes': ['collapse']}), + ] + inlines = [ChoiceInline] + +admin.site.register(Question, QuestionAdmin) +admin.site.register(Choice) \ No newline at end of file diff --git a/mysite/polls/migrations/0001_initial.py b/mysite/polls/migrations/0001_initial.py new file mode 100644 index 0000000..f6837ef --- /dev/null +++ b/mysite/polls/migrations/0001_initial.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Choice', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('choice_text', models.CharField(max_length=200)), + ('votes', models.IntegerField(default=0)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Question', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('question_text', models.CharField(max_length=200)), + ('pub_date', models.DateTimeField(verbose_name=b'date published')), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.AddField( + model_name='choice', + name='question', + field=models.ForeignKey(to='polls.Question'), + preserve_default=True, + ), + ] diff --git a/mysite/polls/migrations/__init__.py b/mysite/polls/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/mysite/polls/models.py b/mysite/polls/models.py new file mode 100644 index 0000000..a832ae2 --- /dev/null +++ b/mysite/polls/models.py @@ -0,0 +1,28 @@ +import datetime + +from django.db import models +from django.utils import timezone + + +class Question(models.Model): + question_text = models.CharField(max_length=200) + pub_date = models.DateTimeField('date published') + + def was_published_recently(self): + return self.pub_date >= timezone.now() - datetime.timedelta(days=1) + + was_published_recently.admin_order_field = 'pub_date' + was_published_recently.boolean = True + was_published_recently.short_description = 'Published recently?' + + def __str__(self): + return self.question_text + + +class Choice(models.Model): + question = models.ForeignKey(Question) + choice_text = models.CharField(max_length=200) + votes = models.IntegerField(default=0) + + def __str__(self): + return self.choice_text \ No newline at end of file diff --git a/mysite/polls/templates/polls/detail.html b/mysite/polls/templates/polls/detail.html new file mode 100644 index 0000000..2f36854 --- /dev/null +++ b/mysite/polls/templates/polls/detail.html @@ -0,0 +1,12 @@ +

{{ question.question_text }}

+ +{% if error_message %}

{{ error_message }}

{% endif %} + +
+{% csrf_token %} +{% for choice in question.choice_set.all %} + +
+{% endfor %} + +
\ No newline at end of file diff --git a/mysite/polls/templates/polls/index.html b/mysite/polls/templates/polls/index.html new file mode 100644 index 0000000..cc41400 --- /dev/null +++ b/mysite/polls/templates/polls/index.html @@ -0,0 +1,9 @@ +{% if latest_question_list %} + +{% else %} +

No polls are available.

+{% endif %} \ No newline at end of file diff --git a/mysite/polls/templates/polls/results.html b/mysite/polls/templates/polls/results.html new file mode 100644 index 0000000..f9b3666 --- /dev/null +++ b/mysite/polls/templates/polls/results.html @@ -0,0 +1,9 @@ +

{{ question.question_text }}

+ +
    + {% for choice in question.choice_set.all %} +
  • {{ choice.choice_text }} -- {{ choice.votes }} vote{{ choice.votes|pluralize }}
    • + {% endfor %} +
+ +Vote again? \ No newline at end of file diff --git a/mysite/polls/tests.py b/mysite/polls/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/mysite/polls/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/mysite/polls/urls.py b/mysite/polls/urls.py new file mode 100644 index 0000000..00b1f35 --- /dev/null +++ b/mysite/polls/urls.py @@ -0,0 +1,10 @@ +from django.conf.urls import patterns, url + +from polls import views + +urlpatterns = patterns('', + url(r'^$', views.IndexView.as_view(), name='index'), + url(r'^(?P\d+)/$', views.DetailView.as_view(), name='detail'), + url(r'^(?P\d+)/results/$', views.ResultsView.as_view(), name='results'), + url(r'^(?P\d+)/vote/$', views.vote, name='vote'), +) \ No newline at end of file diff --git a/mysite/polls/views.py b/mysite/polls/views.py new file mode 100644 index 0000000..82a11b3 --- /dev/null +++ b/mysite/polls/views.py @@ -0,0 +1,44 @@ +from django.shortcuts import get_object_or_404, render +from django.http import HttpResponseRedirect +from django.core.urlresolvers import reverse +from django.views import generic + +from models import Choice, Question + + +class IndexView(generic.ListView): + template_name = 'polls/index.html' + context_object_name = 'latest_question_list' + + def get_queryset(self): + """Return the last five published questions.""" + return Question.objects.order_by('-pub_date')[:5] + + +class DetailView(generic.DetailView): + model = Question + template_name = 'polls/detail.html' + + +class ResultsView(generic.DetailView): + model = Question + template_name = 'polls/results.html' + + +def vote(request, question_id): + p = get_object_or_404(Question, pk=question_id) + try: + selected_choice = p.choice_set.get(pk=request.POST['choice']) + except (KeyError, Choice.DoesNotExist): + # Redisplay the question voting form. + return render(request, 'polls/detail.html', { + 'question': p, + 'error_message': "You didn't select a choice.", + }) + else: + selected_choice.votes += 1 + selected_choice.save() + # Always return an HttpResponseRedirect after successfully dealing + # with POST data. This prevents data from being posted twice if a + # user hits the Back button. + return HttpResponseRedirect(reverse('polls:results', args=(p.id,))) \ No newline at end of file diff --git a/mysite/templates/admin/base_site.html b/mysite/templates/admin/base_site.html new file mode 100644 index 0000000..7e9c91f --- /dev/null +++ b/mysite/templates/admin/base_site.html @@ -0,0 +1,9 @@ +{% extends "admin/base.html" %} + +{% block title %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %} + +{% block branding %} +

{{ 'Task tracker'|default:_('Django administration') }}

+{% endblock %} + +{% block nav-global %}{% endblock %} \ No newline at end of file diff --git a/mysite/templates/admin/index.html b/mysite/templates/admin/index.html new file mode 100644 index 0000000..fcf269e --- /dev/null +++ b/mysite/templates/admin/index.html @@ -0,0 +1,82 @@ +{% extends "admin/base_site.html" %} +{% load i18n admin_static %} + +{% block extrastyle %}{{ block.super }}{% endblock %} + +{% block coltype %}colMS{% endblock %} + +{% block bodyclass %}{{ block.super }} dashboard{% endblock %} + +{% block breadcrumbs %}{% endblock %} + +{% block content %} +
+ +{% if app_list %} + {% for app in app_list %} +
+ + + {% for model in app.models %} + + {% if model.admin_url %} + + {% else %} + + {% endif %} + + {% if model.add_url %} + + {% else %} + + {% endif %} + + {% if model.admin_url %} + + {% else %} + + {% endif %} + + {% endfor %} +
+ {{ app.name }} +
{{ model.name }}{{ model.name }}{% trans 'Add' %} {% trans 'Change' %} 
+
+ {% endfor %} +{% else %} +

{% trans "You don't have permission to edit anything." %}

+{% endif %} +
+{% endblock %} + +{% block sidebar %} +
+
+

{% trans 'Recent Actions' %}

+

{% trans 'My Actions' %}

+ {% load log %} + {% get_admin_log 10 as admin_log for_user user %} + {% if not admin_log %} +

{% trans 'None available' %}

+ {% else %} +
    + {% for entry in admin_log %} +
  • + {% if entry.is_deletion or not entry.get_admin_url %} + {{ entry.object_repr }} + {% else %} + {{ entry.object_repr }} + {% endif %} +
    + {% if entry.content_type %} + {% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %} + {% else %} + {% trans 'Unknown content' %} + {% endif %} +
    • + {% endfor %} +
+ {% endif %} +
+
+{% endblock %} diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..2f2e6fa --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +Django==1.7.1 \ No newline at end of file