ILB
/
sigi
mirror of https://github.com/interlegis/sigi.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

feedback de requisicao e inversao dos menus

diagnosticos
Felipe Vieira 13 years ago
parent
845038b501
commit
fe43bde1a2
6 changed files with 48 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      media/js/diagnosticos/diagnosticos_categorias_form.js
  2. 10
      sigi/templates/base_mobile.html
  3. 7
      sigi/templates/diagnosticos/diagnosticos_categoria_casa_legislativa_form.html
  4. 7
      sigi/templates/diagnosticos/diagnosticos_categoria_contatos_form.html
  5. 6
      sigi/templates/diagnosticos/diagnosticos_categorias_form.html
  6. 4
      sigi/templates/diagnosticos/diagnosticos_categorias_list.html

21
media/js/diagnosticos/diagnosticos_categorias_form.js
View File

@ -1,10 +1,23 @@
// cntabiliza a quantidade de requests
// ajax para nao desabilitar o loader
// antes da hora
var nun_ajax = 0;
$('#page').live('pageinit', function(event){ $('#page').live('pageinit', function(event){
// variaveis globais para as requisicoes ajax // variaveis globais para as requisicoes ajax
$.ajaxSetup({ $.ajaxSetup({
url: $(location).attr('href'), url: $(location).attr('href'),
cache: false, cache: false,
type: 'POST', type: 'POST',
beforeSend: function() {
nun_ajax++;
$('#working').show();
},
success: function(data) { success: function(data) {
nun_ajax--;
if (nun_ajax == 0)
$('#working').hide();
//Retirando o span existente //Retirando o span existente
$("span.errors").html(""); $("span.errors").html("");
if (data.mensagem == "erro") { if (data.mensagem == "erro") {
@ -14,8 +27,11 @@ $('#page').live('pageinit', function(event){
} }
}, },
error: function(msg) { error: function(msg) {
$("#open-dialog").click() nun_ajax--;
}, if (nun_ajax == 0)
$('#working').hide();
$("#open-dialog").click();
}
}); });
// remove a resposta vazia da interface // remove a resposta vazia da interface
@ -31,5 +47,6 @@ $('#page').live('pageinit', function(event){
// se carregou o js sem erros mostra as perguntas // se carregou o js sem erros mostra as perguntas
$("#waiting").hide(); $("#waiting").hide();
$("#working").hide();
$("#form").show(); $("#form").show();
}); });

10
sigi/templates/base_mobile.html
View File

@ -16,27 +16,29 @@
}); });
</script> </script>
<script src="http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.js"></script> <script src="http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.js"></script>
<script src="{{MEDIA_URL}}js/diagnosticos/diagnosticos_categorias_form.js"></script>
{% endblock media %} {% endblock media %}
</head> </head>
<body> <body>
<div data-role="page" id="page" class="type-interior"> <div data-role="page" id="page" class="type-interior">
<div data-role="header"> <div data-role="header" data-position="fixed">
<img id="working" src="{{MEDIA_URL}}images/loader.gif" class="ui-btn-right"/>
{% block cabecalho %}{% endblock cabecalho %} {% block cabecalho %}{% endblock cabecalho %}
</div> <!-- header --> </div> <!-- header -->
<div data-role="content" class="content-primary"> <div data-role="content" class="content-primary">
{% block corpo %}{% endblock corpo %} {% block corpo %}{% endblock corpo %}
</div><!-- content --> </div><!-- content -->
{% block rodape %} <div data-role="footer">
<div data-role="footer" data-position="fixed">
<div data-role="navbar"> <div data-role="navbar">
{% block rodape %}
<ul> <ul>
<li><a href="#" data-icon="grid" class="ui-state-persist">Listar</a></li> <li><a href="#" data-icon="grid" class="ui-state-persist">Listar</a></li>
<li><a href="#" data-icon="home">Home</a></li> <li><a href="#" data-icon="home">Home</a></li>
<li><a href="#" data-icon="plus">Anexar Arquivos</a></li> <li><a href="#" data-icon="plus">Anexar Arquivos</a></li>
</ul> </ul>
{% endblock rodape %}
</div> </div>
</div> <!-- footer --> </div> <!-- footer -->
{% endblock rodape %}
</div> <!-- page --> </div> <!-- page -->
<a id='open-dialog' href="#dialog" data-rel="dialog" data-transition="pop" style='display:none;'></a> <a id='open-dialog' href="#dialog" data-rel="dialog" data-transition="pop" style='display:none;'></a>

7
sigi/templates/diagnosticos/diagnosticos_categoria_casa_legislativa_form.html
View File

@ -3,11 +3,10 @@
{% block media %} {% block media %}
{{ block.super }} {{ block.super }}
<link rel="stylesheet" href="{{MEDIA_URL}}css/diagnosticos/diagnosticos_categoria_model_form.css" /> <link rel="stylesheet" href="{{MEDIA_URL}}css/diagnosticos/diagnosticos_categoria_model_form.css" />
<script src="{{MEDIA_URL}}js/diagnosticos/diagnosticos_categorias_form.js"></script>
{% endblock %} {% endblock %}
{% block cabecalho %} {% block cabecalho %}
<h1>Identificação da Camara Municipal</h1> <h1>01. Identificação da Camara Municipal</h1>
<a href="{% url lista_categorias diagnostico.id %}" data-icon="arrow-l" <a href="{% url lista_categorias diagnostico.id %}" data-icon="arrow-l"
data-direction="reverse" data-theme="c" class="ui-btn-left">Voltar</a> data-direction="reverse" data-theme="c" class="ui-btn-left">Voltar</a>
{% endblock cabecalho %} {% endblock cabecalho %}
@ -42,12 +41,8 @@
{% endblock corpo %} {% endblock corpo %}
{% block rodape %} {% block rodape %}
<div data-role="footer" data-position="fixed">
<div data-role="navbar">
<ul> <ul>
<li><a href="{% url lista_categorias diagnostico.id %}" data-icon="grid" class="ui-state-persist ui-btn-active">Listar</a></li> <li><a href="{% url lista_categorias diagnostico.id %}" data-icon="grid" class="ui-state-persist ui-btn-active">Listar</a></li>
<li><a href="{% url lista_diagnosticos %}" data-icon="home">Home</a></li> <li><a href="{% url lista_diagnosticos %}" data-icon="home">Home</a></li>
</ul> </ul>
</div>
</div> <!-- footer -->
{% endblock rodape %} {% endblock rodape %}

7
sigi/templates/diagnosticos/diagnosticos_categoria_contatos_form.html
View File

@ -3,11 +3,10 @@
{% block media %} {% block media %}
{{ block.super }} {{ block.super }}
<link rel="stylesheet" href="{{MEDIA_URL}}css/diagnosticos/diagnosticos_categoria_model_form.css" /> <link rel="stylesheet" href="{{MEDIA_URL}}css/diagnosticos/diagnosticos_categoria_model_form.css" />
<script src="{{MEDIA_URL}}js/diagnosticos/diagnosticos_categorias_form.js"></script>
{% endblock %} {% endblock %}
{% block cabecalho %} {% block cabecalho %}
<h1>Identificação de Competências</h1> <h1>02. Identificação de Competências</h1>
<a href="{% url lista_categorias diagnostico.id %}" data-icon="arrow-l" <a href="{% url lista_categorias diagnostico.id %}" data-icon="arrow-l"
data-direction="reverse" data-theme="c" class="ui-btn-left">Voltar</a> data-direction="reverse" data-theme="c" class="ui-btn-left">Voltar</a>
{% endblock cabecalho %} {% endblock cabecalho %}
@ -44,12 +43,8 @@
{% endblock corpo %} {% endblock corpo %}
{% block rodape %} {% block rodape %}
<div data-role="footer" data-position="fixed">
<div data-role="navbar">
<ul> <ul>
<li><a href="{% url lista_categorias diagnostico.id %}" data-icon="grid" class="ui-state-persist ui-btn-active">Listar</a></li> <li><a href="{% url lista_categorias diagnostico.id %}" data-icon="grid" class="ui-state-persist ui-btn-active">Listar</a></li>
<li><a href="{% url lista_diagnosticos %}" data-icon="home">Home</a></li> <li><a href="{% url lista_diagnosticos %}" data-icon="home">Home</a></li>
</ul> </ul>
</div>
</div> <!-- footer -->
{% endblock rodape %} {% endblock rodape %}

6
sigi/templates/diagnosticos/diagnosticos_categorias_form.html
View File

@ -3,8 +3,6 @@
{% block media %} {% block media %}
{{ block.super }} {{ block.super }}
<link rel="stylesheet" href="{{MEDIA_URL}}css/diagnosticos/diagnosticos_categorias_form.css" /> <link rel="stylesheet" href="{{MEDIA_URL}}css/diagnosticos/diagnosticos_categorias_form.css" />
<script src="{{MEDIA_URL}}js/diagnosticos/diagnosticos_categorias_form.js"></script>
{% endblock %} {% endblock %}
{% block cabecalho %} {% block cabecalho %}
@ -36,14 +34,10 @@
{% endblock corpo %} {% endblock corpo %}
{% block rodape %} {% block rodape %}
<div data-role="footer" data-position="fixed">
<div data-role="navbar">
<ul> <ul>
<li><a href="{% url lista_categorias categoria.id %}" data-icon="grid" class="ui-state-persist ui-btn-active">Listar</a></li> <li><a href="{% url lista_categorias categoria.id %}" data-icon="grid" class="ui-state-persist ui-btn-active">Listar</a></li>
<li><a href="{% url lista_diagnosticos %}" data-icon="home">Home</a></li> <li><a href="{% url lista_diagnosticos %}" data-icon="home">Home</a></li>
</ul> </ul>
</div>
</div> <!-- footer -->
{% endblock rodape %} {% endblock rodape %}

4
sigi/templates/diagnosticos/diagnosticos_categorias_list.html
View File

@ -32,11 +32,7 @@
{% endblock corpo %} {% endblock corpo %}
{% block rodape %} {% block rodape %}
<div data-role="footer" data-position="fixed">
<div data-role="navbar">
<ul> <ul>
<li><a href="{% url lista_diagnosticos %}" data-icon="home">Home</a></li> <li><a href="{% url lista_diagnosticos %}" data-icon="home">Home</a></li>
</ul> </ul>
</div>
</div> <!-- footer -->
{% endblock rodape %} {% endblock rodape %}

Write Preview
Loading…
Cancel
Save