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

màj promotions

Browse Source
This commit is contained in:
Nicolas Bally 2013-03-25 09:25:34 +01:00
parent 71b38f23b2
commit 3d84f96b48
5 changed files with 73 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
app/assets/stylesheets/public/public.css.scss
View File

@ -492,6 +492,19 @@ ol {
}
.column{
.cat{
background:#8fca46;
text-transform:uppercase;
color:white;
font-weight:bold;
font-size:1.2em;
margin-top:0px;
margin-bottom:0px;
margin:-10px;
padding:10px;
}
text-align:center;
font-size:1.1em;
*{
@ -507,13 +520,30 @@ ol {
padding:10px;
margin-right:29px;
img{
height:245px;
.img{
height:245px;
margin:20px 0px;
img{
max-height:245px;
max-width:100%;
}
}
.title{
text-transform:uppercase;
background:#8fca46;
text-transform:uppercase;
color:white;
a{
color:white;
}
font-weight:bold;
font-size:1.2em;
margin-top:0px;
margin:0px -10px;
padding:10px;
}
@ -698,7 +728,7 @@ padding:5px; } }
text-align:center;
}
height:410px;
min-height:410px;
float:left;
border:3px solid #8fca46;
width:288px;
@ -706,17 +736,36 @@ padding:5px; } }
padding:10px;
margin-right:29px;
img{
height:245px;
.img{
height:245px;
margin:20px 0px;
img{
max-height:245px;
max-width:100%;
}
}
.title{
text-transform:uppercase;
background:#8fca46;
text-transform:uppercase;
color:white;
a{
color:white;
}
font-weight:bold;
font-size:1.2em;
margin-top:0px;
margin:0px -10px;
padding:10px;
}
}
.column_3{
margin-right:0px !important;

9
app/views/admin/promotions/_form.html.haml
View File

@ -5,7 +5,7 @@
= form.input :title, :label => "Titre :"
= form.input :month, :label => "Mois :", :order => [:month, :year]
= form.input :description, :label => "Description courte :", :as => :text, :class => "text_editor"
= form.input :description, :label => "Description courte :", :as => :text, :input_html => {:class => "text_editor"}
%li.string.optional
@ -29,3 +29,10 @@
.actions
= form.submit "Sauvegarder"
:javascript
$(".text_editor").each(function() {
auto_tiny_mce($(this));
});

2
app/views/admin/promotions/edit.js.erb
View File

@ -1 +1 @@
show_pane_hover("<%= escape_javascript(render(:partial => "form"))%>",550,600);
show_pane_hover("<%= escape_javascript(render(:partial => "form"))%>",800,600);

2
app/views/admin/promotions/new.js.erb
View File

@ -1 +1 @@
show_pane_hover("<%= escape_javascript(render(:partial => "form"))%>",550,600);
show_pane_hover("<%= escape_javascript(render(:partial => "form"))%>",800,600);

6
app/views/public/home/show.html.haml
View File

@ -50,7 +50,7 @@
.title
=link_to promotion.title, "/pages/promotions.html"
.description
=link_to simple_format(promotion.description), "/pages/promotions.html"
=link_to raw(promotion.description), "/pages/promotions.html"
.column_2.column
.cat
Bébés
@ -64,7 +64,7 @@
.title
=link_to promotion.title, "/pages/promotions.html"
.description
=link_to simple_format(promotion.description), "/pages/promotions.html"
=link_to raw(promotion.description), "/pages/promotions.html"
.column_3.column
.cat
Hygiène
@ -78,6 +78,6 @@
.title
=link_to promotion.title, "/pages/promotions.html"
.description
=link_to simple_format(promotion.description), "/pages/promotions.html"
=link_to raw(promotion.description), "/pages/promotions.html"
.clear