Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: solidaridadUY/solidaridaduy.github.io
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: fchavat/solidaridaduy.github.io
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 51 files changed
  • 1 contributor

Commits on Apr 3, 2020

  1. Copy the full SHA
    f871331 View commit details
  2. Instalar jekyll-leaflet

    fchavat committed Apr 3, 2020
    Copy the full SHA
    6b060c1 View commit details
  3. Copy the full SHA
    1611ae3 View commit details
  4. Copy the full SHA
    ea054da View commit details

Commits on Apr 4, 2020

  1. Copy the full SHA
    d05d1af View commit details

Commits on Apr 6, 2020

  1. Agregar partial de mapa

    fchavat committed Apr 6, 2020
    Copy the full SHA
    3dbd69c View commit details

Commits on Apr 7, 2020

  1. Copy the full SHA
    62c13c4 View commit details
Showing with 504 additions and 162 deletions.
  1. +0 −1 Gemfile
  2. +8 −0 _includes/head.html
  3. +26 −0 _includes/map.html
  4. +8 −0 _includes/org-popup-content.html
  5. +56 −63 _layouts/home.html
  6. +3 −0 _organizaciones/org001.markdown
  7. +3 −0 _organizaciones/org002.markdown
  8. +4 −1 _organizaciones/org003.markdown
  9. +3 −0 _organizaciones/org004.markdown
  10. +3 −0 _organizaciones/org005.markdown
  11. +3 −0 _organizaciones/org006.markdown
  12. +3 −0 _organizaciones/org007.markdown
  13. +3 −0 _organizaciones/org008.markdown
  14. +3 −0 _organizaciones/org009.markdown
  15. +3 −0 _organizaciones/org010.markdown
  16. +4 −2 _organizaciones/org011.markdown
  17. +3 −0 _organizaciones/org012.markdown
  18. +3 −0 _organizaciones/org013.markdown
  19. +3 −0 _organizaciones/org014.markdown
  20. +3 −0 _organizaciones/org015.markdown
  21. +3 −0 _organizaciones/org016.markdown
  22. +4 −3 _organizaciones/org017.markdown
  23. +3 −0 _organizaciones/org018.markdown
  24. +3 −0 _organizaciones/org019.markdown
  25. +3 −0 _organizaciones/org020.markdown
  26. +3 −0 _organizaciones/org021.markdown
  27. +3 −0 _organizaciones/org022.markdown
  28. +3 −0 _organizaciones/org023.markdown
  29. +3 −0 _organizaciones/org024.markdown
  30. +3 −0 _organizaciones/org025.markdown
  31. +3 −0 _organizaciones/org026.markdown
  32. +3 −0 _organizaciones/org027.markdown
  33. +3 −0 _organizaciones/org028.markdown
  34. +3 −0 _organizaciones/org030.markdown
  35. +3 −0 _organizaciones/org032.markdown
  36. +3 −0 _organizaciones/org033.markdown
  37. +5 −2 _organizaciones/org034.markdown
  38. +3 −0 _organizaciones/org036.markdown
  39. +3 −0 _organizaciones/org039.markdown
  40. +3 −0 _organizaciones/org041.markdown
  41. +3 −0 _organizaciones/org042.markdown
  42. +3 −0 _organizaciones/org043.markdown
  43. +3 −0 _organizaciones/org044.markdown
  44. +3 −0 _organizaciones/org046.markdown
  45. +22 −0 _organizaciones/org18.markdown
  46. +23 −0 _organizaciones/org37.markdown
  47. +1 −0 _sass/header.scss
  48. +102 −0 _sass/home.scss
  49. +15 −0 _sass/post.scss
  50. +113 −90 assets/main.scss
  51. +8 −0 assets/utils-icons.svg
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -29,4 +29,3 @@ end

# Performance-booster for watching directories on Windows
gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform?

8 changes: 8 additions & 0 deletions _includes/head.html
Original file line number Diff line number Diff line change
@@ -35,4 +35,12 @@

gtag('config', 'UA-162185365-1');
</script>
<!-- Mapa de Leaflet -->
<script src="https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"
integrity="sha512-gZwIG9x3wUXg2hdXF6+rVkLF/0Vi9U8D2Ntg4Ga5I5BZpVkVxlJWbSQtXPSiUTtC0TjtGOmxa1AJPuV0CPthew=="
crossorigin=""></script>
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css"
integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ=="
crossorigin=""/>
<!-- -------------- -->
</head>
26 changes: 26 additions & 0 deletions _includes/map.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<div id="leaflet-map"></div>

<script>
let mapZoom = screen.width < 800 ? 6 : 7;
var map = L.map('leaflet-map').setView([-33.055, -55.629], mapZoom);
L.tileLayer('http://{s}.tiles.mapbox.com/v3/{mapId}/{z}/{x}/{y}.png', {
attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a>, Imagery &copy; <a href="http://mapbox.com">Mapbox</a>',
mapId: 'ebrelsford.ho06j5h0',
maxZoom: 18
}).addTo(map);

{%- for org in site.organizaciones -%}
{%- if org.ubicacion and org.ubicacion.latitud and org.ubicacion.longitud -%}
{%- capture popupContent -%}
{%- include org-popup-content.html content=org -%}
{%- endcapture -%}
{%- capture processedPopupContent -%}
{{ popupContent | strip_newlines }}
{%- endcapture -%}

var marker = L.marker([{{ org.ubicacion.latitud }}, {{ org.ubicacion.longitud }}])
.bindPopup("{{ processedPopupContent }}")
.addTo(map);
{%- endif -%}
{%- endfor -%}
</script>
8 changes: 8 additions & 0 deletions _includes/org-popup-content.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<h3>{{ include.content.title }}</h3>
<p>
<b>Se necesita:</b>
{{ include.content.necesidades }}
</p>
<p>
<a href='{{ include.content.url }}' target='_BLANK'>Ver mas...</a>
</p>
119 changes: 56 additions & 63 deletions _layouts/home.html
Original file line number Diff line number Diff line change
@@ -3,104 +3,97 @@
---

<div class="home">

{%- if page.title -%}
<h1 class="page-heading">{{ page.title }}</h1>
{%- endif -%}

{{ content }}


{% if site.paginate %}
{% assign posts = paginator.organizaciones %}
{% else %}
{% assign posts = site.organizaciones %}
{% endif %}

<div id="home-map">
{%- include map.html orgs=site.organizaciones -%}
</div>

{%- if posts.size > 0 -%}
<!--<h2 class="post-list-heading">Todas las organizaciones</h2>-->

<!-- Html Elements for Search -->
<div id="search-container" class="search">
<input type="text" id="search-input" class="search-field" placeholder="Buscar por nombre, ciudad, barrio o actividad ...">

<div class="home-list">
<!-- Html Elements for Search -->
<div class="search-container">
<svg class="svg-icon"><use xlink:href="/assets/utils-icons.svg#search"></use></svg>
<input type="text" id="search-input" placeholder="Buscar por nombre, ciudad, barrio o actividad ...">
</div>
<ul id="results-container" class="post-list"></ul>
<ul id="list" class="post-list">
{%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%}
{%- for post in posts -%}
<li>
<a class="post-link" href="{{ post.url | relative_url }}">
<span class="post-meta">{{ post.barrio }}, {{ post.departamento }}</span>
<h5>
{{ post.title | escape }}
</h5>
<span class="post-meta">
{{ post.actividades }}
</span>
{%- if site.show_excerpts -%}
{{ post.excerpt }}
{%- endif -%}
</a>
</li>
{%- endfor -%}
</ul>

{% if site.paginate %}
<div class="pager">
<ul class="pagination">
{%- if paginator.previous_page %}
<li><a href="{{ paginator.previous_page_path | relative_url }}" class="previous-page">{{ paginator.previous_page }}</a></li>
{%- else %}
<li><div class="pager-edge"></div></li>
{%- endif %}
<li><div class="current-page">{{ paginator.page }}</div></li>
{%- if paginator.next_page %}
<li><a href="{{ paginator.next_page_path | relative_url }}" class="next-page">{{ paginator.next_page }}</a></li>
{%- else %}
<li><div class="pager-edge"></div></li>
{%- endif %}
</ul>
</div>
{%- endif %}
</div>

<!-- hay un java script que oculta uno de estos dos divs dependiendo si se muestra todo el listado o solo las búsquedas-->

<div id="results-container" class="row flex-grid"></div>

<div id="row" class="row flex-grid">
{%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%}
{%- for post in posts -%}

<a class="post-link" href="{{ post.url | relative_url }}">
<article class="box-item">
<div class="box-body">
<div class="box-barrio">
<span class="post-meta">{{ post.barrio }}, {{ post.departamento }}</span>
</div>
<h3>
<a class="post-link" href="{{ post.url | relative_url }}">
{{ post.title | escape }}
</a>
</h3>
<p>{{ post.actividades }}</p>
{%- if site.show_excerpts -%}
{{ post.excerpt }}
{%- endif -%}
</div>
</article>
</a>
{%- endfor -%}

</div>

{% if site.paginate %}
<div class="pager">
<ul class="pagination">
{%- if paginator.previous_page %}
<li><a href="{{ paginator.previous_page_path | relative_url }}" class="previous-page">{{ paginator.previous_page }}</a></li>
{%- else %}
<li><div class="pager-edge"></div></li>
{%- endif %}
<li><div class="current-page">{{ paginator.page }}</div></li>
{%- if paginator.next_page %}
<li><a href="{{ paginator.next_page_path | relative_url }}" class="next-page">{{ paginator.next_page }}</a></li>
{%- else %}
<li><div class="pager-edge"></div></li>
{%- endif %}
</ul>
</div>
{%- endif %}

{%- endif -%}

</div>

<!-- Script pointing to search-script.js -->
<script src="js/search-script.js" type="text/javascript"></script>
<script src="js/jquery-3.4.1.min.js"></script>

<!-- Configuration -->
<script>
SimpleJekyllSearch({
this.window.simpleJekyllSearch = SimpleJekyllSearch({
searchInput: document.getElementById('search-input'),
resultsContainer: document.getElementById('results-container'),
searchResultTemplate: '<article class="box-item"><div class="box-body"><div class="box-barrio"><span class="post-meta">{barrio}, {departamento}</span></div><h3><a class="post-link" href="{url}">{title}</a></h3><p>{actividades}</p></div></article>',
searchResultTemplate: '<li><a class="post-link" href="{url}"><span class="post-meta">{barrio}, {departamento}</span><h5>{title}</h5></a></li>',
noResultsText: ("¡No se encontraron resultados!"),
json: '/search.json'
json: '/search.json',

})
</script>

<script src="js/jquery-3.4.1.min.js"></script>

<script>
$(document).ready(function(){
$("#search-input").keyup(function() {
$("#row").hide();
$("#list").hide();
if (!$('#search-input').val()) {
$("#row").show();
$("#list").show();
};
});
});
</script>
</script>
3 changes: 3 additions & 0 deletions _organizaciones/org001.markdown
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ actividades: "Punto de Donación"
necesidades: "Alimentos no perecederos, frutas y verduras, productos de higiene"
telefono_contacto: "099563819"
direccion: "Grecia esq. Perú"
ubicacion:
latitud: -34.87866
longitud: -56.25052

otros_contactos: ""
horario: ""
3 changes: 3 additions & 0 deletions _organizaciones/org002.markdown
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ actividades: "Merienda"
necesidades: "Es merendero y olla popular. Reciben todo tipo de donaciones"
telefono_contacto: "091997349"
direccion: "Cont Ovidio Fernandez Rios"
ubicacion:
latitud: -34.82579
longitud: -56.11116

otros_contactos: ""
horario: ""
5 changes: 4 additions & 1 deletion _organizaciones/org003.markdown
Original file line number Diff line number Diff line change
@@ -9,7 +9,10 @@ barrio: "Cruz de Carrasco"
actividades: "Punto de Donación"
necesidades: "Alimentos"
telefono_contacto: "25258077 092465261"
direccion: "Agazzi 2707"
direccion: "Agazzi 2707 "
ubicacion:
latitud: -34.87191
longitud: -56.097

otros_contactos: ""
horario: "10 a 15 hs"
3 changes: 3 additions & 0 deletions _organizaciones/org004.markdown
Original file line number Diff line number Diff line change
@@ -13,6 +13,9 @@ telefono_contacto: "097 098 032
097 474 368
094 098 578"
direccion: "Manuel Acuña y Del Fuerte"
ubicacion:
latitud: -34.85228
longitud: -56.11779

otros_contactos: ""
horario: "L a V 20:30 hs.S y D 14 hs.."
3 changes: 3 additions & 0 deletions _organizaciones/org005.markdown
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ actividades: "Olla"
necesidades: "Alimentos y donaciones"
telefono_contacto: "096 880 946"
direccion: "José Piendibene 3642 esq. Lacio"
ubicacion:
latitud: -34.83852
longitud: -56.13701

otros_contactos: ""
horario: "Sabado 28, hora 20 - llevar vianda"
3 changes: 3 additions & 0 deletions _organizaciones/org006.markdown
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ actividades: "Punto de Donación"
necesidades: "Alimentos"
telefono_contacto: "098 600 393"
direccion: "Emilio Romero y Agustín Muñoz"
ubicacion:
latitud: -34.86778
longitud: -56.22833

otros_contactos: ""
horario: ""
3 changes: 3 additions & 0 deletions _organizaciones/org007.markdown
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ actividades: "Punto de Donación"
necesidades: "Alimentos y productos de higiene."
telefono_contacto: "092 279 519"
direccion: "Dionisio Coronel 963"
ubicacion:
latitud: -34.8686563
longitud: -56.2358108

otros_contactos: ""
horario: ""
3 changes: 3 additions & 0 deletions _organizaciones/org008.markdown
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ actividades: "Olla"
necesidades: "Alimentos y donaciones"
telefono_contacto: "094413087"
direccion: "Emilio Romero 952 esq Heredia"
ubicacion:
latitud: -34.87105
longitud: -56.23252

otros_contactos: ""
horario: "13 a 15 hs"
3 changes: 3 additions & 0 deletions _organizaciones/org009.markdown
Original file line number Diff line number Diff line change
@@ -12,6 +12,9 @@ telefono_contacto: "097151643
096671054
091067740"
direccion: "Ideario Artiguista y Liga Federal"
ubicacion:
latitud: -34.8216
longitud: -56.28288

otros_contactos: ""
horario: ""
3 changes: 3 additions & 0 deletions _organizaciones/org010.markdown
Original file line number Diff line number Diff line change
@@ -11,6 +11,9 @@ necesidades: "Alimentos"
telefono_contacto: "25119629
095495706"
direccion: "Servidumbre 705 (Salón comunal)"
ubicacion:
latitud: -34.82057
longitud: -56.09067

otros_contactos: ""
horario: ""
6 changes: 4 additions & 2 deletions _organizaciones/org011.markdown
Original file line number Diff line number Diff line change
@@ -11,8 +11,10 @@ barrio: "Paso Carrasco"
actividades: "Punto de Donación"
necesidades: "reciben donaciones"
telefono_contacto: "098 103 973"
direccion: "Vaz Ferreira 52
"
direccion: "Vaz Ferreira 52"
ubicacion:
latitud: -34.85345
longitud: -56.04637

otros_contactos: ""
horario: "Coordinación telefónica. L a V de 13 a 18 hs."
3 changes: 3 additions & 0 deletions _organizaciones/org012.markdown
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ actividades: "Olla"
necesidades: "Alimentos no perecederos, frutas y verduras, carne, productos sanitarios (tapabocas, guantes, alcohol en gel, detergente,etc)"
telefono_contacto: "098141813 094053638"
direccion: "Pérez Castellano y Sarandí"
ubicacion:
latitud: -34.90917
longitud: -56.20982

otros_contactos: ""
horario: ""
3 changes: 3 additions & 0 deletions _organizaciones/org013.markdown
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ actividades: "Canasta"
necesidades: "Alimentos no perecederos"
telefono_contacto: "093818549 094306437"
direccion: "Calle 34 Solar 38 Manzana 63"
ubicacion:
latitud: -34.82176
longitud: -55.98685

otros_contactos: ""
horario: ""
3 changes: 3 additions & 0 deletions _organizaciones/org014.markdown
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ actividades: "Punto de Donación"
necesidades: "Alimentos, productos de higiene, juegos/juguetes"
telefono_contacto: "091786159 094972263"
direccion: "Becú y Av. Giannattasio (Plaza 8 de Marzo)"
ubicacion:
latitud: -34.83564
longitud: -55.98226

otros_contactos: ""
horario: ""
3 changes: 3 additions & 0 deletions _organizaciones/org015.markdown
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ actividades: "Punto de Donación"
necesidades: "Alimentos y productos de higiene"
telefono_contacto: "092769462 094762392 098394643"
direccion: "Islas Canarias 4264 esq. Juan Lavalle"
ubicacion:
latitud: -34.85135
longitud: -56.2065

otros_contactos: ""
horario: ""
3 changes: 3 additions & 0 deletions _organizaciones/org016.markdown
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ actividades: "Punto de Donación"
necesidades: "Alimentos no perecederos y artículos de limpieza"
telefono_contacto: "098291299"
direccion: "Camino Maldonado 5842 y Venecia"
ubicacion:
latitud: -34.83964
longitud: -56.12084

otros_contactos: ""
horario: ""
7 changes: 4 additions & 3 deletions _organizaciones/org017.markdown
Original file line number Diff line number Diff line change
@@ -8,10 +8,11 @@ departamento: "Montevideo"
barrio: "Paso de la Arena"
actividades: "Punto de Donación"
necesidades: "Alimentos"
telefono_contacto: "
091 881 443"
telefono_contacto: "091881443"
direccion: "Romeo Gavioli y Dolores S/N - Todos los días de 14 a 19 hs."
ubicacion:
latitud: -34.8435
longitud: -56.2604

otros_contactos: ""
horario: ""
Loading