*smaller logo

app/assets/stylesheets/events.css.scss

@@ -65,6 +65,8 @@
 	-webkit-transform:rotate(-90deg);
 	-moz-transform:rotate(-90deg);
 	-o-transform: rotate(-90deg);
+	filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+
 	line-height:140px;
 
 }

app/assets/stylesheets/layout.css.scss

@@ -14,6 +14,9 @@ body {
  margin-left: 0px;
 	a{
 		text-decoration:none;
+		img {
+			border: none;
+		}
 	}
 }
 
@@ -41,6 +44,7 @@ body {
 */
 
 #header {
+	position:relative;
 	max-height:110px;
 	font-family: theFont;
 	text-transform:uppercase;
@@ -52,6 +56,16 @@ body {
 	width:30%;
 }
 
+#slogan {
+	position:absolute;
+	top:90px;
+	left: 90px;
+	z-index:1;
+	font-size:110%;
+	letter-spacing: 0.8px;
+	color:404041;
+}
+
 .logo_size {
 	max-height:110px;	
 	border: none;

app/controllers/events_controller.rb

@@ -9,7 +9,7 @@ class EventsController < ApplicationController
 
   after_filter :create_micropost, :only=>[:update]
 
-  require 'date'
+  #require 'date'
 
   def search
    # @events = Event.where((["CAST(title as varchar(255)) LIKE ?", "%#{params[:query]}%"]) || (["CAST(place as varchar(255)) LIKE ?", "%#{params[:query]}%"]))
@@ -19,7 +19,11 @@ def search
     #@events = @events.find(:all, :conditions => ["start_date between ? and ?","%#{params[:search_start_date]}%", Date.today.next_month.beginning_of_month ])
 
     #@events = @events.where((["CAST(start_date as date) < ?", "%#{params[:search_start_date]}%"]))
-    @events = @events.where('start_date > ?', "%#{params[:search_start_date]}.to_time%")
+    #@time = params[:search_start_date]+" "+"00:00:00"
+    @time = Time.new(params[:search_start_date][:year], params[:search_start_date][:month],params[:search_start_date][:day] , params[:search_start_date][:hour], params[:search_start_date][:minute])
+
+    @events = @events.where("start_date >= ?", @time)
+    #@events = @events.where("start_date > ?", "%#{params[:search_start_date]}%")
     #@events = @events.start_between(params[:start_date], params[:end_date])
   end
 

app/views/events/search.html.haml

@@ -4,10 +4,10 @@
     #user_block_pic
       = image_tag(event.pic.url(:medium), class: 'event_block_image', :alt =>'Event Picture')
 
-    #user_block_details{:style=>"width:66.5%;"}
+    #user_block_details{:style=>"width:66%;"}
       .event_title.capital
         %b 
-          =truncate(strip_tags(event.title), length:60)
+          =truncate(strip_tags(event.title), length:30)
       %div
         %d
           =l event.start_date, :format=> :block

app/views/layouts/application.html.haml

@@ -20,9 +20,10 @@
           .wrap
             #logo
 
-              - logo_tag = image_tag("logo.png", :alt => "Logo HiKultura.com", :class => "logo_size")
+              - logo_tag = image_tag("hikultura_paisvasco_euskadi_jaia_cultura_small.png", :alt => "HiKultura Logo HiKultura.com", :class => "logo_size")
               = link_to logo_tag, root_path
-
+              #slogan.capital
+                =t :slogan
 
             #header_right
               #login
@@ -136,7 +137,7 @@
               %p
               = text_field_tag :town
               %p
-              = submit_tag "GOAZEN"
+              = submit_tag I18n.t(:search)
 
 
 

config/locales/en.yml

@@ -62,7 +62,10 @@ en:
   reminders_delete: "Reminder deleted!"
   users_create: 'Welcome to HiKultura, now you are part of the community!.'
   users_update: 'User was successfully updated.'
-
+
+  #Header
+  slogan: "Basque Country's Agenda"
+
   #Menu
   menu_events: Events
   menu_locations: Locations
@@ -85,7 +88,8 @@ en:
   search_categories: Related to...
   search_where: Where
   search_placeholder_where: town or province
-
+  search: SEARCH
+
   #Event_headers
   new_event: New Event
   events_in_cat:  Events in category

config/locales/es.yml

@@ -223,7 +223,8 @@ es:
   users_create: "Bienvenid@ a HiKultura, ya eres oficial!" #'User was successfully created.'
   users_update: "Tus datos han sido actualizados" #'User was successfully updated.'
 
-
+  #Header
+  slogan: Agenda de Euskal Herria
 
   #Menu
   menu_events: 'Eventos'
@@ -246,6 +247,7 @@ es:
   search_categories: Pertenece a...
   search_where: Donde
   search_placeholder_where: localidad o provincia
+  search: GOAZEN
 
   #Event_headers
   new_event: 'Anade un evento'

config/locales/eu.yml

@@ -215,6 +215,9 @@ eu:
   users_create: 'Ongi etorri HiKulturara, jada barruan zaude!'
   users_update: Zure datuak eguneratuak izan dira.
 
+  #Header
+  slogan: Euskal Herriko Agenda
+
   #Menu
   menu_events: Ekitaldiak
   menu_locations: Tokia
@@ -237,6 +240,7 @@ eu:
   search_categories: Zein kategoriatan
   search_where: Non
   search_placeholder_where: herri edo probintzia
+  search: GOAZEN
 
   #Event_headers
   new_event: Gehitu ekitaldi bat

config/locales/fr.yml

@@ -222,4 +222,6 @@ fr:
           one: ! '%{count} %{model} affiché(e)'
           other: ! '%{count} %{model} affiché(e)s'
       page_gap: ! '…'
-      previous_label: ← précédent
+      previous_label: ← précédent
+
+  search: GOAZEN