From eddf90fb2649d700a7ef495f9515cffca79563e3 Mon Sep 17 00:00:00 2001 From: Felix Date: Tue, 18 Sep 2018 17:25:40 -0300 Subject: [PATCH] Muevo todo a la carpeta src para que sea mas facil el copiado al root web despues de un pull --- index.html.bak2 | 259 ------------------ .../MPS_33a_canasta.pdf | Bin {assets => src/assets}/css/bootstrap.css | 0 .../assets}/css/font-awesome.min.css | 0 {assets => src/assets}/css/style.css | 0 .../assets}/fonts/fontawesome-webfontba72.eot | Bin .../assets}/fonts/fontawesome-webfontba72.svg | 0 .../assets}/fonts/fontawesome-webfontba72.ttf | Bin .../fonts/fontawesome-webfontba72.woff | Bin .../assets}/fonts/fontawesome-webfontd41d.eot | Bin .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../glyphicons-halflings-regulard41d.eot | Bin {assets => src/assets}/img/1.jpg | Bin {assets => src/assets}/img/1.jpg.bak | Bin {assets => src/assets}/img/1b.jpg | Bin {assets => src/assets}/img/2.jpg | Bin {assets => src/assets}/img/3.jpg | Bin {assets => src/assets}/img/3.jpg.bak | Bin {assets => src/assets}/img/bank.png | Bin {assets => src/assets}/img/chancho.jpg | Bin {assets => src/assets}/img/handshake.png | Bin {assets => src/assets}/img/moneyhand.png | Bin {assets => src/assets}/img/mps.ico | Bin {assets => src/assets}/img/mps.png | Bin {assets => src/assets}/img/mps2.png | Bin {assets => src/assets}/img/mps3.png | Bin {assets => src/assets}/img/mps4.png | Bin {assets => src/assets}/img/people.png | Bin {assets => src/assets}/img/seedling.png | Bin {assets => src/assets}/js/custom.js | 0 {assets => src/assets}/plugins/bootstrap.js | 0 .../assets}/plugins/jquery-1.10.2.js | 0 .../assets}/plugins/jquery.parallax-1.1.3.js | 0 .../assets}/plugins/vegas/images/loading.html | 0 .../plugins/vegas/jquery.vegas.min.css | 0 .../assets}/plugins/vegas/jquery.vegas.min.js | 0 .../assets}/plugins/vegas/overlays/01.png | Bin .../assets}/plugins/vegas/overlays/02.png | Bin .../assets}/plugins/vegas/overlays/03.png | Bin .../assets}/plugins/vegas/overlays/04.png | Bin .../assets}/plugins/vegas/overlays/05.png | Bin .../assets}/plugins/vegas/overlays/06.png | Bin .../assets}/plugins/vegas/overlays/07.png | Bin .../assets}/plugins/vegas/overlays/08.png | Bin .../assets}/plugins/vegas/overlays/09.png | Bin .../assets}/plugins/vegas/overlays/10.png | Bin .../assets}/plugins/vegas/overlays/11.png | Bin .../assets}/plugins/vegas/overlays/12.png | Bin .../assets}/plugins/vegas/overlays/13.png | Bin .../assets}/plugins/vegas/overlays/14.png | Bin .../assets}/plugins/vegas/overlays/15.png | Bin index.html => src/index.html | 0 55 files changed, 259 deletions(-) delete mode 100644 index.html.bak2 rename MPS_33a_canasta.pdf => src/MPS_33a_canasta.pdf (100%) rename {assets => src/assets}/css/bootstrap.css (100%) rename {assets => src/assets}/css/font-awesome.min.css (100%) rename {assets => src/assets}/css/style.css (100%) rename {assets => src/assets}/fonts/fontawesome-webfontba72.eot (100%) rename {assets => src/assets}/fonts/fontawesome-webfontba72.svg (100%) rename {assets => src/assets}/fonts/fontawesome-webfontba72.ttf (100%) rename {assets => src/assets}/fonts/fontawesome-webfontba72.woff (100%) rename {assets => src/assets}/fonts/fontawesome-webfontd41d.eot (100%) rename {assets => src/assets}/fonts/glyphicons-halflings-regular.eot (100%) rename {assets => src/assets}/fonts/glyphicons-halflings-regular.svg (100%) rename {assets => src/assets}/fonts/glyphicons-halflings-regular.ttf (100%) rename {assets => src/assets}/fonts/glyphicons-halflings-regular.woff (100%) rename {assets => src/assets}/fonts/glyphicons-halflings-regulard41d.eot (100%) rename {assets => src/assets}/img/1.jpg (100%) rename {assets => src/assets}/img/1.jpg.bak (100%) rename {assets => src/assets}/img/1b.jpg (100%) rename {assets => src/assets}/img/2.jpg (100%) rename {assets => src/assets}/img/3.jpg (100%) rename {assets => src/assets}/img/3.jpg.bak (100%) rename {assets => src/assets}/img/bank.png (100%) rename {assets => src/assets}/img/chancho.jpg (100%) rename {assets => src/assets}/img/handshake.png (100%) rename {assets => src/assets}/img/moneyhand.png (100%) rename {assets => src/assets}/img/mps.ico (100%) rename {assets => src/assets}/img/mps.png (100%) rename {assets => src/assets}/img/mps2.png (100%) rename {assets => src/assets}/img/mps3.png (100%) rename {assets => src/assets}/img/mps4.png (100%) rename {assets => src/assets}/img/people.png (100%) rename {assets => src/assets}/img/seedling.png (100%) rename {assets => src/assets}/js/custom.js (100%) rename {assets => src/assets}/plugins/bootstrap.js (100%) rename {assets => src/assets}/plugins/jquery-1.10.2.js (100%) rename {assets => src/assets}/plugins/jquery.parallax-1.1.3.js (100%) rename {assets => src/assets}/plugins/vegas/images/loading.html (100%) rename {assets => src/assets}/plugins/vegas/jquery.vegas.min.css (100%) rename {assets => src/assets}/plugins/vegas/jquery.vegas.min.js (100%) rename {assets => src/assets}/plugins/vegas/overlays/01.png (100%) rename {assets => src/assets}/plugins/vegas/overlays/02.png (100%) rename {assets => src/assets}/plugins/vegas/overlays/03.png (100%) rename {assets => src/assets}/plugins/vegas/overlays/04.png (100%) rename {assets => src/assets}/plugins/vegas/overlays/05.png (100%) rename {assets => src/assets}/plugins/vegas/overlays/06.png (100%) rename {assets => src/assets}/plugins/vegas/overlays/07.png (100%) rename {assets => src/assets}/plugins/vegas/overlays/08.png (100%) rename {assets => src/assets}/plugins/vegas/overlays/09.png (100%) rename {assets => src/assets}/plugins/vegas/overlays/10.png (100%) rename {assets => src/assets}/plugins/vegas/overlays/11.png (100%) rename {assets => src/assets}/plugins/vegas/overlays/12.png (100%) rename {assets => src/assets}/plugins/vegas/overlays/13.png (100%) rename {assets => src/assets}/plugins/vegas/overlays/14.png (100%) rename {assets => src/assets}/plugins/vegas/overlays/15.png (100%) rename index.html => src/index.html (100%) diff --git a/index.html.bak2 b/index.html.bak2 deleted file mode 100644 index 4a239ae..0000000 --- a/index.html.bak2 +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - - MPS | Mercado Popular de Subsistencia - - - - - - - - - - -
-
-
-

-

LA CANASTA COMBATIVA

- DESCARGAR ULTIMA CANASTA -
-
-
-
- -
-
-
-
-

ACERCA DE

-

Es una organización que busca enfrentar el abuso de los supermercados a través de la solidaridad y la lucha

-
-
-
-
-
- -

Barato

-

Buscamos lograr una canasta muy barata, acorde a nuestros bolsillos de laburantes

-
-
-
-
- -

Solidario

-

Trabajamos entre todos fomentando y transmitiendo valores cooperativos y solidarios

-
-
-
-
- -

Participativo

-

Apoyamos la autogestión, buscando trabajar con cooperativas y empresas recuperadas por sus trabajadores

-
-
-
-
- -

Local

-

Intentamos priorizar a la industria nacional, pequeños productores nacionales y autogestion

-
-
-
-
-
- -
-
-
-
-

Como Funciona el Mercado

-

- La administración del Mercado es a través de un cúmulo de organizaciones barriales. No se puede participar individualmente, sino que se debe responder a un colectivo. El Mercado no tiene fines de lucro y se sustenta con trabajo voluntario, no hay asalariados. Cada familia compra lo que necesite para el mes, y no hay mínimo de compra. Todos los meses, organizamos nuestro consumo logrando bajar significativamente el precio de los bienes de primera necesidad. Pues si los ricos se organizan para robar, la organización de los trabajadores lo puede revertir -

-
-
-
-
- -
-
-
-
-

CANASTA Nº33 (setiembre)

-

- Se han agregado los siguientes productos nuevos! -

DESCARGAR CANASTA Nº33 (PDF)

-

-
-
-
-
-
-
    -
  • Azucar Imp. Hornex 200g
    • -
  • $26
    • -
  • NUEVO!
    • -
-
-
-
    -
  • Galleta de Arroz Saman Clasica
    • -
  • $30
    • -
  • NUEVO!
    • -
-
-
-
    -
  • Leche en Polvo Conaprole 200g
    • -
  • $80
    • -
  • NUEVO!
    • -
-
-
-
    -
  • Coco Rallado Hornex 100g
    • -
  • $31
    • -
  • NUEVO!
    • -
-
- -
-
    -
  • Bizcochuelo Vainilla s/gluten Hornex 500g
    • -
  • $103
    • -
  • NUEVO!
    • -
-
-
-
    -
  • Pizza s/gluten Hornex 320g
    • -
  • $95
    • -
  • NUEVO!
    • -
-
-
-
    -
  • Pan Rallado Saborizaedo 1Kg
    • -
  • $60
    • -
  • NUEVO!
    • -
-
- -
-
-
-
- -
-
-
-
-

Principios

-

a) Independencia de clase

-

b) Trabajo voluntario

-

c) Solidaridad de clase

-

d) Combate a la riqueza

-

e) Autogestión

-

f) Apoyo al crecimiento

-

g) Apoyo a la producción nacional/regional

-

h) Política y formación

-

i) Feminismo

-

-
-
-
-
- -
-
-
-
-

CONTACTO

-
-  E-Mail: mercadopopularbja@gmail.com -
-  Web: mps.org.uy -
-
-
-
- -
-
-
-

Realice su Consulta

-

Llene el siguiente formulario con sus datos y presione "Enviar Consulta". Uno de nuestros compañeros contestará a la brevedad

-
-
-
-
- -
-
-
-
- -
-
-
-
-
-
- -
-
- -
-
-
-
-
- -
-
-
- -
- 2018 | mps.org.uy -
- - - - - - - diff --git a/MPS_33a_canasta.pdf b/src/MPS_33a_canasta.pdf similarity index 100% rename from MPS_33a_canasta.pdf rename to src/MPS_33a_canasta.pdf diff --git a/assets/css/bootstrap.css b/src/assets/css/bootstrap.css similarity index 100% rename from assets/css/bootstrap.css rename to src/assets/css/bootstrap.css diff --git a/assets/css/font-awesome.min.css b/src/assets/css/font-awesome.min.css similarity index 100% rename from assets/css/font-awesome.min.css rename to src/assets/css/font-awesome.min.css diff --git a/assets/css/style.css b/src/assets/css/style.css similarity index 100% rename from assets/css/style.css rename to src/assets/css/style.css diff --git a/assets/fonts/fontawesome-webfontba72.eot b/src/assets/fonts/fontawesome-webfontba72.eot similarity index 100% rename from assets/fonts/fontawesome-webfontba72.eot rename to src/assets/fonts/fontawesome-webfontba72.eot diff --git a/assets/fonts/fontawesome-webfontba72.svg b/src/assets/fonts/fontawesome-webfontba72.svg similarity index 100% rename from assets/fonts/fontawesome-webfontba72.svg rename to src/assets/fonts/fontawesome-webfontba72.svg diff --git a/assets/fonts/fontawesome-webfontba72.ttf b/src/assets/fonts/fontawesome-webfontba72.ttf similarity index 100% rename from assets/fonts/fontawesome-webfontba72.ttf rename to src/assets/fonts/fontawesome-webfontba72.ttf diff --git a/assets/fonts/fontawesome-webfontba72.woff b/src/assets/fonts/fontawesome-webfontba72.woff similarity index 100% rename from assets/fonts/fontawesome-webfontba72.woff rename to src/assets/fonts/fontawesome-webfontba72.woff diff --git a/assets/fonts/fontawesome-webfontd41d.eot b/src/assets/fonts/fontawesome-webfontd41d.eot similarity index 100% rename from assets/fonts/fontawesome-webfontd41d.eot rename to src/assets/fonts/fontawesome-webfontd41d.eot diff --git a/assets/fonts/glyphicons-halflings-regular.eot b/src/assets/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from assets/fonts/glyphicons-halflings-regular.eot rename to src/assets/fonts/glyphicons-halflings-regular.eot diff --git a/assets/fonts/glyphicons-halflings-regular.svg b/src/assets/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from assets/fonts/glyphicons-halflings-regular.svg rename to src/assets/fonts/glyphicons-halflings-regular.svg diff --git a/assets/fonts/glyphicons-halflings-regular.ttf b/src/assets/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from assets/fonts/glyphicons-halflings-regular.ttf rename to src/assets/fonts/glyphicons-halflings-regular.ttf diff --git a/assets/fonts/glyphicons-halflings-regular.woff b/src/assets/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from assets/fonts/glyphicons-halflings-regular.woff rename to src/assets/fonts/glyphicons-halflings-regular.woff diff --git a/assets/fonts/glyphicons-halflings-regulard41d.eot b/src/assets/fonts/glyphicons-halflings-regulard41d.eot similarity index 100% rename from assets/fonts/glyphicons-halflings-regulard41d.eot rename to src/assets/fonts/glyphicons-halflings-regulard41d.eot diff --git a/assets/img/1.jpg b/src/assets/img/1.jpg similarity index 100% rename from assets/img/1.jpg rename to src/assets/img/1.jpg diff --git a/assets/img/1.jpg.bak b/src/assets/img/1.jpg.bak similarity index 100% rename from assets/img/1.jpg.bak rename to src/assets/img/1.jpg.bak diff --git a/assets/img/1b.jpg b/src/assets/img/1b.jpg similarity index 100% rename from assets/img/1b.jpg rename to src/assets/img/1b.jpg diff --git a/assets/img/2.jpg b/src/assets/img/2.jpg similarity index 100% rename from assets/img/2.jpg rename to src/assets/img/2.jpg diff --git a/assets/img/3.jpg b/src/assets/img/3.jpg similarity index 100% rename from assets/img/3.jpg rename to src/assets/img/3.jpg diff --git a/assets/img/3.jpg.bak b/src/assets/img/3.jpg.bak similarity index 100% rename from assets/img/3.jpg.bak rename to src/assets/img/3.jpg.bak diff --git a/assets/img/bank.png b/src/assets/img/bank.png similarity index 100% rename from assets/img/bank.png rename to src/assets/img/bank.png diff --git a/assets/img/chancho.jpg b/src/assets/img/chancho.jpg similarity index 100% rename from assets/img/chancho.jpg rename to src/assets/img/chancho.jpg diff --git a/assets/img/handshake.png b/src/assets/img/handshake.png similarity index 100% rename from assets/img/handshake.png rename to src/assets/img/handshake.png diff --git a/assets/img/moneyhand.png b/src/assets/img/moneyhand.png similarity index 100% rename from assets/img/moneyhand.png rename to src/assets/img/moneyhand.png diff --git a/assets/img/mps.ico b/src/assets/img/mps.ico similarity index 100% rename from assets/img/mps.ico rename to src/assets/img/mps.ico diff --git a/assets/img/mps.png b/src/assets/img/mps.png similarity index 100% rename from assets/img/mps.png rename to src/assets/img/mps.png diff --git a/assets/img/mps2.png b/src/assets/img/mps2.png similarity index 100% rename from assets/img/mps2.png rename to src/assets/img/mps2.png diff --git a/assets/img/mps3.png b/src/assets/img/mps3.png similarity index 100% rename from assets/img/mps3.png rename to src/assets/img/mps3.png diff --git a/assets/img/mps4.png b/src/assets/img/mps4.png similarity index 100% rename from assets/img/mps4.png rename to src/assets/img/mps4.png diff --git a/assets/img/people.png b/src/assets/img/people.png similarity index 100% rename from assets/img/people.png rename to src/assets/img/people.png diff --git a/assets/img/seedling.png b/src/assets/img/seedling.png similarity index 100% rename from assets/img/seedling.png rename to src/assets/img/seedling.png diff --git a/assets/js/custom.js b/src/assets/js/custom.js similarity index 100% rename from assets/js/custom.js rename to src/assets/js/custom.js diff --git a/assets/plugins/bootstrap.js b/src/assets/plugins/bootstrap.js similarity index 100% rename from assets/plugins/bootstrap.js rename to src/assets/plugins/bootstrap.js diff --git a/assets/plugins/jquery-1.10.2.js b/src/assets/plugins/jquery-1.10.2.js similarity index 100% rename from assets/plugins/jquery-1.10.2.js rename to src/assets/plugins/jquery-1.10.2.js diff --git a/assets/plugins/jquery.parallax-1.1.3.js b/src/assets/plugins/jquery.parallax-1.1.3.js similarity index 100% rename from assets/plugins/jquery.parallax-1.1.3.js rename to src/assets/plugins/jquery.parallax-1.1.3.js diff --git a/assets/plugins/vegas/images/loading.html b/src/assets/plugins/vegas/images/loading.html similarity index 100% rename from assets/plugins/vegas/images/loading.html rename to src/assets/plugins/vegas/images/loading.html diff --git a/assets/plugins/vegas/jquery.vegas.min.css b/src/assets/plugins/vegas/jquery.vegas.min.css similarity index 100% rename from assets/plugins/vegas/jquery.vegas.min.css rename to src/assets/plugins/vegas/jquery.vegas.min.css diff --git a/assets/plugins/vegas/jquery.vegas.min.js b/src/assets/plugins/vegas/jquery.vegas.min.js similarity index 100% rename from assets/plugins/vegas/jquery.vegas.min.js rename to src/assets/plugins/vegas/jquery.vegas.min.js diff --git a/assets/plugins/vegas/overlays/01.png b/src/assets/plugins/vegas/overlays/01.png similarity index 100% rename from assets/plugins/vegas/overlays/01.png rename to src/assets/plugins/vegas/overlays/01.png diff --git a/assets/plugins/vegas/overlays/02.png b/src/assets/plugins/vegas/overlays/02.png similarity index 100% rename from assets/plugins/vegas/overlays/02.png rename to src/assets/plugins/vegas/overlays/02.png diff --git a/assets/plugins/vegas/overlays/03.png b/src/assets/plugins/vegas/overlays/03.png similarity index 100% rename from assets/plugins/vegas/overlays/03.png rename to src/assets/plugins/vegas/overlays/03.png diff --git a/assets/plugins/vegas/overlays/04.png b/src/assets/plugins/vegas/overlays/04.png similarity index 100% rename from assets/plugins/vegas/overlays/04.png rename to src/assets/plugins/vegas/overlays/04.png diff --git a/assets/plugins/vegas/overlays/05.png b/src/assets/plugins/vegas/overlays/05.png similarity index 100% rename from assets/plugins/vegas/overlays/05.png rename to src/assets/plugins/vegas/overlays/05.png diff --git a/assets/plugins/vegas/overlays/06.png b/src/assets/plugins/vegas/overlays/06.png similarity index 100% rename from assets/plugins/vegas/overlays/06.png rename to src/assets/plugins/vegas/overlays/06.png diff --git a/assets/plugins/vegas/overlays/07.png b/src/assets/plugins/vegas/overlays/07.png similarity index 100% rename from assets/plugins/vegas/overlays/07.png rename to src/assets/plugins/vegas/overlays/07.png diff --git a/assets/plugins/vegas/overlays/08.png b/src/assets/plugins/vegas/overlays/08.png similarity index 100% rename from assets/plugins/vegas/overlays/08.png rename to src/assets/plugins/vegas/overlays/08.png diff --git a/assets/plugins/vegas/overlays/09.png b/src/assets/plugins/vegas/overlays/09.png similarity index 100% rename from assets/plugins/vegas/overlays/09.png rename to src/assets/plugins/vegas/overlays/09.png diff --git a/assets/plugins/vegas/overlays/10.png b/src/assets/plugins/vegas/overlays/10.png similarity index 100% rename from assets/plugins/vegas/overlays/10.png rename to src/assets/plugins/vegas/overlays/10.png diff --git a/assets/plugins/vegas/overlays/11.png b/src/assets/plugins/vegas/overlays/11.png similarity index 100% rename from assets/plugins/vegas/overlays/11.png rename to src/assets/plugins/vegas/overlays/11.png diff --git a/assets/plugins/vegas/overlays/12.png b/src/assets/plugins/vegas/overlays/12.png similarity index 100% rename from assets/plugins/vegas/overlays/12.png rename to src/assets/plugins/vegas/overlays/12.png diff --git a/assets/plugins/vegas/overlays/13.png b/src/assets/plugins/vegas/overlays/13.png similarity index 100% rename from assets/plugins/vegas/overlays/13.png rename to src/assets/plugins/vegas/overlays/13.png diff --git a/assets/plugins/vegas/overlays/14.png b/src/assets/plugins/vegas/overlays/14.png similarity index 100% rename from assets/plugins/vegas/overlays/14.png rename to src/assets/plugins/vegas/overlays/14.png diff --git a/assets/plugins/vegas/overlays/15.png b/src/assets/plugins/vegas/overlays/15.png similarity index 100% rename from assets/plugins/vegas/overlays/15.png rename to src/assets/plugins/vegas/overlays/15.png diff --git a/index.html b/src/index.html similarity index 100% rename from index.html rename to src/index.html