Conjunto de cambios beac5e8 en consulta_publica para participacion
- Fecha y hora:
- 22/03/2017 15:53:09 (hace 7 años)
- Branches:
- master, base, constituyente, estudiantes, general, plan_patria, sala
- Children:
- 81b0915
- Parents:
- bae8490 (diferencia), 95b08c1 (diferencia)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Ubicación:
- participacion
- Ficheros:
-
- 4 editados
Leyenda
- No modificado
- Añadido
- Eliminado
-
participacion/forms.py
ra1ac8b8 rbae8490 14 14 # @version 1.0 15 15 from django import forms 16 from base.functions import cargar_consulta, cargar_ministerios, cargar_vicepresidencias, cargar_ambitos 16 from base.functions import cargar_consulta, cargar_ministerios, cargar_vicepresidencias, cargar_ambitos, cargar_sectores 17 17 18 18 … … 63 63 self.fields['vicepresidencias'].choices = cargar_vicepresidencias() 64 64 self.fields['ambito'].choices = cargar_ambitos() 65 self.fields['sector'].choices = cargar_sectores() 65 66 66 67 ## Vicepresidencias … … 87 88 ambito = forms.ChoiceField(widget=forms.Select(attrs={'class':'form-control'}), 88 89 label="Selecione un ambito") 89 90 90 91 ## Sector 91 92 sector = forms.ChoiceField(widget=forms.Select(attrs={'class':'form-control'}), -
participacion/templates/participacion.create.html
r1731833 r95b08c1 7 7 <div class="row text-center"> 8 8 <h1>Consulta</h1><hr> 9 <div class="row ">9 <div class="row center-block" style="width: 90%"> 10 10 <div class="progress non-null" role="progressbar" id="status" > 11 11 <div class="progress-bar progress-bar active" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"> -
participacion/templates/participacion.index.html
r2d85efb r95b08c1 3 3 {% block title %}Ver Consultas{% endblock %} 4 4 {% block content %} 5 <form action="{% url 'participacion_index' %}" role="form" class="form form-horizontal validate-form" method="post" autocomplete="off"> 6 {% csrf_token %} 7 <div class="row text-center"> 8 <h1>Ver Consultas</h1><hr> 9 <div class="col-md-12 col-sm-12 col-xs-12"> 10 <div class="form-group {% if form.consultas.errors %}has-error{% endif %}"> 11 <label class="col-md-3 col-xs-3 col-sm-3 control-label" for="{{ form.consultas.auto_id }}"> 12 {{ form.consultas.label }} 13 </label> 14 <div class="col-md-4 col-xs-4 col-sm-4"> 15 {{ form.consultas }} 16 {% include 'base.forms.errors.html' with form_errors=form.consultas.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 5 <div id="content"> 6 <form action="{% url 'participacion_index' %}" role="form" class="form form-horizontal validate-form" method="post" autocomplete="off"> 7 {% csrf_token %} 8 <div class="row text-center"> 9 <h1>Ver Consultas</h1><hr> 10 <div class="col-md-12 col-sm-12 col-xs-12"> 11 <div class="form-group {% if form.consultas.errors %}has-error{% endif %}"> 12 <label class="col-md-3 col-xs-3 col-sm-3 control-label" for="{{ form.consultas.auto_id }}"> 13 {{ form.consultas.label }} 14 </label> 15 <div class="col-md-4 col-xs-4 col-sm-4"> 16 {{ form.consultas }} 17 {% include 'base.forms.errors.html' with form_errors=form.consultas.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 18 </div> 19 <div class="col-sm-1"><i class="ion ion-ios-medical item-requerido"></i></div> 17 20 </div> 18 <div class="col-sm-1"><i class="ion ion-ios-medical item-requerido"></i></div>19 21 </div> 22 <div class="col-md-12 col-sm-12 col-xs-12"> 23 <button type="submit" class="btn btn-success">Participar</button> 24 </div> 20 25 </div> 21 <div class="col-md-12 col-sm-12 col-xs-12"> 22 <button type="submit" class="btn btn-success">Participar</button> 23 </div> 24 </div> 25 </form> 26 </form> 27 </div> 26 28 {% endblock %} -
participacion/templates/participacion.search.html
ra1ac8b8 r95b08c1 3 3 {% block title %}Buscar{% endblock %} 4 4 {% block content %} 5 <form action="" role="form" class="form form-horizontal validate-form" method="post" autocomplete="off"> 6 {% csrf_token %} 7 <div class="row text-center"> 8 <h1>Buscar</h1><hr> 9 <div class="row"> 10 <div class="col-md-6 col-sm-6 col-xs-6"> 11 <div class="form-group {% if form.vicepresidencias.errors %}has-error{% endif %}"> 12 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.vicepresidencias.auto_id }}"> 13 {{ form.vicepresidencias.label }} 14 </label> 15 <div class="col-md-6 col-xs-6 col-sm-6"> 16 {{ form.vicepresidencias }} 17 {% include 'base.forms.errors.html' with form_errors=form.vicepresidencias.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 5 <div id="content"> 6 <form action="" role="form" class="form form-horizontal validate-form" method="post" autocomplete="off"> 7 {% csrf_token %} 8 <div class="row text-center"> 9 <h1>Buscar</h1><hr> 10 <div class="row"> 11 <div class="col-md-6 col-sm-6 col-xs-6"> 12 <div class="form-group {% if form.vicepresidencias.errors %}has-error{% endif %}"> 13 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.vicepresidencias.auto_id }}"> 14 {{ form.vicepresidencias.label }} 15 </label> 16 <div class="col-md-6 col-xs-6 col-sm-6"> 17 {{ form.vicepresidencias }} 18 {% include 'base.forms.errors.html' with form_errors=form.vicepresidencias.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 19 </div> 20 </div> 21 </div> 22 <div class="col-md-6 col-sm-6 col-xs-6"> 23 <div class="form-group {% if form.ministerios.errors %}has-error{% endif %}"> 24 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.ministerios.auto_id }}"> 25 {{ form.ministerios.label }} 26 </label> 27 <div class="col-md-6 col-xs-6 col-sm-6"> 28 {{ form.ministerios }} 29 {% include 'base.forms.errors.html' with form_errors=form.ministerios.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 30 </div> 18 31 </div> 19 32 </div> 20 33 </div> 21 <div class="col-md-6 col-sm-6 col-xs-6"> 22 <div class="form-group {% if form.ministerios.errors %}has-error{% endif %}"> 23 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.ministerios.auto_id }}"> 24 {{ form.ministerios.label }} 25 </label> 26 <div class="col-md-6 col-xs-6 col-sm-6"> 27 {{ form.ministerios }} 28 {% include 'base.forms.errors.html' with form_errors=form.ministerios.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 34 35 <div class="row"> 36 <div class="col-md-4 col-sm-4 col-xs-4"> 37 <div class="form-group {% if form.estado.errors %}has-error{% endif %}"> 38 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.estado.auto_id }}"> 39 {{ form.estado.label }} 40 </label> 41 <div class="col-md-6 col-xs-6 col-sm-6"> 42 {{ form.estado }} 43 {% include 'base.forms.errors.html' with form_errors=form.estado.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 44 </div> 45 </div> 46 </div> 47 <div class="col-md-4 col-sm-4 col-xs-4"> 48 <div class="form-group {% if form.municipio.errors %}has-error{% endif %}"> 49 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.municipio.auto_id }}"> 50 {{ form.municipio.label }} 51 </label> 52 <div class="col-md-6 col-xs-6 col-sm-6"> 53 {{ form.municipio }} 54 {% include 'base.forms.errors.html' with form_errors=form.municipio.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 55 </div> 56 </div> 57 </div> 58 <div class="col-md-4 col-sm-4 col-xs-4"> 59 <div class="form-group {% if form.parroquia.errors %}has-error{% endif %}"> 60 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.parroquia.auto_id }}"> 61 {{ form.parroquia.label }} 62 </label> 63 <div class="col-md-6 col-xs-6 col-sm-6"> 64 {{ form.parroquia }} 65 {% include 'base.forms.errors.html' with form_errors=form.parroquia.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 66 </div> 29 67 </div> 30 68 </div> 31 69 </div> 32 </div> 33 34 <div class="row"> 35 <div class="col-md-4 col-sm-4 col-xs-4"> 36 <div class="form-group {% if form.estado.errors %}has-error{% endif %}"> 37 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.estado.auto_id }}"> 38 {{ form.estado.label }} 39 </label> 40 <div class="col-md-6 col-xs-6 col-sm-6"> 41 {{ form.estado }} 42 {% include 'base.forms.errors.html' with form_errors=form.estado.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 70 <div class="row"> 71 <div class="col-md-6 col-sm-6 col-xs-6"> 72 <div class="form-group {% if form.ambito.errors %}has-error{% endif %}"> 73 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.ambito.auto_id }}"> 74 {{ form.ambito.label }} 75 </label> 76 <div class="col-md-6 col-xs-6 col-sm-6"> 77 {{ form.ambito }} 78 {% include 'base.forms.errors.html' with form_errors=form.ambito.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 79 </div> 80 </div> 81 </div> 82 <div class="col-md-6 col-sm-6 col-xs-6"> 83 <div class="form-group {% if form.sector.errors %}has-error{% endif %}"> 84 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.sector.auto_id }}"> 85 {{ form.sector.label }} 86 </label> 87 <div class="col-md-6 col-xs-6 col-sm-6"> 88 {{ form.sector }} 89 {% include 'base.forms.errors.html' with form_errors=form.sector.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 90 </div> 43 91 </div> 44 92 </div> 45 93 </div> 46 <div class="col-md-4 col-sm-4 col-xs-4"> 47 <div class="form-group {% if form.municipio.errors %}has-error{% endif %}"> 48 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.municipio.auto_id }}"> 49 {{ form.municipio.label }} 50 </label> 51 <div class="col-md-6 col-xs-6 col-sm-6"> 52 {{ form.municipio }} 53 {% include 'base.forms.errors.html' with form_errors=form.municipio.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 54 </div> 55 </div> 56 </div> 57 <div class="col-md-4 col-sm-4 col-xs-4"> 58 <div class="form-group {% if form.parroquia.errors %}has-error{% endif %}"> 59 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.parroquia.auto_id }}"> 60 {{ form.parroquia.label }} 61 </label> 62 <div class="col-md-6 col-xs-6 col-sm-6"> 63 {{ form.parroquia }} 64 {% include 'base.forms.errors.html' with form_errors=form.parroquia.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 65 </div> 66 </div> 67 </div> 94 <div class="col-md-12 col-sm-12 col-xs-12"> 95 <a type="button" class="btn btn-info pull-left" href="{% url 'participacion_index' %}">Regresar</a> 96 <button type="submit" class="btn btn-success">Buscar</button> 97 </div> 68 98 </div> 69 <div class="row"> 70 <div class="col-md-6 col-sm-6 col-xs-6"> 71 <div class="form-group {% if form.ambito.errors %}has-error{% endif %}"> 72 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.ambito.auto_id }}"> 73 {{ form.ambito.label }} 74 </label> 75 <div class="col-md-6 col-xs-6 col-sm-6"> 76 {{ form.ambito }} 77 {% include 'base.forms.errors.html' with form_errors=form.ambito.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 78 </div> 79 </div> 80 </div> 81 <div class="col-md-6 col-sm-6 col-xs-6"> 82 <div class="form-group {% if form.sector.errors %}has-error{% endif %}"> 83 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.sector.auto_id }}"> 84 {{ form.sector.label }} 85 </label> 86 <div class="col-md-6 col-xs-6 col-sm-6"> 87 {{ form.sector }} 88 {% include 'base.forms.errors.html' with form_errors=form.sector.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 89 </div> 90 </div> 91 </div> 92 </div> 93 <div class="col-md-12 col-sm-12 col-xs-12"> 94 <a type="button" class="btn btn-info pull-left" href="{% url 'participacion_index' %}">Regresar</a> 95 <button type="submit" class="btn btn-success">Buscar</button> 96 </div> 97 </div> 98 </form> 99 </form> 100 </div> 99 101 {% endblock %}
Nota: Vea TracChangeset
para ayuda en el uso del visor de conjuntos de cambios.