From ba23e9cad110fc8a70d4ec6b711459af1f62164a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Correa?= <german.correa.balier@gmail.com>
Date: Mon, 17 Aug 2020 16:34:06 -0300
Subject: [PATCH] agrega nuevo header para ceremonia y modifica el autoscroll
 en / y /descripcion

---
 public/js/app.js               |  2 +-
 templates/header.html          |  8 +++---
 templates/headerceremonia.html | 48 ++++++++++++++++++++++++++++++++++
 templates/layout-noside.html   |  2 +-
 4 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 templates/headerceremonia.html

diff --git a/public/js/app.js b/public/js/app.js
index 1187af8..0cf0ea3 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -2,7 +2,7 @@ function routeMenu() {
   var ruta = window.location.pathname.split(".")[0];
   $("ul#menu li").removeClass("active");
   
-  ruta!=='/' &&
+  (ruta!=='/' && ruta!=='/descripcion') &&
   $([document.documentElement, document.body]).animate(
     {
       scrollTop: $("#content").offset().top
diff --git a/templates/header.html b/templates/header.html
index 1b1529b..cec970e 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -3,16 +3,16 @@
   
   <!--<div class="bg"></div>-->
   
-  <!--<div id="logo" class="jumbotron" data-parallax="scroll" data-position="center" data-natural-height="841" data-natural-width="1600" data-image-src="img/headerceremonia.jpeg">-->
-  <img src="img/headerceremonia.jpeg" style="width:100%;"/>
-   <!--<div  class="logo-container">
+  <div id="logo" class="jumbotron" data-parallax="scroll" data-position="center" data-natural-height="1080" data-natural-width="1920" data-image-src="img/headerpic2.jpg">
+  
+   <div  class="logo-container">
       <img class="logopic" src="img/logo-clam.png">
       
     </div>
     <h2 id="when" class="subtitle">
       <span style="text-decoration-line: line-through;">20 al 24 de julio de 2020</span><span style="color:#00b1d7">/</span> Montevideo, Uruguay
     </h2>
-  </div>-->
+  </div>
  
   
 
diff --git a/templates/headerceremonia.html b/templates/headerceremonia.html
new file mode 100644
index 0000000..1b1529b
--- /dev/null
+++ b/templates/headerceremonia.html
@@ -0,0 +1,48 @@
+<header id="header">
+  
+  
+  <!--<div class="bg"></div>-->
+  
+  <!--<div id="logo" class="jumbotron" data-parallax="scroll" data-position="center" data-natural-height="841" data-natural-width="1600" data-image-src="img/headerceremonia.jpeg">-->
+  <img src="img/headerceremonia.jpeg" style="width:100%;"/>
+   <!--<div  class="logo-container">
+      <img class="logopic" src="img/logo-clam.png">
+      
+    </div>
+    <h2 id="when" class="subtitle">
+      <span style="text-decoration-line: line-through;">20 al 24 de julio de 2020</span><span style="color:#00b1d7">/</span> Montevideo, Uruguay
+    </h2>
+  </div>-->
+ 
+  
+
+</header>
+<nav class="navbar navbar-inverse " id="menubar">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#menucollapse">
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand visible-xs" href="#">Clam2020 Menu</a>
+    </div>
+    <div class="navbar-collapse collapse" id="menucollapse">
+      <div class="container">
+        <ul class="nav navbar-nav" id="menu">
+
+          <li id="home"><a href="/"><i class="glyphicon glyphicon-home"></i></a></li>
+          <li id="descripcion"><a href="descripcion">Descripción</a></li>
+          <li id="comites"><a href="comites">Comités</a></li>
+          <li id="program"><a href="programa">Programa</a></li>
+          <li id="conferencias"><a href="conferencias">Conferencias</a></li>
+          <li id="sesiones"><a href="sesiones">Sesiones</a></li>
+          <li id="registration"><a href="registrarse">Registro</a></li>
+          <li id="participants"><a href="participantes">Participantes</a></li>
+          <!--<li id="practicalinfo"><a href="informacion-practica">Información Práctica</a></li>-->
+          <!--<li id="contacto" class="selected"><a href="contact">Contact</a></li>-->
+        </ul>
+      </div>
+    </div>
+  </div>
+</nav>
diff --git a/templates/layout-noside.html b/templates/layout-noside.html
index d0618b1..2c964b5 100644
--- a/templates/layout-noside.html
+++ b/templates/layout-noside.html
@@ -4,7 +4,7 @@
 
   <body>
     <div id="main">
-      {% include 'header.html' %} 
+      {% include 'headerceremonia.html' %} 
       
       <div id="site_content" class="container">
         <div class="row">