From d4a3863b646daceba0acc79d25765c923d55da31 Mon Sep 17 00:00:00 2001
From: Marisol Carrillo <marisol@rindecuentas.org>
Date: Wed, 2 Oct 2019 13:22:36 -0500
Subject: [PATCH] Reorder menu items and highlighting about item #4

---
 2-slider.html                      |  4 ++--
 3-visualization-slider.html        |  2 +-
 7-styleguide.md => 6-styleguide.md |  0
 7-documentation.md                 | 11 +++++++++++
 8-github.md                        | 11 +++++++++++
 "9-espa\303\261ol.md"              | 11 +++++++++++
 6-about.md => 9.1-about.md         |  2 +-
 README.md                          |  2 +-
 _includes/header.html              | 27 ++-------------------------
 _sass/_navbar.scss                 |  5 +++++
 docs/Intro/Seccion1.md             |  2 +-
 docs/README.md                     |  2 +-
 docs/index.rst                     |  2 +-
 13 files changed, 48 insertions(+), 33 deletions(-)
 rename 7-styleguide.md => 6-styleguide.md (100%)
 create mode 100644 7-documentation.md
 create mode 100644 8-github.md
 create mode 100644 "9-espa\303\261ol.md"
 rename 6-about.md => 9.1-about.md (97%)

diff --git a/2-slider.html b/2-slider.html
index 649747f..674d11d 100644
--- a/2-slider.html
+++ b/2-slider.html
@@ -14,7 +14,7 @@
 						{{ first-slide.content }}
 					</div>
 					<div class="col-lg-7 col-md-7 col-sm-12 text-center">
-						<img src="{{ site.baseurl }}/assets/img/{{first-slide.image}}" alt="" class="img-fluid">
+						<img data-src="{{ site.baseurl }}/assets/img/{{first-slide.image}}" class="img-fluid">
 					</div>
               		{%- else -%}
 					<div class="col-lg-12 col-md-12 col-sm-12 text-center">
@@ -29,7 +29,7 @@
 
 <script type="text/javascript">
 	//Inicializing sliders
-	$(function() {
+$(document).ready(function() {
 	  $('#fullpage-slider').fullpage({
 	    verticalCentered: true,
 	    navigation: true,
diff --git a/3-visualization-slider.html b/3-visualization-slider.html
index 8bfb97f..9153f0a 100644
--- a/3-visualization-slider.html
+++ b/3-visualization-slider.html
@@ -42,7 +42,7 @@
 						{{ visualization-slide.content }}
 					</div>
 					<div class="col-lg-7 col-md-7 col-sm-12 d-block d-lg-none mb-5">
-						<img src="{{ site.baseurl }}/assets/img/{{visualization-slide.image}}" alt="" class="img-fluid">
+						<img data-src="{{ site.baseurl }}/assets/img/{{visualization-slide.image}}" alt="" class="img-fluid">
 					</div>
 					{%- else -%}
 					<div class="col-lg-5 col-md-5 col-sm-12 vis-text">
diff --git a/7-styleguide.md b/6-styleguide.md
similarity index 100%
rename from 7-styleguide.md
rename to 6-styleguide.md
diff --git a/7-documentation.md b/7-documentation.md
new file mode 100644
index 0000000..52a9bee
--- /dev/null
+++ b/7-documentation.md
@@ -0,0 +1,11 @@
+---
+layout: page
+title: Documentation
+permalink: /documentation/
+---
+
+# Documentation
+
+Lear more about how to generate websites like Tower Builder with our documentation:
+
+[https://towerbuilder.readthedocs.io/en/latest/index.html](https://towerbuilder.readthedocs.io/en/latest/index.html)
diff --git a/8-github.md b/8-github.md
new file mode 100644
index 0000000..b38dad4
--- /dev/null
+++ b/8-github.md
@@ -0,0 +1,11 @@
+---
+layout: page
+title: Github
+permalink: /github/
+---
+
+# Github
+
+Visit our repository in Github:
+
+[https://github.com/ProjectPODER/TowerBuilder](https://github.com/ProjectPODER/TowerBuilder)
diff --git "a/9-espa\303\261ol.md" "b/9-espa\303\261ol.md"
new file mode 100644
index 0000000..6a62326
--- /dev/null
+++ "b/9-espa\303\261ol.md"
@@ -0,0 +1,11 @@
+---
+layout: page
+title: Español
+permalink: /español/
+---
+
+# Demo
+
+You can see our demo in spanish:
+
+[http://es.towerbuilder.projectpoder.org/](http://es.towerbuilder.projectpoder.org/)
diff --git a/6-about.md b/9.1-about.md
similarity index 97%
rename from 6-about.md
rename to 9.1-about.md
index e4b2710..bee97f6 100644
--- a/6-about.md
+++ b/9.1-about.md
@@ -33,7 +33,7 @@ Contact us to add your project created with TowerBuilder through the following e
 
 ## Demos
 
-Spanish: <https://projectpoder.github.io/TowerBuilder_ES/>
+Spanish: <http://es.towerbuilder.projectpoder.org/>
 
 English: <https://towerbuilder.projectpoder.org/>
 
diff --git a/README.md b/README.md
index bf20df0..a2b2184 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ Contáctanos para añadir tu proyecto creado con TowerBuilder a través de la si
 ### Demos
 Puedes ver una página de ejemplo en:
 
-Español: <https://projectpoder.github.io/TowerBuilder_ES/>
+Español: <http://es.towerbuilder.projectpoder.org/>
 
 Inglés: <https://towerbuilder.projectpoder.org/>
 
diff --git a/_includes/header.html b/_includes/header.html
index 3afd287..f4a5a59 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -17,22 +17,11 @@
           {%- for path in page_paths -%}
             {%- assign my_page = site.pages | where: "path", path | first -%}
             {%- if my_page.title -%}
-              <li class="nav-item {% if my_page.url == page.url %}active{% endif %}">
+              <li class="nav-item {% if my_page.url == page.url %}active{% endif %} {% if my_page.title == "About" %}line{% endif %}">
                 <a class="nav-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
               </li>
             {%- endif -%}
           {%- endfor -%}
-              <!-- Extra links -->
-              <li class="nav-item">
-                <a class="nav-link" href="https://towerbuilder.readthedocs.io/en/latest/index.html" target="_blank">Documentation</a>
-              </li>
-              <li class="nav-item">
-                <a class="nav-link" href="https://github.com/ProjectPODER/TowerBuilder" target="_blank">Github</a>
-              </li>
-              <li class="nav-item">
-                <a class="nav-link" href="https://projectpoder.github.io/TowerBuilder_ES/">Español</a>
-              </li>
-              <!-- Ends extra links -->
       </ul>
       {%- endif -%}
     </div>
@@ -55,24 +44,12 @@
               {%- for path in page_paths -%}
               {%- assign my_page = site.pages | where: "path", path | first -%}
               {%- if my_page.title -%}
-              <li class="nav-item {% if my_page.url == page.url %}active{% endif %}">
+              <li class="nav-item {% if my_page.url == page.url %}active{% endif %} {% if my_page.title == "About" %}line{% endif %}">
                   <a class="nav-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
               </li>
               {%- endif -%}
               {%- endfor -%}
 
-              <!-- Extra links -->
-              <li class="nav-item">
-                <a class="nav-link" href="https://towerbuilder.readthedocs.io/en/latest/index.html" target="_blank">Documentation</a>
-              </li>
-              <li class="nav-item">
-                <a class="nav-link" href="https://github.com/ProjectPODER/TowerBuilder" target="_blank">Github</a>
-              </li>
-              <li class="nav-item">
-                <a class="nav-link" href="https://projectpoder.github.io/TowerBuilder_ES/">Español</a>
-              </li>
-              <!-- Ends extra links -->
-
               <li class="nav-item dropdown d-none">
                   <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenu" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     Más información
diff --git a/_sass/_navbar.scss b/_sass/_navbar.scss
index 5fbf7e6..2acc2e9 100644
--- a/_sass/_navbar.scss
+++ b/_sass/_navbar.scss
@@ -7,3 +7,8 @@
     width: 80px;
     padding: 5px 20px 5px 0;
 }
+
+.line{
+    border-bottom: 2px solid;
+    border-color: $primary;
+}
\ No newline at end of file
diff --git a/docs/Intro/Seccion1.md b/docs/Intro/Seccion1.md
index 55efc4d..00f36bb 100644
--- a/docs/Intro/Seccion1.md
+++ b/docs/Intro/Seccion1.md
@@ -28,7 +28,7 @@ Contáctanos para añadir tu proyecto creado con TowerBuilder a través de la si
 ## Demos
 Puedes ver una página de ejemplo en:
 
-Español: <https://projectpoder.github.io/TowerBuilder_ES/>
+Español: <http://es.towerbuilder.projectpoder.org/>
 
 Inglés: <https://towerbuilder.projectpoder.org/>
 
diff --git a/docs/README.md b/docs/README.md
index bf5a699..f479b48 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -35,7 +35,7 @@ Demos
 
 Puedes ver una página de ejemplo en:
 
-Español: <https://projectpoder.github.io/TowerBuilder_ES/>
+Español: <http://es.towerbuilder.projectpoder.org/>
 
 Inglés: <https://towerbuilder.projectpoder.org/>
 
diff --git a/docs/index.rst b/docs/index.rst
index e95ac23..0216106 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -34,7 +34,7 @@ Demos
 
 Puedes ver una página de ejemplo en:
 
-Español: https://projectpoder.github.io/TowerBuilder_ES/
+Español: http://es.towerbuilder.projectpoder.org/
 
 Inglés: https://towerbuilder.projectpoder.org/