Merge branch 'design_team' into ldap

Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb

app/assets/javascripts/inc/ajax_setting.js

@@ -0,0 +1,7 @@
+jQuery(document).ajaxStart(function(){
+  $('<div class="modal-backdrop fade in" id="sys_modal"><img src="/assets/ajax-loader.gif" style="margin-top: 25%;margin-left: 50%;"></div>').appendTo('body');
+});
+
+jQuery(document).ajaxComplete(function(){
+  $("#sys_modal").hide().remove();
+});

app/assets/javascripts/lib/contenteditable.js.erb

@@ -40,11 +40,11 @@ $(".nav-tabs").find(".icons-pencil").click(function(){
         data: { body: content_holder.html() },
         success: function(json) {
           $(selector).attr("contenteditable",false)
-          alert("<%= I18n.t("admin.contenteditable.update_done") %>");
+          alert("<%= I18n.t('admin.contenteditable.update_done') %>");
           //content_holder.effect('highlight', {'color': '#0f0'}, 3000);
         },
         error: function() {
-          alert("<%= I18n.t("admin.contenteditable.update_failed") %>");
+          alert("<%= I18n.t('admin.contenteditable.update_failed') %>");
           //content_holder.effect('highlight', {'color': '#f00'}, 3000);
           content_holder.html(content);
         }

app/assets/javascripts/new_admin.js

@@ -17,3 +17,4 @@
 //= require side_bar_history
 //= require rss
 //= require ajax_form
+//= require inc/ajax_setting

app/assets/javascripts/page_edit.js.erb

@@ -34,6 +34,10 @@ $('.part_kind').live('click', function() {
 });
 
 $(document).ready(function(){
+	bindTreeDragHandle();
+});
+
+var bindTreeDragHandle = function(){
 	$('ol.sortable').nestedSortable({
 		disableNesting: 'no-nest',
 		forcePlaceholderSize: true,
@@ -52,4 +56,4 @@ $(document).ready(function(){
 			$.post("<%= Rails.application.routes.url_helpers.admin_update_position_path %>", { id: ui.item.attr('id'), parent_id: ui.item.parent().closest('li').attr('id'), position: ui.item.index() } );
   	}
 	});
-});
+}

app/assets/javascripts/side_bar_history.js

@@ -1,14 +1,5 @@
 var history_edited = false; 
 
-$('#back_sidebar a, #back_main a.nav').live('click',  
-  function () {  
-    $.getScript(this.href);
-		history.pushState(null, document.title, this.href);
-		history_edited = true;
-    return false;
-  }  
-);
-
 $('#back_main a.reload').live('click',
   function () { 
     $.getScript(this.href);
@@ -18,7 +9,7 @@ $('#back_main a.reload').live('click',
   }
 );
 
-$('#back_main .form').live('submit', function () { 
+$('#back_main form').live('submit', function () { 
   $.post(this.action, $(this).serialize(), null, 'script');
 	history_edited = true;
   return false;

app/assets/stylesheets/sidebar.css.erb

@@ -18,6 +18,18 @@
 	padding: 3px 0px;
 	display: block;
 }
+.nav-list>li>ol {
+	margin-left: 0;
+}
+.nav-list>li>.with_action {
+	padding-left: 0;
+}
+.nav-list>li>.with_action>.quick-edit {
+	margin: 0 0 0 3px !important;
+}
+.nav-list>li>.with_action>i {
+	display: none;
+}
 /*
 #back_sidebar h1 {
     background: url(<%= asset_path "h1_bg.png" %>) repeat-x scroll left top transparent;
@@ -126,7 +138,7 @@
     background: none repeat scroll 0 0 #FFFFFF;
     border: 1px solid #DDDDDD;
     border-radius: 5px 5px 5px 5px;
-    margin: 0 0 0 3px;
+    margin: 0 0 0 20px;
     padding: 0;
     z-index:1;
 	position: absolute;
@@ -155,7 +167,7 @@ ol.nav>li>.icons-moves {
 }
 .sortable i {
 	position: absolute;
-	left: -20px;
+	left: 0px;
 	top: 6px;
 	margin-right: 0;
 	opacity: 0.3;
@@ -166,6 +178,9 @@ ol.nav>li>.icons-moves {
 	opacity: 0.7;
 	filter: alpha(opacity=70);
 }
+.with_action {
+	padding-left: 20px;
+}
 .placeholder {
 	background-color: rgba(0,136,204,.6);
 	border-radius: 3px;