Merge branch 'design_team' 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()) {
-        return;
-      }
+      //alert('out!!');
+  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!
-        height : 455,
+        width : 530,  // Your dimensions may differ - toy around with them!
+        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
-    model.filename
-  end
+  # def filename
+  #   model.filename.force_encoding("UTF-8")
+  # 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 ) %>
 		

app/views/admin/assets/create.js.erb

@@ -3,12 +3,13 @@
 // document.domain = 'moxiecode.com';
 
 var tinymce=null,tinyMCEPopup,tinyMCE;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document);if(b.features.popup_css!==false){b.dom.loadCSS(b.features.popup_css||b.editor.settings.popup_css)}b.listeners=[];b.onInit={add:function(e,d){b.listeners.push({func:e,scope:d})}};b.isWindow=!b.getWindowArg("mce_inline");b.id=b.getWindowArg("mce_window_id");b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&&window.dialogArguments)||opener||parent||top},getWindowArg:function(c,b){var a=this.params[c];return tinymce.is(a)?a:b},getParam:function(b,a){return this.editor.getParam(b,a)},getLang:function(b,a){return this.editor.getLang(b,a)},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},10)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(!a.isWindow&&tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}},requireLangPack:function(){var b=this,a=b.getWindowArg("plugin_url")||b.getWindowArg("theme_url");if(a&&b.editor.settings.language&&b.features.translate_i18n!==false&&b.editor.settings.language_load!==false){a+="/langs/"+b.editor.settings.language+"_dlg.js";if(!tinymce.ScriptLoader.isDone(a)){document.write('<script type="text/javascript" src="'+tinymce._addVer(a)+'"><\/script>');tinymce.ScriptLoader.markDone(a)}}},pickColor:function(b,a){this.execCommand("mceColorPicker",true,{color:document.getElementById(a).value,func:function(e){document.getElementById(a).value=e;try{document.getElementById(a).onchange()}catch(d){}}})},openBrowser:function(a,c,b){tinyMCEPopup.restoreSelection();this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,c,window)},confirm:function(b,a,c){this.editor.windowManager.confirm(b,a,c,window)},alert:function(b,a,c){this.editor.windowManager.alert(b,a,c,window)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},_restoreSelection:function(){var a=window.event.srcElement;if(a.nodeName=="INPUT"&&(a.type=="submit"||a.type=="button")){tinyMCEPopup.restoreSelection()}},_onDOMLoaded:function(){var b=tinyMCEPopup,d=document.title,e,c,a;if(b.domLoaded){return}b.domLoaded=1;if(b.features.translate_i18n!==false){c=document.body.innerHTML;if(tinymce.isIE){c=c.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')}document.dir=b.editor.getParam("directionality","");if((a=b.editor.translate(c))&&a!=c){document.body.innerHTML=a}if((a=b.editor.translate(d))&&a!=d){document.title=d=a}}if(!b.editor.getParam("browser_preferred_colors",false)||!b.isWindow){b.dom.addClass(document.body,"forceColors")}document.body.style.display="";if(tinymce.isIE){document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection);b.dom.add(b.dom.select("head")[0],"base",{target:"_self"})}b.restoreSelection();b.resizeToInnerSize();if(!b.isWindow){b.editor.windowManager.setTitle(window,d)}else{window.focus()}if(!tinymce.isIE&&!b.isWindow){tinymce.dom.Event._add(document,"focus",function(){b.editor.windowManager.focus(b.id)})}tinymce.each(b.dom.select("select"),function(f){f.onkeydown=tinyMCEPopup._accessHandler});tinymce.each(b.listeners,function(f){f.func.call(f.scope,b.editor)});if(b.getWindowArg("mce_auto_focus",true)){window.focus();tinymce.each(document.forms,function(g){tinymce.each(g.elements,function(f){if(b.dom.hasClass(f,"mceFocus")&&!f.disabled){f.focus();return false}})})}document.onkeyup=tinyMCEPopup._closeWinKeyHandler},_accessHandler:function(a){a=a||window.event;if(a.keyCode==13||a.keyCode==32){a=a.target||a.srcElement;if(a.onchange){a.onchange()}return tinymce.dom.Event.cancel(a)}},_closeWinKeyHandler:function(a){a=a||window.event;if(a.keyCode==27){tinyMCEPopup.close()}},_wait:function(){if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);tinyMCEPopup._onDOMLoaded()}});if(document.documentElement.doScroll&&window==window.top){(function(){if(tinyMCEPopup.domLoaded){return}try{document.documentElement.doScroll("left")}catch(a){setTimeout(arguments.callee,0);return}tinyMCEPopup._onDOMLoaded()})()}document.attachEvent("onload",tinyMCEPopup._onDOMLoaded)}else{if(docuLine truncated
-
 var returnurl = "<%= @asset.data.url %>";
 var returntitle = "<%= show_all_fields(@asset, 'title') %>";
 var returndescription = "<%= show_all_fields(@asset, 'description') %>";
 var win = tinyMCEPopup.getWindowArg("window");
 win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = returnurl;
+win.document.getElementById(tinyMCEPopup.getWindowArg("alt")).value = returndescription;
+win.document.getElementById(tinyMCEPopup.getWindowArg("title")).value = returntitle;
   if (typeof(win.ImageDialog) != "undefined") {
             // we are, so update image dimensions...
             if (win.ImageDialog.getImageData)