initial commit

Gemfile

@@ -7,6 +7,7 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3', :require => 'uglifier'
 	gem 'compass-rails'
+  gem 'zurb-foundation', ">= 3.2"
 end
 
 # Bundle edge Rails instead:

Gemfile.lock

@@ -28,83 +28,87 @@ GEM
     activesupport (3.2.0)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    acts_as_commentable (3.0.1)
+    acts_as_commentable (4.0.0)
-    acts_as_tree (0.1.1)
+    acts_as_tree (1.2.0)
-    ansi (1.4.2)
+      activerecord (>= 3.0.0)
+    ansi (1.4.3)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
-    builder (3.0.0)
+    builder (3.0.4)
-    capistrano (2.11.2)
+    capistrano (2.14.2)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    carrierwave (0.6.1)
+    carrierwave (0.8.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
-    chunky_png (1.2.5)
+    chunky_png (1.2.7)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.2.0)
+    coffee-script-source (1.4.0)
-    compass (0.12.1)
+    compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    compass-rails (1.0.1)
+    compass-rails (1.0.3)
-      compass (~> 0.12.0)
+      compass (>= 0.12.2, < 0.14)
-    devise (2.0.4)
+    devise (2.2.3)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
+      orm_adapter (~> 0.1)
       railties (~> 3.1)
-      warden (~> 1.1.1)
+      warden (~> 1.2.1)
     erubis (2.7.0)
-    execjs (1.3.0)
+    execjs (1.4.0)
       multi_json (~> 1.0)
-    formtastic (2.1.1)
+    formtastic (2.2.1)
-      actionpack (~> 3.0)
+      actionpack (>= 3.0)
-    fssm (0.2.8.1)
+    fssm (0.2.10)
-    geocoder (1.1.1)
+    geocoder (1.1.6)
-    gravatar_image_tag (1.1.2)
+    gravatar_image_tag (1.1.3)
-    haml (3.1.4)
+    haml (3.1.7)
-    highline (1.6.11)
+    highline (1.6.15)
     hike (1.2.1)
-    i18n (0.6.0)
+    i18n (0.6.1)
-    journey (1.0.3)
+    journey (1.0.4)
-    jquery-rails (2.0.2)
+    jquery-rails (2.2.1)
-      railties (>= 3.2.0, < 5.0)
+      railties (>= 3.0, < 5.0)
-      thor (~> 0.14)
+      thor (>= 0.14, < 2.0)
-    json (1.6.6)
+    json (1.7.7)
-    kaminari (0.13.0)
+    kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-      railties (>= 3.0.0)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
+    mime-types (1.21)
-    multi_json (1.2.0)
+    modular-scale (1.0.6)
+      compass (>= 0.12.1)
+      sass (>= 3.2.0)
+      sassy-math (>= 1.5)
+    multi_json (1.5.1)
     mysql2 (0.3.11)
-    net-scp (1.0.4)
+    net-scp (1.1.0)
-      net-ssh (>= 1.99.1)
+      net-ssh (>= 2.6.5)
-    net-sftp (2.0.5)
+    net-sftp (2.1.1)
-      net-ssh (>= 2.0.9)
+      net-ssh (>= 2.6.5)
-    net-ssh (2.3.0)
+    net-ssh (2.6.5)
-    net-ssh-gateway (1.1.0)
+    net-ssh-gateway (1.2.0)
-      net-ssh (>= 1.99.1)
+      net-ssh (>= 2.6.5)
-    orm_adapter (0.0.7)
+    orm_adapter (0.4.0)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rails (3.2.0)
       actionmailer (= 3.2.0)
@@ -121,34 +125,41 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2.2)
+    rake (10.0.3)
-    rdoc (3.12)
+    rdoc (3.12.1)
       json (~> 1.4)
-    rmagick (2.13.1)
+    rmagick (2.13.2)
-    rvm-capistrano (1.1.0)
+    rvm-capistrano (1.2.7)
       capistrano (>= 2.0.0)
-    sass (3.1.15)
+    sass (3.2.5)
-    sass-rails (3.2.5)
+    sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    sprockets (2.1.2)
+    sassy-math (1.5)
+      compass (~> 0.11)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     turn (0.8.2)
       ansi (>= 1.2.2)
-    tzinfo (0.3.32)
+    tzinfo (0.3.35)
-    uglifier (1.2.4)
+    uglifier (1.3.0)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
+      multi_json (~> 1.0, >= 1.0.2)
-    warden (1.1.1)
+    warden (1.2.1)
       rack (>= 1.0)
+    zurb-foundation (3.2.5)
+      compass (>= 0.12.2)
+      modular-scale (= 1.0.6)
+      rake
+      sass (>= 3.2.0)
 
 PLATFORMS
   ruby
@@ -174,3 +185,4 @@ DEPENDENCIES
   sass-rails (~> 3.2.3)
   turn (= 0.8.2)
   uglifier (>= 1.0.3)
+  zurb-foundation (>= 3.2)

app/assets/javascripts/admin.js

@@ -1,6 +1,9 @@
 /*
 *= require ./shared/jquery.js
 *= require ./shared/jquery-ui.js
+
+
+
 *= require ./shared/jquery.strings.js
 *= require ./shared/jquery.utils.js
 *= require ./shared/ui.timepickr.js

app/assets/javascripts/admin/block.js

@@ -32,7 +32,7 @@ function block_js_initialize(){
 		$(this).addClass('portlet_hover');
 		
 		$(this).parents('.portlet').children(".actions").css({'display':'none'});
-		$(this).parents('.portlet').css({ "border" : "1px solid #FBFBFB"});
+		
 		
 	});
 	

app/assets/javascripts/admin/cible.js

@@ -1,5 +1,5 @@
 function select_cible_from_manager(input_id){
-		set_busy();
+		
 
 		manager_prompt("/admin/cibles/?manager=true",function(m_return){
 	

app/assets/javascripts/admin/manager.js

@@ -87,7 +87,7 @@ function manager_send_response(send_value){
 }
 
 function select_image_from_manager(input_id){
-		set_busy();
+
 	manager_prompt("/admin/image_files/?manager=true",function(m_return){
 
 		$('#input_'+input_id).val(m_return.image_file_id);

app/assets/javascripts/admin/menu_items.js

@@ -27,7 +27,7 @@ function initialize_menu_items(){
 		tolerance : "pointer",
 		drop: function( event, ui ) {
 			ui.draggable.fadeOut();
-			set_busy();
+		
 			$.ajax({
 				url:"/admin/menu_items/"+ui.draggable.attr("data-menu_item_id")+".js", 
 				type: "PUT",
@@ -51,8 +51,7 @@ function initialize_menu_items(){
 		tolerance : "pointer",
 		drop: function( event, ui ) {
 			ui.draggable.fadeOut();
-			set_busy();
+	
-			
 			$.ajax({
 				url:"/admin/menu_items/"+ui.draggable.attr("data-menu_item_id")+".js", 
 				type: "PUT",
@@ -77,5 +76,34 @@ function initialize_menu_items(){
 
 $(document).ready(function(){
 	initialize_menu_items();
+	
+	
+	$(".switch").live('click',function(){
+		
+
+		$(this).toggleClass("on");
+			
+	});
+		
+	$(".menu_item_enabled_switch").live('click',function(){
+
+			
+		$.ajax({
+			url:"/admin/menu_items/"+$(this).data("menu_item_id")+".js", 
+			type: "PUT",
+			data: { 
+				menu_item : {
+					enabled : $(this).hasClass("on")
+				} 
+			},
+			success : function (){
+				
+			}
+		});
+			
+			
+			
+	});
+	
 
 });

app/assets/javascripts/admin/pages_actions.js.coffee

@@ -8,6 +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"
 		
@@ -31,6 +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()

app/assets/javascripts/admin/qi_core.js

@@ -19,13 +19,15 @@ function auto_load_div(div_to_load) {
 	    url = div_to_load.attr("data-url");
 		
 	   
-		load_block = div_to_load.children(".loading") ;
+	
 		div_to_load.children(".ajax_load_content").hide();
-		load_block.activity({segments: 8, steps: 5, opacity: 0.5, width: 5, space: 0, length: 5, color: '#212222', speed: 1.5});
-		load_block.show();
 		
 		
-		div_to_load.children(".ajax_load_content").load(url, function() {div_to_load.children(".loading").hide();$(this).show();block_js_initialize();})
+		
+		div_to_load.children(".ajax_load_content").load(url, function() {
+
+			$(this).show();block_js_initialize();}
+		)
 		
 	
 }

app/assets/javascripts/public.js.coffee

@@ -1,35 +1,11 @@
 
-#= require ./shared/jquery.js
+#= require jquery
 
 #= require jquery_ujs
 
-#= require ./shared/jquery.easing.1.3
-#= require ./shared/jquery.fancybox-1.3.4.pack
-
 
 
 
 $ ->
 
-	
+	#dfdf
-	
-	$("a[rel^='prettyPhoto']").fancybox()
-
-	$("#legals").click ->
-		
-		$('#legals_large').toggle()
-		$('#legals_large .content').css("margin-top",( ($(window).height()-$("#legals_large .content").height())/2)+"px")
-		return false
-		
-	$("#legals_large").click ->
-		
-		$('#legals_large').toggle();
-		return false
-		
-		
-	$("#legals_large a").click ->
-		
-		$('#legals_large').toggle();
-		return false
-		
-	

app/assets/stylesheets/admin.css.scss

@@ -8,6 +8,7 @@
 
 
 @import "shared/formtastic";
+
 @import "shared/jquery-ui-1.8.11.custom";
 @import "shared/ui.timepickr";
 

app/assets/stylesheets/admin/menu_items.css.scss

@@ -1,53 +1,191 @@
+#menu_item_index_slide{
+	#menu_item_index{
+		padding:10px;
+	
+	}
+
+}
+
+
 
 #menu_item_detail{
+	
+	.switch {
+		float: right;
+		height: 20px;
+		width: 50px;
+		border: 1px solid #979797;
+		border-radius: 20px;
+		margin-top: -5px;
+		box-shadow: inset 0 1px 3px #BABABA, inset 0 12px 3px 2px rgba(232, 232, 232, 0.5);
+		cursor: pointer;
+		overflow: hidden;
+		background:white;
+		position:relative;
+		top:13px;
+		right:10px;
+	}
+	.switch input[type=checkbox] {
+		display: none;
+	}
+	.switch::before {
+		content: "";
+		display: block;
+		height: 20px;
+		width: 0px;
+		position: absolute;
+		border-radius: 20px;
+
+		box-shadow: inset 0 1px 2px rgb(181, 208, 94), inset 0 6px 3px 2px rgba(171, 208, 94,1);
+		background-color: rgb(151, 188, 74);
+	}
+	.switch.on::before {
+		width: 70px;
+	}
+	.switch > .thumb {
+		display: block;
+		width: 14px;
+		height: 14px;
+
+		position: absolute;
+		top:2px;
+		left:4px;
+
+		border: solid 1px #919191;
+		border-radius: 50%;
+		
+		box-shadow: inset 0 2px 1px white, inset 0 -2px 1px white;
+		@include background(linear-gradient(#CECECE, #FBFBFB));
+		
+	}
+	.switch.on > .thumb {
+	
+		left:inherit;
+		right:4px;
+		
+	}
+	.switch:hover > .thumb {
+		box-shadow: inset 0 2px 1px #fff, inset 0 -2px 1px #fff;
+		background-image: none;
+	}
+	.switch > .thumb::before {
+		content: "";
+		display: block;
+		height: 10px;
+		width: 2px;
+		background-color: white;
+		box-shadow: 0px -1px 1px #666;
+		border: none;
+		position: absolute;
+		top: 3px;
+		left: -15px;
+	}
+	.switch > .thumb::after {
+		content: "";
+		display: block;
+		height: 10px;
+		width: 10px;
+		border-radius: 50%;
+		border: solid 2px #777;
+		position: absolute;
+		right: -22px;
+		top: 0px;
+	}
+	
+	
 	position:fixed;
-	top:44px;
+	top:1%;
-	right:0.5%;
+	right:1%;
 	z-index:1000;
 
 	background:url('/assets/admin/backgrounds/bg-white.jpg') black;
-	bottom:70px;
+	bottom:1%;
-	width:99%;
+	width:98%;
 
 	display:none;
-	margin-right:-110%;
+	margin-right:-100%;
-	box-shadow:  0  0 10px rgba(0,0,0,1) ;
+
-	border-radius: 10px;
+	@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);
+
+	#content_types_draggables{
+		text-align:center;
+		position:absolute;
+		bottom:0px;
+		right:0px;
+		left:0px;
+		z-index:800;
+		background:transparent;
+	
+	}
+
+
 	.header{
 		background:transparent;
+		@include background(linear-gradient(bottom, rgb(50,50,50) 0%, rgb(30,30,30) 100%));
+		position:absolute;
+		height:40px;
+		top:0px;
+		left:0px;
+		right:0px;
+		padding:0px;
+		@include border-radius(7px 0px 0px 0px);
 		h1{
 			font-family:'Gill Sans' ;
 			color:black;
 			font-size:24px;
+			padding:5px;
+			padding-left:10px;
+			color:white;
 			font-weight:normal;
-			em{
-				font-size:13px;
-				padding-left:10px;
-			}
 			
+			@include text-shadow(2px 2px 0px rgba(0,0,0,0.8));
+					
 		}
-		.desc{
+		
-			
-			position:absolute;
-			top:50px;
-			left:10px;
-			bottom:10px;
-			width:370px;
-			overflow:auto;
-			text-align:justify;
-			padding-right:10px;
-		}
 	}
 	
+	.menu_item_informations{
+	
+		width:300px;
+		position:absolute;
+		top:40px;
+		right:0px;
+		bottom:0px;
+		
+		@include border-radius(0px 0px 7px 0px);
+		background:rgba(0,0,0,0.9);
+		
+		h3{
+			font-size:1.1em;
+			@include background(linear-gradient(bottom, rgb(50,50,50) 0%, rgb(30,30,30) 100%));
+			color:white;
+			padding:5px;
+			@include text-shadow(1px 1px 0px rgba(0,0,0,0.8));
+		
+		}
+	
+	}
+	
+	
 	#menu_item_block_edit{
+		
 		position: absolute;
-		top:80px;
+		top:40px;
-		border:1px solid black;
+		
-		bottom:10px;
+		bottom:0px;
-		left:10px;
+		right:300px;
-		right:10px;
+		left:0px;
 		overflow:auto;
-		background:url('/assets/admin/backgrounds/bg-white.jpg');
+		padding:10px;
+		
 		
 	}
 	

app/assets/stylesheets/admin/qi_cms.css.scss

@@ -22,8 +22,8 @@
 
 
 	position:relative;
-	border:1px dotted rgb(127,127,127);
 	
+	border:1px solid rgba(127,127,127,0);
 	
 	&.ui-state-disabled{
 	
@@ -60,7 +60,7 @@
 	text-align:center;
 
 
-
+	
 
 
 
@@ -81,7 +81,7 @@
 
 
 .portlet_hover {
-	border:1px solid rgb(127,127,127);
+	border:1px dotted rgb(127,127,127);
 
 }
 
@@ -107,7 +107,7 @@
 .portlet .render_admin.render_admin_block_content .col_1{
 	padding-right:11px;
 	margin-right:0px;
-	border-right:1px dotted rgb(127,127,127);
+	//border-right:1px dotted rgb(127,127,127);
 
 }
 
@@ -128,7 +128,7 @@
 
 .portlet_hover .render_admin.render_admin_block_content .col_1{
 	
-	border-right:1px solid rgb(127,127,127);
+	//border-right:1px solid rgb(127,127,127);
 }
 
 
@@ -139,7 +139,7 @@ border:1px solid white;
 
 .portlet .render_admin.render_admin_table_content .table_content_cel{
 	
-	border:2px solid rgb(127,127,127);
+	border:1px solid rgb(127,127,127);
 	vertical-align:top;
 	padding:5px;
 }

app/assets/stylesheets/public.css.scss

@@ -1,23 +1,95 @@
 
+$baseFontSize : 16px;
+
+$headerFontFamily : 'Avenir', 'arial', 'san-serif';
+$headerFontWeight : normal;
+$ratio : 1.35;
+$rowWidth : 1200px;
 
 @import "compass";
 
-@import "shared/wysiwg";
 
 @import "shared/formtastic";
-@import "shared/jquery.fancybox-1.3.4";
-
-@import "public/general";
-@import "public/layout";
-@import "public/articles";
 
 @import "public/gallery";
 @import "public/portlets";
 @import "public/slider";
 
 
+@import "foundation/settings";
+@import "foundation/functions/all";
+
+// Control which mixins you have access too
+
+@import "foundation/mixins/clearfix";
+@import "foundation/mixins/css-triangle";
+@import "foundation/mixins/font-size";
+
+// Must include next two for semantic grid to work
+
+@import "foundation/mixins/respond-to";
+@import "foundation/mixins/semantic-grid";
+
+@import "modular-scale";
+@import "foundation/common/globals";
+
+// Must include the grid for any responsiveness
+
+@import "foundation/components/grid";
+@import "foundation/common/typography";
 
 
+body{
+	
+	font-family : 'Avenir', 'arial', 'san-serif';
+
+	color:#333333;
 
 
+	#top_anchor{
+		position:absolute;
+		top:0px;
+		left:0px;
+		display:none;
+	}
+
+	#top{
+	border-bottom:8px solid #00ade2;
+	padding:1em 0;
+	
+	
+	#menu{
+	margin-top:90px;
+	text-align:right;
+	font-size:1.05em;
+	a{
+	display:inline-block;
+	padding:2px 0.5em;
+	color:black;
+	
+	}
+	}
+	}
+	#logo{
+		width:310px;
+		max-width:310px;
+		
+	}
+
+	#main{
+	h1{
+	color :#00ade2;
+	}
+		
+		
+	
+	}
+
+	
+	
+	
+	
+	
+
+}
 

app/assets/stylesheets/public/articles.css.scss

@@ -6,84 +6,39 @@
 	
 	
 }
-.read{
-
-	display:block;
-	text-align:right;
-	margin-top:-0.5em;
-	margin-bottom:1em;
-
-}
-.share_in_social{
-	border-top: #202020 2px solid;
-	border-bottom: #97BC4A 2px solid;
-	padding:10px;
-	padding-bottom:8px;
-	margin:2em 0px;
-	text-align:center;
-	a{
-		
-		img{
-			width:30px;
-			padding-left:10px;
-	
-		}
-	}
-}
 
 
 #articles_pagination{
-	clear:both;
+	
 	margin-top:40px;
 
 	a, .current{
-		background:#97BC4A;
+		
 		display : inline-block;
-
+		padding:5px;
-		color:white;
+		border:1px solid #82B139;
 		text-decoration:none;
-		@include border-radius(50%);
+		border-radius:10px;
-		width:28px;
-		height:22px;
-		padding:0px;
-		padding-top:7px;
-
-		text-align:center;
 		
 	}
-	div.pages{
+	div{
-		display:inline;
+		
 		padding-left:10px;
 	}
-	
-	div.arrows{
-		float:right;
-	}
-	
-	
 	.current{
-		background:#202020;
+		border:none;
 	}
 }
 
-article{
+.article_intro{
-	header{
+	h1{
-		aside{
+		a{
-			font-size:0.95em;
+		    font-size: 1.8em;
-			margin-bottom:-20px;
+		    color: #3f3f3f;
-		
+			text-decoration:none;
 		}
-		
-		h2{
-		font-size:1.3em;	
-		font: normal 600 1em / 90% $font2;
-		line-height:1.4em;
-
-		}
-	
 	}
 
-
 }
 
 

app/assets/stylesheets/public/general.css.scss

@@ -1,370 +0,0 @@
-
-
-
-
-$main-color : #010101;
-$font1 : Palatino, "Georgia", Georgia, "Times New Roman", serif;
-$font2: "Trebuchet MS", "Georgia", "Helvetica Neue", Arial, sans-serif;
-
-$font_title : Palatino, "Georgia", Arial, sans-serif;
-
-
-
-html, body, section, nav, article, aside, h1, h2, h3, h4, h5, h6, hgroup, header, footer, address, p, hr, pre, blockquote, ol, ul, li, dl, dt, dd, figure, figcaption, div, a, em, strong, small, s, cite, q, dfn, abbr, time, code, var, samp, kbd, sub, sup, i, b, mark, span, br, ins, del, img, iframe, embed, object, video audio, canvas, map, area, table, caption, colgroup, tbody, thead, tfoot, tr, td, th, form, fieldset, legend, label, input, button, select, textarea, details, summary, command, menu {
-  font-size: 100%;
-  font-style: normal;
-  text-align: left;
-  text-decoration: none;
-  vertical-align: baseline;
-  background: transparent;
-  margin: 0;
-  outline: 0;
-  border: 0 none;
-  padding: 0; 
-
-}
-
-
-
-
-body {
-	padding:10px;
-
-  color: ($main-color*40);
-  font: 300 1em / 1 $font1;
-  -webkit-font-smoothing: antialiased;
-  text-rendering: optimizeLegibility; }
-
-pre, select, input, textarea, button {
-  color: ($main-color*40);
-  font: 300 1em / 1 $font1;
-  -webkit-font-smoothing: antialiased;
-  text-rendering: optimizeLegibility; }
-
-h1 {
-  color: ($main-color*30);
-  font: 300 2.5em / 1 $font_title;
-
-  word-wrap: break-word;
-  margin: 0.8em 0 0.6em; 
-
-  a{
-	  color: ($main-color*30);
-  }
-
-}
-  
-  
-
-
-
-h2 {
-
-  font:  1.8em  $font_title;
-  letter-spacing: 0.05em;
-  margin: 1.3333em 0 0;
-  padding: 0.3333em 0;
-
-  a{
-	  color: ($main-color*40);
-  }
-	
-
- }
-
-
-h3 {
-  color: ($main-color*30);
-  font: 600 1.125em / 1.333 $font_title;
-  margin: 1.3333em 0 0;
-  border-top: 0 none; }
-
-h4 {
-  color: ($main-color*40);
-  font: 600 1em / 1 $font2;
-  margin: 1.5em 0 0; }
-
-h5 {
-  color: ($main-color*50);
-  font: 600 0.875em / 1.143 $font_title;
-  text-transform: uppercase;
-  letter-spacing: 0.1429em;
-  margin: 1.7143em 0 0; }
-
-h6 {
-  color: ($main-color*60);
-  font: 600 0.875em / 1.143 $font_title;
-  text-transform: uppercase;
-  letter-spacing: 0.1429em;
-  margin: 1.7143em 0 0;
-  }
-
-
-
-
-
-p, pre, blockquote, ul, ol, dl, figure, figcaption, table, fieldset {
-  font-size: 1em;
-  line-height: 1.8;
-  margin: 1em 0; }
-
-hr {
-  font: 600 2em / 1 $font2;
-  text-align: center;
-  margin: 1em 0 2em;
-  border: 0;
-  padding: 0;
-  height: 0;
-  clear: both;
-  display: block;
-  &::after {
-    content: "···";
-    color: ($main-color*150);
-    letter-spacing: 1em;
-    padding-left: 1em;
-    height: 0; } }
-
-pre {
-  margin: 0.5em 0 0.5em 1.5em;
-  white-space: pre;
-  white-space: pre-wrap;
-  white-space: pre-line;
-  word-wrap: break-word; }
-
-blockquote {
-  color: ($main-color*60);
-  font: 300 0.97em / 1.6 $font2;
-  border-left: 4px solid ($main-color*235);
-  margin: 1.0667em 0 1.6em;
-  padding: 0 1.6em 0 1.334em; }
-
-blockquote p {
-  line-height: 1.6;
-  margin: 0.5333em 0; }
-
-
-
-ul li {
-  list-style-type: circle;
-  margin-left: 1.5em; }
-
-ul li ul li {
-  list-style-type: square; }
-
-ol li {
-  list-style-type: decimal;
-  margin-left: 1.5em; }
-
-li {
-  ul li, ol li {
-    margin: 0 0 0 1.5em; } }
-
-dt {
-  font: 600 1em / 1.5 $font2; }
-
-dd {
-  padding: 0 1.5em 0; }
-
-dd>* {
-  margin-top: 0; }
-
-
-
-p+figure {
-  margin: 1em 0 2em; }
-
-
-
-
-  figure{
-    
-	margin: 0 0 2em 0; 
-	
-	img{
-  	  max-width:100%;
-    }
-  
-  }
-
-
-
-figure br {
-  clear: both; }
-
-figcaption * {
-  color: ($main-color*60);
-  font: 300 0.875em / 1.143 $font2;
-  margin: 0.5714em 0;
-  clear: left; }
-
-figcaption * * {
-  font-size: 1em;
-  line-height: 1.1429; }
-
-figcaption h4 {
-  color: ($main-color*40);
-  font: 600 0.875em / 1.143 $font2;
-  clear: left; }
-
-
-
-a {
-	color: #17b;
-  &:hover, &:active {
-    color: #39e;
-    background-color: none;
-    outline: none; }
-  &:link, &:visited, &:hover {
-    -webkit-transition: all 0.3s ease;
-    -moz-transition: all 0.3s ease;
-    -o-transition: all 0.3s ease;
-    transition: all 0.3s ease; }
-  &:active {
-    color: #b41;
-    -webkit-transition: none;
-    -moz-transition: none;
-    -o-transition: none;
-    transition: none; } }
-
-em {
-  font: italic 300 1em / 90% $font1;
-  a {
-    font: italic 300 1em / 90% $font1 } }
-
-i, var, samp, cite, cite a {
-  font: italic 300 1em / 90% $font1 }
-
-strong {
-  color: ($main-color*30);
-  font-weight:bold; }
-  
-  b {
-    color: ($main-color*30);
-    font: normal 600 1em / 90% $font2; }
-  
-
-
-
-small {
-  font-size: 0.8125em;
-  line-height: 1.2308;
-  display: inline-block;
-  opacity: 0.9; }
-
-abbr {
-  font-size: 0.875em;
-  line-height: 90%;
-  letter-spacing: 0.0357em;
-  opacity: 0.9; }
-
-h1 abbr, h2 abbr, h3 abbr, strong abbr {
-  font-weight: 300;
-  line-height: 10%;
-  opacity: 1; }
-
-abbr[title]:hover, dfn[title] {
-  border-bottom: 1px dotted rgba(0, 0, 0, 0.3);
-  cursor: help; }
-
-
-code {
-  font: 0.875em / 90% "Monaco", "Courier New", Courier, monospace;
-  color: #abd37f;
-  &.comment {
-    color: #888; } }
-
-kbd {
-  color: ($main-color*60);
-  font: normal 300 0.875em / 90% $font2;
-  background-color: #fcfcfc;
-  margin: 0 0.25em;
-  border: 1px solid #e6e6e6;
-  border-radius: 4px;
-  padding: 0.1429em 0.4286em; }
-
-sub {
-  font-size: smaller;
-  line-height: 90%;
-  vertical-align: sub; }
-
-sup {
-  font-size: smaller;
-  line-height: 90%;
-  vertical-align: super; }
-
-mark {
-  background-color: #fff9dd;
-  line-height: 90%;
-  padding: 0 0.125em; }
-
-ins {
-  background-color: #fff9dd;
-  line-height: 90%;
-  padding: 0 0.125em;
-  background-color: #f0f0f0; }
-
-del, s {
-  line-height: 90%;
-  text-decoration: line-through; }
-
-table {
-  color: ($main-color*50);
-  font: 300 0.938em / 1.6 $font2;
-  font-variant-numeric: lining-nums tabular-nums;
-  margin: 1.1429em 0;
-  border-collapse: collapse;
-  border-spacing: 0; }
-
-caption {
-  color: ($main-color*60);
-  font: 300 0.933em / 1.143 $font2;
-  caption-side: bottom;
-  padding: 1.1429em 0 0.5714em; }
-
-td {
-  text-align: left;
-  border-bottom: 1px solid #eee;
-  padding: 0.2667em 1.0667em 0.2em 0;
-vertical-align: top;
- }
-
-th {
-  text-align: left;
-  border-bottom: 1px solid #eee;
-  padding: 0.2667em 1.0667em 0.2em 0;
-  color: ($main-color*60);
-  font: 600 1em / 1.6 $font2;
-  border-bottom-color: #ccc; }
-
-
-
-
-
-
-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; }
- }
-
-
-.example {
-  outline: 1px solid #eee;
-  margin: 1em -1em 2em;
-  padding: 0.5em 1em; }
-  
-  img{
-	  @include border-radius(2px);
-  
-  }
-
-

app/assets/stylesheets/public/layout.css.scss

@@ -1,586 +0,0 @@
-body{
-	padding:0px;
-	background: url('/assets/front/fond.jpg');
-
-	
-}
-
-header#top{	
-	display:block;
-	
-
-	background: url('/assets/front/top.png') repeat-x;
-	
-	img{
-		width:120px;
-		float:left;
-		margin:20px 50px;
-	}
-	
-}
-
-navigation#first_nav{
-	
-	margin-top:50px;
-	margin-right:20px;
-	float:right;
-	
-	
-		a{
-		display:inline-block;
-		padding:10px;
-		color:black;
-		}
-
-}
-
-#main, #sidebar{
-	margin-top:50px !important;
-
-}
-#main{
-	
-	
- 
-	header{	  
-		h1{
-			margin-bottom:10px;
-		}
-		
-		h2{
-			margin-top:0em;
-			margin-bottom:1em;
-		}
- 
-	}
-  
-	img{
-		max-width:100%;
-	}
-  
-  
-	article{
-		margin-bottom:3em;
-		border-top:2px solid #97bc4a;
-		padding-top:1em !important;
-		aside{
-			img{
-				display:none;
-			}
-
-			*{
-				display:inline;
-			}
-	
-		}
-
-	}
-	 
-}
-
-#sidebar{	
-	padding:0% 2%;
-	
-	
-	background:#97bc4a;
-	
-	img{
-		margin:0.5em 0;	
-	}
-	
-	
-	color:white;
-	
-	h3,a{
-		color:white;
-	}
-
-}
-
-comment{
-
-	message{
-	padding:10px;
-		
-	}
-		
-	author{
-	float:left;
-	width:200px;
-	text-align:center;
-		
-		p{			
-		text-align:center;
-		margin:0px;
-
-		}
-		
-		.img{
-			height:120px;
-			width:120px;
-			border-radius:50%;
-			overflow:hidden;
-			display:inline-block;
-		
-			img{
-				height:120px;
-			}
-			
-		}
-
-	}
-
-}
-
-.clear{
-	clear:both;
-}
-
-footer{
-	margin-top:100px;
-
-	
-}
-
-
-
-@media only screen and (min-width: 0px)  {
-	
-	header#top{
-	
-		img{
-			width:120px;
-				
-			margin:20px 5%;
-		}
-
-	}	
-	
-	#main{	  
-		margin:auto;
-		
-		max-width:800px;
-		width:90%;
-	}
-	
-	#sidebar{
-		margin:auto;
-		padding:2% !important;
-		max-width:800px;
-		width:86%;	
-	
-		img{
-		margin:0.5em 0;
-		max-width:98%;		
-		}
-
-	}
-	
-	
-	.img_with_legend{
-	position:relative;
-	  
-		figcaption{
-			margin-top:5px; 
-		}
-	  
-	}
-	
-	
-}
-
-
-@media only screen and (min-width: 769px) {
-
-
-	#main{
-		margin-left:2%;
-		
-	
-		max-width:800px;
-		width:69%;
-		float:left;
-	
-		padding:0px;
-	
-	
-		article{
-			padding:0px 6%;
-		}
-		
-	}
-	
-	#sidebar{
-		float:right;
-		width:23%;
-			padding-top:0px !important;
-		min-height:1000px;
-		
-		img{
-			max-width:100%;
-			margin:0.5em 0;	
-		}
-
-	}
-	
-	
-
-	
-	
-
-		
-}
-
-
-@media only screen and (min-width: 950px) {
-
-
-	#main{
-		margin-left:5%;
-
-		width:64%;
-		
-	
-		
-	}
-}
-
-@media only screen and (min-width: 1200px) {
-
-
-	#main{
-		margin-left:18%;
-
-		width:53%;
-		
-		
-	}
-
-	#sidebar{
-		
-		padding-top:0em !important;
-	}
-
-
-
-	article{
-		position:relative;
-		
-		
-
-		aside{			  
-				  
-			display:block;
-			position:absolute;
-			left : -39%;
-
-			top:-2px;
-			padding-top:0em;
-			line-height:1.6em;
-			width:42%;
-			
-			text-align:center;
-		
-			  
-			p{
-				margin:0px;
-				display:block !important;
-			}
-			  
-			img{
-				display:block !important;
-				margin:auto;
-				border-radius:50%;		  
-			}
-			  
-			time{
-				display:block;
-				  
-			}
-
-			*{			  
-				text-align:center;
-
-			}
-		  		  
-		}
-
-	}
-	
-	
-	.img_with_legend{
-		position:relative;
-	  
-		figcaption{
-			display:block;
-			position:absolute;
-			left : -35%;		  
-			width:32%;
-			top:10px;
-		  
-			*{  
-				text-align:right;
-
-			}		  
-		  
-		}
-	  
-	}	
-	
-	
-	
-}
-
-#comments{
-
-	.comment{
-		margin-bottom:3em;
-			
-		aside{
-	
-			img{
-				float:left;
-				margin:auto;				 
-				border-radius:50%;
-			  
-			}
-				
-		}
-
-		blockquote{
-
-			text-align:justify !important;
-			border-color : #97bc4a;
-			min-height:3em;
-			padding-right:0px;
-				
-			p{
-				text-align:justify !important;
-					
-			}
-				
-		}
-	
-		.header, blockquote{			
-			margin-left:100px;
-
-		}
-		
-		.header{
-			font-size: 0.95em;
-			line-height:1.6em;
-			  
-			img{
-				display:none;			  
-			}			
-		  
-		}
-
-	}
-
-}
-
-
-#comment_form{
-	background:#e4f1d5;
-	background-color:rgba(127,182,55,0.2);
-	padding:20px;
-	padding-bottom:35px;
-	margin:0px 0px 0px 0px;
-			
-	h3{
-		margin-top:0px;
-		text-transform:uppercase;
-
-	}
-			
-	input,textarea{
-		background:white;
-		background-color:rgba(255,255,255,0.8);
-		padding:1%;
-			
-	}
-			
-	textarea{
-		line-height:1.6em;
-			
-	}
-			
-	label{
-		display:inline-block;
-		min-width:90px;
-		padding:5px;
-
-	}
-			
-	.submit{
-		float:right;
-		@include border-radius(10px);
-		margin-top:-16px;
-		cursor:pointer;
-
-		&:hover{
-			background:#97bc4a;
-			color:white;
-				
-		}
-		padding:1% 2%;
-			
-	}
-
-}
-
-
-
-
-
-//iPhone
-@media only screen and (max-width: 480px) {
-
-	
-
-
-	body{
-		font-size:50%;
-		
-	}
-	
-	
-	
-	
-}
-
-@media only screen and (max-width: 320px) {
-
-	
-
-
-	body{
-		font-size:75%;
-		
-	}
-	
-	
-	
-	
-}
-
-
-@media only screen and (max-width: 600px) {
-
-	
-
-
-	
-	
-	
-	
-	header#top{
-		
-		text-align:center;
-		img{
-			float:none;
-			display:block;
-			margin:auto;
-	
-			
-		
-		}
-	
-	
-	navigation{
-		text-align:center;
-		float:none;
-		display:block;
-		margin-top:10px;
-		
-	
-	}
-	
-	
-		
-	}
-	
-	
-	
-	#comment_form{
-		margin:0px !important;
-	}
-	
-	#comments{
-
-		.comment{
-			
-			aside{
-	
-				img{
-					float:left;
-					margin:auto;				 
-					border-radius:50%;
-					width:40px;
-					height:40px;
-			  
-				}
-				
-			}
-
-		
-			.header, blockquote{			
-				margin-left:50px;
-
-			}
-			blockquote{			
-							margin-left:10px;
-
-						}
-			
-			
-
-		}
-
-	}
-	
-	
-	
-}
-
-
-footer{
-	display:block;
-	padding:1em;
-	font-size:0.95em;
-	line-height:1.4em;
-	border-top: #202020 2px solid;
-	border-bottom: #97BC4A 12px solid;
-	text-align:center;
-	
-	
-
-
-}
-
-
-
-#legals_large{
-	background:rgba(250,250,250,0.8);
-	position:fixed;
-	top:0px;
-	bottom:0px;
-	left:0px;
-	right:0px;
-	width:100%;
-	height:100%;
-	display:none;
-	
-	.content{
-		background:rgba(250,250,250,0.95);
-		padding:10px 30px;
-		margin:auto;
-		width:90%;
-		max-width:600px;
-		border:1px solid gray;
-		
-		
-	}
-
-}

app/controllers/admin/menu_items_controller.rb

@@ -37,12 +37,17 @@ class Admin::MenuItemsController < ApplicationController
 			
 			
 		
-		
+	
+       
+
 		
 		
 		else
 			redirect_to admin_root_path, :alert => "Un menu doit être séléctionné."
 		end
+    
+    
+    
 	end
 
 	def new

app/views/admin/blocks/_block.html.haml

@@ -1,29 +1,19 @@
 
 
-#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)
-
-
-.grid_12
-
-
 
 
-
+#block_portlets.block_portlets{:id => block.id, :"data-block_id"=>block.id}
-
-	#block_portlets.block_portlets{:id => block.id, :"data-block_id"=>block.id}
 
 	
-		=render :partial => "portlet/portlets/portlet", :collection => block.portlets.find(:all, :order => :position, :include => :content)
+	=render :partial => "portlet/portlets/portlet", :collection => block.portlets.find(:all, :order => :position, :include => :content)
 	
 	
 	
-	%div{:style => "height:70px;"}
+%div{:style => "height:70px;"}
-	
+
-:javascript
-	block_js_initialize();
 	
+
+
+%script
+	=raw "$('#menu_item_content_type').html('"+escape_javascript(render :partial => "admin/blocks/block_allowed.html.haml", :locals => {:block => block})+"');"
+	block_js_initialize();

app/views/admin/blocks/_block_allowed.html.haml

@@ -0,0 +1,12 @@
+
+#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)
+
+
+
+
+

app/views/admin/dashboard/index.html.haml

@@ -18,7 +18,7 @@
 	
 	
 	-Menu.all.each do |menu|
-		= link_to image_tag("admin/dashboard/icones_menu_items.png")+"pages/menu", admin_menu_items_path(:menu_id => menu.id)
+		= link_to image_tag("admin/dashboard/icones_menu_items.png")+"pages/menu", admin_menu_items_path(:menu_id => menu.id), :remote => true
 
 
 

app/views/admin/menu_items/_form.html.haml

@@ -2,7 +2,10 @@
 	= form.input :name, :label => "Nom :" 
 	= form.input :slug, :label => "slug :" if current_admin.super_admin? || !@menu_item.super_admin
 	= form.input :super_admin,:as => :boolean , :label => "Super Admin"  if current_admin.super_admin?
-	= form.input :enabled,:as => :boolean , :label => "Actif" 
+	
+	-if @menu_item.menu_content_type == "Page" and @menu_item.id
+	-else
+		= form.input :enabled,:as => :boolean , :label => "Actif" 
 	= form.input :menu_id,:as => :hidden 
 	= form.input :parent_id,:as => :hidden 
 	

app/views/admin/menu_items/_index_block.html.haml

@@ -7,12 +7,12 @@
 		-if @menu_parent
 		
 	
-			.receptable{:"data-parent_id" => "no-menu-selected"}=link_to "racine", admin_menu_items_path(:menu_id => @menu.id)
+			.receptable{:"data-parent_id" => "no-menu-selected"}=link_to "racine", admin_menu_items_path(:menu_id => @menu.id), :remote => true
 			.separate
 				>
 			-@menu_parent.ancestors.reverse.each do |menu_item|
 				.ancest_menu_item.receptable{:"data-parent_id" => (@menu_parent.parent_id || "no-menu-selected")}
-					=link_to menu_item.name, admin_menu_items_path(:menu_id => @menu.id, :parent_id =>menu_item.id)
+					=link_to menu_item.name, admin_menu_items_path(:menu_id => @menu.id, :parent_id =>menu_item.id), :remote => true
 				.separate
 					>
 			.actual=@menu_parent.name
@@ -28,3 +28,9 @@
 		-else
 			.no_menu_items
 				Il n'y a aucun éléments de menu actuellement.
+
+
+
+
+:javascript
+	initialize_menu_items();

app/views/admin/menu_items/_menu_item.html.haml

@@ -2,7 +2,7 @@
 	%table
 		%tr
 			%td.receptable{:"data-parent_id" => menu_item.id}
-				=link_to i(:plus, :blue)+"#{menu_item.children.size}", admin_menu_items_path(:menu_id => menu_item.menu_id, :parent_id => menu_item.id)
+				=link_to i(:plus, :blue)+"#{menu_item.children.size}", admin_menu_items_path(:menu_id => menu_item.menu_id, :parent_id => menu_item.id), :remote => true
 			%td.grip
 				=i(:move, :blue)
 	

app/views/admin/menu_items/_show.html.haml

@@ -1,10 +1,7 @@
-#menu_item_show
+%h1#menu_item_show
-	
-	%h1
-		=@menu_item.name
-		(
-		=@menu_item.enabled ? "Publié" : "Brouillon"
-		)
-	%p 
-		=@menu_item.permalink
 	
+	=@menu_item.name
+	(
+	=@menu_item.enabled ? "Publié" : "Brouillon"
+	)
+	

app/views/admin/menu_items/edit.html copy.haml

@@ -1,15 +0,0 @@
-.header
-	.right
-		=link_to "modifier", edit_admin_menu_item_path(@menu_item), :remote => true,:class => "button"
-		=link_to "Masquer", "#", :onclick => "$('#edit_pane').toggle();if($(this).html()=='Masquer'){$(this).html('Voir')}else{$(this).html('Masquer')};return false;", :id => "#edit_pane_toggle", :class => "button"
-	
-	%h1 
-		%span.menu_item_name=@menu_item.name
-	
-
-	
-
-#edit_pane=render :partial => "show"
-
--if @menu_item.menu_content_type == "Page"
-	=auto_load_div(eval("edit_admin_#{@menu_item.menu_content_type.tableize.singularize}_path(@menu_item.menu_content)"))

app/views/admin/menu_items/edit.html.haml

@@ -2,18 +2,29 @@
 
 .header
 	.right
-		=link_to "modifier", edit_admin_menu_item_path(@menu_item), :remote => true,:class => "button"
+		=#link_to "modifier", edit_admin_menu_item_path(@menu_item), :remote => true,:class => "button"
 		
 		=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
-		=#auto_load_div(eval("edit_admin_#{@menu_item.menu_content_type.tableize.singularize}_path(@menu_item.menu_content)"))
+	
-	

app/views/admin/menu_items/edit.js.erb

@@ -1,2 +1,3 @@
-show_pane_hover("<%= escape_javascript(render(:partial => "edit_form"))%>",550,600);
 
+
+$('#menu_item_edit').replaceWith("<%= escape_javascript(render(:partial => "edit_form"))%>");

app/views/admin/menu_items/index.html.haml

@@ -2,14 +2,13 @@
 	.header
 		%h1="Liste des éléments du #{@menu.name}"
 	
-	.grid_12	
+
-	
 
     
 	
 	
 	
-		=render :partial => "index_block"
+	=render :partial => "index_block"
 	
 	
 	#menu_item_detail

app/views/admin/menu_items/index.js.erb

@@ -1,2 +1,13 @@
 
-$('#menu_item_index_block').replaceWith("<%= escape_javascript(render(:partial => "index_block")) %>");
+
+if($('#menu_item_index').length > 0){
+	$('#menu_item_index').replaceWith("<%= escape_javascript(render(:partial => "index_block")) %>");
+
+}
+else{
+
+	
+	$('body').html("<%= escape_javascript(render(:template => 'admin/menu_items/index.html.haml')) %>");
+
+}
+

app/views/layouts/public.html.haml

@@ -1,88 +1,47 @@
 !!!
-%html
+%html{:xmlns=>"http://www.w3.org/1999/xhtml", :"xml:lang"=>"fr", :lang=>"fr"}
 	%head
-		%title="Blog de Nicolas Bally - #{@title}"
+		%title= "Ecole EFT France - "+ @title.to_s+" - Geneviève Gagos"
-
+		%meta{ :"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8" }
-		= stylesheet_link_tag "public", :media => "all"
+		%meta{ :"name" => "Description", :content => @description }
+		%meta{ :"name" => "Keywords", :content => @keywords }	
 		
-		=javascript_include_tag "public"
+
+		= javascript_include_tag "public"
 		
 		= csrf_meta_tag 
-		-if @thumbnail_image
-			= raw '<link rel="image_src" href="http://'+("#{HOSTNAME}#{@thumbnail_image}").to_s+'" />' 
-			=raw '<meta property="og:image" content="http://'+("#{HOSTNAME}#{@thumbnail_image}").to_s+'" />'
-		-else 
-			=raw '<link rel="image_src" href="http://blog.nicolasbally.com/front/logo.png" />' 
-			=raw '<meta property="og:image" content="http://blog.nicolasbally.com/front/logo.png" />'
-
-
 		
-		<meta name="viewport" content="width=device-width,initial-scale=1">
+		= stylesheet_link_tag 'public' 
+		
 		=render :partial => "public/shared/ga"
+
+		=javascript_include_tag "http://maps.google.com/maps/api/js?sensor=false&region=FR"
+
 		
 	%body
-		
+		%a{:id => "top_anchor"}
-		
-	
-		%header#top
-		
-			=link_to image_tag("front/logo.png"), "/"
-		
-			%navigation#first_nav
-				=link_to "A propos", "/pages/a-propos-de-nicolas-bally.html"
-				=link_to "Blog", "/"			
-			
-				=link_to "Contact", "/pages/contact.html"
-		
-			
-			%p{:style => "clear:both;"} 
-		#main=yield
-		
-		%section#sidebar
-			
-			%h3 À propos
-			
-			=link_to image_tag("front/nicolasbally.jpg", :alt => "Nicolas Bally, créateur web, photographe & humain"), "/pages/a-propos-de-nicolas-bally.html"
-			
-			
-			%h3 Mes activités
-			%ul
-				%li= link_to "Création de site web", "http://www.quartz-agence.com", :title => "Site de l'agence Nicolas Bally, création de sites web", :target => "_blank"
-				%li= link_to "Photographie", "http://www.nicolasbally.com", :title => "Site photo de Nicolas Bally, Photographe", :target => "_blank"
-			
-			
-		
-		%p{:style => "clear:both;height:1px;margin-top:0px;"}
-		
-		
-		%footer
-			
-			Sauf mentions contraires, textes & photos créés par 
-			=link_to "Nicolas Bally", "mailto:info@nicolasbally.com"
-			sous 
-			=link_to "license Creative Commons (BY-NC-ND)", "http://creativecommons.org/licenses/by-nc-nd/3.0/fr/", :target => "_blank"
-			=#link_to image_tag("front/cc-licenses-terms.png"), "http://creativecommons.org/licenses/by-nc-nd/3.0/fr/", :target => "_blank"
-			=" - "
-			Merci de m'
-			=link_to "envoyer un mail", "mailto:info@nicolasbally.com"
-			lors de toute utilisation de ce contenu -
-			=link_to "Mentions légales", "#", :id => "legals"
-				
-			#legals_large
-				.content
-					%p Le blog "http://blog.nicolasbally.com" est édité et hébérgé par l'entreprise Nicolas Bally
-					%p Le directeur de publication est Nicolas Bally
-				
-					%p Siège social : 1165 rte du châtelard, 38140 Réaumont, France
 
-					%p 
-						Siren : 512 769 787 
-						%br 
-						Code APE : 6201Z 
-						%br
-						N° TVA Intracommunautaire : FR50512769787
 					
-					%p{:style => "text-align:center"}=link_to "Fermer cette fenêtre", "#"
+		.row#top
+			.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
+		
+		#bottom
+			%a#go_top{:href => "#top_anchor"}
 		
 		
+		
+		%p{:style => "clear:both;"}
+			&nbsp;
+			
+			
+				
+

app/views/portlet/block_contents/_form.html.haml

@@ -19,7 +19,7 @@
 		Style :
 		= f.select :style, BlockContent::STYLES
 	%br
-	= f.buttons do 
+	
-		= f.submit "Sauvegarder"
+	= f.submit "Sauvegarder"
 	
 

app/views/portlet/break_contents/_form.html.haml

@@ -9,8 +9,7 @@
 				%td Style :
 				%td= f.select :style, BreakContent::STYLES
 			
-	= f.buttons do 
+	= f.submit "Sauvegarder"
-		= f.submit "Sauvegarder"
 	
 	
 		

app/views/portlet/download_contents/_form.html.haml

@@ -29,8 +29,7 @@
 
 
 	
-	= f.buttons do 
+	= f.submit "Sauvegarder"
-		= f.submit "Sauvegarder"
 	
 	
 

app/views/portlet/dynamic_contents/_form.html.haml

@@ -12,8 +12,7 @@
 
 	
 			
-	= f.buttons do 
+	= f.submit "Sauvegarder"
-		= f.submit "Sauvegarder"
 	
 	
 		

app/views/portlet/event_contents/_form.html.haml

@@ -51,7 +51,6 @@
 				= form.input :popup, :label => "Ouvrir dans une popup ?", :as => :boolean
 
 
-	= form.buttons do 
+	= form.submit "Sauvegarder"
-		= form.submit "Sauvegarder"
 
 

app/views/portlet/gallery_contents/_form.html.haml

@@ -4,7 +4,6 @@
 		Style :
 		= form.select :style, GalleryContent::STYLES	
 	
-	= form.buttons do 
+	= form.submit "Sauvegarder"
-		= form.submit "Sauvegarder"
 
 

app/views/portlet/html_contents/_form.html.haml

@@ -40,8 +40,7 @@
 	
 		.action
 			%button{:onclick => "$(this).closest('.html_content_form').toggleClass('large');editor.resize() ;return false;"} zoom
-			= f.buttons do 
+		= f.submit "Sauvegarder"
-				= f.submit "Sauvegarder"
 	
 			
 		

app/views/portlet/image_contents/_form.html.haml

@@ -27,7 +27,6 @@
 				= form.input :popup, :label => "Ouvrir dans une popup ?", :as => :boolean
 
 
-	= form.buttons do 
+	= form.submit "Sauvegarder"
-		= form.submit "Sauvegarder"
 
 

app/views/portlet/img_link_contents/_form.html.haml

@@ -15,7 +15,6 @@
 			= form.inputs do 
 				= form.input :cible, :label => "Cible :" , :as => :qi_cible_select
 
-	= form.buttons do 
+	= form.commit_button "Sauvegarder"
-		= form.commit_button "Sauvegarder"
 
 

app/views/portlet/link_contents/_form.html.haml

@@ -9,7 +9,6 @@
 			= form.input :cible, :label => "Cible :" , :as => :qi_cible_select
 			
 			
-	= form.buttons do 
+	= form.submit "Sauvegarder"
-		= form.submit "Sauvegarder"
 
 

app/views/portlet/map_contents/_form.html.haml

@@ -20,8 +20,7 @@
 		Zoom 
 		= f.select :zoom, MapContent::ZOOMS
 	%br
-	= f.buttons do 
+	= f.submit "Sauvegarder"
-		= f.submit "Sauvegarder"
 	
 	
 

app/views/portlet/shared/create.js.erb

@@ -1,5 +1,4 @@
 $("#new_portlet_form_inline").replaceWith("<%= escape_javascript(render(@portlet)) %>");
-$("#portlet_<%= @portlet.id %>").effect("highlight", {}, 3000);
 block_js_initialize();
 update_portlet_order();
 

app/views/portlet/shared/edit.js.erb

@@ -1,7 +1,7 @@
 $("#portlet_<%= @portlet.id %>").html("<div id='edit_portlet_content_form'></div>");
 
 $("#edit_portlet_content_form").html("<%= escape_javascript(render( :partial => "form")) %>");
-$("#edit_portlet_content_form").effect("highlight", {color:"#E9F2F9"}, 500);
+
 
 $("#edit_portlet_content_form .text_editor").each(function() {
 

app/views/portlet/shared/update.js.erb

@@ -1,5 +1,6 @@
 
 $("#portlet_<%= @portlet.id %>").replaceWith("<%= escape_javascript(render(@portlet)) %>");
-$("#portlet_<%= @portlet.id %>").effect("highlight", {}, 3000);
+
+
 block_js_initialize();
 <%= flash_notice() %>

app/views/portlet/table_contents/_form.html.haml

@@ -16,8 +16,7 @@
 		= f.select :style, TableContent::STYLES
 	
 	%br
-	= f.buttons do 
+	= f.submit "Sauvegarder"
-		= f.submit "Sauvegarder"
 	
 	
 

app/views/portlet/text_contents/_form.html.haml

@@ -29,9 +29,9 @@
 			
 				%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" => "h1"} h1
 			
-				/%a{"data-wysihtml5-command" => "formatBlock", "data-wysihtml5-command-value" => "h2"} h2
+				%a{"data-wysihtml5-command" => "formatBlock", "data-wysihtml5-command-value" => "h2"} h2
 			
 				%a.rte-rte_unordered_list{"data-wysihtml5-command" => "insertUnorderedList"} 
 			
@@ -85,10 +85,8 @@
 		Style :
 		= f.select :style, TextContent::STYLES
 
-	
+
-			
+	= f.submit "Sauvegarder"
-	= f.buttons do 
-		= f.submit "Sauvegarder"
 	
 	
 		

app/views/portlet/title_contents/_form.html.haml

@@ -8,8 +8,8 @@
 		Style :
 		= f.select :style, TitleContent::STYLES
 	%br
-	= f.buttons do 
+
-		= f.submit "Sauvegarder"
+	= f.submit "Sauvegarder"
 	
 	
 

app/views/public/menu_items/show.html.haml

@@ -1,3 +1,22 @@
+-content_for :sidebar do
+	-if @menu_item.parent_id
+		-if @menu_item.ancestors.reverse[0]
+			-first_level_menu = @menu_item.ancestors.reverse[0]
+		
+	-else
+			
+		-first_level_menu = @menu_item
+			
+	-if first_level_menu.children.size > 0
+		
+		%h3=@menu_item.name
+		%ul
+			-first_level_menu.children.where(:enabled => true).order(:position).each do |menu_item|
+			
+				%li=menu_item_link(menu_item)
+						
+					
+	
 
 =render @menu_item.menu_content.blocks[0]
 

app/views/public/shared/_first_menu.html.haml

@@ -1,4 +1,3 @@
-=link_to "Accueil", "/"
 
 -MenuItem.where(:parent_id => nil, :enabled => true).order(:position).each do |menu_item|
-	=menu_item_link 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))

app/views/public/shared/_ga.html.erb

@@ -1,7 +1,7 @@
 <script type="text/javascript">
 
   var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-33554780-1']);
+  _gaq.push(['_setAccount', 'UA-']);
   _gaq.push(['_trackPageview']);
 
   (function() {

config/database.yml

@@ -8,8 +8,8 @@ development:
   encoding: utf8
   database: blog_app
   pool: 5
-  username: blog_app
+  username: root
-  password: dev
+#  password: dev
   socket: /tmp/mysql.sock 
 
 # Warning: The database defined as "test" will be erased and

config/environments/development.rb

@@ -42,6 +42,6 @@ Crossey2::Application.configure do
 		:password => "sio2mail"
 	}
 
-	HOSTNAME="192.168.0.47:3000"
+	HOSTNAME="localhost:3000"
 
 end