mudanças css e base

9 years ago · b260176457
8 changed files with 49 additions and 50 deletions
--- a/sigi/settings/base.py
+++ b/sigi/settings/base.py
@ -129,12 +129,6 @@ STATIC_URL = '/static/'
 STATICFILES_DIRS = (
    os.path.join(BASE_DIR, 'sigiStatic'),
 )
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    'djangobower.finders.BowerFinder',
-    'sass_processor.finders.CssFinder',
-)

 SERVER_EMAIL = 'sigi@interlegis.leg.br'
 DEFAULT_FROM_EMAIL = 'spdt@interlegis.leg.br'
@ -200,6 +194,17 @@ LOGGING = {
    },
 }

+STATIC_URL = '/static/'
+STATIC_ROOT = os.path.join(BASE_DIR, "collected_static")
+STATICFILES_DIRS = (os.path.join(BASE_DIR, ("static")),)
+
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    'djangobower.finders.BowerFinder',
+    'sass_processor.finders.CssFinder',
+)
+
 CRISPY_TEMPLATE_PACK = 'bootstrap3'
 CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap3'
 CRISPY_FAIL_SILENTLY = False
--- a/sigiStatic/img/img_atendimento/favicon.ico
+++ b/sigiStatic/img/img_atendimento/favicon.ico
--- a/sigiStatic/img/img_atendimento/glyphicons-halflings-white.png
+++ b/sigiStatic/img/img_atendimento/glyphicons-halflings-white.png
--- a/sigiStatic/img/img_atendimento/glyphicons-halflings.png
+++ b/sigiStatic/img/img_atendimento/glyphicons-halflings.png
--- a/sigiStatic/img/img_atendimento/logo.png
+++ b/sigiStatic/img/img_atendimento/logo.png
--- a/sigiStatic/img/img_atendimento/logo_cc.jpg
+++ b/sigiStatic/img/img_atendimento/logo_cc.jpg
--- a/sigiStatic/img/img_atendimento/logo_interlegis.jpg
+++ b/sigiStatic/img/img_atendimento/logo_interlegis.jpg
--- a/templates/base.html
+++ b/templates/base.html
@ -6,12 +6,12 @@
    <meta charset="utf-8" name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Sistema de Atendimento</title>
    {% block head_content %}
-      <link rel="icon" href="{% static 'img/favicon.ico' %}"  type="image/png" >
+      <link rel="icon" href="{% static 'img/img_atendimento/favicon.ico' %}"  type="image/png" >
      <!-- Bootstrap -->
      <link href="{% static 'css/bootstrap-fluid-adj.css' %}" rel="stylesheet">
-      <link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet" media="screen">
+      <link href="{% static 'bootstrap/css/bootstrap.min.css' %}" rel="stylesheet" media="screen">
      <link href="{% static 'css/bootstrap-responsive.css' %}" rel="stylesheet">
-      <link href="{% sass_src 'bootstrap-sass/assets/stylesheets/_bootstrap.scss' %}" rel="stylesheet">
+      <link href="{% static 'bootstrap-sass/assets/stylesheets/_bootstrap.css' %}" rel="stylesheet">
    {% endblock head_content %}
  </head>

@ -19,14 +19,8 @@
      <div class="navbar navbar-inverse navbar-fixed-top">
       <div class="navbar-inner">
           <div class="container">
-             <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                 <span class="icon-bar"></span>
-                 <span class="icon-bar"></span>
-                 <span class="icon-bar"></span>
-             </button>
-
-             <div class="nav-collapse collapse">
-                 <ul class="nav pull-right">
+               <div class="nav-collapse">
+                   <ul class="nav navbar-nav pull-right">
                     {% if user.is_authenticated %}
                      <li class="dropdown">
                        <a href="" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ user.username }}<span class="caret"></span></a>
@ -41,13 +35,12 @@
                      <li><a href="{% url 'usuarios:login' %}">Login</a></li>
                     {% endif %}
                   </ul>
-                 <ul class="nav">
+                   <ul class="nav navbar-nav">
                     {% if user.is_authenticated %}
-                    <li><a href="{% url 'solicitacoes:solicitacao_list' %}">Solicitação</a></li>
-                    <li><a href="{% url 'solicitacoes:sistema_list' %}">Sistema</a></li>
+                      <li><a href="{% url 'servicos:solicitacao_list' %}">Solicitação</a></li>
+                      <li><a href="{% url 'servicos:sistema_list' %}">Sistema</a></li>
                      <li><a href="{% url 'usuarios:usuario_list' %}">Habilitar</a></li>
                     {% endif %}
-                   <li><a href="">Contato</a></li>
                   </ul>
               </div>
           </div>
@ -55,6 +48,7 @@
     </div>
    {% endblock navigation %}

+
  <body>
    {% block body_block %}
      {# Header #}
@ -64,7 +58,7 @@
            <div class="container">
              <div class="navbar-header">
                <a href="/">
-                  <img align="left" height="120" width="120" src="{% static 'img/logo.png' %}" alt="Logo" class="img-responsive visible-lg-inline-block vcenter" >
+                  <img align="left" height="120" width="120" src="{% static 'img/img_atendimento/logo.png' %}" alt="Logo" class="img-responsive visible-lg-inline-block vcenter" >
                  <span class="vcenter" style="display:inline-block; color:black;" align="right">
                    <h2>Interlegis</h4><small><p>Sistema de Solicitação de Serviços</p></small>
                  </span>
@ -117,7 +111,7 @@
      <script src="{% static 'jquery-ui/jquery-ui.min.js' %}"></script>
      <script src="{% static 'jquery-mask-plugin/dist/jquery.mask.js' %}"></script>

-      <script src="{% static 'js/bootstrap.min.js' %}"></script>
+      <script src="{% static 'bootstrap/js/bootstrap.min.js' %}"></script>
      <script src="{% static 'js/app.js' %}"></script>
      {% block extra_js %}{% endblock extra_js %}
    {% endblock foot_js %}
@ -130,7 +124,7 @@
        <div class="row">
          <div style="float:left">
            <a class="footer__logo" href="#">
-              <img src="{% static 'img/logo_interlegis.jpg' %}" alt="{% trans 'Logo do Interlegis' %} ">
+              <img src="{% static 'img/img_atendimento/logo_interlegis.jpg' %}" alt="{% trans 'Logo do Interlegis' %} ">
            </a>
            <p>
              <small>
@ -140,7 +134,7 @@
          </div>
          <div style="float:right">
            <a class="footer__logo" href="">
-              <img src="{% static 'img/logo_cc.jpg' %}" alt="{% trans 'Logo do Creative Commons BY SA' %}">
+              <img src="{% static 'img/img_atendimento/logo_cc.jpg' %}" alt="{% trans 'Logo do Creative Commons BY SA' %}">
            </a>
            <p>
              <small>