popup fix..

app/assets/javascripts/ajax_form.js

@@ -4,4 +4,13 @@ $(document).on('click', '#ajax_form_submit', function(){
 			o.dataType = 'script';
 		}
 	});
-});
+});
+$(document).ready(function(){
+	var win = parent.OWindow;
+	var thatwindow = win.thiswindow;
+	alert(self.id);
+	$("div.button_bar input[type=submit]").click(function(){
+		thatwindow.document.getElementById(win.input).value = "Soemthing";
+		return false;
+	})
+})

app/assets/javascripts/new_admin.js

@@ -16,4 +16,4 @@
 //= require orbit-bar-search
 //= require side_bar_history
 //= require rss
-//= require ajax_form
+//= require ajax_form

app/assets/javascripts/tinymce_orbit.js.erb

@@ -0,0 +1,93 @@
+var OWindow = {};
+function load_tinymce() {
+  $('.tinymce_textarea').tinymce({
+
+    // General options
+    theme: 'advanced',
+    file_browser_callback : 'myFileBrowser',
+    plugins : "autolink,lists,pagebreak,style,layer,table,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",
+
+    // Theme options
+    theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsizeselect",
+    theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,bullist,numlist,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,forecolor,backcolor",
+    theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,fullscreen",
+    theme_advanced_toolbar_location : "top",
+    theme_advanced_toolbar_align : "left",
+    theme_advanced_statusbar_location : "bottom",
+    theme_advanced_resizing : true,
+
+    // Skin options
+    skin : "o2k7",
+    skin_variant : "silver",
+
+    // Drop lists for link/image/media/template dialogs
+    template_external_list_url : "js/template_list.js",
+    // external_link_list_url : "js/link_list.js",
+    // external_image_list_url : "js/image_list.js",
+    // media_external_list_url : "js/media_list.js"
+
+    // Style formats
+    style_formats : [
+      {title : 'Bold text', inline : 'b'},
+      {title : 'Red text', inline : 'span', styles : {color : '#ff0000'}},
+      {title : 'Red header', block : 'h1', styles : {color : '#ff0000'}},
+      {title : 'Example 1', inline : 'span', classes : 'example1'},
+      {title : 'Example 2', inline : 'span', classes : 'example2'},
+      {title : 'Table styles'},
+      {title : 'Table row 1', selector : 'tr', classes : 'tablerow1'}
+    ],
+
+    // Replace values for the template plugin
+    template_replace_values : {
+      username : "Some User",
+      staffid : "991234"
+    }
+  });
+}
+function myFileBrowser(field_name, url, type, win) {
+    var cmsURL = window.location.toString();
+      cmsURL = cmsURL.split("/");
+      cmsURL = "<%= Rails.application.routes.url_helpers.new_admin_asset_path %>"; 
+      console.log(cmsURL);
+      // script URL - use an absolute path!
+    if (cmsURL.indexOf("?") < 0) {
+        //add the type as the only query parameter
+        cmsURL = cmsURL + "?type=" + type;
+    }
+    else {
+        //add the type as an additional query parameter
+        // (PHP session ID is now included if there is one at all)
+        cmsURL = cmsURL + "&type=" + type;
+    }
+    OWindow = {
+      thiswindow : win,
+      input : field_name
+    }
+
+    tinyMCE.activeEditor.windowManager.open({
+        file : cmsURL,
+        title : 'File Browser',
+        width : 850,  // Your dimensions may differ - toy around with them!
+        height : 455,
+        resizable : "no",
+        inline : "no",  // This parameter only has an effect if you use the inlinepopups plugin!
+        close_previous : "no"
+    }, {
+        window : win,
+        input : field_name
+    });
+    return false;
+  }
+  function ajaxSave() {
+    var ed = tinyMCE.get('content');
+    // Do you ajax call here, window.setTimeout fakes ajax call
+    ed.setProgressState(1); // Show progress
+    window.setTimeout(function() {
+      ed.setProgressState(0); // Hide progress
+      alert(ed.getContent());
+    }, 3000);
+  }
+
+$(document).ready(function() {
+  load_tinymce();
+});

app/controllers/admin/assets_controller.rb

@@ -30,7 +30,7 @@ class Admin::AssetsController < OrbitBackendController
     @asset = Asset.new(params[:asset])
     if @asset.save
       respond_to do |format|
-        format.html { redirect_to admin_assets_url }
+        format.html { render :text => @asset.data.url }
         format.js { render 'js/remove_pop_up_and_reload_content', :locals => {:function => 'append', :id => 'tbody_assets', :value => @asset, :values => nil, :partial => 'admin/assets/asset', :locals => nil} }
       end
     else

app/views/admin/assets/new.html.erb

@@ -1,6 +1,6 @@
 <% content_for :secondary do %>
 <div class="assets_setup">
-  <ul class="list">
+  <ul class="list"> 
 	<li><%= link_to t(:new_asset, :scope => :admin), new_admin_asset_path, :remote => true, :class => 'button positive' %></li>
   </ul>
 </div>