New Dev branch, starting private site

css/style.css

@@ -246,6 +246,25 @@ img.logo{
 .btn-red:focus{
   outline: none !important;
 }
+
+.btn-green{
+  font-family: 'Roboto-Bold';
+  font-size: 16px;
+  background-color: #fff;
+  color: #2ecc71;
+  border-color: #2ecc71;
+  border-radius: 15px;
+}
+.btn-green:hover{
+  background-color: #2ecc71 !important;
+  color: #fff !important;
+}
+
+.btn-green:focus{
+  outline: none !important;
+}
+
+
 a.thumbnail.active, a.thumbnail:focus, a.thumbnail:hover{
   border: none !important;
   outline: none !important;
@@ -300,6 +319,10 @@ font-family: 'Roboto-Bold';
 .form-control{
   font-size: 17px;
 }
+
+.alert {
+    padding: 5px
+  }
 /*==========  Non-Mobile First Method  ==========*/
 
 
@@ -317,7 +340,7 @@ h1.title{
 
 /* Small Devices, Tablets */
 
-@media only screen and (max-width: 768px) {
+@media only screen and (max-width: 1115px) {
     .navbar-text {
         float: left;
         /*margin-left: 15px;
@@ -341,7 +364,7 @@ h1.title{
 
 @media only screen and (max-width: 320px) {}
 
-@media only screen and (max-width:767px) {
+@media only screen and (max-width:1115px) {
     /*-----End Navar-----*/
     #slide-nav .container {
         margin: 0!important;
@@ -376,6 +399,7 @@ h1.title{
         width: 100%;
         margin: 0;
     }
+
     #slide-nav #slidemenu .navbar-nav .dropdown-menu li a {
         min-width: 0;
         width: 80%;
@@ -400,6 +424,9 @@ h1.title{
     #slide-nav .navbar-form .btn {
         width: 100%
     }
+    .navbar-toggle {
+    display: block;
+}
     .navbar-nav>li>a:before {
         position: absolute;
         content: '';
@@ -414,8 +441,44 @@ h1.title{
     #page-content {
         margin-top: 70px;
     }
+    .navbar-header {
+        float: none;
+    }
+    .navbar-nav>li {
+        float: none;
+    }
 }
 
-@media only screen and (min-width:768px) {
 
+
+
+
+
+
+
+@media (min-width: 1116px){
+
+
+  .navbar-header {
+      float: left;
+  }
+.navbar-toggle {
+    display: none;
+}
+
+
+}
+
+
+
+.expSolar,.expSolar_click{
+  background-color: #ffa500;
+}
+
+.expNocturno, .expNocturno_click{
+  background-color: #758ddc
+}
+
+.padding0{
+  padding: 0px;
 }

index.html

@@ -15,6 +15,8 @@
     <link rel="stylesheet" href="css/style.css">
     <!-- fontsawesome -->
     <link rel="stylesheet" href="css/font-awesome.min.css">
+    <!-- DatePicker -->
+    <link href="css/jquery-ui.css" rel="stylesheet" type="text/css">
     <!-- Google Analytics -->
     <script>
         window.ga = window.ga || function() {
@@ -43,7 +45,7 @@
     <span class="icon-bar"> </span>
     <span class="icon-bar"></span>
     </button>
-                <a href="./" class="navbar-text"><strong>Observatorio Astronómico <br> Francisco Manuel Sánchez</strong></a>
+                <a href="./inicio" id="logo" class="navbar-text"><strong>Observatorio Astronómico <br> Francisco Manuel Sánchez</strong></a>
             </div>
 
             <!-- home -->
@@ -60,9 +62,19 @@
                     <li id="equip"><a href="./equipamiento">Equipamiento</a></li>
                     <li id="about"><a href="./acerca">Acerca de</a></li>
                     <li id="contact"><a href="./contacto">Contacto</a></li>
-                    <!-- <li><a href="#/reservas">Reservas</a></li>
-                  <li><a href="#/galeria">Galeria</a></li>
-                  <li><a href="#/perfil">Perfil</a></li> -->
+
+
+                    <li ng-show='isLogged'><a href="./experimento">Experimentos</a></li>
+                  <!-- <li ng-hide="user.login"><a href="./galeria">Galeria</a></li> -->
+                  <li id="profile" ng-show='isLogged'><a href="./perfil">Perfil</a></li>
+                </ul>
+                <ul class="nav navbar-nav navbar-right">
+                  <!-- <li id="login"><button  class="btn btn-warning navbar-btn" type="button" name="button" style="padding: 10px 10px;margin:8px 10px">Inicar sesión</button></li>
+                  <li id="register"><button class="btn btn-danger navbar-btn" type="button" name="button" style="padding: 10px 10px;margin:8px 10px">Registrar</button></li> -->
+                  <li ng-hide='isLogged' id="login"><button   ng-click="goLogin()" class="btn btn-success navbar-btn" type="button" name="button" style="padding: 10px 10px;margin:8px 10px">Iniciar sesión</button></li>
+                  <li ng-hide='isLogged' id="register"><button  ng-click="goRegister()" class="btn btn-danger navbar-btn" type="button" name="button" style="padding: 10px 10px;margin:8px 10px">Registrar</button></li>
+                  <li ng-show='isLogged'><p class="black navbar-text" style="margin-left: 15px"><strong>Bienvenido</strong></p></li>
+                  <li ng-show='isLogged' id="logout"><button   ng-click="toLogout()" class="btn btn-danger navbar-btn" type="button" name="button" style="padding: 10px 10px;margin:8px 10px">Cerrar sesión</button></li>
                 </ul>
                 <!-- <ul class="nav navbar-nav navbar-right" ng-show="user.login">
                 <li>
@@ -101,16 +113,22 @@
     <script src="js/angular.min.js"></script>
     <!-- AngularJS route -->
     <script src="js/angular-route.min.js"></script>
+    <!-- AngularJS cookies -->
+    <script src="js/angular-cookies.min.js"></script>
     <!-- AngularJS Sanitize -->
     <script src="js/angular-sanitize.min.js"></script>
     <!-- routes.js -->
     <script src="js/app.js"></script>
     <!-- Controllers -->
     <script src="js/controllers.js"></script>
+    <!-- Services -->
+    <script src="services/service.js"></script>
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
     <script src="js/jquery.min.js"></script>
     <!-- Bootstrap js-->
     <script src="js/bootstrap.min.js"></script>
+    <!-- jquery-ui -->
+    <script src="js/jquery-ui.js"></script>
     <!-- Script js -->
     <script src="js/script.js"></script>
 </body>

js/app.js

@@ -1,4 +1,4 @@
-var app = angular.module('observatorioapp', ['ngRoute', 'ngSanitize']);
+var app = angular.module('observatorioapp', ['ngRoute', 'ngSanitize','ngCookies']);
 
 // URL prefix
 app.config(['$locationProvider', function($locationProvider) {
@@ -36,10 +36,26 @@ app.config(function($routeProvider) {
           templateUrl: 'views/contact.html',
           controller: 'contactoController'
         })
-        // .when('/inicio', {
-        //     templateUrl: 'views/inicio.html',
-        //     controller: 'inicioController'
-        // })
+        .when('/registrar', {
+          templateUrl: 'views/register.html',
+          controller: 'registrarController'
+        })
+        .when('/iniciarsesion', {
+          templateUrl: 'views/register.html',
+          controller: 'loginController'
+        })
+        .when('/experimento', {
+          templateUrl: 'views/experiment.html',
+          controller: 'experimentoController'
+        })
+        .when('/perfil', {
+          templateUrl: 'views/profile.html',
+          controller: 'perfilController'
+        })
+        .when('/observacion', {
+          templateUrl: 'views/observation.html',
+          controller: 'observacionController'
+        })
         .otherwise({
             redirectTo: function(){
               return  '/inicio'
@@ -65,7 +81,4 @@ app.config(function($routeProvider) {
         //   templateUrl: 'views/profile.html',
         //   controller: ''
         // })
-
-
-        // $locationProvider.html5Mode(true);
 })