mostrar calendario (al fiiin) #7

LabPLC · May 28, 2014 · fe6650a · fe6650a
1 parent 07e79af
commit fe6650a
Show file tree

Hide file tree

Showing 8 changed files with 276 additions and 41 deletions.
diff --git a/app/assets/javascripts/eventos.js b/app/assets/javascripts/eventos.js
@@ -9,7 +9,7 @@ var myOptions = {
 
 }
 var map = new google.maps.Map(document.getElementById("map_canvas"), myOptions);
- 
+
 marker = new google.maps.Marker({
         position: myLatlng,
         map: map,
@@ -44,5 +44,5 @@ google.maps.event.addListener(marker,'dragend',function(event) {
   $(document).ready(function(){
    initialize()
 
-  
+
  })
diff --git a/app/assets/javascripts/forma.js b/app/assets/javascripts/forma.js
@@ -0,0 +1,4 @@
+
+
+   $('#formaforma').datepick({
+    rangeSelect: true, monthsToShow: 2, showTrigger: '#calImg'});
diff --git a/app/views/eventos/_form.html.erb b/app/views/eventos/_form.html.erb
@@ -20,17 +20,17 @@
     <%= f.text_field :nombre, class: "text_formulario" ,placeholder:"Yoga CDMX" %>
   </div>
   <div class="field">
- 
+
 
     <%= f.label :lugar, "Lugar donde sera el Evento *" , class: "label_formulario"%><br>
     <%= f.text_field :lugar , class: "text_formulario" ,placeholder:"Angel de la Independencia"  %>
   </div>
 
    <div class="field">
-      
-   
-    
-       
+
+
+
+
 
     <%= f.label :direccion ,"Direccion *", class: "label_formulario"%><br>
     <%= f.text_field :direccion , class: "text_formulario" ,placeholder:"Av Viaducto Rio de la Piedad y Rio Churubusco S/N, Granjas México, Iztacalco, 08400 Ciudad de México" %>
@@ -41,7 +41,7 @@
         <div class="field">
 
 <label for="from">From</label>
-<input type="text" id="from" name="from">
+<input type="text" id="formaforma" name="from">
 <label for="to">to</label>
 <input type="text" id="to" name="to">
 
@@ -59,7 +59,7 @@
    </div>
 
   <div class="col-xs-12">
-           
+
             <div class="col-xs-6">
 
 
@@ -68,20 +68,20 @@
                 <%= f.label :hora_inicio , class: "label_formulario"%><br>
                 <%= f.time_select :hora_inicio, :default=> {:hour=>"0",:minute=>"0"} %>
               </div>
-              
+
             </div>
 
             <div class="col-xs-6">
               <div class="field">
                 <%= f.label :hora_fin , class: "label_formulario"%><br>
                 <%= f.time_select :hora_fin %>
               </div>
-            
+
             </div>
-           
+
    </div>
-  
-  
+
+
 
   <div class="field">
      <%= f.label :imagen, "Imagen" , class: "label_formulario"%><br>
@@ -96,14 +96,14 @@
   <div class="col-xs-4">
    <div class="field">
     <%= f.label :categoria, class: "label_formulario" %><br>
-   
+
      <%= f.select :categoria, options_for_select([ "Deportivo", "Cine", "Exposiciones", "Infantile","Música","Cultura","Teatro","Aprendizaje" ], "Deportivo") %>
     </div>
   </div>
   <div class="col-xs-4">
   <div class="field">
     <%= f.label :Entrada_Libre, class: "label_formulario" %><br>
-   
+
      <%= f.select :categoria, options_for_select([ "Si", "No"], "Si") %>
     <%= f.label :precio , class: "label_formulario"%><br>
     <%= f.text_field :precio, class: "text_formulario" ,placeholder:"Entrada Libre"  %>
@@ -117,7 +117,7 @@
   </div>
   </div>
 
- 
+
 
  <div class="col-xs-12">
   <div class="col-xs-6">
@@ -144,7 +144,7 @@
   </div>
   <div class="col-xs-6">
   <div class="field">
-   
+
     <%= f.hidden_field :longitud , :id=>'lng' %>
   </div>
   </div>
@@ -158,22 +158,23 @@
    </div>
  <!-- <div class="col-md-3 box1">
    <div class="row">
-      
+
       <pre>
         <IMG align="middle" SRC="/codigo.png" WIDTH=98% HEIGHT=210 >
       </pre>
       <pre>
           <IMG align="middle" SRC="/eventario.png" WIDTH=98% HEIGHT=210 >
-      </pre>   
+      </pre>
       <pre>
           <IMG align="middle" SRC="/labplc.jpg" WIDTH=98% HEIGHT=210 >
-      </pre>      
+      </pre>
       </div>
    </div>-->
 
     </div>
 <% end %>
-<%= javascript_include_tag "jquery"%>
-<%= javascript_include_tag "jquery.ui.all"%>
+<%= javascript_include_tag "datepick.plugin" %>
+<%= javascript_include_tag "datepick"%>
+<%= javascript_include_tag "forma" %>
 
 
diff --git a/app/views/eventos/show.html.erb b/app/views/eventos/show.html.erb
@@ -5,7 +5,7 @@
         <div class="col-xs-1">
         </div>
               <div class="col-xs-10 box1">
-             
+
                  <div class="col-xs-0.5">
                  </div>
 
@@ -20,7 +20,7 @@
                        </p>
 
                     <p>
-                      
+
                       <img src="/donde.png" width="20" height="23" />
                       <span class='eventos_textos'>  <%= @evento.lugar %></span>
                     </p>
@@ -33,12 +33,12 @@
                     <span class='eventos_textos'>   <%= @evento.fecha_inicio %>  - <%= @evento.fecha_fin %></span>
                     </p>
 
-                    
+
 
                     <p>
-                      
+
                       <img src="/hora.png" width="20" height="23" />
-                     <span class='eventos_textos'>  <%= @evento.hora_inicio %> a 
+                     <span class='eventos_textos'>  <%= @evento.hora_inicio %> a
                       <%= @evento.hora_fin %></span>
                     </p>
 
@@ -50,7 +50,7 @@
                       <strong>Fecha fin:</strong>
                       <%= @evento.fecha_fin %>
                     </p>-->
-                    
+
 
                     <p>
                       <strong>Descripcion:</strong>
@@ -65,21 +65,21 @@
                       </div>
                       <div class="col-xs-6">
                         <p>
-                      
+
                        <p class="text-center">
                         <img src="<%= @evento.imagen %>" class="img-responsive center-block ">
                       </p>
-                   
+
                     </p>
                       </div>
-                    
-                    
+
+
                     <p>
                       <strong>Fuente:</strong>
                       <%= @evento.fuente %>
                     </p>
 
-                    
+
                     <p>
                       <strong>Categoria:</strong>
                       <%= @evento.categoria %>
@@ -107,15 +107,16 @@
                     </p>
                      <p class="text-center">
                        <div id="map_canvas" style="width:100%;height:400px;"></div>
-                        
+
                       </p>
 
                      </div>
                 </div>
-            
+
             </div>
 </div>
 </div>
   <pre class='space'></pre>
 <!--<%= link_to 'Edit', edit_evento_path(@evento) %> |
 <%= link_to 'Back', eventos_path %>-->
+<%= javascript_include_tag "showEventos" %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -13,6 +13,7 @@
   <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&libraries=geometry">         </script>
   <%= javascript_include_tag "jquery","jquery_ujs"%>
   <%= stylesheet_link_tag    "application" %>
+  <%= stylesheet_link_tag "datepick" %>
   <%= csrf_meta_tags %>
 
   <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
@@ -41,11 +42,11 @@
       <ul class="nav navbar-nav navbar-left">
         <li ><%= link_to "Inicio", root_path %></li>
         <li class="<%= 'active' if current_page?(mapa_path) %>"><%= link_to "Buscar Eventos", mapa_path %></li>
-        
-        
+
+
 
         <li>&nbsp;</li> <li>&nbsp;</li> <li>&nbsp;</li> <li>&nbsp;</li>
-        
+
       </ul>
 <% if user_signed_in? %>
             Logged in as <strong><%= current_user.email %></strong>.
@@ -72,7 +73,7 @@
           <li><%= link_to "Términos de uso", privacy_path %></li>
           <li><a href="http://codigo.labplc.mx/">Código CDMX</a></li>
           <li><a href="http://labplc.mx/">LabPLC</a></li>
-         
+
         </ul>
       </div>
     <div class="col-xs-6 col-md-3 column">
@@ -81,7 +82,7 @@
 
            <li><a href="https://twitter.com/EventarioCDMX">Twitter</a></li>
           <li><a href="https://www.facebook.com/EventarioCDMX">Facebook</a></li>
-         
+
         </ul>
       </div>
    <!-- <div class="col-xs-6 col-md-3 column">

diff --git a/vendor/assets/javascripts/datepick.js b/vendor/assets/javascripts/datepick.js
diff --git a/vendor/assets/javascripts/datepick.plugin.js b/vendor/assets/javascripts/datepick.plugin.js
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@


		$('#formaforma').datepick({
		rangeSelect: true, monthsToShow: 2, showTrigger: '#calImg'});