modif design et édition

This commit is contained in:
Nicolas Bally 2013-05-03 22:15:46 +02:00
parent 407b6c1323
commit 5975797bbd
26 changed files with 5140 additions and 995 deletions

View File

@ -0,0 +1,68 @@
var RELANG = {};
RELANG['fr'] = {
html: 'Code HTML',
video: 'Insérer une vidéo...',
image: 'Insérer une image...',
table: 'Tableau',
link: 'Lien',
link_insert: 'Insérer un lien...',
unlink: 'Supprimer le lien',
formatting: 'Styles',
paragraph: 'Paragraphe',
quote: 'Citation',
code: 'Code',
header1: 'Titre 1',
header2: 'Titre 2',
header3: 'Titre 3',
header4: 'Titre 4',
bold: 'Gras',
italic: 'Italique',
fontcolor: 'Couleur du texte',
backcolor: 'Couleur d\'arrière plan du texte',
unorderedlist: 'Liste à puces',
orderedlist: 'Liste numérotée',
outdent: 'Diminuer le trait',
indent: 'Augmenter le trait',
cancel: 'Annuler',
insert: 'Insérer',
save: 'Sauvegarder',
_delete: 'Supprimer',
insert_table: 'Insérer un tableau...',
insert_row_above: 'Ajouter une rangée au-dessus',
insert_row_below: 'Ajouter une rangée en-dessous',
insert_column_left: 'Ajouter une colonne à gauche',
insert_column_right: 'Ajouter une colonne à droite',
delete_column: 'Supprimer la colonne',
delete_row: 'Supprimer la rangée',
delete_table: 'Supprimer le tableau',
rows: 'Rangées',
columns: 'Colonnes',
add_head: 'Ajouter un en-tête',
delete_head: 'Supprimer l\'en-tête',
title: 'Titre',
image_position: 'Position',
none: 'Aucun',
left: 'Gauche',
right: 'Droite',
image_web_link: 'Adresse URL de l\'image',
text: 'Texte',
mailto: 'Courriel',
web: 'Adresse URL',
video_html_code: 'Code d\'intégration du vidéo',
file: 'Insérer un fichier...',
upload: 'Téléverser',
download: 'Télécharger',
choose: 'Choisir',
or_choose: 'Ou choisissez',
drop_file_here: 'Déposez le fichier ici',
align_left: 'Aligner à gauche',
align_center: 'Aligner au centre',
align_right: 'Aligner à droite',
align_justify: 'Justifier',
horizontalrule: 'Insérer une ligne horizontale',
deleted: 'Supprimé',
anchor: 'Ancre',
link_new_tab: 'Ouvrir le lien dans un nouvel onglet',
underline: 'Underline',
alignment: 'Alignment'
};

View File

@ -8,7 +8,7 @@ $('.menu_item_row .show_details').live "click", ->
$("#menu_item_detail").show().delay(1).css
"-webkit-transition-duration": "0.8s"
"-webkit-transform": "scale(1)"
"-moz-transition-duration": "0.8s"
"margin-right": "0px"
@ -32,7 +32,7 @@ $('#menu_item_detail .hide').live "click", ->
$("#menu_item_detail").css(
"-webkit-transition-duration": "0.8s"
"-webkit-transform": "scale(0.2)"
"-moz-transition-duration": "0.8s"
"margin-right": "-110%").delay(800).queue ->
$("#menu_item_detail").html("").clearQueue()

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,21 @@
#= require jquery
#= require ./shared/jquery
#= require ./shared/jquery-ui
#= require jquery_ujs
#= require ./shared/jquery.strings.js
#= require ./shared/jquery.utils.js
#= require ./admin/block
#= require ./admin/image_files
#= require ./admin/manager
#= require ./admin/uploads
#= require ./admin/redactor
#= require ./admin/fr
$ ->
#dfdf
#

View File

@ -16,7 +16,7 @@
@import "admin/qi_core";
@import "admin/forms";
@import "admin/general";
@import "admin/qi";
@ -28,7 +28,7 @@
@import "admin/menu_items";
@import "admin/articles";
@import "admin/wisihtml5";
@import "admin/redactor";
@import "shared/wysiwg";
@ -38,26 +38,6 @@
ol {
&.code {
color: ($main-color*90);
font: 0.875em / 1.714 Menlo, Monaco, "Courier New", Courier, monospace;
margin: 1.1429em 0 1.1429em 2.8571em; }
&.code li {
list-style: decimal-leading-zero;
background: #f0f0f0;
margin: 0 0 -1px 0;
border-top: 1px solid #fff;
padding: 0 0.5em; }
&.code li code {
font-size: 1em; }
}
.text_panel{
@include border-radius(5px);
@ -72,27 +52,7 @@ ol {
position:relative;
&:before,
&:after {
content:"";
position:absolute;
z-index:-1;
bottom:15px;
left:10px;
width:50%;
height:20%;
max-width:300px;
@include box-shadow(rgba(0, 0, 0, 0.7) 0 20px 15px );
@include transform(rotate(-3deg));
}
&:after{
right:10px;
left:auto;
@include transform(rotate(3deg));
}
@include box-shadow(rgba(0, 0, 0, 0.5) 1px 1px 5px);
@ -133,32 +93,6 @@ ol {
&:before,
&:after {
content:"";
position:absolute;
z-index:-1;
bottom:15px;
left:10px;
width:50%;
height:20%;
max-width:300px;
@include box-shadow(rgba(0, 0, 0, 0.7) 0 20px 15px );
@include transform(rotate(-3deg));
}
&:after{
right:10px;
left:auto;
@include transform(rotate(3deg));
}
display:block;
padding:15px;
@ -175,21 +109,10 @@ ol {
height:100px;
}
@include box-shadow(rgba(0, 0, 0, 0.5) 1px 1px 5px);
&:hover{
@include border-radius(5px 5px 12px 5px / 5px 5px 25px 5px);
@include background-image(linear-gradient(bottom right, #cccccc, white 10%,white));
&:after{
@include transform(rotate(10deg));
}
}
}

View File

@ -94,26 +94,25 @@
position:fixed;
top:1%;
right:1%;
top:0px;
right:0px;
z-index:1000;
background:url('/assets/admin/backgrounds/bg-white.jpg') black;
bottom:1%;
width:98%;
background:#fbfbfb;
bottom:0px;
width:100%;
display:none;
margin-right:-100%;
@include border-radius(10px 10px 7px 7px);
@include box-shadow(0px 0px 5px rgba(0,0,0,0.8));
overflow:hidden;
@include transform(scale(0.2));
@include transition-duration(5s);
@include transition-duration(0.8s);
#content_types_draggables{
text-align:center;
@ -136,7 +135,7 @@
left:0px;
right:0px;
padding:0px;
@include border-radius(7px 0px 0px 0px);
h1{
font-family:'Gill Sans' ;
color:black;
@ -160,7 +159,7 @@
right:0px;
bottom:0px;
@include border-radius(0px 0px 7px 0px);
background:rgba(0,0,0,0.9);
h3{

View File

@ -0,0 +1,13 @@
body{
#edit_toolbar{
position:fixed;
top:0px;
left:0px;
bottom:0px;
width:100px;
background:black;
}
}

View File

@ -1,58 +0,0 @@
.QI_background_middle {
background-color: #e2eef7; }
.QI_background_middle_alt1 {
background-color: #a9d64b; }
.QI_padding_small {
padding: 5px; }
.QI_padding {
padding: 10px; }
.QI_table_alternate_alt1 tr {
background-color: white; }
.QI_table_alternate_alt1 tr:nth-child(odd) {
background-color: #ebf4fa; }
.QI_background_resize {
background-position: center center;
background-repeat: no-repeat;
background-size: contain;
-moz-background-size: contain;
-webkit-background-size: contain; }
.QI_box_shadow {
-webkit-box-shadow: #AFAFAF 0px 0px 5px;
-moz-box-shadow: #AFAFAF 0px 0px 5px;
box-shadow: #AFAFAF 0px 0px 5px; }
.QI_font_alt1 {
font-family: Georgia; }
.QI_font {
font-family: Lucida grande; }
.QI_color_white {
color: white; }
.bar_transparent_dark{
background:rgba(0,0,0,0.8);
height:34px;
}
.position_absolute_bottom{
position:absolute;
bottom:0px;
right:0px;
left:0px;
}

View File

@ -1,3 +1,16 @@
.menu_item_informations{
position:fixed;
top:1em;
left:1em;
width:300px;
background:rgba(0,0,0,0.8);
z-index:2;
color:white;
}
.separate_alt1{
@ -7,7 +20,7 @@
}
/* blocks.css */
.portlet_place_holder{
width:100%;
height:15px;
@ -107,9 +120,7 @@
.portlet .render_admin.render_admin_block_content .col_1{
padding-right:11px;
margin-right:0px;
//border-right:1px dotted rgb(127,127,127);
}
}
@ -126,10 +137,7 @@
}
.portlet_hover .render_admin.render_admin_block_content .col_1{
//border-right:1px solid rgb(127,127,127);
}
.portlet.portlet_table_content {

View File

@ -17,63 +17,6 @@
}
body {
-webkit-font-smoothing: antialiased;
width:100%;
font-size: 13px;
font-family: 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif;
padding: 0px;
margin: 0px;
background:url('/assets/admin/backgrounds/white_oak.png');
&.wysihtml5-editor{
background:transparent;
}
}
/* bar.css */
.bar{
padding:10px;
}
.bar a{
padding:5px;
}
.bar a.active{
padding:5px;
border-radius:10px;
-moz-border-radius:5px;
}
.bar.dark_blue{
background:#6FB7E9;
}
.bar.dark_blue a{
color:white;
}
.bar.dark_blue a.active{
color:#6FB7E9;
background:white;
}
@ -108,33 +51,9 @@ body {
}
.main_slide{
width: 100%;
min-height:600px;
margin: auto;
}
.header{
background:#6FB7E9;
padding:16px;
}
.header h1{
color:#ffffff;
font-family:georgia;
text-shadow: #357EB0 1px 1px 0px;
font-size:20px;
}
.right{
float:right;
@ -312,34 +231,6 @@ body {
.menu_item_position td {
padding: 0px; }
.exportation {
color: #484848;
padding: 5px; }
.exportation em {
text-decoration: none;
padding: 2px 5px 2px 5px;
border-radius: 10px;
text-decoration: none;
color: #484848;
font-style: normal;
margin-right: -3px;
font-weight: normal;
background-color: #ebf2fe; }
.exportation a {
text-decoration: none;
padding: 1px 5px 2px 5px;
text-decoration: none;
margin-right: 2px;
font-weight: normal;
border-radius: 10px;
background-color: #ebf2fe;
color: #484848; }
.exportation a:hover {
padding: 2px 5px 2px 5px;
margin-right: 2px;
font-weight: bold;
background-color: #484848;
color: white; }
/* manager.css */
#manager_box_place{
@ -383,588 +274,7 @@ body {
/* styled_blocks.css */
.image_square{
float:left;
padding:5px;
margin:5px;
position:relative;
border : 1px solid rgb(230,230,230);
border-radius:10px;
background:white;
}
.image_square:hover{
border : 1px solid rgba(0,0,0,0.8);
}
.image_square .img{
text-align:center;
width:150px;
height:150px;
margin:0px;
background-position:center center;
background-repeat:no-repeat;
background-size: contain;
-moz-background-size: contain; /* Gecko 1.9.2 (Firefox 3.6) */
-webkit-background-size: contain;/* Safari 3.0 */
}
.image_square:hover .actions{
display:block;
border:none;
padding:0px;
margin:0px;
left:0px;
top:0px;
opacity:0.5;
background :rgb(10,10,10);
}
.image_square:hover .actions:hover{
opacity:1;
}
/* core/elements */
a{
color : #3C74A8;
text-decoration:none;
}
a:hover{
color:#3F94EB;
}
/* core/fluid_grid */
/*
Variable Grid System (Fluid Version).
Learn more ~ http://www.spry-soft.com/grids/
Based on 960 Grid System - http://960.gs/ & 960 Fluid - http://www.designinfluences.com/
Licensed under GPL and MIT.
*/
/* Containers
----------------------------------------------------------------------------------------------------*/
.container_12 {
width: 100%;
/*
margin-left: 4%;
margin-right: 4%;
*/
}
/* Grid >> Global
----------------------------------------------------------------------------------------------------*/
.grid_1,
.grid_2,
.grid_3,
.grid_4,
.grid_5,
.grid_6,
.grid_7,
.grid_8,
.grid_9,
.grid_10,
.grid_11,
.grid_12 {
display:inline;
float: left;
position: relative;
margin-left: 1%;
margin-right: 1%;
}
/* Grid >> Children (Alpha ~ First, Omega ~ Last)
----------------------------------------------------------------------------------------------------*/
.alpha {
margin-left: 0;
}
.omega {
margin-right: 0;
}
/* Grid >> 12 Columns
----------------------------------------------------------------------------------------------------*/
.container_12 .grid_1 {
width:6.333%;
}
.container_12 .grid_2 {
width:14.667%;
}
.container_12 .grid_3 {
width:23.0%;
}
.container_12 .grid_4 {
width:31.333%;
}
.container_12 .grid_5 {
width:39.667%;
}
.container_12 .grid_6 {
width:48.0%;
}
.container_12 .grid_7 {
width:56.333%;
}
.container_12 .grid_8 {
width:64.667%;
}
.container_12 .grid_9 {
width:73.0%;
}
.container_12 .grid_10 {
width:81.333%;
}
.container_12 .grid_11 {
width:89.667%;
}
.container_12 .grid_12 {
width:98.0%;
}
/* Prefix Extra Space >> 12 Columns
----------------------------------------------------------------------------------------------------*/
.container_12 .prefix_1 {
padding-left:8.333%;
}
.container_12 .prefix_2 {
padding-left:16.667%;
}
.container_12 .prefix_3 {
padding-left:25.0%;
}
.container_12 .prefix_4 {
padding-left:33.333%;
}
.container_12 .prefix_5 {
padding-left:41.667%;
}
.container_12 .prefix_6 {
padding-left:50.0%;
}
.container_12 .prefix_7 {
padding-left:58.333%;
}
.container_12 .prefix_8 {
padding-left:66.667%;
}
.container_12 .prefix_9 {
padding-left:75.0%;
}
.container_12 .prefix_10 {
padding-left:83.333%;
}
.container_12 .prefix_11 {
padding-left:91.667%;
}
/* Suffix Extra Space >> 12 Columns
----------------------------------------------------------------------------------------------------*/
.container_12 .suffix_1 {
padding-right:8.333%;
}
.container_12 .suffix_2 {
padding-right:16.667%;
}
.container_12 .suffix_3 {
padding-right:25.0%;
}
.container_12 .suffix_4 {
padding-right:33.333%;
}
.container_12 .suffix_5 {
padding-right:41.667%;
}
.container_12 .suffix_6 {
padding-right:50.0%;
}
.container_12 .suffix_7 {
padding-right:58.333%;
}
.container_12 .suffix_8 {
padding-right:66.667%;
}
.container_12 .suffix_9 {
padding-right:75.0%;
}
.container_12 .suffix_10 {
padding-right:83.333%;
}
.container_12 .suffix_11 {
padding-right:91.667%;
}
/* Push Space >> 12 Columns
----------------------------------------------------------------------------------------------------*/
.container_12 .push_1 {
left:8.333%;
}
.container_12 .push_2 {
left:16.667%;
}
.container_12 .push_3 {
left:25.0%;
}
.container_12 .push_4 {
left:33.333%;
}
.container_12 .push_5 {
left:41.667%;
}
.container_12 .push_6 {
left:50.0%;
}
.container_12 .push_7 {
left:58.333%;
}
.container_12 .push_8 {
left:66.667%;
}
.container_12 .push_9 {
left:75.0%;
}
.container_12 .push_10 {
left:83.333%;
}
.container_12 .push_11 {
left:91.667%;
}
/* Pull Space >> 12 Columns
----------------------------------------------------------------------------------------------------*/
.container_12 .pull_1 {
left:-8.333%;
}
.container_12 .pull_2 {
left:-16.667%;
}
.container_12 .pull_3 {
left:-25.0%;
}
.container_12 .pull_4 {
left:-33.333%;
}
.container_12 .pull_5 {
left:-41.667%;
}
.container_12 .pull_6 {
left:-50.0%;
}
.container_12 .pull_7 {
left:-58.333%;
}
.container_12 .pull_8 {
left:-66.667%;
}
.container_12 .pull_9 {
left:-75.0%;
}
.container_12 .pull_10 {
left:-83.333%;
}
.container_12 .pull_11 {
left:-91.667%;
}
/* Clear Floated Elements
----------------------------------------------------------------------------------------------------*/
/* http://sonspring.com/journal/clearing-floats */
.clear {
clear: both;
display: block;
overflow: hidden;
visibility: hidden;
width: 0;
height: 0;
}
/* http://perishablepress.com/press/2008/02/05/lessons-learned-concerning-the-clearfix-css-hack */
.clearfix:after {
clear: both;
content: ' ';
display: block;
font-size: 0;
line-height: 0;
visibility: hidden;
width: 0;
height: 0;
}
.clearfix {
display: inline-block;
}
* html .clearfix {
height: 1%;
}
.clearfix {
display: block;
}
/* forms.css */
/* tutorial */
input[type=text],input[type=password], textarea {
padding: 5px;
border: solid 1px #C9C9C9;
outline: 0;
font: normal 13px/100% Verdana, Tahoma, sans-serif;
width: 200px;
background: -webkit-gradient(linear, left top, left 25, from(#FFFFFF), color-stop(4%, #F7F7F7), to(#FFFFFF));
background: -moz-linear-gradient(top, #FFFFFF, #F7F7F7 1px, #FFFFFF 25px);
}
textarea {
width: 400px;
max-width: 400px;
height: 150px;
line-height: 150%;
}
input:hover, textarea:hover,
input:focus, textarea:focus {
box-shadow: rgba(0,0,0, 0.1) 0px 0px 8px;
-moz-box-shadow: rgba(0,0,0, 0.1) 0px 0px 8px;
-webkit-box-shadow: rgba(0,0,0, 0.1) 0px 0px 8px;
}
label {
cursor:pointer;
}
.button{
display: inline-block;
background: #3c74a8;
background: -webkit-gradient(linear, 0% 100%, 0% 0%, from(rgb(239,242,242)), to(rgb(255,255,255)));
background: -moz-linear-gradient(bottom, rgb(239,242,242), rgb(255,255,255));
box-shadow: rgba(0,0,0, 0.4) 0px 0px 3px;
-moz-box-shadow: rgba(0,0,0, 0.4) 0px 0px 3px;
-webkit-box-shadow: rgba(0,0,0, 0.4) 0px 0px 3px;
border: none;
-moz-border-radius: 20px;
-webkit-border-radius: 20px;
border-radius: 20px;
color: RGB(46,46,46);
padding: 5px 15px;
margin:0px 5px 0px 5px;
font-weight:normal;
}
.button:hover {
box-shadow: rgba(0,0,0, 0.6) 0px 0px 5px;
-moz-box-shadow: rgba(0,0,0, 0.6) 0px 0px 5px;
-webkit-box-shadow: rgba(0,0,0, 0.6) 0px 0px 5px;
color: RGB(46,46,46);
cursor: pointer;
}
.actions{
text-align:right;
}
button,input[type=submit] {
display: inline-block;
background: #3c74a8;
background: -webkit-gradient(linear, 0% 100%, 0% 0%, from(rgb(60,116,168)), to(rgb(103,146,187)));
background: -moz-linear-gradient(bottom, rgb(60,116,168), rgb(103,146,187));
box-shadow: rgba(0,0,0, 0.4) 0px 0px 3px;
-moz-box-shadow: rgba(0,0,0, 0.4) 0px 0px 3px;
-webkit-box-shadow: rgba(0,0,0, 0.4) 0px 0px 3px;
border: none;
-moz-border-radius: 20px;
-webkit-border-radius: 20px;
border-radius: 20px;
color: white;
margin:0px 5px 0px 5px;
padding: 5px 15px;
text-shadow: 0 1px 1px rgba(0,0,0,0.6);
font-weight:normal;
font-size:13px;
}
button:hover,input[type=submit]:hover {
box-shadow: rgba(0,0,0, 0.6) 0px 0px 5px;
-moz-box-shadow: rgba(0,0,0, 0.6) 0px 0px 5px;
-webkit-box-shadow: rgba(0,0,0, 0.6) 0px 0px 5px;
cursor: pointer;
}
.field_with_errors{
display:inline;
color:red;
}
.field_with_errors input{
display:inline;
border-color:red;
}
.errorExplanation{
border-top: 1px solid black;
border-bottom: 1px solid black;
padding:5px;
border-color:#F2EDA1;
background:#FEFCDB;
}
.errorExplanation h2{
font-size:13px;
margin:0px;
padding:0px;
}
/* core/general */
.message{
border: 4px solid black;
border-radius:10px;
padding:5px;
margin:20px;
-webkit-box-shadow: rgba(0,0,0,0.5) 1px 1px 40px;
-moz-box-shadow: rgba(0,0,0,0.5) 1px 1px 40px;
box-shadow: rgba(0,0,0,0.5) 1px 1px 40px;
}
.alert{
border-color: rgb(242,237,161);
background: rgba(254,252,219,0.8);
}
.notice{
border-color:rgb(205,230,245);
background:rgba(236,248,254,0.8);
}
#flash{
position:fixed;
bottom:0px;
width:100%;
}
a img{
border:0px;
}
table{
border-collapse:collapse;
width:100%;
}
h1, h2, h3, h4, h5, h6 {
margin:0px;
padding:0px;
}

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,7 @@
$baseFontSize : 16px;
$headerFontFamily : 'Avenir', 'arial', 'san-serif';
$headerFontFamily : 'Verdana', 'arial', 'san-serif';
$headerFontWeight : normal;
$ratio : 1.35;
$rowWidth : 1200px;
@ -39,6 +39,11 @@ $rowWidth : 1200px;
@import "foundation/common/typography";
@import "admin/qi_cms";
@import "admin/public_admin";
@import "admin/redactor";
@import "admin/qi_core";
body{
font-family : 'Avenir', 'arial', 'san-serif';
@ -54,11 +59,15 @@ body{
}
#top{
border-bottom:8px solid #00ade2;
border-bottom:8px solid #208dbb;
padding:1em 0;
margin-bottom:1em;
#menu{
.active{
font-weight:bold;
}
margin-top:90px;
text-align:right;
font-size:1.05em;
@ -81,18 +90,30 @@ body{
color :#00ade2;
}
.sidebar{
background:#208dbb;
}
}
.menu{
.active{
font-weight:bold;
}
color:white;
h3{
a{
color:white;
}
}
ul{
a{
color:black;
color:white;
&:hover,&.active{
&:hover{
color :#00ade2;
}

View File

@ -109,7 +109,7 @@ class Admin::MenuItemsController < ApplicationController
def edit
@menu_item= MenuItem.find(params[:id])
render :layout => false
render :layout => "public"
end
def update

View File

@ -3,6 +3,8 @@ class Public::MenuItemsController < ApplicationController
layout "public"
def show
@admin = true if params[:admin]
@menu_item = MenuItem.find_by_permalink(params[:url])
if @menu_item

View File

@ -1,7 +1,7 @@
# -*- encoding : utf-8 -*-
module Public::MenuItemsHelper
def menu_item_link(menu_item)
link_to menu_item.name, menu_item_path(:url => menu_item.url)
link_to menu_item.name, menu_item_path(:url => menu_item.url), :class => ("active" if @menu_item and (@menu_item == menu_item or @menu_item.ancestors.include?(menu_item)))
end
end

View File

@ -1,11 +1,6 @@
#content_types_draggables
-block.content_types.each do |content_type|
.content_types_draggable{:id => content_type.id, :data_type => content_type.slug}
=image_tag("admin/content_type/type_"+content_type.slug.to_s+".png", :alt => content_type.name)

View File

@ -1,10 +1,10 @@
#menu_item_edit
= semantic_form_for [:admin,@menu_item], :remote => true do |form|
.form1=render :partial => "form", :locals => {:form => form}
=render :partial => "form", :locals => {:form => form}
.form2
=render :partial => "admin/"+@menu_item.menu_content_type.tableize.to_s+"/form", :locals => {:form => form}
=render :partial => "admin/"+@menu_item.menu_content_type.tableize.to_s+"/form", :locals => {:form => form}
.actions
= form.submit "Sauvegarder"

View File

@ -22,7 +22,7 @@
=link_to i(:clone_page_stroke, :blue), clone_admin_menu_item_path(menu_item), :confirm => 'Voulez-vous vraiment cloner cet élément de menu ?', :style => "padding:0px 5px 0px 0px;"
= link_to i(:trash_stroke, :blue), [:admin, menu_item], :confirm => 'Voulez-vous vraiment supprimer cet élément de menu ?', :method => :delete, :style => "padding:0px 5px 0px 2px;" if current_admin.super_admin? || !menu_item.super_admin
= link_to i(:pen_alt_fill, :blue), edit_admin_menu_item_path(menu_item), :style => "padding:0px 0px 0px 0px;", :class => "show_details"
= link_to i(:pen_alt_fill, :blue), edit_admin_menu_item_path(menu_item), :style => "padding:0px 0px 0px 0px;"
.receptable_position{:"data-position" => (menu_item.position.to_i+1)}

View File

@ -1,30 +1,14 @@
.header
.right
=#link_to "modifier", edit_admin_menu_item_path(@menu_item), :remote => true,:class => "button"
-if @menu_item.menu_content_type == "Page"
=render @menu_item.menu_content
=link_to "Masquer", "#", :class => "hide button"
.switch.menu_item_enabled_switch{:"data-menu_item_id" => @menu_item.id, :class => ('on' if @menu_item.enabled?)}
%span.thumb
=render :partial => "show"
.menu_item_informations
.tab
%h3 Infos sur la page
=render :partial => "edit_form"
#menu_item_content_type
#menu_item_block_edit
-if @menu_item.menu_content_type == "Page"
=render @menu_item.menu_content

View File

@ -1 +1,25 @@
=render page.blocks[0]
.menu_item_informations
.tab
%h3 Infos sur la page
=render :partial => "edit_form"
.tab
%h3 éléments
-page.blocks[0].content_types.each do |content_type|
.content_types_draggable{:id => content_type.id, :data_type => content_type.slug}
=image_tag("admin/content_type/type_"+content_type.slug.to_s+".png", :alt => content_type.name)
#menu_item_block_edit
=render page.blocks[0]

View File

@ -26,13 +26,15 @@
.four.column=link_to image_tag( "front/logo.png", :id => "logo", :alt => ""), "/"
.eight.column
#menu=render(:partial => "public/shared/first_menu")
#main.row
.four.column=yield :sidebar
.eight.column=yield
%p{:style => "clear:both;"}
%br
.eight.column
=yield
.four.column.sidebar
=yield :sidebar
#bottom
%a#go_top{:href => "#top_anchor"}

View File

@ -8,11 +8,5 @@
.render_admin{:class => "render_admin_"+portlet.content_type.tableize.singularize}
=render :partial => "portlet/"+portlet.content_type.tableize+"/"+portlet.content_type.tableize.singularize, :object => portlet.content
=render :partial => "portlets/render_public/"+portlet.content_type.to_s.downcase, :locals => {:input => portlet.content}

View File

@ -1,86 +1,9 @@
=semantic_form_for( [:portlet, @text_content], :remote => true) do |f|
.wysihtml5_area
#toolbar{:draggable => "true"}
=f.text_area :content, :style => "width:98%;height:600px;", :class => "redactor_content"
%div
%a.rte-rte_justify_left{"data-wysihtml5-command" => "justifyLeft"}
%a.rte-rte_justify_center{"data-wysihtml5-command" => "justifyCenter"}
%a.rte-rte_justify_right{"data-wysihtml5-command" => "justifyRight"}
%a.rte-rte_justify{"data-wysihtml5-command" => "justify"}
%a.rte-rte_strong{"data-wysihtml5-command" => "strong"}
%a.rte-rte_bold{"data-wysihtml5-command" => "bold", :title => "CTRL+B"}
%a.rte-rte_em{"data-wysihtml5-command" => "em", :title => "CTRL+I"}
%a.rte-rte_italic{"data-wysihtml5-command" => "italic"}
%a.rte-rte_underline{"data-wysihtml5-command" => "underline", :title => "CTRL+S"}
%a.rte-rte_sub{"data-wysihtml5-command" => "formatInline", "data-wysihtml5-command-value" => "sub"}
%a.rte-rte_sup{"data-wysihtml5-command" => "formatInline", "data-wysihtml5-command-value" => "sup"}
%a.rte-rte_link{"data-wysihtml5-command" => "createLink"}
%a{"data-wysihtml5-command" => "formatBlock", "data-wysihtml5-command-value" => "h1"} h1
%a{"data-wysihtml5-command" => "formatBlock", "data-wysihtml5-command-value" => "h2"} h2
%a{"data-wysihtml5-command" => "formatBlock", "data-wysihtml5-command-value" => "h3"} h3
%a{"data-wysihtml5-command" => "formatBlock", "data-wysihtml5-command-value" => "h4"} h4
%a.rte-rte_unordered_list{"data-wysihtml5-command" => "insertUnorderedList"}
%a.rte-rte_ordered_list{"data-wysihtml5-command" => "insertOrderedList"}
%a.rte-rte_blockquote{"data-wysihtml5-command" => "formatBlock", "data-wysihtml5-command-value" => "blockquote"}
.fore_color.rte-rte_fore_color{"data-wysihtml5-command-group"=>"foreColor"}
%a
.menu
%a{"data-wysihtml5-command" => "foreColor", "data-wysihtml5-command-value" => "blue", :style => "background:blue;"}
%a{"data-wysihtml5-command" => "foreColor", "data-wysihtml5-command-value" => "red", :style => "background:red;"}
%a{"data-wysihtml5-command" => "foreColor", "data-wysihtml5-command-value" => "green", :style => "background:green;"}
/%a{"data-wysihtml5-command" => "insertSpeech"} speech
%a.rte-rte_html{"data-wysihtml5-action" => "change_view"}
%div.link_dialog{"data-wysihtml5-dialog" => "createLink", :style => "display: none;"}
%label
Link:
%input{"data-wysihtml5-dialog-field" => "href", :value => "http://"}
%a{"data-wysihtml5-dialog-action" => "save"} OK
%a{"data-wysihtml5-dialog-action" => "cancel"} Cancel
=f.text_area :content, :style => "width:98%;height:600px;", :id => "wysihtml5"
:javascript
var editor = new wysihtml5.Editor("wysihtml5", {
toolbar: "toolbar",
stylesheets: "/assets/admin.css",
parserRules: wysihtml5ParserRules,
breakElement: 'p'
});
-if TextContent::STYLES.size > 0
@ -91,4 +14,15 @@
= f.submit "Sauvegarder"
:javascript
$('.redactor_content').redactor({
fixed: true,
lang: 'fr',
buttons : ['html', '|', 'formatting', '|', 'bold', 'italic', 'deleted','underline','|', 'alignleft', 'aligncenter', 'alignright', 'justify', '|', 'unorderedlist', 'orderedlist', 'outdent', 'indent', '|', 'table', 'link', '|','fontcolor', 'backcolor','|', 'horizontalrule']
});

View File

@ -10,7 +10,7 @@
-if first_level_menu.children.size > 0
%h3=@menu_item.name
%h3=menu_item_link(first_level_menu)
%ul
-first_level_menu.children.where(:enabled => true).order(:position).each do |menu_item|
@ -19,6 +19,19 @@
=render @menu_item.menu_content.blocks[0]
-if @admin
=render :partial => "admin/blocks/block", :locals => {:block => @menu_item.menu_content.blocks[0]}
-else
=render @menu_item.menu_content.blocks[0]
-if @menu_item.menu_content_type == "Page" and @admin
#edit_toolbar
-@menu_item.menu_content.blocks[0].content_types.each do |content_type|
.content_types_draggable{:id => content_type.id, :data_type => content_type.slug}
=image_tag("admin/content_type/type_"+content_type.slug.to_s+".png", :alt => content_type.name)

View File

@ -1,3 +1,3 @@
-MenuItem.where(:parent_id => nil, :enabled => true).order(:position).each do |menu_item|
=link_to menu_item.name, menu_item_path(:url => menu_item.url), :class => ("active" if (@menu_item and @menu_item == menu_item) or ( @reference_menu_item and @reference_menu_item == menu_item))
=menu_item_link(menu_item)

View File

@ -6,7 +6,7 @@
development:
adapter: mysql2
encoding: utf8
database: blog_app
database: ecoleeft_app
pool: 5
username: root
socket: /tmp/mysql.sock