Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap

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

@@ -1,25 +1,37 @@
 <%#= encoding: utf-8 %>
 $(function() {
   var content_holder, content;
-  var selector = 'li[contenteditable="true"]';
+  var selector = 'a[contenteditable="true"]';
   // prevent clicks inside editable area to fire
   // a click event on the body
   // and therefor saving our content before we even edit it
-  $(selector).click(function(e) {
+  
-    e.stopPropagation();
+$(".nav-tabs").find(".icons-pencil").click(function(){
-  });
+  $(this).css({
+    "display" : "none"
+  })
+  $(this).next().attr("contenteditable",true).addClass("edit");
+  // $(selector).click(function(e) {
+  //   e.stopPropagation();
+  // });
   
   // initialize the "save" function
   $(selector).focus(function(e) {
     content_holder = $(this);
-    content        = content_holder.html();
+    content   = content_holder.html();
-    
     // one click outside the editable area saves the content
-    $('body').one('click', function(e) {
+    $(selector).keypress( function(e) {
       // but not if the content didn't change
-      if ($(e.target).is(selector) || content == content_holder.html()) {
+      //alert('out!!');
-        return;
+  if(e.keyCode == 13){ 
-      }
+     $(".nav-tabs>li>a").removeClass("edit");
+     $(this).prev(".icons-pencil").css({
+      "display" : "block"
+     })
+      e.preventDefault();
+      // if ($(e.target).is(selector) || content == content_holder.html()) {
+      //   return;
+      // }
       
       $.ajax({
         url: content_holder.data('edit-url'),
@@ -27,6 +39,7 @@ $(function() {
         dataType: 'json',
         data: { body: content_holder.html() },
         success: function(json) {
+          $(selector).attr("contenteditable",false)
           alert("<%= I18n.t("admin.contenteditable.update_done") %>");
           //content_holder.effect('highlight', {'color': '#0f0'}, 3000);
         },
@@ -36,6 +49,8 @@ $(function() {
           content_holder.html(content);
         }
       });
+    }
     });
   });
+});
 });

app/assets/javascripts/tinymce_orbit.js.erb

@@ -62,14 +62,16 @@ function myFileBrowser(field_name, url, type, win) {
     tinyMCE.activeEditor.windowManager.open({
         file : cmsURL,
         title : 'File Browser',
-        width : 850,  // Your dimensions may differ - toy around with them!
+        width : 530,  // Your dimensions may differ - toy around with them!
-        height : 455,
+        height : 350,
         resizable : "no",
         inline : "no",  // This parameter only has an effect if you use the inlinepopups plugin!
         close_previous : "no"
     }, {
         window : win,
         input : field_name,
+        alt : "alt",
+        title : "title"
     });
     return false;
   }

app/assets/stylesheets/style.css.erb

@@ -606,6 +606,19 @@
 .news_paragraph p {
     line-height: 20px;
 }
+.nav-tabs>li>.edit, .nav-tabs>li>.edit:hover {
+	background-color: #333;
+	color: #FFF;
+	padding-right: 12px;
+}
+.nav-tabs li .icons-pencil {
+	float: right;
+	margin-top: 8px;
+}
+.nav-tabs li a {
+	padding-right: 32px;
+}
+
 
 /*icons*/
 .the-icons i:after {

app/controllers/admin/ad_banners_controller.rb

@@ -6,7 +6,7 @@ class Admin::AdBannersController < OrbitBackendController
 
   def rename
     @ad_banner = AdBanner.find(params[:id])
-    @ad_banner.title = Nokogiri::HTML.fragment(params["body"]).at("a").children().to_s
+    @ad_banner.title = params[:body]
     render :json => {:success =>@ad_banner.save!}
   end
   def destroy

app/controllers/admin/ad_images_controller.rb

@@ -18,7 +18,8 @@ class Admin::AdImagesController < ApplicationController
   end
   
   def new
-    @ad_image =AdImage.new 
+    ad_banner = AdBanner.find params[:ad_banner_id]
+    @ad_image =ad_banner.ad_images.build 
     @ad_image.post_date = Date.today
     @ad_image.unpost_date = Date.today + 30
     #render :action => 'new',:url=> {:ad_banner_id => params.has_key?(:ad_banner_id)? params[:ad_banner_id],nil}

app/uploaders/file_asset_uploader.rb

@@ -48,8 +48,8 @@ class FileAssetUploader < CarrierWave::Uploader::Base
   # end
 
   # Override the filename of the uploaded files:
-  def filename
+  # def filename
-    model.filename
+  #   model.filename.force_encoding("UTF-8")
-  end
+  # end
 
 end

app/views/admin/ad_banners/index.html.erb

@@ -12,7 +12,10 @@
 <div id="post-body-content" class="clear">
 	<ul id="banner_tab" class="nav nav-tabs">
 		<% @ad_banners.each do |ab| %>
-			<%= content_tag :li,link_to(ab.title,"##{ab.title.dehumanize}",:data=>{:toggle=>"tab"}),:class => (ab ==  @active ? 'active' : nil ), :contenteditable=>"true" ,"data-edit-url"=>(admin_rename_ad_banner_path ab)%>
+			<%= content_tag :li ,:class => (ab ==  @active ? 'active' : nil) do %>
+				<i class="icons-pencil"></i>
+				<%= link_to(ab.title,"##{ab.title.dehumanize}",:contenteditable=>"false",:data=>{:toggle=>"tab" ,'edit-url' =>(admin_rename_ad_banner_path ab) } )%>
+			<% end -%>
 		<% end -%>
 		<%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"modal"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %>
 		

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_modal_preview.html.erb

@@ -0,0 +1,55 @@
+ <% if bulletin -%>
+
+<div class="modal hide fade in banner-preview" id="bulletin-<%=bulletin.id%>" style="width:1024px;height:500px;margin-left:-512px">
+  <div class="modal-header">
+    <a class="close" data-dismiss="modal">×</a>
+    <h3><%= t("modal.preview") %></h3>
+  </div>
+  <div class="modal-body">
+    <p class="bulletin_slideshow">
+
+      <iframe src=<%= panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id ,:preview=>true) %> style="width:1000px;height:300px" >
+
+        </iframe>
+  
+      <%# preview_block_ad_images_helper(bulletin).each do |ad_image| -%>
+        <%#= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => bulletin.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || bulletin.context || " ")) %>
+      <%# end -%>
+    </p>
+  </div>
+  <div class="modal-footer">
+    
+  
+    <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
+  </div>
+  <div>
+    <script type="text/javascript" src="/static/kernel.js"></script>
+    <script type="text/javascript">
+      $(document).ready(function() {
+  
+      // $("#bulletin-<%#=bulletin.title.dehumanize%>").on("show", function () {
+      //      $("#bulletin-<%#=bulletin.title.dehumanize%>").find(".bulletin_slideshow").cycle({delay: -1000, fx: "<%#= bulletin.ad_fx.nil?? "fade": bulletin.ad_fx %>", timeoutFn: getTimeout });
+      // });
+    $(".modal").on("hidden", function () {
+    $("#show_preview").remove();
+      });
+      
+      $("iframe").load(function(){
+          // Get the body element
+          var frameBody = $("iframe").contents().find("body");
+
+          // Get all links inside the BODY tag
+          $('a', frameBody).click(function(e){
+                  //Disable all default actions       
+                  e.preventDefault();
+          });
+          $('input', frameBody).attr("disabled", true);
+      });
+    });
+    </script>
+  </div>
+</div>
+
+
+
+<% end -%>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/realtime_preview.js.erb

@@ -0,0 +1,2 @@
+$('#show_preview').html("<%= escape_javascript(render(:partial => 'modal_preview',:locals => {:bulletin => @bulletin})) %>");
+var start_modal_with_id = "bulletin-<%=@bulletin.id%>"

vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_modal_preview.html.erb

@@ -0,0 +1,55 @@
+ <% if page_context -%>
+
+<div class="modal hide fade in banner-preview" id="page_context-<%=page_context.id%>" style="width:1024px;height:500px;margin-left:-512px">
+  <div class="modal-header">
+    <a class="close" data-dismiss="modal">×</a>
+    <h3><%= t("modal.preview") %></h3>
+  </div>
+  <div class="modal-body">
+    <p class="page_context_slideshow">
+
+      <iframe src=<%= panel_page_content_back_end_view_path(page_context.page_id, :category_id => page_context.page_context_category.id ,:preview=>true) %> style="width:1000px;height:300px" >
+
+        </iframe>
+  
+      <%# preview_block_ad_images_helper(page_context).each do |ad_image| -%>
+        <%#= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => page_context.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || page_context.context || " ")) %>
+      <%# end -%>
+    </p>
+  </div>
+  <div class="modal-footer">
+    
+  
+    <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
+  </div>
+  <div>
+    <script type="text/javascript" src="/static/kernel.js"></script>
+    <script type="text/javascript">
+      $(document).ready(function() {
+  
+      // $("#page_context-<%#=page_context.title.dehumanize%>").on("show", function () {
+      //      $("#page_context-<%#=page_context.title.dehumanize%>").find(".page_context_slideshow").cycle({delay: -1000, fx: "<%#= page_context.ad_fx.nil?? "fade": page_context.ad_fx %>", timeoutFn: getTimeout });
+      // });
+    $(".modal").on("hidden", function () {
+    $("#show_preview").remove();
+      });
+      
+      $("iframe").load(function(){
+          // Get the body element
+          var frameBody = $("iframe").contents().find("body");
+
+          // Get all links inside the BODY tag
+          $('a', frameBody).click(function(e){
+                  //Disable all default actions       
+                  e.preventDefault();
+          });
+          $('input', frameBody).attr("disabled", true);
+      });
+    });
+    </script>
+  </div>
+</div>
+
+
+
+<% end -%>

vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/realtime_preview.js.erb

@@ -0,0 +1,2 @@
+$('#show_preview').html("<%= escape_javascript(render(:partial => 'modal_preview',:locals => {:page_context => @page_context})) %>");
+var start_modal_with_id = "page_context-<%=@page_context.id%>"