This commit is contained in:
Nicolas Bally 2013-12-09 23:01:30 +01:00
parent e33494cf61
commit dab22ee570
8 changed files with 161 additions and 140 deletions

BIN
app/assets/images/book.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

View File

@ -256,9 +256,28 @@ body{
#home_main{ #home_main{
@extend .center; @extend .center;
#events_container{ #new_book{
color:white;
h3{
color:white;
margin-top:5px;
}
margin: 0px 15px 20px 23px ;
padding: 10px ;
background:#80a93f;
img{
width:100%;
}
}
#right{
float:right; float:right;
width:430px; width:430px;
}
#events_container{
background:url('/assets/events_shadow.png') no-repeat bottom center; background:url('/assets/events_shadow.png') no-repeat bottom center;
position:relative; position:relative;
top:-22px; top:-22px;

View File

@ -50,7 +50,7 @@
#legals #legals
%p{:style => "float:right"} %p{:style => "float:right"}
=link_to "Site réalisé par Nicolas Bally - Quartz Agence", "http://www.quartz-agence.com", :target => "_blank" =link_to "Site réalisé par Nicolas Bally", "http://nicolasbally.com", :target => "_blank"
%p=link_to "Mentions légales" %p=link_to "Mentions légales"

View File

@ -3,6 +3,7 @@
%h3=event.title %h3=event.title
%p.date= event_human_date(event) %p.date= event_human_date(event)
-if event.image_file
%p %p
=image_tag(event.image_file.file.large.medium.small.thumb.url, :alt => "Jean François Noblet - Blog écologie") =image_tag(event.image_file.file.large.medium.small.thumb.url, :alt => "Jean François Noblet - Blog écologie")
%p.desc %p.desc

View File

@ -56,7 +56,7 @@
#home_main #home_main
#right
#events_container #events_container
#events #events
.slide .slide
@ -65,6 +65,9 @@
=render Event.after(Time.now.beginning_of_day).order(:start_at).limit(3) =render Event.after(Time.now.beginning_of_day).order(:start_at).limit(3)
=link_to "voir la suite.", public_events_path, :style => "display:block;padding-top:15px;text-align:right" =link_to "voir la suite.", public_events_path, :style => "display:block;padding-top:15px;text-align:right"
#new_book
%h3 Découvrez mon nouveau livre !
=link_to image_tag("book.jpg"), "http://www.plumedecarotte.com/ouvrage_fiche.php?id=147"
#articles #articles

View File

@ -4,13 +4,10 @@
# Ensure the SQLite 3 gem is defined in your Gemfile # Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3' # gem 'sqlite3'
development: development:
adapter: mysql2 adapter: sqlite3
encoding: utf8 database: db/development.sqlite3
database: jfn_app
pool: 5 pool: 5
username: root timeout: 5000
socket: /tmp/mysql.sock
# Warning: The database defined as "test" will be erased and # Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake". # re-generated from your development database when you run "rake".

View File

@ -1,5 +1,5 @@
class AddImageToEvents < ActiveRecord::Migration class AddImageToEvents < ActiveRecord::Migration
def change def change
add_column :events, :image_file, :references add_column :events, :image_file_id, :integer
end end
end end

View File

@ -11,7 +11,7 @@
# #
# It's strongly recommended to check this file into your version control system. # It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20111209094403) do ActiveRecord::Schema.define(:version => 20131209165939) do
create_table "actualities", :force => true do |t| create_table "actualities", :force => true do |t|
t.string "title" t.string "title"
@ -184,6 +184,7 @@ ActiveRecord::Schema.define(:version => 20111209094403) do
t.datetime "stop_at" t.datetime "stop_at"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.integer "image_file_id"
end end
create_table "external_links", :force => true do |t| create_table "external_links", :force => true do |t|