nicolas/idn_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

suite

Browse Source
This commit is contained in:
Nicolas Bally 2016-08-01 17:59:47 +02:00
parent 1ef4a5bade
commit 50a813bc31
8 changed files with 108 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
app/assets/stylesheets/public.scss
View File

@ -749,6 +749,48 @@ padding:5px 8px;
}
.bottom_social{
margin:1em 0;
text-align:center;
margin-top:2em;
display:none;
a, .top_link{
display:inline-block;
padding:10px 0px;
width:43px;
margin:0 5px;
text-align:center;
cursor:pointer;
font-size:1.2em;
background:$blue;
color:white;
&:hover{
background:darken($blue, 10);
}
}
}
#nous-bloc{
.gallery_for_mobile{
display:none;
img{
margin-bottom:20px;
}
}
.rea-gal.gallery{
}
}
@media screen and (max-width:880px) {
.socials_links, .contact_links{
@ -881,6 +923,8 @@ padding:5px 8px;
}
.columns{
display:block !important;
width:auto !important;
@ -928,10 +972,15 @@ padding:5px 8px;
padding:0 !important;
}
}
.mobile-no-margin-top{
margin-top:0;
}
@ -966,6 +1015,39 @@ padding:5px 8px;
}
.center{
padding: 0 20px;
}
}
@media screen and (max-width:600px) {
#nous-bloc{
.gallery_for_mobile{
display:block;
}
.rea-gal.gallery{
display:none;
}
}
.bottom_social{
display:block;
}
.socials_links, .contact_links{
display:none;
}
}

43
app/mailers/donate_transactions_mails.rb
View File

@ -1,43 +0,0 @@
# -*- encoding : utf-8 -*-
class DonateTransactionsMails < ActionMailer::Base
layout 'mail'
default from: "One Voice <info@test.com>"
def confirmation_pa(donate_transaction, options = {})
@options = options
@donate_transaction = donate_transaction
@email = @donate_transaction.particular_bill.email
@title = "Merci pour votre promesse de don."
mail(:to => @email, :subject => @title)
end
def confirmation_cheque(donate_transaction, options = {})
@options = options
@donate_transaction = donate_transaction
@email = @donate_transaction.particular_bill.email
@title = "Merci pour votre promesse de don."
mail(:to => @email, :subject => @title)
end
def confirmation_cb(donate_transaction, options = {})
@options = options
@donate_transaction = donate_transaction
@email = @donate_transaction.particular_bill.email
@title = "Merci pour votre don."
mail(:to => @email, :subject => @title)
end
def confirmation_cb_rec(donate_transaction, options = {})
@options = options
@donate_transaction = donate_transaction
@email = @donate_transaction.particular_bill.email
@title = "Merci pour votre don mensuel."
mail(:to => @email, :subject => @title)
end
end

2
app/mailers/general.rb
View File

@ -1,5 +1,5 @@
class General < ActionMailer::Base
default :from => "One Voice <info@test.com>"
default :from => "contact@idncommunication.com"
self.default_url_options = {:host => HOSTNAME}

37
app/mailers/petition_mails.rb
View File

@ -1,37 +0,0 @@
# -*- encoding : utf-8 -*-
class PetitionMails < ActionMailer::Base
layout 'mail'
default from: "One Voice <info@test.com>"
def confirmation(signator, options = {})
@options = options
@signator = signator
@petition = @signator.petition
@petition_lang = @petition.petition_langs.where(:lang_site_id => @signator.lang_site.id).first
@email = @signator.email
@title = "Important : pour valider votre signature."
mail(:to => @email, :subject => @title)
end
def thanks(signator, options = {})
@options = options
@signator = signator
@petition = @signator.petition
@petition_lang = @petition.petition_langs.where(:lang_site_id => @signator.lang_site.id).first
@email = @signator.email
@title = "Merci pour votre signature."
mail(:to => @email, :subject => @title)
end
end

4
app/mailers/question_mailer.rb
View File

@ -1,5 +1,5 @@
class QuestionMailer < ActionMailer::Base
default from: "info@nicolasbally.com"
default from: "contact@idncommunication.com"
# Subject can be set in your I18n file at config/locales/en.yml
# with the following lookup:
@ -9,7 +9,7 @@ class QuestionMailer < ActionMailer::Base
def send_contact(contact)
@contact = contact
mail to: "test@nicolasbally.com", :bcc => "info@nicolasbally.com" ,:reply_to => @contact.email, :subject => "Nouveau mail par le site"
mail to: "contact@idncommunication.com", :bcc => "info@nicolasbally.com" ,:reply_to => @contact.email, :subject => "Nouveau mail par le site"
end

43
app/mailers/sponsorship_animal_mails.rb
View File

@ -1,43 +0,0 @@
# -*- encoding : utf-8 -*-
class SponsorshipAnimalMails < ActionMailer::Base
layout 'mail'
default from: "One Voice <info@test.com>"
def confirmation_pa(donate_transaction, options = {})
@options = options
@donate_transaction = donate_transaction
@email = @donate_transaction.particular_bill.email
@title = "Merci pour votre promesse de parrainage."
mail(:to => @email, :subject => @title)
end
def confirmation_cheque(donate_transaction, options = {})
@options = options
@donate_transaction = donate_transaction
@email = @donate_transaction.particular_bill.email
@title = "Merci pour votre promesse de parrainage."
mail(:to => @email, :subject => @title)
end
def confirmation_cb(donate_transaction, options = {})
@options = options
@donate_transaction = donate_transaction
@email = @donate_transaction.particular_bill.email
@title = "Merci pour votre parrainage."
mail(:to => @email, :subject => @title)
end
def confirmation_cb_rec(donate_transaction, options = {})
@options = options
@donate_transaction = donate_transaction
@email = @donate_transaction.particular_bill.email
@title = "Merci pour votre parrainage mensuel."
mail(:to => @email, :subject => @title)
end
end

17
app/views/layouts/public.html.haml
View File

@ -183,6 +183,15 @@
.columns.span_6
.contact_form
#form=render :partial => "public/contacts/form"
.bottom_social
=link_to "https://www.facebook.com/idn.communication/", :target => "_blank", :class => "link facebook" do
=i(:"facebook")
=link_to "https://twitter.com/idncontact", :target => "_blank", :class => "link twitter" do
=i(:"twitter")
.top_link
=i(:"arrow-up")
.bottom
© 2016 idN communication • Tous droits réservés •
@ -190,15 +199,17 @@
.socials_links
.top_link
=i(:"arrow-up")
=link_to "https://www.facebook.com/idn.communication/", :target => "_blank", :class => "link facebook" do
=i(:"facebook")
=link_to "https://twitter.com/idncontact", :target => "_blank", :class => "link twitter" do
=i(:"twitter")
.top_link
=i(:"arrow-up")
.contact_links

10
app/views/portlets/render_public/_gallerycontent.html.haml
View File

@ -68,8 +68,14 @@
-if input.style == 3
.portlet.input
.gallery_for_mobile
-input.gallery_images.each do |gallery_images|
-if gallery_images.image_file
-if !gallery_images.more
=image_tag(gallery_images.big_image_file ? gallery_images.big_image_file.file.large.medium.url : gallery_images.image_file.file.large.medium.url)
.rea-gal.gallery
-input.gallery_images.each do |gallery_images|
-if gallery_images.image_file