Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Jelle van der Waa
Archweb
Commits
bd9a99d7
Commit
bd9a99d7
authored
Dec 22, 2007
by
eliott
Browse files
renamed imports
parent
f02fdcee
Changes
13
Hide whitespace changes
Inline
Side-by-side
devel/views.py
View file @
bd9a99d7
...
...
@@ -2,12 +2,12 @@
from
django.contrib.auth.decorators
import
login_required
from
django.contrib.auth.models
import
User
from
django.core
import
validators
from
arch
linux
.utils
import
render_template
from
arch
linux
.packages.models
import
Package
from
arch
linux
.todolists.models
import
Todolist
,
TodolistPkg
from
arch
linux
.settings
import
DATA_DIR
from
arch
linux
.utils
import
validate
from
arch
linux
.common.models
import
UserProfile
from
arch
web_dev
.utils
import
render_template
from
arch
web_dev
.packages.models
import
Package
from
arch
web_dev
.todolists.models
import
Todolist
,
TodolistPkg
from
arch
web_dev
.settings
import
DATA_DIR
from
arch
web_dev
.utils
import
validate
from
arch
web_dev
.common.models
import
UserProfile
@
login_required
def
index
(
request
):
...
...
feeds.py
View file @
bd9a99d7
from
django.contrib.syndication.feeds
import
Feed
from
arch
linux
.packages.models
import
Package
from
arch
linux
.news.models
import
News
from
arch
web_dev
.packages.models
import
Package
from
arch
web_dev
.news.models
import
News
#from datetime import datetime
class
PackageFeed
(
Feed
):
...
...
news/models.py
View file @
bd9a99d7
from
django.db
import
models
from
django.contrib.auth.models
import
User
import
re
from
arch
linux
.utils
import
Stripper
from
arch
web_dev
.utils
import
Stripper
class
News
(
models
.
Model
):
id
=
models
.
AutoField
(
primary_key
=
True
)
...
...
news/views.py
View file @
bd9a99d7
...
...
@@ -3,8 +3,8 @@
from
django.contrib.auth.decorators
import
user_passes_test
from
django.contrib.auth.models
import
User
from
django
import
forms
from
arch
linux
.utils
import
render_template
from
arch
linux
.news.models
import
News
from
arch
web_dev
.utils
import
render_template
from
arch
web_dev
.news.models
import
News
from
datetime
import
date
def
view
(
request
,
newsid
):
...
...
packages/views.py
View file @
bd9a99d7
...
...
@@ -5,9 +5,9 @@
from
django.core
import
validators
from
django.contrib.auth.decorators
import
login_required
from
django.contrib.auth.models
import
User
from
arch
linux
.utils
import
validate
,
render_template
from
arch
web_dev
.utils
import
validate
,
render_template
from
datetime
import
datetime
from
arch
linux
.packages.models
import
Package
,
PackageFile
,
Repo
,
Category
from
arch
web_dev
.packages.models
import
Package
,
PackageFile
,
Repo
,
Category
def
update
(
request
):
if
request
.
POST
.
has_key
(
'adopt'
):
...
...
public/views.py
View file @
bd9a99d7
from
django.http
import
HttpResponse
from
arch
linux
.utils
import
render_template
from
arch
web_dev
.utils
import
render_template
from
django.contrib.auth.models
import
User
from
arch
linux
.packages.models
import
Package
,
Repo
from
arch
linux
.news.models
import
News
from
arch
linux
.settings
import
DATA_DIR
from
arch
linux
.common.models
import
Donator
,
Mirror
from
arch
web_dev
.packages.models
import
Package
,
Repo
from
arch
web_dev
.news.models
import
News
from
arch
web_dev
.settings
import
DATA_DIR
from
arch
web_dev
.common.models
import
Donator
,
Mirror
def
index
(
request
):
# get the most recent 10 news items
...
...
settings.py
View file @
bd9a99d7
# Django settings for arch
linux
project.
# Django settings for arch
web_dev
project.
## Import local settings
from
local_settings
import
*
...
...
@@ -60,7 +60,7 @@
"django.middleware.doc.XViewMiddleware"
,
)
ROOT_URLCONF
=
'arch
linux
.urls'
ROOT_URLCONF
=
'arch
web_dev
.urls'
TEMPLATE_DIRS
=
(
# Put strings here, like "/home/html/django_templates".
...
...
@@ -78,12 +78,12 @@
'django.contrib.sessions'
,
'django.contrib.sites'
,
'django.contrib.admin'
,
'arch
linux
.common'
,
'arch
linux
.news'
,
'arch
linux
.packages'
,
'arch
linux
.public'
,
'arch
linux
.todolists'
,
'arch
linux
.devel'
,
'arch
linux
.wiki'
'arch
web_dev
.common'
,
'arch
web_dev
.news'
,
'arch
web_dev
.packages'
,
'arch
web_dev
.public'
,
'arch
web_dev
.todolists'
,
'arch
web_dev
.devel'
,
'arch
web_dev
.wiki'
)
todolists/models.py
View file @
bd9a99d7
from
django.db
import
models
from
django.contrib.auth.models
import
User
from
arch
linux
.packages.models
import
Package
from
arch
web_dev
.packages.models
import
Package
class
TodolistManager
(
models
.
Manager
):
def
get_incomplete
(
self
):
...
...
todolists/views.py
View file @
bd9a99d7
...
...
@@ -2,9 +2,9 @@
from
django.shortcuts
import
get_object_or_404
from
django.contrib.auth.decorators
import
login_required
,
user_passes_test
from
django.contrib.auth.models
import
User
from
arch
linux
.utils
import
render_template
from
arch
linux
.todolists.models
import
Todolist
,
TodolistPkg
from
arch
linux
.packages.models
import
Package
from
arch
web_dev
.utils
import
render_template
from
arch
web_dev
.todolists.models
import
Todolist
,
TodolistPkg
from
arch
web_dev
.packages.models
import
Package
# FIXME: ugly hackery. http://code.djangoproject.com/ticket/3450
import
django.db
...
...
urls.py
View file @
bd9a99d7
from
django.conf.urls.defaults
import
*
from
arch
linux
.news.models
import
News
from
arch
linux
.feeds
import
PackageFeed
,
NewsFeed
from
arch
web_dev
.news.models
import
News
from
arch
web_dev
.feeds
import
PackageFeed
,
NewsFeed
from
django.views.decorators.cache
import
cache_page
feeds
=
{
...
...
@@ -12,58 +12,58 @@
#(r'^media/(.*)$', 'django.views.static.serve', {'document_root': '/home/jvinet/shared/work/archlinux/media'}),
# Dynamic Stuff
(
r
'^packages/flag/(\d+)/$'
,
'arch
linux
.packages.views.flag'
),
(
r
'^packages/flaghelp/$'
,
'arch
linux
.packages.views.flaghelp'
),
(
r
'^packages/unflag/(\d+)/$'
,
'arch
linux
.packages.views.unflag'
),
(
r
'^packages/files/(\d+)/$'
,
'arch
linux
.packages.views.files'
),
(
r
'^packages/search/$'
,
'arch
linux
.packages.views.search'
),
(
r
'^packages/search/([A-z0-9]+)/$'
,
'arch
linux
.packages.views.search'
),
(
r
'^packages/update/$'
,
'arch
linux
.packages.views.update'
),
(
r
'^packages/(?P<pkgid>\d+)/$'
,
'arch
linux
.packages.views.details'
),
(
r
'^packages/(?P<name>[A-z0-9]+)/$'
,
'arch
linux
.packages.views.details'
),
(
r
'^packages/(?P<repo>[A-z0-9]+)/(?P<name>[A-z0-9]+)/$'
,
'arch
linux
.packages.views.details'
),
(
r
'^packages/$'
,
'arch
linux
.packages.views.search'
),
(
r
'^packages/flag/(\d+)/$'
,
'arch
web_dev
.packages.views.flag'
),
(
r
'^packages/flaghelp/$'
,
'arch
web_dev
.packages.views.flaghelp'
),
(
r
'^packages/unflag/(\d+)/$'
,
'arch
web_dev
.packages.views.unflag'
),
(
r
'^packages/files/(\d+)/$'
,
'arch
web_dev
.packages.views.files'
),
(
r
'^packages/search/$'
,
'arch
web_dev
.packages.views.search'
),
(
r
'^packages/search/([A-z0-9]+)/$'
,
'arch
web_dev
.packages.views.search'
),
(
r
'^packages/update/$'
,
'arch
web_dev
.packages.views.update'
),
(
r
'^packages/(?P<pkgid>\d+)/$'
,
'arch
web_dev
.packages.views.details'
),
(
r
'^packages/(?P<name>[A-z0-9]+)/$'
,
'arch
web_dev
.packages.views.details'
),
(
r
'^packages/(?P<repo>[A-z0-9]+)/(?P<name>[A-z0-9]+)/$'
,
'arch
web_dev
.packages.views.details'
),
(
r
'^packages/$'
,
'arch
web_dev
.packages.views.search'
),
(
r
'^todo/(\d+)/$'
,
'arch
linux
.todolists.views.view'
),
(
r
'^todo/add/$'
,
'arch
linux
.todolists.views.add'
),
(
r
'^todo/flag/(\d+)/(\d+)/$'
,
'arch
linux
.todolists.views.flag'
),
(
r
'^todo/$'
,
'arch
linux
.todolists.views.list'
),
(
r
'^todo/(\d+)/$'
,
'arch
web_dev
.todolists.views.view'
),
(
r
'^todo/add/$'
,
'arch
web_dev
.todolists.views.add'
),
(
r
'^todo/flag/(\d+)/(\d+)/$'
,
'arch
web_dev
.todolists.views.flag'
),
(
r
'^todo/$'
,
'arch
web_dev
.todolists.views.list'
),
(
r
'^news/(\d+)/$'
,
'arch
linux
.news.views.view'
),
(
r
'^news/add/$'
,
'arch
linux
.news.views.add'
),
(
r
'^news/edit/(\d+)/$'
,
'arch
linux
.news.views.edit'
),
(
r
'^news/delete/(\d+)/$'
,
'arch
linux
.news.views.delete'
),
(
r
'^news/$'
,
'arch
linux
.news.views.list'
),
(
r
'^news/(\d+)/$'
,
'arch
web_dev
.news.views.view'
),
(
r
'^news/add/$'
,
'arch
web_dev
.news.views.add'
),
(
r
'^news/edit/(\d+)/$'
,
'arch
web_dev
.news.views.edit'
),
(
r
'^news/delete/(\d+)/$'
,
'arch
web_dev
.news.views.delete'
),
(
r
'^news/$'
,
'arch
web_dev
.news.views.list'
),
(
r
'^devel/$'
,
'arch
linux
.devel.views.index'
),
(
r
'^devel/notify/$'
,
'arch
linux
.devel.views.change_notify'
),
(
r
'^devel/profile/$'
,
'arch
linux
.devel.views.change_profile'
),
(
r
'^devel/guide/$'
,
'arch
linux
.devel.views.guide'
),
(
r
'^devel/$'
,
'arch
web_dev
.devel.views.index'
),
(
r
'^devel/notify/$'
,
'arch
web_dev
.devel.views.change_notify'
),
(
r
'^devel/profile/$'
,
'arch
web_dev
.devel.views.change_profile'
),
(
r
'^devel/guide/$'
,
'arch
web_dev
.devel.views.guide'
),
(
r
'^wiki/([A-Z]+[A-z0-9 :/-]+)/$'
,
'arch
linux
.wiki.views.page'
),
(
r
'^wiki/edit/([A-Z]+[A-z0-9 :/-]+)/$'
,
'arch
linux
.wiki.views.edit'
),
(
r
'^wiki/delete/$'
,
'arch
linux
.wiki.views.delete'
),
(
r
'^wiki/index/$'
,
'arch
linux
.wiki.views.index'
),
(
r
'^wiki/$'
,
'arch
linux
.wiki.views.main'
),
(
r
'^wiki/([A-Z]+[A-z0-9 :/-]+)/$'
,
'arch
web_dev
.wiki.views.page'
),
(
r
'^wiki/edit/([A-Z]+[A-z0-9 :/-]+)/$'
,
'arch
web_dev
.wiki.views.edit'
),
(
r
'^wiki/delete/$'
,
'arch
web_dev
.wiki.views.delete'
),
(
r
'^wiki/index/$'
,
'arch
web_dev
.wiki.views.index'
),
(
r
'^wiki/$'
,
'arch
web_dev
.wiki.views.main'
),
# Feeds
(
r
'^feeds/(?P<url>.*)/$'
,
'django.contrib.syndication.views.feed'
,
{
'feed_dict'
:
feeds
}),
# (mostly) Static Pages
(
r
'^$'
,
'arch
linux
.public.views.index'
),
(
r
'^about/$'
,
'arch
linux
.public.views.about'
),
(
r
'^art/$'
,
'arch
linux
.public.views.art'
),
(
r
'^cvs/$'
,
'arch
linux
.public.views.cvs'
),
(
r
'^developers/$'
,
'arch
linux
.public.views.developers'
),
(
r
'^donate/$'
,
'arch
linux
.public.views.donate'
),
(
r
'^download/$'
,
'arch
linux
.public.views.download'
),
(
r
'^irc/$'
,
'arch
linux
.public.views.irc'
),
(
r
'^moreforums/$'
,
'arch
linux
.public.views.moreforums'
),
(
r
'^press/$'
,
'arch
linux
.public.views.press'
),
(
r
'^projects/$'
,
'arch
linux
.public.views.projects'
),
(
r
'^$'
,
'arch
web_dev
.public.views.index'
),
(
r
'^about/$'
,
'arch
web_dev
.public.views.about'
),
(
r
'^art/$'
,
'arch
web_dev
.public.views.art'
),
(
r
'^cvs/$'
,
'arch
web_dev
.public.views.cvs'
),
(
r
'^developers/$'
,
'arch
web_dev
.public.views.developers'
),
(
r
'^donate/$'
,
'arch
web_dev
.public.views.donate'
),
(
r
'^download/$'
,
'arch
web_dev
.public.views.download'
),
(
r
'^irc/$'
,
'arch
web_dev
.public.views.irc'
),
(
r
'^moreforums/$'
,
'arch
web_dev
.public.views.moreforums'
),
(
r
'^press/$'
,
'arch
web_dev
.public.views.press'
),
(
r
'^projects/$'
,
'arch
web_dev
.public.views.projects'
),
# Authentication / Admin
(
r
'^denied/$'
,
'arch
linux
.public.views.denied'
),
(
r
'^denied/$'
,
'arch
web_dev
.public.views.denied'
),
(
r
'^login/$'
,
'django.contrib.auth.views.login'
,
{
'template_name'
:
'registration/login.html'
}),
(
r
'^accounts/login/$'
,
'django.contrib.auth.views.login'
,
{
'template_name'
:
'registration/login.html'
}),
(
r
'^logout/$'
,
'django.contrib.auth.views.logout'
,
{
'template_name'
:
'registration/logout.html'
}),
...
...
utils.py
View file @
bd9a99d7
...
...
@@ -5,8 +5,8 @@
from
string
import
*
import
sgmllib
#from arch
linux
.packages.models import Maintainer
#from arch
linux
.settings import BADPRIVS_URL
#from arch
web_dev
.packages.models import Maintainer
#from arch
web_dev
.settings import BADPRIVS_URL
#def is_maintainer(view_func, badprivs_url=BADPRIVS_URL):
# """
# Decorator for views that checks that the logged-in user has a corresponding
...
...
wiki/templatetags/wikitags.py
View file @
bd9a99d7
from
django.template
import
Library
from
django.conf
import
settings
from
arch
linux
.lib
import
markdown
from
arch
web_dev
.lib
import
markdown
import
re
register
=
Library
()
...
...
wiki/views.py
View file @
bd9a99d7
...
...
@@ -3,8 +3,8 @@
#
from
django.http
import
HttpResponse
,
HttpResponseRedirect
from
django.contrib.auth.decorators
import
login_required
from
arch
linux
.utils
import
render_template
from
arch
linux
.wiki.models
import
Wikipage
from
arch
web_dev
.utils
import
render_template
from
arch
web_dev
.wiki.models
import
Wikipage
@
login_required
def
index
(
request
):
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment