[guadec-web: 4/8] rebase
- From: Oliver Gutiérrez <ogutierrez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [guadec-web: 4/8] rebase
- Date: Tue, 12 Jun 2018 11:13:59 +0000 (UTC)
commit d4c8a8d7aabe445aea0c04026c2c9750f7a6e89e
Merge: 53af61b 00fc4b1
Author: Juanjo Salvador <juanjosalvador netc eu>
Date: Mon Jun 11 20:48:06 2018 +0200
rebase
.gitignore | 1 +
README.md | 2 +-
content/images/16-9-2.jpg | Bin 0 -> 30010 bytes
content/images/16-9.jpg | Bin 0 -> 36384 bytes
content/images/CAMPUS_DESDE_EL_AULARIO_I_04.jpg | Bin 0 -> 257979 bytes
content/images/UAL-from-sea-_MG_6831.jpg | Bin 0 -> 213486 bytes
content/images/UAL-plan.png | Bin 0 -> 189241 bytes
content/images/a-iv-hall.jpg | Bin 0 -> 68183 bytes
content/images/a-iv.jpg | Bin 0 -> 100783 bytes
content/images/acmarriot.jpg | Bin 0 -> 299245 bytes
content/images/acmarriott.jpg | Bin 0 -> 299245 bytes
content/images/auditorium-inside.jpg | Bin 0 -> 98857 bytes
content/images/auditorium.jpg | Bin 0 -> 129561 bytes
content/images/avenida.jpg | Bin 0 -> 252451 bytes
content/images/cafeteria-outside.jpg | Bin 0 -> 103713 bytes
content/images/cafeteria.jpg | Bin 0 -> 86732 bytes
content/images/childcare.jpg | Bin 0 -> 1612986 bytes
content/images/costasol.jpg | Bin 0 -> 28462 bytes
content/images/elba.jpg | Bin 0 -> 139281 bytes
content/images/embajador.jpg | Bin 0 -> 50459 bytes
content/images/hotel-catedral-almeria.jpg | Bin 0 -> 49624 bytes
.../images/hotel-torreluz-centro-almera-011.jpg | Bin 0 -> 67565 bytes
content/images/nh.jpg | Bin 0 -> 66180 bytes
content/images/nuevo-torreluz.jpg | Bin 0 -> 460128 bytes
content/images/sercotel.jpg | Bin 0 -> 108997 bytes
content/images/torreluz-centro-7.jpg | Bin 0 -> 140552 bytes
content/images/tryp-indalo.jpg | Bin 0 -> 20756 bytes
content/images/ual21-aerea.jpg | Bin 0 -> 411010 bytes
content/news-2018061101.md | 17 ++
content/pages/about-the-city.md | 55 ++++
content/pages/accommodation-others.md | 139 +++++++++
content/pages/accommodation.md | 63 +++-
content/pages/code-of-conduct.md | 126 +++++---
content/pages/contact.md | 15 +-
content/pages/guadec-2018-almeria-bid.md | 79 -----
content/pages/schedule.md | 128 +++++++-
content/pages/sponsors.md | 9 +
content/pages/submit-a-proposal.md | 85 ++----
content/pages/test-map.md | 17 ++
content/pages/{toursm.md => tourism.md} | 71 ++---
content/pages/travel.md | 147 ++++++++--
content/pages/venue.md | 149 +++++++++-
content/pages/visa.md | 26 +-
pelicanconf.py | 39 ++-
src/haml/base/base.haml | 25 +-
src/haml/index.haml | 2 +
src/img/icon-180x180.png | Bin 0 -> 11124 bytes
src/img/icon-192x192.png | Bin 0 -> 12020 bytes
src/img/icon-270x270.png | Bin 0 -> 16567 bytes
src/img/icon-32x32.png | Bin 0 -> 1433 bytes
src/img/skyline.png | Bin 0 -> 16269 bytes
src/img/skyline.svg | 321 ---------------------
src/img/social/mail-lw.png | Bin 0 -> 796 bytes
src/img/social/mail-mw.png | Bin 0 -> 668 bytes
src/img/social/mail-sw.png | Bin 0 -> 480 bytes
src/img/social/mail-xlw.png | Bin 0 -> 1200 bytes
src/img/social/telegram-lw.png | Bin 0 -> 878 bytes
src/img/social/telegram-mw.png | Bin 0 -> 749 bytes
src/img/social/telegram-sw.png | Bin 0 -> 535 bytes
src/img/social/telegram-xlw.png | Bin 0 -> 1472 bytes
src/img/social/youtube-mw.png | Bin 669 -> 631 bytes
src/sass/compass-sass-base/_social.sass | 12 +
src/sass/screen.sass | 24 +-
63 files changed, 933 insertions(+), 619 deletions(-)
---
diff --cc content/pages/tourism.md
index f154675,9bcdf5f..72e0f07
--- a/content/pages/tourism.md
+++ b/content/pages/tourism.md
@@@ -1,7 -1,7 +1,9 @@@
- Title: Toursm
+ Title: Tourism in Almería
Date: 20180605
- <img
src="https://upload.wikimedia.org/wikipedia/commons/thumb/f/fe/Küste_bei_Monsul14.jpg/800px-Küste_bei_Monsul14.jpg";
align="right" width="200" alt="Monsul Beach"/>
-<img
src="https://upload.wikimedia.org/wikipedia/commons/thumb/f/fe/Küste_bei_Monsul14.jpg/800px-Küste_bei_Monsul14.jpg";
align="right" width="200"/>
++{:width="100%"}
++
++<img src="" align="right" width="200" alt="Monsul Beach"/>
The province landscapes are extraordinaire. You can find three or more
different climates/ecosystems in an hour travel car.
@@@ -14,9 -14,8 +16,8 @@@ When in Almería you can take the oppor
here. But be sure to do your reservations soon enough since is tourist
high season.
- <br/><br/>
- <img src="https://upload.wikimedia.org/wikipedia/commons/b/be/Well_(9599702769).jpg" align="right"
width="200" alt="Arabic Well"/>
-<img src="https://upload.wikimedia.org/wikipedia/commons/b/be/Well_(9599702769).jpg" align="right"
width="200"/>
++.jpg){:width="100%"}
Since probably it will be the first time you'll visit Almería and theses
parts of Spain we feel you could take the opportunity to travel with
@@@ -37,35 -33,35 +35,36 @@@ significant ones. An you'll find a lot
- scuba diving baptisms in the natural park waters
- kayak routes in the natural park waters
- The city of Almería has its own offers:
+ The [city of Almería has its own
offers](https://www.turismodealmeria.org/en/travel-preparations/culture-and-traditions/):
- <img
src="https://3.bp.blogspot.com/-h3Ia78wSNTA/U5yhrgOhFsI/AAAAAAAAAEE/to1euw6q7yQ/s400/Alcazaba_de_Almería.jpg";
align="right" width="200" alt="Almeria's Alcazaba"/>
-<img
src="https://3.bp.blogspot.com/-h3Ia78wSNTA/U5yhrgOhFsI/AAAAAAAAAEE/to1euw6q7yQ/s400/Alcazaba_de_Almería.jpg";
align="right" width="200"/>
++{:width="100%"}
- [The Alcazaba moorish castle](https://en.wikipedia.org/wiki/Alcazaba_of_Almer%C3%ADa)
- about 1000 years old [The Museum of Almería](https://en.wikipedia.org/wiki/Museum_of_Almer%C3%ADa)
-
- - some artistic and historic museums
-
+ about 1000 years old
+ - [The Museum of Almería](https://en.wikipedia.org/wiki/Museum_of_Almer%C3%ADa)
- a beautiful XIX bourgeois downtown
-
- and the restored [air raid shelters](https://en.wikipedia.org/wiki/Almer%C3%ADa_air_raid_shelters)
- build in the Spanish Civil War.
+ build in the Spanish Civil War
+ - and a lot of others [historic places and
museums](https://www.turismodealmeria.org/en/travel-preparations/culture-and-traditions/#museums-and-exhibition-certres)
to visit.
+
+ There is an [Almería Tourist Guide
application](https://play.google.com/store/apps/details?id=com.segittur.almeria) for Android.
Very near the city (less than 30 Km far):
- <img
src="https://upload.wikimedia.org/wikipedia/commons/thumb/1/1c/Los_Millares_recreacion_cuadro.jpg/290px-Los_Millares_recreacion_cuadro.jpg";
align="right" width="200" alt="Recreation of Los Millares"/>
-<img
src="https://upload.wikimedia.org/wikipedia/commons/thumb/1/1c/Los_Millares_recreacion_cuadro.jpg/290px-Los_Millares_recreacion_cuadro.jpg";
align="right" width="200"/>
++{:width="100%"}
+<br>
- visit to the [Los Millares Calcolithic archaeological
site](https://en.wikipedia.org/wiki/Los_Millares), five
thousand years old, one of the most important of the world for that
age;
- attend to the [recreation and espectable of Western movies](http://fortbravooficial.com/) in real
cinema stages
used in world famous Spaguetti Western movies, like Sergio Leone and
- Clint Eastwood ones;
- - visit to the international research place [Almería Solar
Platform](https://en.wikipedia.org/wiki/Plataforma_Solar_de_Almer%C3%ADa)
+ Clint Eastwood ones or TV shows like Dr. Who;
+ - visit to the international research place [Almería Solar
Platform](https://en.wikipedia.org/wiki/Plataforma_Solar_de_Almer%C3%ADa);
+ - visit to the [German-Spanish Astronomical Centre of Calar
Alto](http://www.azimuthspain.com/en/calar-alto/).
-<br/>
-<img src="https://www.cabogataalmeria.com/img/ocio/th_pobladoOeste2.jpg"; align="right" width="200"/>
+<br><br>
- <img src="https://www.cabogataalmeria.com/img/ocio/th_pobladoOeste2.jpg"; align="right" width="200"
alt="Western town"/>
++{:width="100%"}
A bit more far there are some nice destinations:
@@@ -87,10 -80,10 +83,10 @@@
province, a popular place for sun and beach tourism and a nice
places like the [white towns](https://en.wikipedia.org/wiki/White_Towns_of_Andalusia).
- <br><br>
- ## Where to eat in Almería
+ <br/>
+ ## W̶h̶e̶r̶e̶ How to eat in Almería
- <img
src="https://www.colourbox.de/preview/2845494-typical-spanish-tapas-prawns-fried-with-oil-and-garlic-served-in-clay-cooking-pot.jpg";
align="right" width="200" "Spanish typical tapas"/>
-<img
src="https://www.colourbox.de/preview/2845494-typical-spanish-tapas-prawns-fried-with-oil-and-garlic-served-in-clay-cooking-pot.jpg";
align="right" width="200"/>
++{:width="100%"}
Well, as you can imagine we have restaurants and other meal shops here,
but what we really love is [to go for
@@@ -102,12 -105,7 +108,7 @@@ So, remember, the ideal way to have you
You can get more information on
- <img
src="https://3.bp.blogspot.com/-NPP81M_NCfE/UBcTdBzVhBI/AAAAAAAADCM/7lYVNXp_6Rw/s1600/Almeria+playas.jpg";
align="right" width="200" alt="Beaches of Almeria"/>
-<img
src="https://3.bp.blogspot.com/-NPP81M_NCfE/UBcTdBzVhBI/AAAAAAAADCM/7lYVNXp_6Rw/s1600/Almeria+playas.jpg";
align="right" width="200"/>
++
- [Almería City Turism](http://www.turismodealmeria.org/en/)
- [Andalucia.com](http://www.andalucia.com/cities/almeria.htm)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
![https://upload.wikimedia.org/wikipedia/commons/thumb/f/fe/Küste_bei_Monsul14.jpg/800px-Küste_bei_Monsul14.jpg"](https://upload.wikimedia.org/wikipedia/commons/thumb/f/fe/Küste_bei_Monsul14.jpg/800px-Küste_bei_Monsul14.jpg"){kind=link}
![https://3.bp.blogspot.com/-h3Ia78wSNTA/U5yhrgOhFsI/AAAAAAAAAEE/to1euw6q7yQ/s400/Alcazaba_de_Almería.jpg"](https://3.bp.blogspot.com/-h3Ia78wSNTA/U5yhrgOhFsI/AAAAAAAAAEE/to1euw6q7yQ/s400/Alcazaba_de_Almería.jpg"){kind=link}
![https://upload.wikimedia.org/wikipedia/commons/thumb/1/1c/Los_Millares_recreacion_cuadro.jpg/290px-Los_Millares_recreacion_cuadro.jpg"](https://upload.wikimedia.org/wikipedia/commons/thumb/1/1c/Los_Millares_recreacion_cuadro.jpg/290px-Los_Millares_recreacion_cuadro.jpg"){kind=link}
![https://www.cabogataalmeria.com/img/ocio/th_pobladoOeste2.jpg"](https://www.cabogataalmeria.com/img/ocio/th_pobladoOeste2.jpg"){kind=link}
![https://www.colourbox.de/preview/2845494-typical-spanish-tapas-prawns-fried-with-oil-and-garlic-served-in-clay-cooking-pot.jpg"](https://www.colourbox.de/preview/2845494-typical-spanish-tapas-prawns-fried-with-oil-and-garlic-served-in-clay-cooking-pot.jpg"){kind=link}
![https://3.bp.blogspot.com/-NPP81M_NCfE/UBcTdBzVhBI/AAAAAAAADCM/7lYVNXp_6Rw/s1600/Almeria+playas.jpg"](https://3.bp.blogspot.com/-NPP81M_NCfE/UBcTdBzVhBI/AAAAAAAADCM/7lYVNXp_6Rw/s1600/Almeria+playas.jpg"){kind=link}
