diff --git a/_config.yml b/_config.yml index ca032bc..f950086 100644 --- a/_config.yml +++ b/_config.yml @@ -46,14 +46,6 @@ navigationLinks: - {permalink: "/proyectos/", text: "Proyectos"} - {permalink: "/ponentes/", text: "Ponentes"} - {permalink: "/blog/", text: "Blog"} -<<<<<<< HEAD - - {permalink: "/schedule/", text: "Programa"} - - {permalink: "/speakers/", text: "Ponentes"} - - {permalink: "/team/", text: "Equipo"} - - {permalink: "/logistics/", text: "Logística"} - - {permalink: "/hackathon/", text: "DataMad"} -======= ->>>>>>> a51ffaf064fa19ff57b12b1f8dc4259cb69419a7 - {permalink: "/equipo/", text: "Equipo"} bottomNavigationLinks: - {link: "https://bit.ly/dfua-c4p", text: "Become a speaker"} @@ -61,18 +53,14 @@ rightNavigationButtons: - {link: "https://bit.ly/dfua-c4p", text: "Become a speaker"} # Home Block -<<<<<<< HEAD -homeImage: "medialab_gente_currando_flickr.jpg" -======= -homeImage: "medialab_exterior_architizer.jpg" +homeImage: "medialab_auditorio3_flickr.jpg" homeTitle: "Premios de Datos Abiertos de Madrid 2017" eventDate: "Octubre - Diciembre, 2017" #typeoutFallback: "Season" homeTitle: "Premios de Datos Abiertos de Madrid 2017" eventDate: "September - November, 2014" # Hero Block -heroImage: "hero.jpg" ->>>>>>> a51ffaf064fa19ff57b12b1f8dc4259cb69419a7 +heroImage: "medialab_auditorio3_flickr.jpg" heroTitle: "DataMad 2017" eventDate: "Octubre - Diciembre, 2017" typeoutTextValues: '"", "Madrid", "Datos abiertos", "Periodismo de datos", "Datatón"' @@ -84,12 +72,12 @@ heroButtons: # About Block aboutTitle: "Acerca del DataMad" aboutBlock: - - {title: "Ponencias", image: "conference.jpg", text: "Representantes de organismos públicos nos hablarán de sus datos y servicios abiertos" } - - {title: "Datatón", image: "hackathon.jpg", text: "Full-day freestyle hackathon! Want some real team building on friday? Grab your team and join our hackathon!" } - - {title: "Premio Periodismo de Datos", image: "workshop.jpg", text: "Full-day of workshops, hands-on experience, hacking and debugging. Come and tame your favourite technology!" } + - {title: "Ponencias", image: "medialab_auditorio_flickr.jpg", text: "Representantes de organismos públicos nos hablarán de sus datos y servicios abiertos" } + - {title: "Datatón", image: "medialab_gente_currando_flickr.jpg", text: "Full-day freestyle hackathon! Want some real team building on friday? Grab your team and join our hackathon!" } + - {title: "Premio Periodismo de Datos", image: "medialab_lab1_flickr.jpg", text: "Full-day of workshops, hands-on experience, hacking and debugging. Come and tame your favourite technology!" } # Statistic Block -statisticBlockImage: "statistic.jpg" +statisticBlockImage: "medialab_plantabaja2_flickr.jpg" statisticBlock: - {count: "60", specialCharacter: "+", info: "asistentes", detail: "de diferentes perfiles"} - {count: "48", specialCharacter: "+", info: "horas", detail: "de trabajo con datos abiertos"} @@ -100,7 +88,7 @@ statisticBlock: latestNewsTitle: "Últimas noticias" # Rockstar Speakers Block -rockstarSpeakersImage: "medialab_auditorio_flickr.jpg" +rockstarSpeakersImage: "medialab_auditorio2_flickr.jpg" rockstarSpeakersCount: 4 rockstarSpeakersTitle: "Expertos en datos abiertos" rockstarSpeakersButtonText: "Ver todos los ponentes" @@ -123,15 +111,15 @@ mapMobileCenterCoordinates: "40.41063,-3.69366" # Venue Block venueBlockTitle: "Instalaciones" -venueBigImage: "medialab_gente_currando2_flickr.jpg" -venueSmallImage1: "venue_1.jpg" -venueSmallImage2: "venue_2.jpg" -venueSmallImage3: "venue_3.jpg" -venueTitle: "Kinopalace Cinema" -venueFeatures: ["3 huge cinema screens", "Doulby Digital Surround EX audio system", "Located directly in the city center"] +venueBigImage: "medialab_exterior_architizer.jpg" +venueSmallImage1: "medialab_exterior2_architizer.jpg" +venueSmallImage2: "medialab_plantabaja2_flickr.jpg" +venueSmallImage3: "medialab_ropa_flickr.jpg" +venueTitle: "Medialab-Prado" +venueFeatures: ["Medialab-Prado es un laboratorio ciudadano de producción, investigación y difusión de proyectos culturales perteneciente al Área de Gobierno de Cultura y Deportes del Ayuntamiento de Madrid"] # Tweets Feed Block -tweetsFeedImage: "twitter-feed.jpg" +tweetsFeedImage: "medialab_ventana2_flickr.jpg" tweetsFeedTitle: "What's Up?" twitterHashTag: "datamad17" twitterFeed: "http://lviv.gdg.org.ua/tweetledee/favoritesjson.php?c=10&cache_interval=8000" @@ -142,7 +130,7 @@ partnersTitle: "Colaboran" partnersC4sponsorsButton: "Become a sponsor" # Subscribe Block -subscribeImage: "subscribe.jpg" +subscribeImage: "medialab_ventana_flickr.jpg" subscribeTitle: "Subscribe for updates" subscribeAction: "https://gdg.us5.list-manage1.com/subscribe/post?u=9fc8aa205b0521b5f05fc8e1e&id=ae0fb459fc" subscribeInfo: "Registration will be open around end of August. Number of tickets are limited. Stay tuned!" @@ -158,12 +146,6 @@ ticketsOffers: ticketsNumber: "" buyButtonLink: "" buyButtonText: "Buy Now" -<<<<<<< HEAD - ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"] - validFrom: "2014-08-25T10:00" - validThrough: "2014-09-30T23:59" -======= ->>>>>>> a51ffaf064fa19ff57b12b1f8dc4259cb69419a7 ticketContentList: ["Datos Abiertos", "Software Libre"] validFrom: "2017-08-25T10:00" validThrough: "2017-09-30T23:59" diff --git a/images_datalab/background/background.txt b/images_datalab/background/background.txt new file mode 100644 index 0000000..6b2285e --- /dev/null +++ b/images_datalab/background/background.txt @@ -0,0 +1,6 @@ +Distribucion de las imagenes background por orden + +medialab_auditorio3_flickr.jpg -> hero (pagina inicio) +medialab_plantabaja2_flickr.jpg -> statistics +medialab_gente_currando_flickr.jpg -> rockstar speakers + diff --git a/images_datalab/medialab_auditorio2_flickr.jpg b/images_datalab/background/medialab_auditorio2_flickr.jpg similarity index 100% rename from images_datalab/medialab_auditorio2_flickr.jpg rename to images_datalab/background/medialab_auditorio2_flickr.jpg diff --git a/images_datalab/medialab_auditorio3_flickr.jpg b/images_datalab/background/medialab_auditorio3_flickr.jpg similarity index 100% rename from images_datalab/medialab_auditorio3_flickr.jpg rename to images_datalab/background/medialab_auditorio3_flickr.jpg diff --git a/images_datalab/medialab_exterior2_architizer.jpg b/images_datalab/background/medialab_exterior2_architizer.jpg similarity index 100% rename from images_datalab/medialab_exterior2_architizer.jpg rename to images_datalab/background/medialab_exterior2_architizer.jpg diff --git a/images_datalab/medialab_exterior_architizer.jpg b/images_datalab/background/medialab_exterior_architizer.jpg similarity index 100% rename from images_datalab/medialab_exterior_architizer.jpg rename to images_datalab/background/medialab_exterior_architizer.jpg diff --git a/images_datalab/medialab_gente_currando_flickr.jpg b/images_datalab/background/medialab_gente_currando_flickr.jpg similarity index 100% rename from images_datalab/medialab_gente_currando_flickr.jpg rename to images_datalab/background/medialab_gente_currando_flickr.jpg diff --git a/images_datalab/medialab_plantabaja2_flickr.jpg b/images_datalab/background/medialab_plantabaja2_flickr.jpg similarity index 100% rename from images_datalab/medialab_plantabaja2_flickr.jpg rename to images_datalab/background/medialab_plantabaja2_flickr.jpg diff --git a/images_datalab/medialab_ropa_flickr.jpg b/images_datalab/background/medialab_ropa_flickr.jpg similarity index 100% rename from images_datalab/medialab_ropa_flickr.jpg rename to images_datalab/background/medialab_ropa_flickr.jpg diff --git a/images_datalab/medialab_ventana2_flickr.jpg b/images_datalab/background/medialab_ventana2_flickr.jpg similarity index 100% rename from images_datalab/medialab_ventana2_flickr.jpg rename to images_datalab/background/medialab_ventana2_flickr.jpg diff --git a/images_datalab/team_JoseLuisEsteban.jpg b/images_datalab/team/team_JoseLuisEsteban.jpg similarity index 100% rename from images_datalab/team_JoseLuisEsteban.jpg rename to images_datalab/team/team_JoseLuisEsteban.jpg diff --git a/images_datalab/team_adolfo_anton_linkedin.jpg b/images_datalab/team/team_adolfo_anton_linkedin.jpg similarity index 100% rename from images_datalab/team_adolfo_anton_linkedin.jpg rename to images_datalab/team/team_adolfo_anton_linkedin.jpg diff --git a/images_datalab/team_vicky_bolaños_twitter.jpg b/images_datalab/team/team_vicky_bolaños_twitter.jpg similarity index 100% rename from images_datalab/team_vicky_bolaños_twitter.jpg rename to images_datalab/team/team_vicky_bolaños_twitter.jpg diff --git a/images_datalab/team_victoria_anderica_twitter.jpeg b/images_datalab/team/team_victoria_anderica_twitter.jpeg similarity index 100% rename from images_datalab/team_victoria_anderica_twitter.jpeg rename to images_datalab/team/team_victoria_anderica_twitter.jpeg diff --git a/img/about-section/conference.jpg b/img/about-section/conference.jpg deleted file mode 100644 index b5d3732..0000000 Binary files a/img/about-section/conference.jpg and /dev/null differ diff --git a/img/about-section/hackathon.jpg b/img/about-section/hackathon.jpg deleted file mode 100644 index 8e84a9a..0000000 Binary files a/img/about-section/hackathon.jpg and /dev/null differ diff --git a/img/about-section/medialab_auditorio_flickr.jpg b/img/about-section/medialab_auditorio_flickr.jpg new file mode 100644 index 0000000..dee0d3c Binary files /dev/null and b/img/about-section/medialab_auditorio_flickr.jpg differ diff --git a/img/about-section/medialab_gente_currando_flickr.jpg b/img/about-section/medialab_gente_currando_flickr.jpg new file mode 100644 index 0000000..3f94ffb Binary files /dev/null and b/img/about-section/medialab_gente_currando_flickr.jpg differ diff --git a/img/about-section/medialab_lab1_flickr.jpg b/img/about-section/medialab_lab1_flickr.jpg new file mode 100644 index 0000000..d4c0d6a Binary files /dev/null and b/img/about-section/medialab_lab1_flickr.jpg differ diff --git a/img/about-section/workshop.jpg b/img/about-section/workshop.jpg deleted file mode 100644 index b62e1f3..0000000 Binary files a/img/about-section/workshop.jpg and /dev/null differ diff --git a/img/sections-background/medialab_auditorio2_flickr.jpg b/img/sections-background/medialab_auditorio2_flickr.jpg new file mode 100644 index 0000000..f0365b9 Binary files /dev/null and b/img/sections-background/medialab_auditorio2_flickr.jpg differ diff --git a/img/sections-background/medialab_auditorio3_flickr.jpg b/img/sections-background/medialab_auditorio3_flickr.jpg new file mode 100644 index 0000000..8347e86 Binary files /dev/null and b/img/sections-background/medialab_auditorio3_flickr.jpg differ diff --git a/img/sections-background/medialab_exterior2_architizer.jpg b/img/sections-background/medialab_exterior2_architizer.jpg new file mode 100644 index 0000000..fa7a7ca Binary files /dev/null and b/img/sections-background/medialab_exterior2_architizer.jpg differ diff --git a/img/sections-background/medialab_gente_currando2_flickr.jpg b/img/sections-background/medialab_gente_currando2_flickr.jpg deleted file mode 100644 index 54ac38b..0000000 Binary files a/img/sections-background/medialab_gente_currando2_flickr.jpg and /dev/null differ diff --git a/img/sections-background/medialab_gentecurrando4_flickr.jpg b/img/sections-background/medialab_gentecurrando4_flickr.jpg new file mode 100644 index 0000000..8300680 Binary files /dev/null and b/img/sections-background/medialab_gentecurrando4_flickr.jpg differ diff --git a/img/sections-background/medialab_plantabaja2_flickr.jpg b/img/sections-background/medialab_plantabaja2_flickr.jpg new file mode 100644 index 0000000..a1e7991 Binary files /dev/null and b/img/sections-background/medialab_plantabaja2_flickr.jpg differ diff --git a/img/sections-background/medialab_ropa_flickr.jpg b/img/sections-background/medialab_ropa_flickr.jpg new file mode 100644 index 0000000..f2e44bc Binary files /dev/null and b/img/sections-background/medialab_ropa_flickr.jpg differ diff --git a/img/sections-background/medialab_ventana2_flickr.jpg b/img/sections-background/medialab_ventana2_flickr.jpg new file mode 100644 index 0000000..abc553f Binary files /dev/null and b/img/sections-background/medialab_ventana2_flickr.jpg differ diff --git a/img/sections-background/medialab_ventana_flickr.jpg b/img/sections-background/medialab_ventana_flickr.jpg new file mode 100644 index 0000000..fd403e8 Binary files /dev/null and b/img/sections-background/medialab_ventana_flickr.jpg differ diff --git a/img/venue/venue_0.jpg b/img/venue/venue_0.jpg deleted file mode 100644 index 1e9f02d..0000000 Binary files a/img/venue/venue_0.jpg and /dev/null differ diff --git a/img/venue/venue_1.jpg b/img/venue/venue_1.jpg deleted file mode 100644 index 20fdfc6..0000000 Binary files a/img/venue/venue_1.jpg and /dev/null differ diff --git a/img/venue/venue_2.jpg b/img/venue/venue_2.jpg deleted file mode 100644 index 048cab5..0000000 Binary files a/img/venue/venue_2.jpg and /dev/null differ diff --git a/img/venue/venue_3.jpg b/img/venue/venue_3.jpg deleted file mode 100644 index 1e4cf83..0000000 Binary files a/img/venue/venue_3.jpg and /dev/null differ diff --git a/img/venue/venue_4.jpg b/img/venue/venue_4.jpg deleted file mode 100644 index 6b42b98..0000000 Binary files a/img/venue/venue_4.jpg and /dev/null differ