Permalink
Browse files

Refactoring for better distribution

  • Loading branch information...
1 parent 69a4e3a commit 8a98d3214299c8fc8d37ff440eb47bb9c791dd47 @mariocesar committed Feb 14, 2011
Showing with 21 additions and 37 deletions.
  1. +10 −0 .gitignore
  2. 0 README
  3. 0 django-templator/readme.txt → README.rst
  4. 0 setup.py → TODO
  5. 0 django-templator/templator/site_media/favicon.ico → boostrap.py
  6. 0 django-templator/templator/conf/local/__init__.py → buildout.cfg
  7. +0 −1 django-templator/requirements.txt
  8. +0 −14 django-templator/templator/conf/local/example/settings.py
  9. +0 −11 django-templator/templator/conf/local/example/urls.py
  10. 0 {django-templator/templator/conf → example}/__init__.py
  11. 0 {django-templator → example}/manage.py
  12. 0 {django-templator/templator/site_media → example/media}/fancybox/blank.gif
  13. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_close.png
  14. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_loading.png
  15. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_nav_left.png
  16. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_nav_right.png
  17. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_shadow_e.png
  18. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_shadow_n.png
  19. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_shadow_ne.png
  20. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_shadow_nw.png
  21. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_shadow_s.png
  22. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_shadow_se.png
  23. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_shadow_sw.png
  24. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_shadow_w.png
  25. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_title_left.png
  26. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_title_main.png
  27. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_title_over.png
  28. 0 {django-templator/templator/site_media → example/media}/fancybox/fancy_title_right.png
  29. 0 {django-templator/templator/site_media → example/media}/fancybox/fancybox-x.png
  30. 0 {django-templator/templator/site_media → example/media}/fancybox/fancybox-y.png
  31. 0 {django-templator/templator/site_media → example/media}/fancybox/fancybox.png
  32. 0 {django-templator/templator/site_media → example/media}/fancybox/jquery.easing-1.3.pack.js
  33. 0 {django-templator/templator/site_media → example/media}/fancybox/jquery.fancybox-1.3.1.css
  34. 0 {django-templator/templator/site_media → example/media}/fancybox/jquery.fancybox-1.3.1.js
  35. 0 {django-templator/templator/site_media → example/media}/fancybox/jquery.fancybox-1.3.1.pack.js
  36. 0 {django-templator/templator/site_media → example/media}/fancybox/jquery.mousewheel-3.0.2.pack.js
  37. 0 django-templator/templator/__init__.py → example/media/favicon.ico
  38. 0 {django-templator/templator/site_media → example/media}/scripts/jquery-1.4.2.min.js
  39. 0 {django-templator/templator/site_media → example/media}/scripts/jquery.taboverride-1.0.js
  40. 0 {django-templator/templator/site_media → example/media}/styles/main.css
  41. +2 −2 {django-templator/templator/conf → example}/settings.py
  42. 0 {django-templator/templator → example}/templates/404.html
  43. 0 {django-templator/templator → example}/templates/500.html
  44. 0 {django-templator/templator → example}/templates/base.html
  45. 0 {django-templator/templator → example}/templates/plantillas/form.html
  46. 0 {django-templator/templator/conf → example}/urls.py
  47. 0 {django-templator/templator/plantillas → templator}/__init__.py
  48. +1 −1 {django-templator/templator/plantillas → templator}/admin.py
  49. 0 {django-templator/templator/plantillas → templator}/defaultfilters.py
  50. 0 {django-templator/templator/plantillas → templator}/fields.py
  51. +1 −1 {django-templator/templator/plantillas → templator}/forms.py
  52. +1 −1 {django-templator/templator/plantillas → templator}/loader.py
  53. +1 −1 {django-templator/templator/plantillas → templator}/models.py
  54. 0 {django-templator/templator/plantillas → templator}/reporter.py
  55. +1 −1 {django-templator/templator/plantillas → templator}/utils.py
  56. +4 −4 {django-templator/templator/plantillas → templator}/views.py
View
10 .gitignore
@@ -0,0 +1,10 @@
+*.pyc
+*.swp
+*.swo
+bin
+develop-eggs
+downloads
+eggs
+parts
+.installed.cfg
+*.db
View
0 README
No changes.
View
0 django-templator/readme.txt → README.rst
File renamed without changes.
View
0 setup.py → TODO
File renamed without changes.
View
0 ...emplator/templator/site_media/favicon.ico → boostrap.py 100644 → 100755
File renamed without changes.
View
0 ...emplator/templator/conf/local/__init__.py → buildout.cfg
File renamed without changes.
View
1 django-templator/requirements.txt
@@ -1 +0,0 @@
-django==1.2.1
View
14 django-templator/templator/conf/local/example/settings.py
@@ -1,14 +0,0 @@
-from templator.conf.settings import *
-
-DEBUG = True
-
-DATABASES['default']['ENGINE'] = 'django.db.backends.sqlite3'
-DATABASES['default']['NAME'] = os.path.join(PROJECT_PATH, 'conf', 'local', 'dev.db')
-
-UNSAFE_PATHS = (
- '/path/to/site-packages/',
- '/path/to/django-templator/',
-)
-
-ROOT_URLCONF = 'templator.conf.local.urls'
-
View
11 django-templator/templator/conf/local/example/urls.py
@@ -1,11 +0,0 @@
-from django.conf import settings
-
-from templator.conf.urls import *
-
-# in case using internal server
-urlpatterns += patterns('django.views.static',
- (r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 'serve', {
- 'document_root': settings.MEDIA_ROOT,
- 'show_indexes': True,
- }),
-)
View
0 django-templator/templator/conf/__init__.py → example/__init__.py
File renamed without changes.
View
0 django-templator/manage.py → example/manage.py
File renamed without changes.
View
0 ...r/templator/site_media/fancybox/blank.gif → example/media/fancybox/blank.gif
File renamed without changes
View
0 ...lator/site_media/fancybox/fancy_close.png → example/media/fancybox/fancy_close.png
File renamed without changes
View
0 ...tor/site_media/fancybox/fancy_loading.png → example/media/fancybox/fancy_loading.png
File renamed without changes
View
0 ...or/site_media/fancybox/fancy_nav_left.png → example/media/fancybox/fancy_nav_left.png
File renamed without changes
View
0 ...r/site_media/fancybox/fancy_nav_right.png → example/media/fancybox/fancy_nav_right.png
File renamed without changes
View
0 ...or/site_media/fancybox/fancy_shadow_e.png → example/media/fancybox/fancy_shadow_e.png
File renamed without changes
View
0 ...or/site_media/fancybox/fancy_shadow_n.png → example/media/fancybox/fancy_shadow_n.png
File renamed without changes
View
0 ...r/site_media/fancybox/fancy_shadow_ne.png → example/media/fancybox/fancy_shadow_ne.png
File renamed without changes
View
0 ...r/site_media/fancybox/fancy_shadow_nw.png → example/media/fancybox/fancy_shadow_nw.png
File renamed without changes
View
0 ...or/site_media/fancybox/fancy_shadow_s.png → example/media/fancybox/fancy_shadow_s.png
File renamed without changes
View
0 ...r/site_media/fancybox/fancy_shadow_se.png → example/media/fancybox/fancy_shadow_se.png
File renamed without changes
View
0 ...r/site_media/fancybox/fancy_shadow_sw.png → example/media/fancybox/fancy_shadow_sw.png
File renamed without changes
View
0 ...or/site_media/fancybox/fancy_shadow_w.png → example/media/fancybox/fancy_shadow_w.png
File renamed without changes
View
0 .../site_media/fancybox/fancy_title_left.png → example/media/fancybox/fancy_title_left.png
File renamed without changes
View
0 .../site_media/fancybox/fancy_title_main.png → example/media/fancybox/fancy_title_main.png
File renamed without changes
View
0 .../site_media/fancybox/fancy_title_over.png → example/media/fancybox/fancy_title_over.png
File renamed without changes
View
0 ...site_media/fancybox/fancy_title_right.png → example/media/fancybox/fancy_title_right.png
File renamed without changes
View
0 ...plator/site_media/fancybox/fancybox-x.png → example/media/fancybox/fancybox-x.png
File renamed without changes
View
0 ...plator/site_media/fancybox/fancybox-y.png → example/media/fancybox/fancybox-y.png
File renamed without changes
View
0 ...emplator/site_media/fancybox/fancybox.png → example/media/fancybox/fancybox.png
File renamed without changes
View
0 ..._media/fancybox/jquery.easing-1.3.pack.js → .../media/fancybox/jquery.easing-1.3.pack.js
File renamed without changes.
View
0 ..._media/fancybox/jquery.fancybox-1.3.1.css → .../media/fancybox/jquery.fancybox-1.3.1.css
File renamed without changes.
View
0 ...e_media/fancybox/jquery.fancybox-1.3.1.js → ...e/media/fancybox/jquery.fancybox-1.3.1.js
File renamed without changes.
View
0 ...ia/fancybox/jquery.fancybox-1.3.1.pack.js → ...ia/fancybox/jquery.fancybox-1.3.1.pack.js
File renamed without changes.
View
0 .../fancybox/jquery.mousewheel-3.0.2.pack.js → .../fancybox/jquery.mousewheel-3.0.2.pack.js
File renamed without changes.
View
0 django-templator/templator/__init__.py → example/media/favicon.ico
File renamed without changes.
View
0 ...or/site_media/scripts/jquery-1.4.2.min.js → example/media/scripts/jquery-1.4.2.min.js
File renamed without changes.
View
0 ...e_media/scripts/jquery.taboverride-1.0.js → ...e/media/scripts/jquery.taboverride-1.0.js
File renamed without changes.
View
0 ...ator/templator/site_media/styles/main.css → example/media/styles/main.css
File renamed without changes.
View
4 django-templator/templator/conf/settings.py → example/settings.py
@@ -24,7 +24,7 @@
USE_L10N = False
MEDIA_ROOT = os.path.join(PROJECT_PATH, 'site_media')
-MEDIA_URL = '/site_media/'
+MEDIA_URL = '/media/'
ROOT_URLCONF = 'templator.conf.urls'
@@ -48,7 +48,7 @@
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.admin',
- 'templator.plantillas',
+ 'templator',
)
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
View
0 ...go-templator/templator/templates/404.html → example/templates/404.html
File renamed without changes.
View
0 ...go-templator/templator/templates/500.html → example/templates/500.html
File renamed without changes.
View
0 ...o-templator/templator/templates/base.html → example/templates/base.html
File renamed without changes.
View
0 .../templator/templates/plantillas/form.html → example/templates/plantillas/form.html
File renamed without changes.
View
0 django-templator/templator/conf/urls.py → example/urls.py
File renamed without changes.
View
0 ...emplator/templator/plantillas/__init__.py → templator/__init__.py
File renamed without changes.
View
2 ...o-templator/templator/plantillas/admin.py → templator/admin.py
@@ -1,6 +1,6 @@
from django.contrib import admin
-from templator.plantillas.models import TemplateContext, Template
+from templator.models import TemplateContext, Template
admin.site.register(TemplateContext)
admin.site.register(Template)
View
0 ...or/templator/plantillas/defaultfilters.py → templator/defaultfilters.py
File renamed without changes.
View
0 ...-templator/templator/plantillas/fields.py → templator/fields.py
File renamed without changes.
View
2 ...o-templator/templator/plantillas/forms.py → templator/forms.py
@@ -4,7 +4,7 @@
from django import forms
from django.utils.translation import ugettext as _
-from templator.plantillas.models import TemplateContext, Template
+from templator.models import TemplateContext, Template
class TemplateContextForm(forms.ModelForm):
View
2 ...-templator/templator/plantillas/loader.py → templator/loader.py
@@ -7,7 +7,7 @@
find_template_loader,
make_origin)
-from templator.plantillas.models import Template as TemplateModel
+from templator.models import Template as TemplateModel
thread_context = threading.local()
View
2 ...-templator/templator/plantillas/models.py → templator/models.py
@@ -1,7 +1,7 @@
from django.db import models
from django.utils.translation import ugettext as _
-from templator.plantillas.fields import UUIDField
+from templator.fields import UUIDField
class TemplateContext(models.Model):
View
0 ...emplator/templator/plantillas/reporter.py → templator/reporter.py
File renamed without changes.
View
2 ...o-templator/templator/plantillas/utils.py → templator/utils.py
@@ -7,7 +7,7 @@
from django.template.loader import render_to_string
from django.utils import simplejson
-from templator.plantillas.reporter import ExceptionReporter
+from templator.reporter import ExceptionReporter
SAFE_MIMES = (
View
8 ...o-templator/templator/plantillas/views.py → templator/views.py
@@ -8,10 +8,10 @@
from django.shortcuts import get_object_or_404, redirect, render_to_response
from django.utils.translation import ugettext as _
-from templator.plantillas import loader
-from templator.plantillas.forms import TemplateContextForm, TemplateForm
-from templator.plantillas.models import TemplateContext, Template
-from templator.plantillas.utils import (get_context_from_request,
+from templator import loader
+from templator.forms import TemplateContextForm, TemplateForm
+from templator.models import TemplateContext, Template
+from templator.utils import (get_context_from_request,
template_to_response,
get_object_or_none,
uuid_hex,

0 comments on commit 8a98d32

Please sign in to comment.