diff --git a/app/assets/javascripts/eventos.js b/app/assets/javascripts/eventos.js index e9977b5..97d0020 100644 --- 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 new file mode 100644 index 0000000..b4cbdb5 --- /dev/null +++ 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 index cd2985d..a2c0506 100644 --- 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" %>
- + <%= f.label :lugar, "Lugar donde sera el Evento *" , class: "label_formulario"%>
<%= f.text_field :lugar , class: "text_formulario" ,placeholder:"Angel de la Independencia" %>
- - - - + + + + <%= f.label :direccion ,"Direccion *", class: "label_formulario"%>
<%= 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 @@
- + @@ -59,7 +59,7 @@
- +
@@ -68,7 +68,7 @@ <%= f.label :hora_inicio , class: "label_formulario"%>
<%= f.time_select :hora_inicio, :default=> {:hour=>"0",:minute=>"0"} %>
- +
@@ -76,12 +76,12 @@ <%= f.label :hora_fin , class: "label_formulario"%>
<%= f.time_select :hora_fin %>
- +
- + - - + +
<%= f.label :imagen, "Imagen" , class: "label_formulario"%>
@@ -96,14 +96,14 @@
<%= f.label :categoria, class: "label_formulario" %>
- + <%= f.select :categoria, options_for_select([ "Deportivo", "Cine", "Exposiciones", "Infantile","Música","Cultura","Teatro","Aprendizaje" ], "Deportivo") %>
<%= f.label :Entrada_Libre, class: "label_formulario" %>
- + <%= f.select :categoria, options_for_select([ "Si", "No"], "Si") %> <%= f.label :precio , class: "label_formulario"%>
<%= f.text_field :precio, class: "text_formulario" ,placeholder:"Entrada Libre" %> @@ -117,7 +117,7 @@
- +
@@ -144,7 +144,7 @@
- + <%= f.hidden_field :longitud , :id=>'lng' %>
@@ -158,22 +158,23 @@
<% 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 index d4078cd..19dc921 100644 --- a/app/views/eventos/show.html.erb +++ b/app/views/eventos/show.html.erb @@ -5,7 +5,7 @@
- +
@@ -20,7 +20,7 @@

- + <%= @evento.lugar %>

@@ -33,12 +33,12 @@ <%= @evento.fecha_inicio %> - <%= @evento.fecha_fin %>

- +

- + - <%= @evento.hora_inicio %> a + <%= @evento.hora_inicio %> a <%= @evento.hora_fin %>

@@ -50,7 +50,7 @@ Fecha fin: <%= @evento.fecha_fin %>

--> - +

Descripcion: @@ -65,21 +65,21 @@

- +

- +

- - + +

Fuente: <%= @evento.fuente %>

- +

Categoria: <%= @evento.categoria %> @@ -107,15 +107,16 @@

- +

- +

 
+<%= javascript_include_tag "showEventos" %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 999e44a..bc7970d 100755
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -13,6 +13,7 @@
   
   <%= javascript_include_tag "jquery","jquery_ujs"%>
   <%= stylesheet_link_tag    "application" %>
+  <%= stylesheet_link_tag "datepick" %>
   <%= csrf_meta_tags %>
 
   
@@ -41,11 +42,11 @@
       
 <% if user_signed_in? %>
             Logged in as <%= current_user.email %>.
@@ -72,7 +73,7 @@
           
  • <%= link_to "Términos de uso", privacy_path %>
  • Código CDMX
  • LabPLC
  • - +
    @@ -81,7 +82,7 @@
  • Twitter
  • Facebook
  • - +