- Agrega lista de invited speaker

- Corrige menu centrandolo y agregando la sección de invited speaker
- corrije sidebar, sacando cosas (falta afiche)

.htaccess

@@ -6,5 +6,5 @@ RewriteCond %{REQUEST_FILENAME}.php -f
 RewriteRule ^(.+)$ $1.php [L,QSA]
 
 #301 from example.com/page.html to example.com/page
-RewriteCond %{THE_REQUEST} ^[A-Z]{3,9}\ /.*\.php\ HTTP/
+#RewriteCond %{THE_REQUEST} ^[A-Z]{3,9}\ /.*\.php\ HTTP/
-RewriteRule ^(.*)\.php$ /$1 [R=301,L]
+#RewriteRule ^(.*)\.php$ /$1 [R=301,L]

api/register.php

@@ -1,9 +1,12 @@
 <?php 
 
+$root = realpath($_SERVER["DOCUMENT_ROOT"]);
+include_once $root.'/db/db.php';
+
 function verifyCaptcha(){
     $url = 'https://www.google.com/recaptcha/api/siteverify';
     $data = array(
-        'secret' => '6LeLxy4UAAAAABClplWLJUjZ1_nhX_-SI7CuNcm8',
+        'secret' => '6LesRDsUAAAAAA6t3UgL4U4Foc9njmXX-8HIiLj_',
         'response' => $_POST["g-recaptcha-response"]
     );
     $options = array(
@@ -19,12 +22,12 @@ function verifyCaptcha(){
     return $captcha_success;
 }
 
-function verifyExistance($doc,$mail){
+/*function verifyExistance($doc,$mail){
     $fp = fopen("2021y22.csv", 'r');
     fclose($fp);
-}
+}*/
 
-function setheaders() {
+/*function setheaders() {
     $fp = fopen("2021y22.csv", 'w');
     $cabezal = array('Nombre', 'Apellido','TipoDoc','Documento',
                     'Direccion','Pais','Ciudad', 'Telefono', 'Email',
@@ -36,9 +39,9 @@ function setheaders() {
     else{
         die("unable to open file");
     }
-}
+}*/
 
-function registrar($fila) {
+/*function registrar($fila) {
     $fp = fopen("2021y22.csv", 'a');
     if($fp){
         fputcsv($fp,$fila);
@@ -55,26 +58,29 @@ function bkpregister(){
     $fecha = date("d-m-H:i:s");
     $filebkp = "bkp/registro-".$fecha.".bak.csv";
     copy("2021y22.csv",$filebkp);
-}
+}*/
 
 $errors         = array();      // array to hold validation errors
 $data           = array();      // array to pass back data
-$filename       = "2021y22";
+
 
 // validate the variables ======================================================
 $data['nombre'] = $_POST['nombre'];
 $data['apellido'] = $_POST['apellido'];
-$data['tipodoc'] = $_POST['doctype'];
+$data['titulo'] = $_POST['titulo'];
-$data['nrodoc'] = $_POST['docnro'];    
+$data['afiliacion'] = $_POST['afiliacion'];
-$data['direccion'] = $_POST['dir'];
-$data['pais'] = $_POST['pais'];
 $data['ciudad'] = $_POST['ciudad'];
-$data['telefono'] = $_POST['tel'];
+$data['pais'] = $_POST['pais'];
 $data['email'] = $_POST['email'];
-$data['profesion'] = $_POST['profesion'];
+$data['fechaLlegada'] = $_POST['bda'];
-$data['trabaja'] = $_POST['trabaja'];
+$data['fechaPartida'] = $_POST['eda'];
 $data['financiacion'] = $_POST['financiacion'];
-$data['detallefinan'] = $_POST['detallefinan'];
+$data['invitado'] = $_POST['invited'];
+$data['cartaInvitacion'] = $_POST['letterinvited'];
+$data['roomingPref']  = $_POST['roomtype'];
+$data['roommate']  = $_POST['roomate'];
+$data['fechaRegistro'] = date("Y-m-d H:i:s");
+$fila = $data;
 
 if (empty($_POST['nombre']))
     $errors['nombre'] = 'Nombre is required.';
@@ -82,32 +88,13 @@ if (empty($_POST['nombre']))
 if (empty($_POST['apellido']))
     $errors['apellido'] = 'Apellido is required.'; 
 
-if (empty($_POST['doctype']))
-    $errors['doctype'] = 'No seleccionó un tipo de doc'; 
-
-if (empty($_POST['docnro']))
-    $errors['docnro'] = 'No ingreso un documento'; 
-
-if (empty($_POST['dir']))
-    $errors['dir'] = 'No ingreso una direccion'; 
-
-if (empty($_POST['pais']))
-    $errors['pais'] = 'Ingrese el pais de presedencia';
-
-if (empty($_POST['ciudad']))
-    $errors['ciudad'] = 'Ingrese ciudad de presedencia';
-
-if (empty($_POST['tel']))
-    $errors['ciudad'] = 'Telefono de contacto vacio o incorrecto';
-
 if (empty($_POST['email']))
     $errors['email'] = 'E-Mail de contacto vacio o incorrecto';
 
-if (empty($_POST['profesion']))
+if($db->findByMail($data['email']))
-    $errors['email'] = 'indique profesion';
+    $errors['emailExists'] = 'There is already a registration for that email: ' . $data['email'].'\n'.
+    'Please contact: lydia@cmat.edu.uy';
 
-if (empty($_POST['trabaja']))
-    $errors['trabaja'] = 'Indique en el sector que trabaja';
 if(empty($_POST['g-recaptcha-response'])){
     $errors['recaptcha'] = 'Debe validar el captcha';
 }
@@ -115,11 +102,7 @@ else if(!verifyCaptcha()){
     $errors['recaptcha'] = 'Error en la validación de ReCaptcha';
 }
 
-if( !file_exists("2021y22.csv"))
-    setheaders();        
 
-// return a response ===========================================================
-// if there are any errors in our errors array, return a success boolean of false
 if ( !empty($errors)) {
 
     // if there are items in our errors array, return those errors
@@ -128,27 +111,29 @@ if ( !empty($errors)) {
 } 
 else {
     $data['success'] = true;
-    bkpregister();
+    $db->insert($fila);   
-    $fila = $data;   
+    /*
-    registrar($fila);    
     $mail = $data["email"];
     $nombre = $data["nombre"] . " " . $data["apellido"];
-    $msg = "Hola ". $data["nombre"] ."!\n\n".
+    $msg = "Hi ". $data["nombre"] ."!\n\n".
-    "te has registrado al 6to Coloquio Uruguayo de Matemática exitosamente!\n\n".
+    "You have been Successfully registered to the workshop on Groups, Geometry and Dynamics!\n\n".
-    "Por cualquier consulta escribe a: 6coloquio@cmat.edu.uy\n\n".
+    "For any question, write us to: ggdworkshop@cmat.edu.uy\n\n".
-    "Saludos cordiales,\n\n".
+    "Regards,\n\n".
-    "Comité Organizador, 6to Coloquio Uruguayo de Matemática.";
+    "Organizing Commite, GGD Workshop.";
-    $headers = 'From: ' . "6coloquio@cmat.edu.uy" . "\r\n" .
+    $headers = 'From: ' . "ggdworkshop@cmat.edu.uy" . "\r\n" .
-               'Reply-To: ' . "6coloquio@cmat.edu.uy" . "\r\n" .
+               'Reply-To: ' . "ggdworkshop@cmat.edu.uy" . "\r\n" .
                'Content-Type: ' . "text/plain; charset=UTF-8". "\r\n" .
                'X-Mailer: PHP/' . phpversion();
-    mail($mail, 'Registro confirmado. 6to Coloquio Uruguayo de Matemática', $msg, $headers);
+    mail($mail, 'Registration confirmation for GGDWorkshop', $msg, $headers);
-
+    */
-    $data['message'] = 'Registro exitoso';
+    $data['message'] = "Registration Successfully!";
 
 }
 
 // return all our data to an AJAX call
-echo json_encode($data);
+$encoded = json_encode($data);
+header('Content-Type: application/json');
+exit($encoded);
+//echo json_encode($data);
 
 ?>

committess.php

@@ -8,18 +8,36 @@
         <ul class="comite">
           <li><a href="http://www.math.lsa.umich.edu/~canary/" data-linktype="external" data-val="http://www.math.lsa.umich.edu/~canary/">Dick Canary - University of Michigan</a></li>
           <li><a href="https://www.math.u-psud.fr/~crovisie/" data-linktype="external" data-val="https://www.math.u-psud.fr/~crovisie/">Sylvain Crovisier - Université Paris-Sud</a></li>
-          <li><a href="https://www.ihes.fr/en/professeur/3403-2/" data-linktype="external" data-val="https://www.ihes.fr/en/professeur/3403-2/">Fanny Kassel - IHES</a></li>
+          <li><a href="https://www.ihes.fr/en/professeur/3403-2/" data-linktype="external" data-val="https://www.ihes.fr/en/professeur/3403-2/">Fanny Kassel - IHES Université Paris-Saclay</a></li>
           <li><a href="http://cayley.kr/wiki/Sang-hyun_Kim" data-linktype="external" data-val="http://cayley.kr/wiki/Sang-hyun_Kim">Sang-hyun Kim - Seoul National University</a></li>
           <li><a href="https://www.dpmms.cam.ac.uk/~gpp24/" data-linktype="external" data-val="https://www.dpmms.cam.ac.uk/~gpp24/">Gabriel Paternain - University of Cambridge</a></li>
           <li><a href="http://w3.impa.br/~enrique/" data-linktype="external" data-val="http://w3.impa.br/~enrique/">Enrique Pujals - IMPA</a></li>
-          <li><a data-val="http://www.cmat.edu.uy/~rpotrie/" href="http://www.cmat.edu.uy/~rpotrie/" data-linktype="external">Rafael Potrie - CMAT</a></li>
+          <li><a data-val="http://www.cmat.edu.uy/~rpotrie/" href="http://www.cmat.edu.uy/~rpotrie/" data-linktype="external">Rafael Potrie - Universidad de la República</a></li>
         </ul>
 	      <h2>Organizing Committee</h2>
         <ul class="comite">
-          <li>Juan Alonso</li>
+          <li>
-          <li>Joaquín Brum</li>
+            <a href="http://www.cmat.edu.uy/docentes/alonso-juan" target="_external">
-          <li>Andrés Sambarino</li>
+            Juan Alonso - Universidad de la República
-          <li>Martín Sambarino</li>
+            </a>
+          </li>
+          <li>
+            <a href="http://abadejo.fing.edu.uy/ssd/integrantes/gente/Joaquin.htm" target="_external">
+            Joaquín Brum - Universidad de la República
+            </a>
+          </li>
+          <li>
+            <a href="https://webusers.imj-prg.fr/~andres.sambarino/" target="_external">
+            Andrés Sambarino - Université Paris VI
+          </a>
+          </li>
+          <li>
+            <a href="http://www.cmat.edu.uy/docentes/sambarino-martin" target="_external">
+            Martín Sambarino - Universidad de la República
+            </a>
+          </li>
+          </li>
+          <li>Adriana Da Luz - Universidad de la República</li>
         </ul>
 
      </div>

config.php

@@ -0,0 +1,10 @@
+<?php
+ 
+ 
+class Config {
+   /**
+    * path to the sqlite file
+    */
+    const PATH_TO_SQLITE_FILE = 'db/ggdworkshop.db';
+ 
+}

db.php

@@ -1,14 +0,0 @@
-<?php
-    class DB extends SQLite3{
-        function __construct(){
-            $this->open('test.db');
-        }
-    }
-    $db = new DB();
-    if(!$db){
-        echo $db->lastErrorMsg();
-    }else{
-        echo "Opened database successfully\n";
-    }
-?>
-        

db/db.php

@@ -0,0 +1,80 @@
+<?php 
+ 
+  $root = realpath($_SERVER["DOCUMENT_ROOT"]);
+  $db_path = $root."/db/ggdworkshop.db";
+  $schema_path = $root."/db/schema.sql";
+
+  class DB{
+    private $pdo;
+
+    public function connect(){
+      if($this->pdo == null){
+        global $db_path;
+        $this->pdo = new \PDO('sqlite:'.$db_path);
+        $this->pdo->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION );
+      }
+      return $this->pdo;
+    }
+
+    public function schema($schema_file){
+      $sql = file_get_contents($schema_file);
+      $this->pdo->exec($sql);
+    }
+
+    public function insert($registro){
+      $columns = implode(",", array_keys($registro));
+      echo $columns;
+      $sql = "INSERT INTO Registro ($columns)"
+              .' VALUES (:nombre,:apellido,:titulo,:afiliacion,:ciudad,:pais,:email,:fechaLlegada,'
+              .':fechaPartida,:financiacion,:invitado,:cartaInvitacion,:roomingPref,:roommate,:fechaRegistro);';
+      echo $sql;
+      $stmt = $this->pdo->prepare($sql);  
+      $stmt->execute([
+        ':nombre' => $registro['nombre'],
+        ':apellido' => $registro['apellido'],
+        ':titulo' => $registro['titulo'],
+        ':afiliacion' => $registro['afiliacion'],
+        ':ciudad' => $registro['ciudad'],
+        ':pais' => $registro['pais'],
+        ':email' => $registro['email'],
+        ':fechaLlegada' => $registro['fechaLlegada'],
+        ':fechaPartida' => $registro['fechaPartida'],
+        ':financiacion' => $registro['financiacion'],
+        ':invitado' => $registro['invitado'],
+        ':cartaInvitacion' => $registro['cartaInvitacion'],
+        ':roomingPref' => $registro['roomingPref'],
+        ':roommate' => $registro['roommate'],
+        ':fechaRegistro' => $registro['fechaRegistro']
+        ]);
+      return $this->pdo->lastInsertId();
+  
+    }
+    public function getAll(){
+      $stmt = $this->pdo->prepare("SELECT * FROM Registro");
+      $stmt -> execute();
+      return $stmt->fetchAll(\PDO::FETCH_BOTH);
+
+    }
+    public function findByMail($email){
+      $stmt = $this->pdo->prepare("SELECT * FROM Registro WHERE email=:email");
+      $stmt->bindParam(":email",$email);
+      $stmt->execute();
+      $result = $stmt->fetch(\PDO::FETCH_ASSOC);
+      if($result)
+        return false;
+      else
+        true;
+    }
+
+
+
+  } 
+
+  $db = new DB();
+  $db->connect();
+  $db->schema($schema_path);
+
+
+    
+?>
+        

db/schema.sql

@@ -0,0 +1,19 @@
+CREATE TABLE IF NOT EXISTS Registro
+      (
+        id              INTEGER PRIMARY KEY AUTOINCREMENT,
+        nombre          VARCHAR(50) NOT NULL,
+        apellido        VARCHAR(50) NOT NULL,
+        titulo          VARCHAR(50),
+        afiliacion      VARCHAR(50),
+        ciudad          VARCHAR(50),
+        pais            VARCHAR(50),
+        email           VARCHAR(80) NOT NULL UNIQUE,
+        fechaLlegada    DATE,
+        fechaPartida    DATE,
+        financiacion    BOOLEAN     NOT NULL,
+        invitado        BOOLEAN     NOT NULL,
+        cartaInvitacion BOOLEAN     NOT NULL,
+        roomingPref     VARCHAR(50),
+        roommate        VARCHAR(50),
+        fechaRegistro   DATETIME NOT NULL
+    );

dbconnect.php

@@ -0,0 +1,28 @@
+<?php 
+/**
+ * SQLite connnection
+ */
+class SQLiteConnection {
+    /**
+     * PDO instance
+     * @var type 
+     */
+    private $pdo;
+ 
+    /**
+     * return in instance of the PDO object that connects to the SQLite database
+     * @return \PDO
+     */
+    public function connect() {
+        if ($this->pdo == null) {
+            try {
+                $this->pdo = new \PDO("sqlite:" . Config::PATH_TO_SQLITE_FILE);
+                } catch (\PDOException $e) {
+               // handle the exception here
+                }
+                
+            }
+        return $this->pdo;
+    }
+}
+?>

header.php

@@ -50,28 +50,38 @@
         <div id="logo_text">
 
           <!-- class="logo_colour", allows you to change the colour of the text -->
-          <h1 class="title"><a href="/"><!--<span class="logo_init">GGD</span>--><span class="logo_colour"> Workshop on<br/> Group Geometry and Dynamics</span></a></h1>
+          <h1 class="title"><a href="/"><span class="logo_colour"> Workshop on<br/> Groups, Geometry and Dynamics</span></a></h1>
-          <br/>
+        
           <h2 class="subtitle">
             <strong>With a homage to Ricardo Mañé</strong><br>            
+          </h2>
+
+          <h2 id="when" class="subtitle">
             <strong>23 - 27, July 2018</strong>
           </h2>
+          <h2 id="where" class="subtitle">
+            <strong>Montevideo, Uruguay</strong>
+          </h2>
         </div>
       </div>
+      
       <nav class="navbar navbar-inverse " id="menubar">
-        <div class="container">
+        <div class="container-fluid">
           <ul class="nav navbar-nav" id="menu">
             <!--<li id="home" class="selected"><a href="/">Home</a></li>-->
             <li id="program" class="selected"><a href="program">Program</a></li>
+            <li id="committee" class="selected"><a href="committess">Committees</a></li>
+            <li id="invitedspeakers" class="selected"><a href="invitedspeakers">Invited Speakers</a></li>                    
             <li id="registro" class="selected"><a href="registration">Registration</a></li>
-            <li id="program" class="selected"><a href="participants">Participants</a></li>  
+            <li id="participants" class="selected"><a href="participants">Participants</a></li>  
-            <li id="program" class="selected"><a href="committess">Committees</a></li>
             
-            <li id="mapa" class="selected"><a href="location">Practical Information</a></li>
+            
-            <li id="contacto" class="selected"><a href="contact">Contact</a></li>
+            <li id="practicalinfo" class="selected"><a href="practicalinfo">Practical Information</a></li>
+            <!--<li id="contacto" class="selected"><a href="contact">Contact</a></li>-->
           </ul>
         </div>
       </nav>
+    
      </header>
      <div id="site_content" class="container">
       

index.php

@@ -17,16 +17,20 @@
         working on these areas  to discuss new trends on these topics. The
         idea is to have few talks and lots of discussion time.
     </p>
+    <hr class="separador">
       <p>
         During the conference we will be holding  a memorial recognition to Ricardo Mañé
-        (1948-1995), a top Uruguayan mathematician who worked on Dynamical
+        (1948-1995), a top Uruguayan (and Brazilian) mathematician who worked on Dynamical
         Systems, and who in 2018 would have been 70 years old.
       </p>
       <div class="thumbnail">
         <a  href="https://en.wikipedia.org/wiki/Ricardo_Ma%C3%B1%C3%A9" target="_blank">
           <img class="img-responsive" src="img/rmane.jpg" alt="Ricardo Mañé"/>
           <div class="caption">
+            <blockquote>
             <p>Quisque in porttitor ante. Morbi non maximus purus. Nulla vel varius nulla. Fusce in orci a nibh sodales sagittis eu vel elit. </p>
+            <footer>Ricardo Mañé</footer>
+            </blockquote>
           </div>
         </a>
       </div>

invitedspeakers.php

@@ -0,0 +1,136 @@
+<?php include_once 'header.php'; ?>
+
+
+<div class="row">
+  <div id="content" class="col-xs-12 col-sm-8">
+    <div class="row">
+
+      <h1><strong>Invited Speakers</strong></h1> 
+        <!--<h2>Scientific Committee</h2>-->
+        <ul class="comite">
+          <!-- Por la Letra B -->
+          <li>
+            <a href="http://www.mat.uc.cl/~jairo.bochi/" target="_external">
+              Jairo Bochi - Pontificia Universidad Católica de Chile
+            </a>
+          </li>
+          <li>
+            <a href="http://bonatti.perso.math.cnrs.fr/" target="_external">
+              Christian Bonatti - Université de Bourgogne
+            </a>
+          </li>
+          <li>
+            <a href="http://www.math.northwestern.edu/~burns/" target="_external">
+              Keith Burns - Northwestern University
+            </a>
+          </li>
+          <!-- Por la letra C -->
+          <li>
+            <a href="http://canzani.web.unc.edu/" target="_external">
+             Yaiza Canzani - University of North Carolina at Chapel Hill 
+            </a>
+          </li>
+          <li>
+            <a href="http://www.cimat.mx/~gonzalo/" target="_external">
+             Gonzalo Contreras - CIMAT, Guanajuato 
+            </a>
+          </li>
+          <!-- Por la letra D -->
+          <li>
+            <!--<a href="http://www.fing.edu.uy/imerl" target="_external">-->
+             Adriana da Luz - Universidad de la República 
+            <!--</a>-->
+          </li>
+          <!-- Por la letra G -->
+          <li>
+            <a href="https://www.math.u-psud.fr/~guillarmou/" target="_external">
+             Colin Guillarmou - Université Paris-Sud
+            </a>
+          </li>
+          <!-- Por la letra H -->
+          <li>
+            <a href="http://www.math.uni-bonn.de/people/ursula/" target="_external">
+             Ursula Hamenstädt - Universität Bonn
+            </a>
+          </li>
+          <!-- Por la letra K -->
+          <li>
+            <a href="http://faculty.virginia.edu/Koberda/" target="_external">
+             Thomas Koberda - University of Virginia
+            </a>
+          </li>
+          <li>
+            <a href="http://www.professores.uff.br/koro/" target="_external">
+             Andrés Koropecki - Universidade Federal Fluminense
+            </a>
+          </li>
+          <!-- Por la letra L -->
+          <li>
+            <a href="http://math.nd.edu/people/faculty/francois-ledrappier/" target="_external">
+              François Ledrappier - University of Notre Dame
+            </a>
+          </li>
+          <li>
+            <a href="http://www.math.cornell.edu/m/People/bynetid/yl763" target="_external">
+              Yash Lodha - Cornell University
+            </a>
+          </li>
+          <!-- Por la letra M -->
+          <li>
+            <a href="http://www.im.ufrj.br/visualizarDocente.php?idDepartamento=3&idDocente=28" target="_external">
+              Leonardo Macarini - Universidade Federal do Rio de Janeiro
+            </a>
+          </li>
+          <li>
+            <a href="http://www.math.brown.edu/~mann/index.html" target="_external">
+              Kathryn Mann - Brown University
+            </a>
+          </li>
+          <!-- Por la letra N -->
+          <li>
+            <a href="http://www.mat.usach.cl/index.php/2012-12-19-12-50-19/academicos/75-andres-navas-flores" target="_external">
+              Andrés Navas - Universidad de Santiago de Chile
+            </a>
+          </li>
+          <!-- Por la letra Q -->
+          <li>
+            <a href="https://www.math.u-bordeaux.fr/~jquint/" target="_external">
+              Jean-François Quint - Université Bordeaux I
+            </a>
+          </li>
+          <!-- Por la letra S -->
+          <li>
+            <a href="https://webusers.imj-prg.fr/~andres.sambarino/" target="_external">
+              Andrés Sambarino - Université Paris VI
+            </a>
+          </li>
+          <li>
+            <a href="http://www.utdt.edu/profesores/pshmerkin" target="_external">
+              Pablo Shmerkin - Universidad Torcuato Di Tella
+            </a>
+          </li>
+          <!-- Por la letra W -->
+          <li>
+            <a href=" https://webusers.imj-prg.fr/~maxime.wolff/" target="_external">
+              Maxime Wolff - Université Paris VI            </a>
+          </li>
+
+
+
+          </ul>
+        <!--<h2>Organizing Committee</h2>
+        <ul class="comite">
+          <li>Juan Alonso</li>
+          <li>Joaquín Brum</li>
+          <li>Andrés Sambarino</li>
+          <li>Martín Sambarino</li>
+          <li>Adriana Da Luz</li>
+        </ul>-->
+
+
+  </div>               
+</div>
+
+
+<?php include_once 'sidebar.php'; ?>
+<?php include_once 'footer.php'; ?>

js/registerform.js

@@ -1,25 +1,30 @@
 
-
+function showMessage(error,msg){
+	$("#statusmsg .modal-body").html("<p>"+msg+"</p>");
+	$("#statusmsg").modal({show:true})
+}
 $().ready(function(){
 	$("#statusmsg").hide();
 	
 	$("#txtbda,#txteda").datepicker({
 
-      	minDate:new Date(2018,7,23),
+		dateFormat: "dd/mm/yy",
-      	maxDate:new Date(2018,7,27)
+      	minDate:new Date(2018,6,23),
+      	maxDate:new Date(2018,6,27)
 	});
 	
 	$("#pais").select2({
 		data: data.paises,
 		placeholder: "Select Country",
-		width: "70%",
+		width: "100%",
 	});
 	
 	$("#roomtype").select2({
 		data: data.roomtypes,
 		placeholder: "Select Rooming Preference",
-		width:"70%",
+		width:"100%",
 		minimumResultsForSearch: -1,
+		dropdownCssClass: "bigdrop",
 		
 	});
 	
@@ -70,80 +75,72 @@ $().ready(function(){
 			formdata.find(item => item.name === "roomtype").value = $("#roomtype").select2("data")[0].text;
 			var parameters = $.param(formdata);
 			console.log(parameters);
+			var post = $.post('api/register', parameters);
+			post.done(function(data){
+				//var res = $.parseJSON(data);				
+				console.log(data);
+
+				if(data.success){
+
+					alert("yupiiii, te registraste ok");
+				}
+				else{
+					var errorMsg=""
+					$.each(data.errors, function(idx,val){
+						
+						errorMsg += val+"\n";						
+					});
+					console.log(errorMsg);
+					console.log(data.errors);
+					showMessage("true",errorMsg);
+
+
+				}
+				
+			});
+			//console.log(parameters);
+
 		},		
 		errorElement: "em",
 		errorPlacement: function ( error, element ) {
 			// Add the `help-block` class to the error element			
-			
-			element.parents(".input-container").addClass("has-feedback");
-			var esradio = element.prop("type") == "radio";
-			var pariente;
-			if ( esradio ) {
-				pariente = element.parents(".form-group").children(".radioerror");
-				
-				pariente.append(error);
-				error.css("color", "#a94442")
-				//element.parents(".form-group").children(".radioerror").append(error);
-				//element.parents(".radios").append(error);
-				
-			} else {
 			error.addClass("help-block");
-				error.insertAfter( element );
+			var esradio = $(element).prop("type") == "radio";
+			var padre = element.parents(".input-container");
+			padre.addClass("has-feedback");
+			padre.append(error);
+			var iconstatus = $("<span class='glyphicon glyphicon-remove form-control-feedback'></span>");
+			if(!$.contains(padre,"span.glyhpicon")){
+				error.before(iconstatus);				
+			}
+			if(esradio){
+				error.css("display", "inline");
+				$(iconstatus).css("display", "inline");
+				$(iconstatus).css("position", "initial");
 			}			
-			if ( !element.next( "span" )[ 0 ] && !esradio ) 
-				$( "<span class='glyphicon glyphicon-remove form-control-feedback'></span>" ).insertAfter( element );
-			if(esradio)
-				element.parents(".form-group").children(".radioerror").prepend("<span style='color:#a94442;' class='glyphicon glyphicon-remove'></span>");
-			
 		},
 		success: function(label,element){
 			var esradio = $(element).prop("type") == "radio";
-			var pariente;
+			var padre = $(element).parents(".input-container");
-			if ( esradio ) {
+			var iconstatus = padre.children("span.glyphicon");			
-				pariente = $(element).parents(".form-group").children(".radioerror");
+			if(!iconstatus){
-				var iconstatus = $(pariente).children("span");
+				label.before("<span class='glyphicon glyphicon-ok form-control-feedback'></span>");				
-				if (!$(pariente).children("span")[ 0 ])
-					pariente.preprend("<span style='color:#3c763d;' class='glyphicon glyphicon-ok form-control-feedback'></span>");					
 			}
-			else if ( !$( element ).next( "span" )[ 0 ]){				
-					$( "<span class='glyphicon glyphicon-ok form-control-feedback'></span>" ).insertAfter( $( element ) );
-			}
-			
-			
-
 		},
 		highlight: function ( element, errorClass, validClass ) {
-			var esradio = $(element).prop("type") == "radio";
+			var padre = $(element).parents(".input-container");
-			var pariente;
+			var iconstatus = padre.children("span.glyphicon");
-			if ( esradio ) {
+			padre.addClass("has-error").removeClass("has-success");
-				pariente = $(element).parents(".form-group").children(".radioerror");
-				pariente.addClass("has-error").removeClass("has-success");
-				var iconstatus = pariente.children( "span" );
 			iconstatus.addClass( "glyphicon-remove" ).removeClass( "glyphicon-ok" );
-				iconstatus.css("color","#a94442");
+			padre.addClass( "has-error" ).removeClass( "has-success" );			
-			}
-			else
-				$( element ).next( "span" ).addClass( "glyphicon-remove" ).removeClass( "glyphicon-ok" );
-			$( element ).parents( ".input-container" ).addClass( "has-error" ).removeClass( "has-success" );
-			
 		},
 		unhighlight: function (element, errorClass, validClass) {
-			var esradio = $(element).prop("type") == "radio";
+			var padre = $(element).parents(".input-container");			
-			var pariente;
+			var iconstatus = padre.children("span.glyphicon");
-			if ( esradio ) {
+			padre.addClass("has-success").removeClass("has-error");									
-				pariente = $(element).parents(".form-group").children(".radioerror");
-				pariente.addClass("has-success").removeClass("has-error");
-				var iconstatus = pariente.children( "span" );
 			iconstatus.addClass( "glyphicon-ok" ).removeClass( "glyphicon-remove" );
-				iconstatus.css("color","#3c763d");
+			padre.addClass( "has-success" ).removeClass( "has-error" );			
-				
 		}    	
-			else
-				$( element ).next( "span" ).addClass( "glyphicon-ok" ).removeClass( "glyphicon-remove" );
-			$( element ).parents( ".input-container" ).addClass( "has-success" ).removeClass( "has-error" );
-			
-		}
-    	
     });
 
     var finan;

participants.php

@@ -0,0 +1,39 @@
+<?php $root = realpath($_SERVER["DOCUMENT_ROOT"]);?>
+<?php include_once 'header.php'; ?>
+<?php include_once $root.'/db/db.php'; ?>
+<div class="row">
+  <div id="content" class="col-xs-12 col-sm-8">
+    <div class="row">
+      <div class="col-xs-12">
+        <h1><strong>Participants</strong></h1> 
+        <table class="table table-striped">
+          <thead>
+            <tr>
+              <th>Firstname</th>
+              <th>Lastname</th>
+              <th>Affiliation</th>
+            </tr>
+          </thead>
+          <tbody>
+          <?php
+            
+            foreach($db->getAll() as $row){
+              echo "<tr>";
+              echo "<td> ".$row['nombre']." </td>";
+              echo "<td> ".$row['apellido']." </td>";
+              echo "<td> ".$row['afiliacion']." </td>";
+              echo "</tr>";
+            }
+            
+            ?>
+
+          
+          </tbody>
+        </table>
+        </div>
+
+      </div>
+    </div>
+      
+<?php include_once 'sidebar.php'; ?>
+<?php include_once 'footer.php'; ?>

practicalinfo.php

@@ -0,0 +1,83 @@
+<?php include_once 'header.php'; ?>
+<div class="row">
+  <div id="content" class="col-xs-12 col-sm-8">
+    <div class="row">
+    <div class="col-xs-12">
+      <h1><strong>Lodging:</strong></h1>
+      <p>Rooms have been reserved at the 
+        <a href="https://www.intercityhoteis.com.br/en/hoteis/montevideu/hotel-intercity-montevideo/sobre/" target="_external">
+          Intercity Montevideo
+        </a> hotel
+        <div class="map-responsive">
+          <iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3271.616381915736!2d-56.16325672170411!3d-34.916075368615274!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x959f819f8574ca93%3A0xc7b49804a0598fec!2sHotel+Intercity+Premium+Montevid%C3%A9u!5e0!3m2!1ses!2suy!4v1512510114017" width="600" height="450" frameborder="0" style="border:0" allowfullscreen></iframe>
+        </div>
+    </div>
+  </div>
+  <hr>
+  <div class="row">
+    <div class="col-xs-12">
+       <div class="media">
+        <div class="media-left media-top">
+          <img src="img/intercityhotel.jpg" class="media-object" style="width:200px">
+        </div>
+        <div class="media-body">
+          <h4 class="media-heading" style="color: rgb(75, 170, 190);">Edificio Polifuncional "José Luis Massera"</h4>
+          <p> Senda Nelson Landoni 631, Montevideo</p>
+        </div>
+      </div> 
+    </div>
+   </div>
+   <br>
+
+   <div class="row">
+      <div class="col-xs-12">
+        <h1><strong>Arrival Information:</strong></h1> 
+          <p><a href="http://www.aeropuertodecarrasco.com.uy/home/en/" target="_external">Carrasco International Airport</a> is one hour grom the center of Montevideo</p>
+          <h3>ByBus</h3>
+          <p>Se necistan tomar 2 omnibus. 1 linea interdepartamental hasta terminal 3 cruces y luego linea urbana hasta el Hotel.</p>
+          <ul>
+            <li>Tomar el Copsa o Cot con destino Montevideo</li>
+            <li>Bajar en terminal 3 cruces</li>
+            <li>Tomar lineas 300,199</li>
+          </ul>
+
+          <h3>Taxi</h3>
+          <p>
+            El aeropuerto mismo está lleno de taxis, salen una plata.
+          </p>
+          <h3>Uber</h3>
+          <p>The safest method to get to the Hotel, it cost approx. $750 (25 dollars)</p>
+        
+      </div>
+    </div>
+
+    <br>
+    <div class="row">
+      <div class="col-xs-12">
+        <h1><strong>Venue:</strong></h1> 
+	        <div class="map-responsive">
+            <iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3271.5742234352!2d-56.16905248474392!3d-34.91713308037947!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x959f81a27b71199f%3A0x4ece30db435561f!2sEdificio+Polifuncional+%22Jose+Luis+Massera%22%2C+Senda+Nelson+Landoni+631%2C+11200+Montevideo!5e0!3m2!1ses!2suy!4v1504130822964" width="600px" height="450px"  style="border:0" allowfullscreen>
+            </iframe>
+          </div>
+        <hr/>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-xs-12">
+       <div class="media">
+        <div class="media-left media-top">
+          <img src="img/aulario.jpg" class="media-object" style="width:200px">
+        </div>
+        <div class="media-body">
+          <h4 class="media-heading" style="color: rgb(75, 170, 190);">Edificio Polifuncional "José Luis Massera"</h4>
+          <p> Senda Nelson Landoni 631, Montevideo</p>
+        </div>
+      </div> 
+    </div>
+   </div>
+   <hr>
+  
+
+  </div>         
+<?php include_once 'sidebar.php'; ?>
+<?php include_once 'footer.php'; ?>

program.php

@@ -0,0 +1,38 @@
+<?php include_once 'header.php'; ?>
+
+
+<div class="row">
+  <div id="content" class="col-xs-12 col-sm-8">
+    <div class="row">
+
+      <h1><strong>Program</strong> </h1>
+      <h2> To be announced</h2>
+      <!--<h2 class="filelink"><a href="cronograma.pdf"><span class="glyphicon glyphicon-file"></span>Cronograma por día</a></h2>
+      <br/>
+      
+      <div id="programa">
+        <ul class="nav nav-tabs">
+          <li class="active"><a data-toggle="tab" href="#cursos">Cursos</a></li>
+          <li><a data-toggle="tab" href="#charlas">Charlas</a></li>
+          <li><a data-toggle="tab" href="#plenarias">Plenarias</a></li>
+          <li><a data-toggle="tab" href="#diplomados">Diplomados</a></li>
+          <li><a data-toggle="tab" href="#olimpiadas">Olimpíadas</a></li>
+          <li><a data-toggle="tab" href="#mesaredonda">Mesa Redonda</a></li>
+        </ul>
+        <div class="tab-content">
+          <?php include_once 'prgr/cursos.html'; ?>
+          <?php include_once 'prgr/charlas.html'; ?>
+          <?php include_once 'prgr/plenarias.html'; ?>
+          <?php include_once 'prgr/diplomados.html'; ?>
+          <?php include_once 'prgr/olimpiadas.html'; ?>
+          <?php include_once 'prgr/mesaredonda.html'; ?>
+          
+        </div>
+      </div>-->
+
+  </div>               
+</div>
+
+
+<?php include_once 'sidebar.php'; ?>
+<?php include_once 'footer.php'; ?>

registration.php

@@ -1,170 +1,184 @@
 <?php include_once 'header.php'; ?>
-
 <script src="js/data.js"></script>
 <script src="js/registerform.js"></script>
 <div class="row">         
 <div id="content" class="col-xs-12 col-sm-12">
   <h1>Registration</h1>
 
-  <form id="registerform" method="post" class="form-horizontal" action novalidate="novalidate">           
+  <form id="registerform" method="post" action novalidate="novalidate">           
-    
+    <!-- Nombre y Apellido -->
-    <div class="form-group">
+    <div class="row">
-      <label class="control-label col-sm-2" for="nombre">First Name</label>
+      <div class="form-group col-xs-12 col-sm-6">
-      <div class="col-sm-8 input-container">
+        <label class="control-label" for="nombre">First Name</label>
+        <div class="input-container">
            <input id="nombre" class="form-control" name="nombre" type="text">         
         </div>
       </div>
 
-    <div class="form-group">
+      <div class="form-group col-xs-12 col-sm-6">
-      <label class="control-label col-sm-2" for="apellido">Last Name</label>
+        <label class="control-label" for="apellido">Last Name</label>
-      <div class="col-sm-8 input-container">
+        <div class="input-container">
           <input id="apellido" class="form-control" name="apellido" type="text">
         </div>
       </div>
+    </div>
 
-    <div class="form-group">
+    <!-- Título y Afiliación -->
-      <label class="control-label col-sm-2" for="titulo">Title</label>
+    <div class="row">
-      <div class="col-sm-8 input-container">
+      <div class="form-group col-xs-12 col-sm-6">
+        <label class="control-label" for="titulo">Title</label>
+        <div class="input-container">
           <input id="titulo" class="form-control" name="titulo" 
             placeholder="Professor, Post Doc, Grad Student(1st year, 2nd year, etc..)"  type="text">
         </div>
       </div>
       
-    <div class="form-group">
+      <div class="form-group col-xs-12 col-sm-6">
-      <label class="control-label col-sm-2" for="afiliacion">Affiliation</label>
+        <label class="control-label " for="afiliacion">Affiliation</label>
-      <div class="col-sm-8 input-container">
+        <div class="input-container">
-        <input id="afiliacion" class="form-control" name="afiliciacion"
+          <input id="afiliacion" class="form-control" name="afiliacion"
           placeholder="Which university or organization"  type="text">
         </div>
       </div>
+    </div>
 
-    <div class="form-group">
+    <!-- Ciudad y Pais -->
-      <label class="col-sm-2 control-label" for="ciudad">City</label>
+    <div class="row">
-      <div class="col-sm-8 input-container">
+      <div class="form-group col-xs-12 col-sm-6">
+        <label class=" control-label" for="ciudad">City</label>
+        <div class="input-container">
           <input id="ciudad" name="ciudad" class="form-control" type="text">   
         </div>      
       </div>
 
-    <div class="form-group">
+      <div class="form-group col-xs-12 col-sm-6">
-      <label class="col-sm-2 control-label" for="pais">Country</label>
+        <label class=" control-label" for="pais">Country</label>
-      <div class="col-sm-8 input-container">    
+        <div class="input-container">    
           <select id="pais" name="pais">
             <option></optoon>
           </select>  
           
         </div>    
       </div>
+    </div>
 
-     <div class="form-group">
+    <!-- Email -->
-      <label class="control-label col-sm-2" for="email">Email</label>
+    <div class="row">
-      <div class="col-sm-8 input-container">
+       <div class="form-group col-xs-12">
+        <label class="control-label" for="email">Email</label>
+        <div class="input-container">
           <input id="email" class="form-control" name="email" 
             placeholder="mail@example.com"  type="email">
         </div>
       </div>
+    </div>
 
-    <div class="form-group">
+    <!-- Beggining date  and Endig Date-->
-      <label class="control-label col-sm-2" for="txtbda">Beginning date attending</label>
+    <div class="row">
-      <div class="col-sm-8 input-container">
+      <div class="form-group col-xs-12 col-sm-6">
+        <label class="control-label " for="txtbda">Beginning date attending</label>
+        <div class="input-container">
           <input id="txtbda" class="form-control" placeholder="DD/MM/AAAA" name="bda">
         </div>
       </div>  
-    <div class="form-group">
+      <div class="form-group col-xs-12 col-sm-6">
-      <label class="control-label col-sm-2" for="txteda">Ending date attending</label>
+        <label class="control-label " for="txteda">Ending date attending</label>
-      <div class="col-sm-8 input-container">
+        <div class="input-container">
           <input id="txteda" class="form-control" placeholder="DD/MM/AAAA" name="eda">
         </div>
       </div>  
+    </div>
     
-    <div class="form-group">
+    <!-- Financial Support -->
-       <label class="control-label col-sm-2" for="sifinan">
+    <div class="row">
+      <div class="form-group col-xs-12">
+         <label class="control-label" for="sifinan">
           Are you asking for support from the conference? 
          </label>
-      <div class="col-sm-1 radios input-container">
+        <div class="radios input-container">
-        <label class="radio-inline"><input id="sifinan" type="radio" name="financiacion" value="si">Yes</label><br>
+          <label class="radio-inline"><input id="sifinan" type="radio" name="financiacion" value="1">Yes</label>
-        <label class="radio-inline"><input id="nofinan" type="radio" name="financiacion" value="no">No</label>      
+          <label class="radio-inline"><input id="nofinan" type="radio" name="financiacion" value="0">No</label> 
+          
         </div>
-      <div class="col-sm-6 alert alert-info">
+        <div class="col-sm-8 alert alert-info" style="margin:10px 0px 5px 0px;">
 
           <em class="text-justify">
-          we have submitted funding requests and hope to cover the housing
+            We have submitted funding requests and hope to cover the housing
             for a shared room, but we cannot make a guarantee at this time
           </em>
         </div>      
-      <div class="col-sm-7 col-sm-offset-2 radioerror">
+      </div>      
-
     </div>
 
-      
+    <!-- Invitation and letter of -->
-    </div>
+    <div class="row">
-    <div class="form-group">
+      <div class="form-group col-xs-12 col-sm-6">
         <!--requerido-->
-       <label class="control-label col-sm-2" for="invited">
+         <label class="control-label" for="invited">
           Were you invited to participate in this conference?
          </label>
-      <div class="col-sm-4 input-container">
+        <div class="input-container">
           <div class="radio">
-          <label><input id="invited" type="radio" name="invited" value="si">Yes, I was previously invited</label>
+            <label><input id="invited" type="radio" name="invited" value="1">Yes, I was previously invited</label>
           </div>
           <div class="radio">
-          <label><input id="noinvited" type="radio" name="invited" value="no">No, I am applying(Registration committee will notifiy you if accepted)</label>
+            <label><input id="noinvited" type="radio" name="invited" value="0">No, I am applying (Registration committee will notifiy you if accepted)</label>
           </div>
         </div>
-      <div class="col-sm-7 col-sm-offset-2 radioerror">
-
       </div>                       
     
-        
+      <div class="form-group col-xs-12 col-sm-6">
-                   
+         <label class="control-label" for="invited">
-    </div>
-    <div class="form-group">
-       <label class="control-label col-sm-2" for="invited">
           Do you need a letter of invitation?
          </label>
-      <div class="col-sm-4 input-container">
+        <div class="input-container">
-        <label class="radio-inline"><input id="sifinan" type="radio" name="letterinvited" value="si">Yes</label>
+          <label class="radio-inline"><input id="sifinan" type="radio" name="letterinvited" value="1">Yes</label>
-        <label class="radio-inline"><input id="nofinan" type="radio" name="letterinvited" value="no">No</label>        
+          <label class="radio-inline"><input id="nofinan" type="radio" name="letterinvited" value="0">No</label>        
+        </div>                     
+      </div>
     </div>
-      <div class="col-sm-10 col-sm-offset-2 radioerror">
     
-      </div>             
+    <!-- Rooming Preferences -->
-    </div>
+    <div class="row">
-    <div class="form-group">
+      <div class="form-group col-xs-12 col-sm-6">
-      <!-- es requerido -->
+        <label class="control-label " for="roomtype">Rooming Preference</label>
-      <label class="control-label col-sm-2" for="roomtype">Rooming Preference</label>
+        <div class="input-container">
-      <div class="col-sm-8 input-container">
           <select id="roomtype" name="roomtype">
             <option></optoon>
           </select>
         </div>
-
       </div>
-    <div class="form-group">
+
-      <label class="col-sm-2 control-label" for="roomate">Name of preferred roommate (if any)</label>
+      <div class="form-group col-xs-12 col-sm-6">
-      <div class="col-sm-8 input-container">
+        <label class=" control-label" for="roomate">Name of preferred roommate (if any)</label>
+        <div class="input-container">
 
           <input id="roomate" name="roomate" class="form-control" 
                type="text">   
         </div>      
       </div>        
-    
-    <div class="form-group">
-      <div class="g-recaptcha col-sm-8" data-sitekey="6LeLxy4UAAAAALcrNXxcOiW1B3QgcfgZ6u4l52kZ" data-callback="onReturnCallback"></div>              
     </div>
-    <div class="form-group"> 
+
-        <div class="col-sm-8">
+    <!--Captcha -->
+    <div class="row">
+      <div class="form-group col-xs-12">
+        <div class="g-recaptcha" data-sitekey="6LesRDsUAAAAAJvyoODvjiza9u75qEGJmbKHEV6s"></div>        
+      </div>
+    </div>
+    
+    <!-- Confirm Button -->
+    <div class="row">
+      <div class="form-group col-xs-12 col-sm-8">         
           <button type="submit" class="btn-lg btn btn-primary">Register</button>
       </div>
     </div>
   </form> 
   
-  <div id="statusmsg" class="alert alert-success">
+  
-    <strong>Success!</strong> Indicates a successful or positive action.
+  <div id="statusmsg" class="modal fade" role="dialog" data-hidden>
-  </div>
-  <!--<div id="myModal" class="modal fade" role="dialog">
     <div class="modal-dialog">
       <!-- Modal content-->
-      <!--<div class="modal-content">
+      <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal">&times;</button>
           <h4 class="modal-title">Revise sus datos cuidadosamente y confirme</h4>
@@ -182,7 +196,7 @@
       </div>
 
     </div>
-  </div>-->
+  </div>
 </div>
 
 <?php include_once 'footer.php'; ?>        

sidebar.php

@@ -13,26 +13,16 @@
   </div>
   <div class="row">
     <div class="col-xs-12 text-center">
-      <h1>Últimos Avisos</h1>
+      <h1>News</h1>
-      <h4 style="color:red;">Inscripciones Abiertas</h4>
+      
-      <h4 style="color:#43423F;">30 de Agosto, 2017</h4>
-      <p> <a title="Formulario de registro" href="/registro">Registrarse </a></p>
-      <h4 style="color:red;">Fecha Límite para ayuda económica</h4>
-      <h4 style="color:#43423F;">15 de Noviembre, 2017</h4>
-      <h1>Links de interés</h1>
-      <div class="interest-links">
-        <h4><a target="_blank" data-toogle="tooltip" title="Imaginary Uruguay" href="http://imaginary.org/es/project/imaginary-uruguay">Imaginary</a></h4>
-      </div>
     </div>
   </div>
   <div class="row">
-    <div class="col-xs-12">
+    <div class="col-xs-12 text-center">
-      <p class="text-center">Marian Pereira dará una charla sobre ciclo IMAGINARY aqui un video de su presentación en Berlin:</h4>
+      <h1>Contact</h1>
-      <div class="js-video vimeo">
+      <h4><a href="mailto:ggdworkshop@cmat.edu.uy">ggdworkshop@cmat.edu.uy</a></h4>
-        <iframe src="https://player.vimeo.com/video/206030280?color=ffffff&title=0&byline=0&portrait=0" width="640" height="360" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
       
     </div>
-      <p><a href="https://vimeo.com/206030280">IC16: IMAGINARY in Uruguay - Diego Armentano and Mariana Pereira</a> from <a href="https://vimeo.com/imaginaryopenmathematics">IMAGINARY</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
-    </div>
   </div>
+  
 </div>

style/style.css

@@ -95,24 +95,11 @@ blockquote
   padding: 10px 20px 0px 20px;
   border: 1px solid #E5E5DB;
   background: #FFF;}
-/*
-ul
-{ margin: 2px 0px 18px 16px;
-  padding: 0px;}
-
-ul li
-{ list-style-type: square;
-  margin: 0px 0px 6px 0px; 
-  padding: 0px;}*/
-
-ol
-{ margin: 8px 0px 0px 24px;
-  padding: 0px;}
-
-ol li
-{ margin: 0px 0px 11px 0px; 
-  padding: 0px;}
 
+hr.separador{
+  width:50%;
+  border-top:1px solid #bbb;
+}
 #main, #logo, #menubar, #site_content, #footer
 { margin-left: auto; 
   margin-right: auto;}
@@ -122,7 +109,7 @@ ol li
 
 #header
 { /*background: transparent url(logo.jpg) no-repeat;*/
-  //*background-color: #FC9C04;*/
+  /*background-color: #FC9C04;*/
 }
 .jumbotron{
   margin-bottom: 0px;
@@ -145,7 +132,8 @@ ol li
   /*position: relative*/;
   /*height: 200px;*/
   padding:10px 0px;
-  background:inherit;}
+  background:inherit;
+}
 #logo_text{
   margin-top:20px;
   /*text-shadow: #444 0 1px 1px;*/
@@ -155,6 +143,14 @@ ol li
 }
 #logo_text h2.subtitle{
   text-shadow: #333 2px 2px 1px;
+
+}
+
+h2#when{margin-top:10px!important;}
+
+h2#where{
+  
+  font-size: 220%!important;
 }
 #logo_text h1
 {
@@ -208,19 +204,31 @@ ol li
   .logo_colour{font-size:30px;}
 }
 ul#menu
-{ /*float: right;
+{ 
-  margin-right:10px;
+  display: inline-block!important;
-  margin: 0px;
+  float: none!important;
-  background: black;
+
-  padding: 4px;
-  margin-top: 20px;*/
 }
 
-ul#menu li
+#menubar div.container-fluid{
+  text-align: center;
+}
+
+/*ul#menu li
 { float: left;
   margin: 5px 0 0 0;
   padding: 0 0 0 0px;
-  list-style: none;}
+  list-style: none;
+}*/
+
+@media screen and (min-width: 768px){
+ul#menu {
+    display: inline-block!important;
+    float: none!important;
+    margin-bottom: 7.5px;
+    margin-top: 7.5px;
+  }
+}
 
 ul#menu li a
 { letter-spacing: 0.1em;
@@ -262,10 +270,10 @@ ul#menu li a:hover
 { color: #FC9C04;}
 
 ul.comite{
-  list-style: none;
+  
 }
 ul.comite li{
-  
+  font-size:18px;
 }
 ul.comite li a{
   text-decoration:none;
@@ -291,7 +299,7 @@ div.interest-links h4 a{
   margin: 0 auto 0 auto;
   /*padding: 0px 15px 0px 30px;*/
   /*background: #F6F6F0 url(back.png) repeat-y;*/
-  border: 15px solid #FFF;*/} 
+  border: 15px solid #FFF;} 
 
 .sidebar
 { /*float: right;
@@ -353,90 +361,21 @@ div.interest-links h4 a{
   width: 134px;
   padding: 5px;}
   
-.form_settings
-{ margin: 15px 0 0 0;}
-
-.form_settings p
-{ 
-  padding: 0 0 4px 0;
-
-}
 #registerform .control-label{
   text-align: left;
 }
-.form_settings span
+.select2-selection, .select2-selection__rendered, .select2-selection__arrow{
-{ float: left; 
+  height:34px!important;
-  width: 100px; 
+  line-height: 34px!important;
-  text-align: left;}
-  
-.form_settings input, .form_settings textarea
-{ padding: 5px; 
-  width: 299px; 
-  font: 100% arial; 
-  border: 1px solid #E5E5DB; 
-  background: #FFF; 
-  color: #47433F;
 }
 
-.form_settings p.inline-input input{
+@media screen and (max-width: 480px) {
-  width: 200px;
+    .g-recaptcha {
+      transform:scale(0.87);
+      transform-origin:0 0;
     }
-.form_settings select.small{
-  width:100px;
-}  
-.form_settings input.radio-input{
-  width: 50px;
 }
 
-.form_settings p input[type="radio"]{
-  width: 50px;
-}
-
-.form_settings .submit
-{ font: 100% arial; 
-  border: 0; 
-  width: 99px; 
-  margin: 0 0 0 212px; 
-  height: 33px;
-  padding: 2px 0 3px 0;
-  cursor: pointer; 
-  background: #3B3B3B; 
-  color: #FFF;}
-
-.form_settings textarea, .form_settings select
-{ font: 100% arial; 
-  width: 299px;}
-
-.form_settings select
-{ width: 310px;}
-
-.form_settings .checkbox
-{ margin: 4px 0; 
-  padding: 0; 
-  width: 14px;
-  border: 0;
-  background: none;}
-
-.separator
-{ width: 100%;
-  height: 0;
-  border-top: 1px solid #D9D5CF;
-  border-bottom: 1px solid #FFF;
-  margin: 0 0 20px 0;}
-  
-table
-{ margin: 10px 0 30px 0;}
-
-table tr th, table tr td
-{ background: #3B3B3B;
-  color: #FFF;
-  padding: 7px 4px;
-  text-align: left;}
-  
-table tr td
-{ background: #E5E5DB;
-  color: #47433F;
-  border-top: 1px solid #FFF;}
 
 div.map-responsive{
     overflow:hidden;