Merge branch 'master' of github.com:nemesiscodex/openfonacide

CEAMSO · Jun 17, 2015 · 3a0256e · 3a0256e
2 parents dc2b69c + 267f4b9
commit 3a0256e
Show file tree

Hide file tree

Showing 9 changed files with 116 additions and 10 deletions.
diff --git a/static/css/custom.css b/static/css/custom.css
@@ -166,8 +166,45 @@ footer {
         display: none;
     }
 }
+/*Barra de SCROLL*/
 
 
+
+/* Let's get this party started */
+::-webkit-scrollbar {
+    width: 10px;
+}
+
+/* Track */
+::-webkit-scrollbar-track {
+   /* -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); */
+    -webkit-border-radius: 3px;
+    border-radius: 5px;
+}
+
+/* Handle */
+::-webkit-scrollbar-thumb {
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    background: rgba(200,200,200,0.8); 
+  /*  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5); */
+}
+::-webkit-scrollbar-thumb:window-inactive {
+    background: rgba(100,100,100,0.4); 
+}
+
+/*Barra de SCROLL*/
+/* FIXED NAV */
+
+@media screen and (min-width: 795px)  and (max-width: 1200px) {
+
+    #ng-view{
+       margin-top: 75px !important;
+
+}
+}
+/* END FIXED NAV */
+
 /* SIDEBAR SIZE */
 /* tablet */
 @media only screen and (min-width: 768px) and (max-width: 991px) {

diff --git a/static/img/fonacide.png b/static/img/fonacide.png
diff --git a/templates/home.html b/templates/home.html
@@ -5,13 +5,13 @@
 
         <div class="eight wide computer fourteen wide mobile tablet column centered ">
             <div class="sixteen wide column">
-                <img src="{% static 'img/logo.svg' %}" alt="" class="ui svg image"/>
+                <img src="{% static 'img/logo.png' %}" alt="" class="ui svg image"/>
             </div>
         </div>
 
         <div class="eight wide computer fourteen wide mobile tablet column centered ">
             <div class="sixteen wide column">
-               <p>Con esta herramienta podrás encontrar toda la información referente a los requerimientos de infraestructura de las instituciones priorizadas por la MircroPlanificacion del MEC.</p>
+               <p>Con esta herramienta podrás encontrar toda la información referente a los requerimientos de infraestructura de las instituciones priorizadas por la MicroPlanificación del MEC.</p>
 
                <p><b>Podés comenzar buscando una institución o distrito. ▼</b> </p>
             </div>

diff --git a/templates/index-nuevo.html b/templates/index-nuevo.html
@@ -4,6 +4,22 @@
     <head>
       <meta charset="utf-8">
       <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+
+        <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+        <title>Contralor Fonacide - MEC</title>
+        <meta name="description" content="Con esta herramienta podrás encontrar toda la información referente a los requerimientos de infraestructura de las instituciones priorizadas por la MicroPlanificación del MEC." />
+        <meta name="keywords" content="" />     
+        <meta name="author" content="MEC" />
+
+
+
+        <meta property="og:title" content="Contralor Fonacide" />
+        <meta property="og:site_name" content="Contralor Fonacide"/>       
+        <meta property="og:url" content="http://mec.gov.py/contralorfonacide/" />
+        <meta property="og:image" content="http://mec.gov.py{% static 'img/fonacide.png' %}" />
+        <meta property="article:author" content="https://www.facebook.com/MECDigital" />
+        <meta property="article:publisher" content="https://www.facebook.com/MECDigital" />
+
     <link rel="stylesheet" type="text/css" media="screen" href="{% static 'css/ui.jqgrid.css' %}" />
         <base href="{% url 'index' %}">
         <link href="{% static 'semantic.min.css' %}" rel="stylesheet">
@@ -20,6 +36,35 @@
         <link rel="shortcut icon" type="image/png" href="{% static 'img/favicon.png' %} "/>
 
     </head>
+<style type="text/css">
+
+
+
+
+/* Let's get this party started */
+::-webkit-scrollbar {
+    width: 10px;
+}
+
+/* Track */
+::-webkit-scrollbar-track {
+   /* -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); */
+    -webkit-border-radius: 3px;
+    border-radius: 5px;
+}
+
+/* Handle */
+::-webkit-scrollbar-thumb {
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    background: rgba(200,200,200,0.8); 
+  /*  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5); */
+}
+::-webkit-scrollbar-thumb:window-inactive {
+    background: rgba(255,0,0,0.4); 
+}
+
+</style>
 
     <body id="ng-app" ng-app="frontEnd"  ng-controller="PageController">
         <!--[if IE]>
@@ -33,7 +78,7 @@
         <span ng-init="errors = true"></span>
         {% endif %}
 
-        <div id="ng-view" ng-view ></div>
+        <div id="ng-view" ng-view style="margin-top:40px;" ></div>
         <div archivos-contraloria></div>
         <div agregar-adjudicacion></div>
         <div login-modal></div>

diff --git a/templates/map.html b/templates/map.html
@@ -892,7 +892,7 @@ <h4>Prioridad</h4>
 </div>
 
 
-<div class="pusher mapContainer" style="background-color: #00b5ad"
+<div class="pusher mapContainer" style="background-color: #00b5ad;"
      onClick="$('#map').css('width', '100%'); window.map.invalidateSize();">
     <div id="map" style="height: 96%">
         <div class="ui indeterminate large text active loader map-loader">

diff --git a/templates/nav.html b/templates/nav.html
@@ -1,7 +1,8 @@
 {% load staticfiles %}
+
 <div class="ui grid" style="margin:0">
     <div class="computer tablet only row" style="padding: 0">
-        <div class="ui inverted teal large menu navbar ">
+        <div class="ui inverted teal large menu navbar fixed top sticky " style="z-index: 99999">
             <a href="{% url 'index' %}" class="brand item">Contralor de Fonacide <i class="unhide icon"></i></a>
             <a href="{% url 'index' %}" class="item"><i class="home icon"></i>Inicio</a>
             <a href="map" class="item" ng-class="{active: $location.path().match('/?map.*') != null}"><i class="marker icon"></i> Mapa</a>
@@ -35,8 +36,8 @@
         </div>
 
     </div>
-    <div class="mobile only row" style="padding: 0;">
-        <div class="ui inverted teal large menu navbar " style="z-index: 100">
+    <div class="mobile only row" style="padding: 15px;">
+        <div class="ui inverted teal large menu navbar fixed top sticky" style="z-index: 99999">
             <div search  class="item" style="padding: 0; width: 100%" input-class="large"></div>
             <a href="{% url 'index' %}" class="brand item"><i class="unhide icon"></i></a>
 

diff --git a/templates/visualizaciones/agua.html b/templates/visualizaciones/agua.html
@@ -5,6 +5,14 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta charset="UTF-8">
     <title>Abastecimiento de Agua</title>
+    <meta name="description" content="¿De dónde proviene el liquido vital para las escuelas de nuestro país?La fuente de abastecimiento de agua en las escuelas priorizadas para recibir los fondos de FONACIDE es muy
+            variada." />
+
+      <meta property="og:title" content="Abastecimiento de Agua" />
+        <meta property="og:site_name" content="Contralor Fonacide"/>       
+        <meta property="og:url" content="http://mec.gov.py/contralorfonacide/agua/" />
+        <meta property="og:image" content="{% static 'images/agua.png' %}" />
+
 
     <script src="{% static 'js/d3.v3.min.js' %}"></script>
     <script src="{% static 'js/liquidFillGauge.js' %}"></script>

diff --git a/templates/visualizaciones/dncp.html b/templates/visualizaciones/dncp.html
@@ -4,11 +4,18 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title></title>
-        <meta name="description" content="">
+        <title>Adjudicaciones Fonacide-DNCP</title>
+
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <link rel="apple-touch-icon" href="apple-touch-icon.png">
 
+        <meta name="description" content="En esta infografía podrás responder algunas de las preguntas más comunes en torno a las contrataciones referentes a FONACIDE." />
+
+      <meta property="og:title" content="Abastecimiento de Agua" />
+        <meta property="og:site_name" content="Contralor Fonacide"/>       
+        <meta property="og:url" content="http://mec.gov.py/contralorfonacide/dncp/" />
+        <meta property="og:image" content="{% static 'images/dncp.png' %}" />
+
         <link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}">
          <link rel="stylesheet" href="{% static 'css/bootstrap-theme.min.css' %}">
 

diff --git a/templates/visualizaciones/mobiliarios.html b/templates/visualizaciones/mobiliarios.html
@@ -7,8 +7,16 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0"> 
 		<title>Solicitud de Mobiliarios - MEC</title>
 		<meta name="description" content="Solicitud de Mobiliarios - MEC" />
-		<meta name="keywords" content="" />
+		<meta name="keywords" content="" />		
 		<meta name="author" content="MEC" />
+		 <link rel="shortcut icon" type="image/png" href="{% static 'img/favicon.png' %} "/>
+
+
+        <meta property="og:title" content="Contralor Fonacide" />
+        <meta property="og:site_name" content="Contralor Fonacide"/>       
+        <meta property="og:url" content="http://mec.gov.py/contralorfonacide/mobiliarios/" />
+        <meta property="og:image" content="{% static 'images/mobiliarios.png' %}" />
+
 
 		<link rel="stylesheet" type="text/css" href="{% static 'css/mobiliarios-demo.css' %}" />
 		<link rel="stylesheet" type="text/css" href="{% static 'css/mobiliarios.css' %}" />