File clean up

pedrogaudencio · May 12, 2014 · 72d5100 · 72d5100
1 parent 3df5ba7
commit 72d5100
Show file tree

Hide file tree

Showing 75 changed files with 22 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,8 @@
+*.pyc
+*.pyo
+*.db
+.DS_Store
+.coverage
+local_settings.py
+/static
+gen_tgz_iifa.sh
diff --git a/.hgignore b/.hgignore
@@ -0,0 +1,10 @@
+syntax: glob
+*.pyc
+*.pyo
+*.db
+.DS_Store
+.coverage
+local_settings.py
+
+syntax: regexp
+^static/
diff --git a/__init__.py b/__init__.py
diff --git a/__init__.pyc b/__init__.pyc
diff --git a/contactos/__init__.py b/contactos/__init__.py
diff --git a/contactos/__init__.pyc b/contactos/__init__.pyc
diff --git a/contactos/models.py b/contactos/models.py
diff --git a/contactos/models.pyc b/contactos/models.pyc
diff --git a/contactos/tests.py b/contactos/tests.py
diff --git a/contactos/views.py b/contactos/views.py
diff --git a/fabfile.py b/fabfile.py
diff --git a/listagens/__init__.py b/listagens/__init__.py
diff --git a/listagens/__init__.pyc b/listagens/__init__.pyc
diff --git a/listagens/models.py b/listagens/models.py
diff --git a/listagens/models.pyc b/listagens/models.pyc
diff --git a/listagens/tests.py b/listagens/tests.py
diff --git a/listagens/translation.py b/listagens/translation.py
diff --git a/listagens/views.py b/listagens/views.py
diff --git a/listagens_bottom/__init__.py b/listagens_bottom/__init__.py
diff --git a/listagens_bottom/__init__.pyc b/listagens_bottom/__init__.pyc
diff --git a/listagens_bottom/admin.py b/listagens_bottom/admin.py
diff --git a/listagens_bottom/admin.pyc b/listagens_bottom/admin.pyc
diff --git a/listagens_bottom/models.py b/listagens_bottom/models.py
diff --git a/listagens_bottom/models.pyc b/listagens_bottom/models.pyc
diff --git a/listagens_bottom/tests.py b/listagens_bottom/tests.py
diff --git a/listagens_bottom/views.py b/listagens_bottom/views.py
diff --git a/local_settings.py b/local_settings.py
diff --git a/local_settings.pyc b/local_settings.pyc
diff --git a/paginas/__init__.py b/paginas/__init__.py
diff --git a/paginas/__init__.pyc b/paginas/__init__.pyc
diff --git a/paginas/models.py b/paginas/models.py
@@ -67,4 +67,4 @@ class Meta:
 
 
 admin.site.register(Pagina, PageAdmin)
-admin.site.register(BotoesPopup)
+admin.site.register(BotoesPopup)
diff --git a/paginas/models.pyc b/paginas/models.pyc
diff --git a/paginas/tests.py b/paginas/tests.py
diff --git a/paginas/translation.py b/paginas/translation.py
diff --git a/paginas/urls.py b/paginas/urls.py
diff --git a/paginas/urls.pyc b/paginas/urls.pyc
diff --git a/paginas/views.py b/paginas/views.py
diff --git a/paginas/views.pyc b/paginas/views.pyc
diff --git a/requirements/project.txt b/requirements/project.txt
@@ -1,3 +1 @@
-Mezzanine==3.0.4
-django-modeltranslation==0.7.3
-git+git://github.com/renyi/mezzanine-blocks.git
+Mezzanine==3.0.4
diff --git a/settings.py b/settings.py
@@ -238,7 +238,6 @@
     "mezzanine.twitter",
     #"mezzanine.accounts",
     #"mezzanine.mobile",
-    "mezzanine_blocks",
 
     "sliders",
     "submenus",

diff --git a/settings.pyc b/settings.pyc
diff --git a/sliders/__init__.py b/sliders/__init__.py
diff --git a/sliders/__init__.pyc b/sliders/__init__.pyc
diff --git a/sliders/admin.py b/sliders/admin.py
diff --git a/sliders/admin.pyc b/sliders/admin.pyc
diff --git a/sliders/models.py b/sliders/models.py
diff --git a/sliders/models.pyc b/sliders/models.pyc
diff --git a/sliders/tests.py b/sliders/tests.py
diff --git a/sliders/views.py b/sliders/views.py
diff --git a/static/img/favicon.ico b/static/img/favicon.ico
diff --git a/static/img/icons/down_arrow.png b/static/img/icons/down_arrow.png
diff --git a/static/img/icons/modal-close.png b/static/img/icons/modal-close.png
diff --git a/static/img/icons/page-back-button.png b/static/img/icons/page-back-button.png
diff --git a/static/img/icons/page-back-button.psd b/static/img/icons/page-back-button.psd
diff --git a/static/img/icons/page-forward-button.png b/static/img/icons/page-forward-button.png
diff --git a/static/img/icons/page-forward-button.psd b/static/img/icons/page-forward-button.psd
diff --git a/static/js/flowplayer/flowplayer-3.2.13.min.js b/static/js/flowplayer/flowplayer-3.2.13.min.js
diff --git a/static/js/flowplayer/flowplayer-3.2.18.swf b/static/js/flowplayer/flowplayer-3.2.18.swf
diff --git a/static/js/flowplayer/flowplayer.controls-3.2.16.swf b/static/js/flowplayer/flowplayer.controls-3.2.16.swf
diff --git a/static/js/jquery.min.js b/static/js/jquery.min.js
diff --git a/submenus/__init__.py b/submenus/__init__.py
diff --git a/submenus/__init__.pyc b/submenus/__init__.pyc
diff --git a/submenus/models.py b/submenus/models.py
@@ -46,4 +46,4 @@ class Meta:
 
 
 admin.site.register(Submenus, PageAdmin)
-admin.site.register(Botoes)
+admin.site.register(Botoes)
diff --git a/submenus/models.pyc b/submenus/models.pyc
diff --git a/submenus/tests.py b/submenus/tests.py
diff --git a/submenus/translation.py b/submenus/translation.py
diff --git a/submenus/views.py b/submenus/views.py
diff --git a/templates/base.html b/templates/base.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <html lang="{{ LANGUAGE_CODE }}"{% if LANGUAGE_BIDI %} dir="rtl"{% endif %}>
-{% load pages_tags mezzanine_tags i18n future staticfiles block_tags %}
+{% load pages_tags mezzanine_tags i18n future staticfiles %}
 <head>
 <meta http-equiv="Content-type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">

diff --git a/templates/includes/footer_scripts.html b/templates/includes/footer_scripts.html
diff --git a/templates/index.html b/templates/index.html
diff --git a/templates/menus/header_menu.html b/templates/menus/header_menu.html
diff --git a/templates/pages/page.html b/templates/pages/page.html
diff --git a/urls.py b/urls.py
diff --git a/urls.pyc b/urls.pyc
diff --git a/wsgi.py b/wsgi.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -67,4 +67,4 @@ class Meta:


		admin.site.register(Pagina, PageAdmin)
		admin.site.register(BotoesPopup)
		admin.site.register(BotoesPopup)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,4 +46,4 @@ class Meta:


		admin.site.register(Submenus, PageAdmin)
		admin.site.register(Botoes)
		admin.site.register(Botoes)