Merge branch 'develop'

.gitignore

@@ -36,4 +36,5 @@ nosetests.xml
 .pydevproject
 .gitignore
 fotos
-sigi.db
+*.db
+media/

sigi/apps/casas/views.py

@@ -18,14 +18,22 @@ from django.conf import settings
 
 import csv
 
-def query_ordena(qs,o,ot):
+# @param qs: queryset
-    list_display = ('nome','municipio','logradouro')
+# @param o: (int) number of order field
-
+def query_ordena(qs, o):
-    aux = list_display[(int(o)-1)]
+    from sigi.apps.casas.admin import CasaLegislativaAdmin
-    if ot =='asc':
+    list_display = CasaLegislativaAdmin.list_display
-        qs = qs.order_by(aux)
+    order_fields = []
-    else:
+
-        qs = qs.order_by("-"+aux)
+    for order_number in o.split('.'):
+        order_number = int(order_number)
+        order = ''
+        if order_number != abs(order_number):
+            order_number = abs(order_number)
+            order = '-'
+        order_fields.append(order + list_display[order_number - 1])
+
+    qs = qs.order_by(*order_fields)
     return qs
 
 def get_for_qs(get,qs):
@@ -34,13 +42,13 @@ def get_for_qs(get,qs):
     """
     kwargs = {}
     for k,v in get.iteritems():
-        if not (k == 'page' or k == 'pop' or k == 'q'):            
+        if str(k) not in ('page', 'pop', 'q', '_popup', 'o', 'ot'):
-            if not k == 'o':
+            kwargs[str(k)] = v
-                if k == "ot":
+
-                    qs = query_ordena(qs,get["o"],get["ot"])
+    qs = qs.filter(**kwargs)
-                else:
+    if 'o' in get:
-                    kwargs[str(k)] = v
+        qs = query_ordena(qs,get['o'])
-                    qs = qs.filter(**kwargs)
+
     return qs
 
 def carrinhoOrGet_for_qs(request):

sigi/apps/diagnosticos/templates/diagnosticos/graficos.html

@@ -35,6 +35,7 @@ jQuery(document).ready(function () {
 {% block content %}
 <div id="content-main">
   <form id="categoria" action="." method="POST">
+    {% csrf_token %}
       <select name="categoria">
         {% for categoria in categorias %}
         <option value="{{ categoria.id }}" {% if categoria.id == sel_categoria %}selected="selected"{% endif %}>{{ categoria.nome }}</option>
@@ -47,7 +48,7 @@ jQuery(document).ready(function () {
       {{ pergunta }}
         <li>
           {% if pergunta.datatype == 'many' or pergunta.datatype == 'one' %}
-          <a id="{{ pergunta.name }}" href="/sigi/api/diagnosticos/?id={{ pergunta.name }}"><p>{{ pergunta.title }}</p></a>
+          <a id="{{ pergunta.name }}" href="/sigi/diagnosticos/api/?id={{ pergunta.name }}"><p>{{ pergunta.title }}</p></a>
           <div id="output_{{ pergunta.name }}" class="grafico">
             <img style="display:none"/>
           </div>

sigi/apps/metas/templates/metas/mapa.html

@@ -10,7 +10,7 @@
 	<script type="text/javascript" src="{% static "admin/js/jquery.min.js" %}"></script>
 	<script type="text/javascript" src="{% static "admin/js/jquery.init.js" %}"></script>
 	<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script>
-	<script type="text/javascript" src="{{ MEDIA_URL }}js/metas/mapa.js"></script>
+	<script type="text/javascript" src="{{ STATIC_URL }}js/metas/mapa.js"></script>
 	<style>
 	  .totalizador { float:right; }
 	</style>
@@ -22,7 +22,7 @@
 	<div id="toolbar">
 		<form method="get" action="" id="changelist-search">
 			<div><!-- DIV needed for valid HTML -->
-				<label for="searchbar"><img alt="Search" src="/sigi/admin_media/img/admin/icon_searchbox.png"></label>
+				<label for="searchbar"><img alt="Search" src="{{ STATIC_URL }}admin/img/icon_searchbox.png"></label>
 				<input type="text" id="searchbar" value="" name="q" size="40">
 				<input type="submit" value="Pesquisar">
 				<span id="search-panel" class="small quiet">&nbsp;</span>

sigi/settings.py

@@ -26,17 +26,6 @@ TEMPLATE_DEBUG = True
 
 ALLOWED_HOSTS = []
 
-# TEMPLATE_CONTEXT_PROCESSORS = (
-#     "django.contrib.auth.context_processors.auth",
-#     "django.core.context_processors.debug",
-#     "django.core.context_processors.i18n",
-#     "django.core.context_processors.media",
-#     "django.core.context_processors.static",
-#     "django.core.context_processors.tz",
-#     "django.contrib.messages.context_processors.messages",
-#     'sigi.context_processors.charts_data',
-# )
-
 TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + (
     'sigi.context_processors.charts_data',
 )
@@ -118,9 +107,14 @@ USE_TZ = True
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/dev/howto/static-files/
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
 STATIC_URL = '/static/'
 
+STATICFILES_DIRS = (
+    os.path.join(BASE_DIR, 'sigiStatic'),
+)
+
 # ADMIN_MEDIA_PREFIX = '/sigi/admin_media/' # Deprecated!
 
 DEFAULT_FROM_EMAIL = 'sesostris@interlegis.leg.br'
@@ -131,14 +125,3 @@ TEMPLATE_DIRS = (
 )
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 MEDIA_URL = '/media/'
-
-# STATIC_ROOT = os.path.join(BASE_DIR, 'static')
-
-# STATICFILES_DIRS = (
-#     os.path.join(BASE_DIR, "sitestatic"),
-# )
-
-# STATICFILES_FINDERS = (
-#     "django.contrib.staticfiles.finders.FileSystemFinder",
-#     "django.contrib.staticfiles.finders.AppDirectoriesFinder"
-# )

sigi/urls.py

@@ -21,7 +21,7 @@ urlpatterns = patterns('',
     
 
     url(r'^sigi/', include(admin.site.urls)),
-) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 
 if settings.DEBUG:
     urlpatterns = patterns('',

media/css/base_site.css → sigiStatic/css/base_site.css

@@ -8,7 +8,7 @@ a:hover {
 
 /* HEADER */
 #header {
-	background: #003351 url(../images/default-bg2.jpg);
+	background: #003351 url(../img/default-bg2.jpg);
 }
 
 #site-name a:hover {
@@ -39,7 +39,7 @@ a:hover {
 }
 
 #nav-global li a {
-	/*background: url("../images/menu/seperator.gif") bottom right no-repeat;*/
+	/*background: url("../img/menu/seperator.gif") bottom right no-repeat;*/
 	color: #cccccc;
 	display: block;
 	font-weight: normal;
@@ -79,7 +79,7 @@ a:hover {
 }
 
 #nav-global li li {
-	background: url('../images/menu/sub_sep.gif') bottom left no-repeat;
+	background: url('../img/menu/sub_sep.gif') bottom left no-repeat;
 	display: block;
 	float: none;
 	margin: 0px;
@@ -117,7 +117,7 @@ div.breadcrumbs {
 
 /* CONTENT */
 .module h2,.module caption,.inline-group h2 {
-	background: #00367b url(../images/default-bg.gif);
+	background: #00367b url(../img/default-bg.gif);
 }
 
 .row1 {