From 34f9e33fa57f15462caa053e16dcd67b2dff804e Mon Sep 17 00:00:00 2001 From: echarp Date: Sun, 29 Dec 2013 23:25:38 +0100 Subject: [PATCH] =?UTF-8?q?Consultation=20d'=C3=A9v=C3=A9nement=20en=20pla?= =?UTF-8?q?ce?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/all.css.sass | 22 +++++- app/assets/stylesheets/events.css.sass | 29 ++++++- app/models/event.rb | 4 + app/models/region.rb | 1 + app/views/events/index.rss.builder | 19 +++-- app/views/events/show.html.haml | 105 ++++++++++++------------- config/locales/fr.yml | 9 ++- 7 files changed, 124 insertions(+), 65 deletions(-) diff --git a/app/assets/stylesheets/all.css.sass b/app/assets/stylesheets/all.css.sass index 11baa7fc..60da2d3b 100644 --- a/app/assets/stylesheets/all.css.sass +++ b/app/assets/stylesheets/all.css.sass @@ -61,8 +61,26 @@ header.top margin-right: 0.6em vertical-align: middle -main h1 - margin-top: 1em +main + h1 + margin: 10px 5px 5px 5px + letter-spacing: 2px + h2 + margin: 52px 0px 18px + h3 + margin: 1.1em 0 1em + font-size: 1.2em + text-align: left + ul, ol + margin: 10px 0px 10px 35px + text-align: left + li + margin-left: 2em + line-height: 1.3em + p + margin: 0.9em 0 + line-height: 1.3em + text-align: justify footer.bottom nav margin: 29px auto -3px diff --git a/app/assets/stylesheets/events.css.sass b/app/assets/stylesheets/events.css.sass index ff65cfae..7a51d9c9 100644 --- a/app/assets/stylesheets/events.css.sass +++ b/app/assets/stylesheets/events.css.sass @@ -1,3 +1,5 @@ +@import "compass" + form.region_selector width: 98.4% position: absolute @@ -11,9 +13,9 @@ main form.region_selector + h2 a font-weight: normal &.previous-month - margin-right: 0.35em + margin-right: 0.33em &.next-month - margin-left: 0.35em + margin-left: 0.33em // For whole year calendar main form.region_selector + h2 + h2 @@ -89,3 +91,26 @@ table.calendar margin: 10px auto font-size: smaller text-align: right + +#lug-list + float: right + width: 15em + border: 1px solid #96CFFF + margin: 5em 1.2em 0px + padding: 5px + font-size: 0.7em + background-color: #D6ECFF + @include border-radius(10px) + h1 + font-size: 1.22em + line-height: 1.1em + font-weight: normal + border-bottom: 1px black solid + padding-bottom: 4px + ul + text-align: left + line-height: 1.2em + margin-left: 1em + li + margin-left: 2em + line-height: 1.3em diff --git a/app/models/event.rb b/app/models/event.rb index a67bb94c..5a66ea92 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -11,4 +11,8 @@ class Event < ActiveRecord::Base } scope :region, -> region { where region: region } scope :tag, -> tag { where "tags like ?", "%#{tag}%" } + + def same_day? + start_time.to_date == end_time.to_date + end end diff --git a/app/models/region.rb b/app/models/region.rb index 2e39f32c..318a34fe 100644 --- a/app/models/region.rb +++ b/app/models/region.rb @@ -1,2 +1,3 @@ class Region < ActiveRecord::Base + has_many :lugs, foreign_key: :region end diff --git a/app/views/events/index.rss.builder b/app/views/events/index.rss.builder index 28ff8ddc..b4c5489f 100644 --- a/app/views/events/index.rss.builder +++ b/app/views/events/index.rss.builder @@ -31,16 +31,23 @@ xml.tag! 'rdf:RDF', 'xmlns:rdf' => "http://www.w3.org/1999/02/22-rdf-syntax-ns#" xml.tag! 'georss:point', City.find_all_by_majname(event.city.upcase).collect { |c| "#{c.latitude} #{c.longitude}" }.first content = "

#{event.city}: #{event.title}

-

Date et lieu

-

#{l event.start_time.to_date, format: :long}, - de #{event.start_time.hour}h#{event.start_time.min} à #{event.end_time.hour}h#{event.end_time.min}.

-

À #{event.city}, - #{event.region.name}

+

Date et lieu

" + if event.same_day? + content += " +

Le #{l event.start_time.to_date, format: :long}, + de #{l event.start_time, format: :hours} à #{l event.end_time, format: :hours}.

+

À #{link_to event.city, 'http://fr.wikipedia.org/wiki/'+event.city}, + #{link_to event.region.name, 'http://fr.wikipedia.org/wiki/'+event.region.name}

" + else + content += " +

Du #{l event.start_time, format: :at} au #{l event.end_time, format: :at}.

" + end + content += "

Description

#{event.description}

Informations

Site Web: #{event.url}

-

Contact: #{mail_to event.contact.sub('@', ' CHEZ ').sub('.', ' POINT '), event.contact.sub('@', ' CHEZ ').sub('.', ' POINT ')}

+

Contact: #{mail_to event.contact.gsub('@', ' CHEZ ').gsub('.', ' POINT '), event.contact.gsub('@', ' CHEZ ').gsub('.', ' POINT ')}

" if (event.tags && event.tags.present?) diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml index b95f38c9..54a115ef 100644 --- a/app/views/events/show.html.haml +++ b/app/views/events/show.html.haml @@ -1,57 +1,54 @@ %p#notice= notice -%p - %b Title: - = @event.title -%p - %b Description: - = @event.description -%p - %b Start time: - = @event.start_time -%p - %b End time: - = @event.end_time -%p - %b City: - = @event.city -%p - %b Region: - = @event.region.name -%p - %b Locality: - = @event.locality -%p - %b Url: - = @event.url -%p - %b Contact: - = @event.contact -%p - %b Submitter: - = @event.submitter -%p - %b Moderated: - = @event.moderated -%p - %b Tags: - = @event.tags -%p - %b Secret: - = @event.secret -%p - %b Decision time: - = @event.decision_time -%p - %b Submission time: - = @event.submission_time -%p - %b Moderator mail: - = @event.moderator_mail_id -%p - %b Submitter mail: - = @event.submitter_mail_id +#lug-list + %h1=t '.lug-list' + %ul + - @event.region.lugs.order(department: :asc).each do |lug| + %li + = link_to lug.name, lug.url + (#{lug.department}) -= link_to 'Edit', edit_event_path(@event) -\| -= link_to 'Back', events_path + %h1 Actions + = link_to t('.add_to_calendar'), root_url + +%h2 + %em + = @event.city + \: + = @event.title + +%h3 + Date et lieu + +%p + - if @event.same_day? + Le #{l @event.start_time.to_date, format: :long}, + de #{l @event.start_time, format: :hours} à #{l @event.end_time, format: :hours}.

+ - else + Du + =l @event.start_time, format: :at + au + #{l @event.end_time, format: :at}. + +%p + À + %em + = link_to(@event.city, "http://fr.wikipedia.org/wiki/#{@event.city}") + ',' + = link_to @event.region.name, "http://fr.wikipedia.org/wiki/#{@event.region.name}" + +%h3 Description +=raw @event.description + +%h3 Informations +%p + Site Web: + = link_to @event.url, @event.url +%p + Contact: + = mail_to @event.contact.gsub('@', ' CHEZ ').gsub('.', ' POINT '), @event.contact.gsub('@', ' CHEZ ').gsub('.', ' POINT ') + +- if (@event.tags && @event.tags.present?) + %p + Tags: + - @event.tags.split.each do |tag| + = link_to tag, events_url(tag: tag) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 2d37666a..3242e948 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -53,7 +53,11 @@ fr: - Vendredi - Samedi formats: - long: "le %A %d %B %Y" + long: "%A %d %B %Y" + time: + formats: + at: "%A %d %B %Y à %Hh%M" + hours: "%Hh%M" layouts: application: @@ -73,3 +77,6 @@ fr: index: calendar_in: Ce calendrier en all_regions: Toutes les régions + show: + lug-list: Groupes d'utilisateurs de la région + add_to_calendar: Ajouter à mon calendrier