checkboxes for search dispalyed

app/assets/javascripts/application.js

@@ -3,11 +3,8 @@
 //= require jquery-ui
 //= require_tree .
 //= require_directory .
-//= require gmaps4rails/bing.js
 //= require gmaps4rails/googlemaps.js
-//= require gmaps4rails/mapquest.js
-//= require gmaps4rails/openlayers.js
-//= require gmaps4rails/all_apis.js
+//= require checkbox 
 
 
 

app/assets/javascripts/autocomplete.js

@@ -1,10 +1,3 @@
-$(function () {
-  $('#alert').click(function () {
-    alert('Hello, world!');
-    return false;
-  })
-});
-
 $(function() {
 		var availableTags = [
 		"ActionScript",

app/assets/javascripts/checkbox.js

@@ -0,0 +1,18 @@
+var clicked = 0
+function selectAll(){
+	if(clicked==0){
+ 		$("input:checkbox").each(function(){	
+  		$(this).attr('checked', true);
+ 		});
+		clicked=1;
+ 		return false;
+	}
+	else {
+		$("input:checkbox").each(function(){	
+  		$(this).attr('checked', false);
+ 		});
+		clicked=0;
+ 		return false;
+	}
+}
+

app/assets/stylesheets/layout.css.scss

@@ -46,8 +46,10 @@ body {
 #header {
 	position:relative;
 	max-height:110px;
+	font-family:"Arial Narrow","Times New Roman",Georgia,Serif;
 	font-family: theFont;
 	text-transform:uppercase;
+
 }
 
 #logo {
@@ -60,7 +62,7 @@ body {
 	position:absolute;
 	top:90px;
 	left: 90px;
-	z-index:1;
+	z-index:-1;
 	font-size:110%;
 	letter-spacing: 0.8px;
 	color:404041;
@@ -205,6 +207,7 @@ body {
 /* Submenu
 */
 #submenu {
+	font-family:"Arial Narrow","Times New Roman",Georgia,Serif;
 	color:white;
 	font-size:110%;
 	font-family: theFont;
@@ -267,13 +270,28 @@ body {
 /* This is SIDE SEARCH BOX
 */
 #search_box{
+	font-family:"Arial Narrow","Times New Roman",Georgia,Serif;
 	background-color:404041;
 	position:absolute;
-	right:5px;
+	right:7px;
 	top:-33px;
 	z-index:1;
-	width:230px;
+	width:216px;
 	height:350px;
+	padding: 10px;
+	font-family: theFont;
+	color:white;
+	font-size:80%;
+	letter-spacing: 1.5px;
+	p {
+		margin-bottom:-5px;
+	}
+
+}
+
+.category_field {
+	float:left;
+	width:98px;
 }
 
 

app/controllers/application_controller.rb

@@ -19,6 +19,8 @@ class ApplicationController < ActionController::Base
   #  redirect_to url_for(locale: locale)
   #end
 
+
+
   # Defines the variable for the menu tab
   def set_up(page)
     @page_id = page  

app/views/events/_form.html.haml

@@ -47,23 +47,23 @@
   .field
     = f.label t :event_price
     %br
-    = f.text_field :price
+    = f.number_field :price
   .field
     = f.label t :event_description
     %br
     = f.text_area :description, :class => 'autogrow', :rows => 10
   .field
     = f.label t :email
     %br
-    = f.text_field :email
+    = f.email_field :email
   .field
     = f.label t :event_website
     %br
     = f.text_field :website
   .field
     = f.label t :event_phone
     %br
-    = f.text_field :phone
+    = f.telephone_field :phone
   %p
     = f.label t :event_pic
     %br

app/views/events/show.html.haml

@@ -59,7 +59,7 @@
       %p
         %b 
           = t :event_description
-        = @event.description
+        = simple_format(@event.description)
       %p
         %b 
           =t :email

app/views/layouts/application.html.haml

@@ -1,4 +1,6 @@
 
+
+
 %html{:lang => "en", "xml:lang" => "en", :xmlns => "http://www.w3.org/1999/xhtml"}
 
   %head
@@ -11,6 +13,10 @@
     = csrf_meta_tags
     <link type="text/css" href="http://yourwebsite.com/css/ui-lightness/jquery-ui-1.8.custom.css" rel="stylesheet" /> 
     <script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js#pubid=xa-4f832c682c196183"></script>  
+
+
+
+
   %body{:class => "#{controller.controller_name} container"}
     .container
       #header
@@ -130,14 +136,37 @@
         #right
           #search_box.shadow
             = form_tag search_path do
-              = text_field_tag :query
-              %p
-              = select_date Date.today, :prefix => :search_start_date
-              %p
-              %p
-              = text_field_tag :town
-              %p
-              = submit_tag I18n.t(:search)
+              #s_keyword.capital
+                = label_tag I18n.t(:search_keyword)
+                %br
+                  = text_field_tag :query
+                %p
+              #s_date01.capital
+                = label_tag I18n.t(:search_when)
+                %br
+                  = select_date Date.today, :prefix => :search_start_date , :size =>"90"
+                %p
+              #s_categories.capital
+                = label_tag I18n.t(:search_categories)
+                %br
+                  - Category.all.each do |category|
+                    .category_field
+                      = check_box_tag "category_ids[]", category.id
+                      = I18n.t("categories.#{category.name}")
+                  .category_field
+                    = check_box("all", 'pm_xray', {:onclick=>"selectAll()"} )
+                    = I18n.t(:all)
+
+
+
+                %p
+              #s_where.capital
+                = label_tag I18n.t(:search_where)
+                %br
+                  = text_field_tag :town
+                %p
+              #s_button
+                = submit_tag I18n.t(:search)
 
 
 

app/views/users/_form.html.haml

@@ -14,7 +14,7 @@
   .field
     = f.label t :user_email
     %br
-    = f.text_field :email
+    = f.email_field :email
   .field
     = f.label t :user_town
     %br

app/views/users/new.html.haml

@@ -21,7 +21,7 @@
   %p
     = f.label t :user_email
     %br
-    = f.text_field :email
+    = f.email_field :email
   %p
     = f.label t :user_password
     %br

config/locales/en.yml

@@ -83,10 +83,10 @@ en:
   upload_event_button: Upload an Event
 
   #Search_Box
-  search_keyword: Keyword
-  search_when: When
-  search_categories: Related to...
-  search_where: Where
+  search_keyword: WHAT ARE YOU AFTER?
+  search_when: WHEN?
+  search_categories: IN WHICH CATEGORIES?
+  search_where: WHERE?
   search_placeholder_where: town or province
   search: SEARCH
 

config/locales/es.yml

@@ -241,11 +241,12 @@ es:
 
   #Other
   upload_event_button: Anadir evento
+
   #Search_Box
-  search_keyword: Palabra a buscar
-  search_when: Cuando
-  search_categories: Pertenece a...
-  search_where: Donde
+  search_keyword: ¿QUE BUSCAS?
+  search_when: ¿CUANDO?
+  search_categories: ¿EN QUÉ CATEGORÍA?
+  search_where: ¿DONDE?
   search_placeholder_where: localidad o provincia
   search: GOAZEN
 

config/locales/eu.yml

@@ -235,10 +235,10 @@ eu:
   upload_event_button: Ekitaldia gehitu
 
   #Search_Box
-  search_keyword: Hitz bilaketa
-  search_when: Noiz
-  search_categories: Zein kategoriatan
-  search_where: Non
+  search_keyword: HITZ BILAKETA
+  search_when: NOIZ
+  search_categories: ZEIN KATEGORIATAN
+  search_where: NON
   search_placeholder_where: herri edo probintzia
   search: GOAZEN
 

config/routes.rb

@@ -29,7 +29,7 @@
     get "account" => "users#microposts", :as => "account"
 
     match 'events/category/:category' => 'events#category', :as => :category
-    match 'events/province/:province' => 'events#province', :as => :province
+    match 'events/locations/:province' => 'events#province', :as => :province
     #match 'users/events_created/:user'=> 'users#events', :as => "events_created", :via=> :get
     get 'user/profile' => 'users#profile', :as => "profile"
     get 'events_created' => 'users#events', :as =>"events_created"
@@ -42,7 +42,7 @@
     get 'alarm_switch' => "alarms#switch", :as => "alarm_switch"
     get 'cancel_event' => "events#cancel", :as => "cancel_event"
     get 'report_spam' => "comments#report_spam", :as => "report_spam"
-
+    get "locations" => "events#locations", :as => "locations"
   end
 
   # Google verify.
@@ -74,7 +74,7 @@
 
 
 #temp
-  get "locations" => "events#locations", :as => "locations"
+
   # The priority is based upon order of creation:
   # first created -> highest priority.