JPT
/
citavi_mapper
0
0
Fork 0
Code Issues Pull Requests Activity

[TASK] Add bootstrap as git submodule.

This commit is contained in:
Jan Philipp Timme 2014-07-25 13:53:01 +02:00
parent 2ede0fe160
commit 0f0d3f7154
16 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
.settings
.project
.pydevproject
*.pyc

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "public/static/contrib/bootstrap"]
path = public/static/contrib/bootstrap
url = https://github.com/twbs/bootstrap.git

1
citavi_mapper/__init__.py
View File

@ -0,0 +1 @@
# -*- coding: utf-8 -*-

5
citavi_mapper/settings.py
View File

@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-
"""
Django settings for citavi_mapper project.
@ -36,6 +38,7 @@ INSTALLED_APPS = (
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'crispy_forms',
'hello',
)
@ -53,6 +56,8 @@ ROOT_URLCONF = 'citavi_mapper.urls'
WSGI_APPLICATION = 'citavi_mapper.wsgi.application'
CRISPY_TEMPLATE_PACK = 'bootstrap3'
# Database
# https://docs.djangoproject.com/en/1.6/ref/settings/#databases

2
citavi_mapper/urls.py
View File

@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-
from django.conf.urls import patterns, include, url
from django.contrib import admin

2
citavi_mapper/wsgi.py
View File

@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-
"""
WSGI config for citavi_mapper project.

2
hello/__init__.py
View File

@ -0,0 +1,2 @@
# -*- coding: utf-8 -*-

2
hello/admin.py
View File

@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-
from django.contrib import admin
# Register your models here.

2
hello/models.py
View File

@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-
from django.db import models
# Create your models here.

0
hello/templates/hello.html Normal file
View File

2
hello/tests.py
View File

@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-
from django.test import TestCase
# Create your tests here.

5
hello/urls.py
View File

@ -1,7 +1,10 @@
# -*- coding: utf-8 -*-
from django.conf.urls import patterns, url
from hello import views
urlpatterns = patterns('',
url(r'^$', views.index, name='index')
url(r'^$', views.Hello.as_view(), name='hello'),
url(r'^formtest/$', views.FormTest.as_view(), name='formtest')
)

14
hello/views.py
View File

@ -1,5 +1,11 @@
from django.http import HttpResponse
# -*- coding: utf-8 -*-
# Create your views here.
def index(request):
return HttpResponse('Hello World!')
from django.http import HttpResponse
from django.views.generic import TemplateView
from django.views.generic import FormView
class Hello(TemplateView):
template_name = "hello.html"
class FormTest(FormView):
pass

1
public/static/contrib/bootstrap Submodule

@ -0,0 +1 @@
Subproject commit 2c4641855dd0505608566489392ed35aaa6cf2e3

11
public/templates/main.html Normal file
View File

@ -0,0 +1,11 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>{% block title %}Citavi Mapper{% endblock %}</title>
</head>
<body>
<h1>{% block headline %}{% endblock %}</h1>
{% block content %}{% endblock %}
</body>
</html>

3
requirements.txt
View File

@ -1,2 +1,3 @@
django
psycopg2
django
django-crispy-forms