Merge commit 'refs/merge-requests/33' of git://gitorious.org/noosfero/noosfero i…

…nto merge-requests/33 (ActionItem2059)

Merge commit 'refs/merge-requests/33' of git://gitorious.org/noosfero/noosfero i…
…nto merge-requests/33 (ActionItem2059)
Daniela Feitosa
2 parents 7214021c 04e23d80
Showing 17 changed files with 312 additions and 485 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/views/cms/_document_link.rhtml
app/views/cms/_drag_and_drop_note.rhtml
app/views/cms/_image_thumb.rhtml
app/views/cms/_media_listing.rhtml
app/views/cms/_select_folder.rhtml
app/views/cms/_text_editor_sidebar.rhtml
app/views/cms/_textile_article.rhtml
app/views/cms/_textile_quick_reference.rhtml
app/views/cms/_upload_file_form.rhtml
app/views/cms/edit.rhtml
app/views/cms/media_listing.rhtml
lib/delayed_attachment_fu.rb
public/javascripts/article.js
public/stylesheets/application.css
public/stylesheets/media_listing.css
test/functional/cms_controller_test.rb
@@ -177,8 +177,7 @@ class CmsController &lt; MyProfileController
     @article = @parent = check_parent(params[:parent_id])
     @target = @parent ? ('/%s/%s' % [profile.identifier, @parent.full_name]) : '/%s' % profile.identifier
     @folders = Folder.find(:all, :conditions => { :profile_id => profile })
-    @media_listing = params[:media_listing]
-    if @article && !@media_listing
+    if @article
       record_coming
     end
     if request.post? && params[:uploaded_files]
@@ -187,26 +186,14 @@ class CmsController &lt; MyProfileController
       end
       @errors = @uploaded_files.select { |f| f.errors.any? }
       if @errors.any?
-        if @media_listing
-          flash[:notice] = _('Could not upload all files')
-          redirect_to :action => 'media_listing'
-        else
-          render :action => 'upload_files', :parent_id => @parent_id
-        end
+        render :action => 'upload_files', :parent_id => @parent_id
       else
-        if @media_listing
-          flash[:notice] = _('All files were uploaded successfully')
-          redirect_to :action => 'media_listing'
+        if @back_to
+          redirect_to @back_to
+        elsif @parent
+          redirect_to :action => 'view', :id => @parent.id
         else
-          if @back_to
-            redirect_to @back_to
-          else
-            redirect_to( if @parent
-              {:action => 'view', :id => @parent.id}
-            else
-              {:action => 'index'}
-            end)
-          end
+          redirect_to :action => 'index'
         end
       end
     end
@@ -302,37 +289,21 @@ class CmsController &lt; MyProfileController
     end
   end
-  def media_listing
-    if params[:image_folder_id]
-      folder = profile.articles.find(params[:image_folder_id]) if !params[:image_folder_id].blank?
-      @images = (folder ? folder.children : profile.top_level_articles).images
-    elsif params[:document_folder_id]
-      folder = profile.articles.find(params[:document_folder_id]) if !params[:document_folder_id].blank?
-      @documents = (folder ? folder.children : profile.top_level_articles)
-    else
-      @documents = profile.articles
-      @images = @documents.images
-      @documents -= @images
-    end
-
-    @images = @images.paginate(:per_page => per_page, :page => params[:ipage], :order => "updated_at desc") if @images
-    @documents = @documents.paginate(:per_page => per_page, :page => params[:dpage], :order => "updated_at desc", :conditions => {:is_image => false}) if @documents
-
-    @folders = profile.folders
-    @image_folders = @folders.select {|f| f.children.any? {|c| c.image?} }
-    @document_folders = @folders.select {|f| f.children.any? {|c| !c.image? && c.kind_of?(UploadedFile) } }
-
-    @media_listing = true
-
-    respond_to do |format|
-      format.html { render :layout => false}
-      format.js {
-        render :update do |page|
-          page.replace_html 'media-listing-folder-images', :partial => 'image_thumb', :locals => {:images => @images } if !@images.blank?
-          page.replace_html 'media-listing-folder-documents', :partial => 'document_link', :locals => {:documents => @documents } if !@documents.blank?
-        end
-      }
+  def search
+    query = params[:q]
+    results = query.blank? ? [] : profile.articles.published.find_by_contents(query)
+    render :text => article_list_to_json(results), :content_type => 'application/json'
+  end
+  def media_upload
+    files_uploaded = []
+    parent = check_parent(params[:parent_id])
+    files = [:file1,:file2, :file3].map { |f| params[f] }.compact
+    if request.post?
+      files.each do |file|
+        files_uploaded << UploadedFile.create(:uploaded_data => file, :profile => profile, :parent => parent) unless file == ''
+      end
     end
+    render :text => article_list_to_json(files_uploaded), :content_type => 'text/plain'
   end
   protected
@@ -366,7 +337,7 @@ class CmsController &lt; MyProfileController
   end
   def refuse_blocks
-    if ['TinyMceArticle', 'Event', 'EnterpriseHomepage'].include?(@type)
+    if ['TinyMceArticle', 'TextileArticle', 'Event', 'EnterpriseHomepage'].include?(@type)
       @no_design_blocks = true
     end
   end
@@ -380,5 +351,17 @@ class CmsController &lt; MyProfileController
     @selected_locale = @article.language || FastGettext.locale
   end
+  def article_list_to_json(list)
+    list.map do |item|
+      {
+        'title' => item.title,
+        'url' => item.image? ? item.public_filename(:uploaded) : url_for(item.url),
+        :icon => icon_for_article(item),
+        :content_type => item.mime_type,
+        :error => item.errors.any? ? _('%s could not be uploaded') % item.title : nil,
+      }
+    end.to_json
+  end
+
 end
@@ -1,10 +0,0 @@
-<div id='media-listing-folder-documents' >
-  <ul>
-    <% documents.each do |document| %>
-      <li><%= link_to(document.name, document.view_url, :class => icon_for_article(document)) %></li>
-    <% end %>
-  </ul>
-  <div id='pagination-documents'>
-    <%= pagination_links documents, :param_name => 'dpage', :params => {:document_folder_id => params[:document_folder_id]} %>
-  </div>
-</div>
@@ -0,0 +1,4 @@
+<p>
+<em><%= _('Drag images to add them to the text.') unless @article.is_a?(TextileArticle) %>
+<%= _('Drag item names to the text to add links.') %></em>
+</p>
@@ -1,10 +0,0 @@
-<div id='media-listing-folder-images' >
-  <ul>
-    <% images.each do |image| %>
-      <li><%= image_tag image.public_filename %></li>
-    <% end %>
-  </ul>
-  <div id='pagination-images'>
-    <%= pagination_links images, :param_name => 'ipage', :params => {:image_folder_id => params[:image_folder_id]} %>
-  </div>
-</div>
@@ -1,3 +0,0 @@
-<iframe id='media-listing-iframe' src="<%= url_for(:controller => 'cms', :action => 'media_listing', :profile => profile.identifier, :type => @type) %>">
-  <p><%= _('Your browser does not support iframes.') %></p>
-</iframe>
@@ -1 +0,0 @@
-<%= select('folder', 'folder_id', @image_folders.collect {|f| [ f.name, f.id ] }, {:include_blank => "#{profile.identifier}"}, :onchange => remote_function(:update => 'media-listing-folder-images', :with => "'folder_id=' + value", :url => { :action => :get_images }) ) %>
@@ -0,0 +1,44 @@
+<div class='text-editor-sidebar'>
+  <%= render(:partial => 'textile_quick_reference') if @article.is_a?(TextileArticle) %>
+  <div class='text-editor-sidebar-box' id='media-upload-box'>
+    <p><strong><%= _('Media upload') %></strong></p>
+    <div id='media-upload-form'>
+      <% form_tag({ :action => 'media_upload' }, :multipart => true) do %>
+        <div class='formfield'>
+          <%# TODO duplicated from partial upload_file_form %>
+          <%= labelled_form_field(_('Choose folder to upload files:'), select_tag('parent_id', options_for_select([[profile.identifier, '']] + profile.folders.collect {|f| [ profile.identifier + '/' +  f.full_name, f.id ] }))) %>
+        </div>
+        <p><%= file_field_tag('file1') %></p>
+        <p><%= file_field_tag('file2') %></p>
+        <p><%= file_field_tag('file3') %></p>
+        <% button_bar do %>
+          <%= submit_button(:save, _('Upload')) %>
+        <% end %>
+      <% end %>
+    </div>
+    <div id='media-upload-results' style='display: none'>
+      <%= render :partial => 'drag_and_drop_note' %>
+      <div class='items'>
+      </div>
+      <p><%= link_to(_('Upload more files ...'), '#', :id => 'media-upload-more-files')%></p>
+    </div>
+  </div>
+  <div id='media-search-box' class='text-editor-sidebar-box'>
+    <p><strong><%= _('Media search') %></strong></p>
+    <p>
+    <% form_tag({ :action => 'search' }) do %>
+      <span class='formfield'>
+        <input name='q' type='text' id='media-search-query' style='width: 250px;'/>
+      </span>
+      <%= submit_button :search, _('Search'), :id => 'media-search-button' %>
+    <% end %>
+    </p>
+    <div id='media-search-results' style='display: none'>
+      <%= render :partial => 'drag_and_drop_note' %>
+      <div class='items'>
+      </div>
+    </div>
+  </div>
+</div>
+
+
@@ -2,7 +2,7 @@
 <%# TODO add Textile help here %>
-<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64')) %>
+<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '72')) %>
 <%= render :partial => 'translatable' %>
 <%= render :partial => 'shared/lead_and_body' %>
@@ -0,0 +1,28 @@
+<div class='text-editor-sidebar-box'>
+  <p>
+  <strong><%= _('Textile markup quick reference') %></strong>
+  <%= link_to(_('(show)'), '#', :id => 'textile-quickref-show') %>
+  <%= link_to(_('(hide)'), '#', :id => 'textile-quickref-hide', :style => 'display: none') %>
+  </p>
+  <div id='textile-quickref' style='display: none;'>
+    <p><%= _('Simple formatting:') %> <code>_<%= _('italics') %>_</code> <code>*<%= _('bold') %>*</code>, <code>-<%= _('striked')%>-</code>.</p>
+    <p><%= _('Links:') %> <code>"Noosfero":http://noosfero.org/</code></p>
+    <p><%= _('Images:') %> <code>!http://example.com/image.png!</code></p>
+    <p><%= _('Bullet lists:') %></p>
+    <pre>* <%= _('first item') %>
+* <%= _('second item') %></pre>
+    <p><%= _('Numbered lists:') %></p>
+    <pre># <%= _('first item') %>
+# <%= _('second item') %></pre>
+    <p><%= h(_('For code, use HTML tags <pre> and <code>, and indent the code inside them:')) %>
+    <pre>
+&lt;pre&gt;
+&lt;code&gt;
+  a.gsub!( /&lt;/, '' )
+&lt;/code&gt;
+&lt;/pre&gt;
+</pre>
+    <p><%= _('See also a more complete <a href="%s">Textile Reference</a>.') % 'http://redcloth.org/hobix.com/textile/' %></p>
+  </div>
+</div>
+
 <% if @parent %>
   <%= hidden_field_tag('parent_id', @parent.id) %>
 <% else %>
-  <h4><%= _('Choose folder to upload files:') %></h4>
-  <%= select_tag('parent_id', options_for_select([[profile.identifier, '']] + @folders.collect {|f| [ profile.identifier + '/' +  f.full_name, f.id ] })) %>
+  <%= labelled_form_field(_('Choose folder to upload files:'), select_tag('parent_id', options_for_select([[profile.identifier, '']] + @folders.collect {|f| [ profile.identifier + '/' +  f.full_name, f.id ] }))) %>
 <% end %>
 <div id='uploaded_files'>
@@ -15,9 +14,7 @@
 <% button_bar do %>
   <%= add_upload_file_field(_('More files'), {:size => size}) %>
-  <% if @media_listing %>
-    <%= submit_button :save, _('Upload') %>
-  <% elsif @back_to %>
+  <% if @back_to %>
     <%= submit_button :save, _('Upload'), :cancel => @back_to %>
   <% else %>
     <%= submit_button :save, _('Upload'), :cancel => {:action => (@parent ? 'view' : 'index'), :id => @parent } %>
@@ -49,8 +49,8 @@
 <% end %>
 </div>
-<% if environment.enabled?('media_panel') && [TinyMceArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
-  <%= render :partial => 'media_listing' %>
+<% if environment.enabled?('media_panel') && [TinyMceArticle, TextileArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
+  <%= render :partial => 'text_editor_sidebar' %>
 <% end %>
 <br style='clear: both'/>
@@ -1,75 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <%= stylesheet_link_tag 'application', 'media_listing', :cache => 'cache-media-listing' %>
-  <%= stylesheet_import 'button', :themed_source => true %>
-  <%= javascript_include_tag :defaults %>
-  <%= javascript_include_tag 'lowpro' %>
-  <%= stylesheet_link_tag icon_theme_stylesheet_path %>
-</head>
-<body class='noosfero'>
-  <script type="text/javascript">
-    /* Adds a class to "msie" to the body element if a Microsoft browser is
-     * detected. This is needed to workaround several of their limitations.
-     */
-    if ( navigator.appVersion.indexOf("MSIE") > -1 ) {
-      document.body.className += " msie msie" +
-        navigator.appVersion.replace(/^.*MSIE\s+([0-9]+).*$/, "$1");
-    }
-    function registerDocumentSize() {
-      document.body.className = document.body.className.replace(/(^| )docSize.+( |$)/g, " ");
-      for ( var x=100; x<=1500; x+=100 ) {
-        if ( document.body.clientWidth > x ) {
-          document.body.className += " docSize-GT-" + x;
-        } else {
-          document.body.className += " docSize-LT-" + x;
-        }
-      }
-    }
-    registerDocumentSize();
-  </script>
-  <div id='media-listing-upload'>
-    <p><%= _("Include files in some folder or select from the list below to add images and documents to the text editor beside (max size %s)") % UploadedFile.max_size.to_humanreadable %></p>
-
-    <div id="notice" onclick="Element.hide('notice');" style="display:none">
-      <% unless flash[:notice].nil? %>
-        <%= flash[:notice] %>
-        <%= javascript_tag(visual_effect( :appear, 'notice')) %>
-      <% end %>
-    </div>
-
-    <% form_for('uploaded_file', :url => {:action => 'upload_files'}, :html => {:multipart => true}) do |f| %>
-      <%= hidden_field_tag('media_listing', @media_listing) %>
-      <%= render :partial => 'upload_file_form', :locals => { :size => '30' } %>
-    <% end %>
-  </div><!-- id='media-listing-upload' -->
-  <hr/>
-
-  <script type='text/javascript'>
-    document.observe("dom:loaded", function() {
-      Event.addBehavior.reassignAfterAjax = true;
-      Event.addBehavior({
-        'div#pagination-images .pagination a' : Remote.Link,
-        'div#pagination-documents .pagination a' : Remote.Link
-      })
-    });
-  </script>
-
-  <div id='media-listing'>
-    <h3><%= _('Folders') %></h3>
-    <p><%= _('Drag images and documents to add them to the text. If needed, resize images by clicking the tree icon on editor.') %></p>
-
-    <div id='media-listing-images'>
-      <h4><%= _('Images') %></h4>
-      <%= select_folder('', 'folder', 'image_folder_id', @image_folders, {}, :onchange => remote_function(:with => "'image_folder_id=' + value + '&ipage=1'", :url => { :action => :media_listing, :format => 'js' }) ) %>
-      <%= render :partial => 'image_thumb', :locals => { :images => @images } %>
-    </div><!-- id='media-listing-images' -->
-    <div id='media-listing-documents'>
-      <h4><%= _('Documents') %></h4>
-      <%= select_folder('', 'folder', 'document_folder_id', @document_folders, {}, :onchange => remote_function(:with => "'document_folder_id=' + value + '&dpage=1'", :url => { :action => :media_listing }) ) %>
-      <%= render :partial => 'document_link', :locals => { :documents => @documents } %>
-    </div><!-- id='media-listing-documents' -->
-    <br style="clear:both" />
-  </div><!-- id='media-listing' -->
-</body>
-</html>
@@ -38,7 +38,11 @@ module DelayedAttachmentFu
     end
     def public_filename(size=nil)
-      if !self.thumbnailable? || self.thumbnails_processed
+      force = (size == :uploaded)
+      if force
+        size = nil
+      end
+      if !self.thumbnailable? || self.thumbnails_processed || force
         super(size)
       else
         size ||= 'thumb'
-(function($) {
+jQuery(function($) {
   $(".lead-button").live('click', function(){
     article_id = this.getAttribute("article_id");
     $(this).toggleClass('icon-add').toggleClass('icon-remove');
@@ -10,4 +10,67 @@
     $('#article-body-field').slideToggle();
     return false;
   })
-})(jQuery)
+
+  $("#textile-quickref-show").click(function(){
+    $('#textile-quickref-hide').show();
+    $(this).hide();
+    $('#textile-quickref').slideToggle();
+    return false;
+  })
+  $("#textile-quickref-hide").click(function(){
+    $('#textile-quickref-show').show();
+    $(this).hide();
+    $('#textile-quickref').slideToggle();
+    return false;
+  })
+  function insert_items(items, selector) {
+    var html_for_items = '';
+    $.each(items, function(i, item) {
+      if (item.error) {
+        html_for_items += '<div class="media-upload-error">' + item.error + '</div>';
+        return;
+      }
+      if (item.content_type && item.content_type.match(/^image/)) {
+        html_for_items += '<div class="icon-photos"><img src="' + item.url + '"/><br/><a href="' + item.url + '">' + item.title + '</a></div>';
+      } else {
+        html_for_items += '<div class="' + item.icon + '"><a href="' + item.url + '">' + item.title + '</a></div>';
+      }
+    });
+    $(selector).html(html_for_items);
+  }
+  $('#media-search-button').click(function() {
+    var query = '*' + $('#media-search-query').val() + '*';
+    var $button = $(this);
+    $('#media-search-box').toggleClass('icon-loading');
+    $.get($(this).parent().attr('action'), { 'q': query }, function(data) {
+      insert_items(data, '#media-search-results .items');
+      if (data.length && data.length > 0) {
+        $('#media-search-results').slideDown();
+      }
+    $('#media-search-box').toggleClass('icon-loading');
+    });
+    return false;
+  });
+  $('#media-upload-form form').ajaxForm({
+    dataType: 'json',
+    resetForm: true,
+    beforeSubmit:
+      function() {
+        $('#media-upload-form').slideUp();
+        $('#media-upload-box').toggleClass('icon-loading');
+      },
+    success:
+      function(data) {
+        insert_items(data, '#media-upload-results .items');
+        if (data.length && data.length > 0) {
+          $('#media-upload-results').slideDown();
+        }
+        $('#media-upload-box').toggleClass('icon-loading');
+      }
+  });
+  $('#media-upload-more-files').click(function() {
+    $('#media-upload-results').hide();
+    $('#media-upload-form').show();
+  });
+
+});
@@ -2768,6 +2768,7 @@ div#activation_enterprise div {
   border-top: none;
   border-left: none;
   color: #585858;
+  font-size: 11px;
 }
 .formfield input {
   text-indent: 5px;
@@ -3343,21 +3344,7 @@ table.cms-articles .icon:hover {
   display: block;
 }
-/* Media listing */
-
-.controller-cms #media-listing-iframe {
-  float: right;
-  width: 380px;
-  height: 630px;
-  border: none;
-  margin-top: 104px;
-  padding: 0px;
-  overflow: hidden;
-}
-
-.controller-cms .msie #media-listing-iframe {
-  height: 610px;
-}
+/* Text editors sidebar */
 .controller-cms div.with_media_panel {
   float: left;
@@ -3368,6 +3355,64 @@ div.with_media_panel .formfield input {
   width: 100%;
 }
+.text-editor-sidebar {
+  position: absolute;
+  width: 380px;
+  right: 20px;
+  top: 70px;
+}
+
+.text-editor-sidebar-box  {
+  background: #eeeeec;
+  border: 1px solid #d3d7cf;
+  padding: 10px 10px 0px 10px;
+  margin-bottom: 10px;
+}
+.text-editor-sidebar-box p {
+  margin-top: 0px;
+}
+.text-editor-sidebar code,
+.text-editor-sidebar pre {
+  border: 1px solid #d3d7cf;
+  color: black;
+  padding: 2px;
+}
+.text-editor-sidebar .icon-loading {
+  background-image: url(../images/loading-small.gif);
+}
+.text-editor-sidebar .items {
+  margin-bottom: 10px;
+}
+.text-editor-sidebar .items div {
+  background-repeat: no-repeat;
+  background-position: 0px 0px;
+  padding-left: 20px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  border: none;
+  margin-bottom: 2px;
+}
+.text-editor-sidebar .items :hover {
+  background-color: transparent;
+  border: none;
+}
+.text-editor-sidebar #media-upload-box,
+.text-editor-sidebar #media-search-box {
+  background-repeat: no-repeat;
+  background-position: 98% 10px;
+}
+.text-editor-sidebar img {
+ max-height: 96px;
+ max-width: 96px;
+ border: 1px solid #d3d7cf;
+}
+.text-editor-sidebar .media-upload-error {
+  color: red;
+}
+.text-editor-sidebar select {
+  max-width: 355px;
+}
+
 /* ==> public/stylesheets/controller_contact.css <== */
 /*** SELECT CITY ***/
@@ -1,167 +0,0 @@
-body {
-  padding: 0px;
-  margin: 0px;
-  font-family: Verdana, sans-serif;
-  font-size: 14px;
-  color: #444;
-  background-color: #F0F0EE;
-  overflow: hidden;
-}
-
-h3, h4, h5 {
-  margin: 5px 0px;
-}
-
-h3 {
-  font-size: 18px;
-}
-
-h4 {
-  font-size: 16px;
-}
-
-#media-listing {
-  width: 100%;
-  height: 48%;
-  margin: 0px;
-  padding: 0px;
-  padding-bottom: 5px;
-}
-
-#media-listing-upload p,
-#media-listing p {
-  font-size: 13px;
-  font-weight: bold;
-  margin: 5px 5px;
-}
-
-#media-listing li {
-  list-style: none;
-  margin: 0px;
-}
-
-#media-listing li:hover {
-  background-color: #CCC;
-}
-
-#media-listing a {
-  text-decoration: none;
-}
-
-#media-listing select {
-  width: 80%;
-}
-
-#media-listing-images {
-  width: 46%;
-  float: left;
-  text-align: center;
-}
-
-#media-listing-images img {
-  max-width: 80px;
-  max-height: 60px;
-}
-
-.msie6 #media-listing-images img,
-.msie7 #media-listing-images img {
-  width: 80px;
-  height: 60px;
-}
-
-#media-listing-folder-images,
-#media-listing-folder-documents {
-  height: 80%;
-}
-
-#media-listing ul {
-  padding: 0px;
-  margin: 5px;
-  height: 40%;
-  overflow: auto;
-  width: 98%;
-}
-
-#media-listing ul {
-  height: 85%;
-}
-
-#media-listing-images,
-#media-listing-documents {
-  height: 55%;
-}
-
-#media-listing-documents ul {
-  text-align: left;
-}
-
-#media-listing-documents {
-  width: 52%;
-  float: left;
-  text-align: center;
-}
-
-#media-listing-documents li {
-  padding-bottom: 5px;
-}
-
-#media-listing-folder-documents a.icon {
-  background-repeat: no-repeat;
-  padding-left: 20px;
-  border: none;
-}
-
-#media-listing-folder-documents .icon:hover {
-  background-color: transparent;
-}
-
-#media-listing .icon-rss-feed {
-  background-image: url(../images/icons-mime/rss-feed-16.png);
-}
-
-#media-listing-upload {
-  width: 98%;
-  padding: 3px;
-}
-
-#media-listing-upload p {
-  margin: 5px 0px;
-}
-
-#media-listing-upload select {
-  width: 90%;
-}
-
-#uploaded_files {
-  overflow-x: hidden;
-  overflow-y: scroll;
-  height: 100px;
-  margin-top: 5px;
-}
-
-.msie #uploaded_files {
-  height: 100px;
-  padding: 0px;
-}
-
-.formlabel {
-  font-size: 11px;
-  display: block;
-}
-
-/* Notice */
-
-div#notice {
-  background: #fee;
-  border: 1px solid #933;
-  top: 150px;
-  color: black;
-  cursor: pointer;
-  font-weight: bold;
-  left: 50%;
-  margin-left: -150px;
-  padding: 5px;
-  position: absolute;
-  text-align: center;
-  width: 300px;
-}
@@ -1064,7 +1064,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'input', :attributes => { :name => 'article[external_feed_builder][only_once]', :checked => 'checked', :value => 'true' }
   end
-  should 'display iframe for media listing when it is TinyMceArticle and enabled on environment' do
+  should 'display media listing when it is TinyMceArticle and enabled on environment' do
     e = Environment.default
     e.enable('media_panel')
     e.save!
@@ -1076,10 +1076,10 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     file = UploadedFile.create!(:profile => profile, :parent => non_image_folder, :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
     get :new, :profile => profile.identifier, :type => 'TinyMceArticle'
-    assert_tag :tag => 'iframe', :attributes => { :src => "/myprofile/#{profile.identifier}/cms/media_listing?type=TinyMceArticle" }
+    assert_tag :div, :attributes => { :class => "text-editor-sidebar" }
   end
-  should 'not display iframe for media listing when it is Folder' do
+  should 'not display media listing when it is Folder' do
     image_folder = Folder.create(:profile => profile, :name => 'Image folder')
     non_image_folder = Folder.create(:profile => profile, :name => 'Non image folder')
@@ -1087,145 +1087,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     file = UploadedFile.create!(:profile => profile, :parent => non_image_folder, :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
     get :new, :profile => profile.identifier, :type => 'Folder'
-    assert_no_tag :tag => 'iframe', :attributes => { :src => "/myprofile/#{profile.identifier}/cms/media_listing" }
-  end
-
-  should 'display list of images' do
-    file = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
-    process_delayed_job_queue
-    get :media_listing, :profile => profile.identifier
-
-    assert_tag :tag => 'div', :attributes => { :id => 'media-listing-images' }, :descendant => { :tag => 'img', :attributes => {:src => /rails.png/}}
-  end
-
-  should 'display loading image if not processed yet' do
-    file = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
-    get :media_listing, :profile => profile.identifier
-
-    assert_tag :tag => 'div', :attributes => { :id => 'media-listing-images' }, :descendant => { :tag => 'img', :attributes => {:src => /image-loading-thumb.png/}}
-  end
-
-
-  should 'display list of documents' do
-    file = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
-    get :media_listing, :profile => profile.identifier
-    assert_tag :tag => 'div', :attributes => { :id => 'media-listing-documents' }, :descendant => { :tag => 'a', :attributes => {:href => /#{file.name}/}}
-  end
-
-  should 'list image folders to select' do
-    image_folder = Folder.create(:profile => profile, :name => 'Image folder')
-    non_image_folder = Folder.create(:profile => profile, :name => 'Non image folder')
-
-    image = UploadedFile.create!(:profile => profile, :parent => image_folder, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
-    file = UploadedFile.create!(:profile => profile, :parent => non_image_folder, :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
-
-    get :media_listing, :profile => profile.identifier
-    assert_tag :tag => 'div', :attributes => { :id => 'media-listing-images' }, :descendant => { :tag => 'option', :content => /#{image_folder.name}/, :attributes => { :value => image_folder.id}}
-    assert_no_tag :tag => 'div', :attributes => { :id => 'media-listing-images' }, :descendant => { :tag => 'option', :content => /#{non_image_folder.name}/, :attributes => { :value => non_image_folder.id}}
-  end
-
-  should 'list documents folders to select' do
-    image_folder = Folder.create(:profile => profile, :name => 'Image folder')
-    non_image_folder = Folder.create(:profile => profile, :name => 'Non image folder')
-
-    image = UploadedFile.create!(:profile => profile, :parent => image_folder, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
-    file = UploadedFile.create!(:profile => profile, :parent => non_image_folder, :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
-
-    get :media_listing, :profile => profile.identifier
-    assert_no_tag :tag => 'div', :attributes => { :id => 'media-listing-documents' }, :descendant => { :tag => 'option', :content => /#{image_folder.name}/, :attributes => { :value => image_folder.id}}
-    assert_tag :tag => 'div', :attributes => { :id => 'media-listing-documents' }, :descendant => { :tag => 'option', :content => /#{non_image_folder.name}/, :attributes => { :value => non_image_folder.id}}
-  end
-
-  should 'get a list of images from a image folder' do
-    folder = Folder.create(:profile => profile, :name => 'Image folder')
-    other_folder = Folder.create(:profile => profile, :name => 'Non image folder')
-    image = UploadedFile.create!(:profile => profile, :parent => folder, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
-    file_in_folder = UploadedFile.create!(:profile => profile, :parent => folder, :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
-    image_in_other_folder = UploadedFile.create!(:profile => profile, :parent => other_folder, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
-
-    get :media_listing, :profile => profile.identifier, :image_folder_id => folder.id, :format => 'js'
-
-    assert_includes assigns(:images), image
-    assert_not_includes assigns(:images), file_in_folder
-    assert_not_includes assigns(:images), image_in_other_folder
-  end
-
-  should 'get a list of images from profile' do
-    image = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
-    folder = Folder.create(:profile => profile, :name => 'Image folder')
-    image_in_folder = UploadedFile.create!(:profile => profile, :parent => folder, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
-    get :media_listing, :profile => profile.identifier, :image_folder_id => '', :format => 'js'
-
-    assert_includes assigns(:images), image
-    assert_not_includes assigns(:images), image_in_folder
-  end
-
-  should 'get a list of documents from a document folder' do
-    folder = Folder.create(:profile => profile, :name => 'Non images folder')
-    other_folder = Folder.create(:profile => profile, :name => 'Image folder')
-    file = UploadedFile.create!(:profile => profile, :parent => folder, :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
-    image = UploadedFile.create!(:profile => profile, :parent => folder, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
-    file_in_other_folder = UploadedFile.create!(:profile => profile, :parent => other_folder, :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
-
-    get :media_listing, :profile => profile.identifier, :document_folder_id => folder.id, :format => 'js'
-
-    assert_includes assigns(:documents), file
-    assert_not_includes assigns(:documents), image
-    assert_not_includes assigns(:documents), file_in_other_folder
-  end
-
-  should 'get a list of documents from profile' do
-    file = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
-    folder = Folder.create(:profile => profile, :name => 'Image folder')
-    file_in_folder = UploadedFile.create!(:profile => profile, :parent => folder, :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
-
-    get :media_listing, :profile => profile.identifier, :document_folder_id => '', :format => 'js'
-
-    assert_includes assigns(:documents), file
-    assert_not_includes assigns(:documents), file_in_folder
-  end
-
-  should 'display pagination links of images' do
-    @controller.stubs(:per_page).returns(1)
-
-    image = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('/files/other-pic.jpg', 'image/jpg'))
-    image2 = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :created_at => 1.day.ago)
-    image2.updated_at = 1.day.ago
-    image2.send :update_without_callbacks
-
-    get :media_listing, :profile => profile.identifier
-
-    assert_includes assigns(:images), image
-    assert_not_includes assigns(:images), image2
-  end
-
-  should 'display pagination links of documents' do
-    @controller.stubs(:per_page).returns(1)
-    profile.articles.destroy_all
-    file = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('/files/feed.xml', 'text/xml'))
-    file2 = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
-    file2.created_at = 1.day.ago
-    file2.save!
-
-    get :media_listing, :profile => profile.identifier
-
-    assert_includes assigns(:documents), file
-    assert_not_includes assigns(:documents), file2
-  end
-
-
-  should 'redirect to media listing when upload files from there' do
-    post :upload_files, :profile => profile.identifier, :media_listing => true, :uploaded_files => [fixture_file_upload('files/rails.png', 'image/png')]
-    assert_template nil
-    assert_redirected_to :action => 'media_listing'
-  end
-
-  should 'redirect to media listing when occur errors when upload files from there' do
-    file = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('files/rails.png', 'image/png'))
-
-    post :upload_files, :profile => profile.identifier, :media_listing => true, :uploaded_files => [fixture_file_upload('files/rails.png', 'image/png')]
-    assert_template nil
-    assert_redirected_to :action => 'media_listing'
+    assert_no_tag :div, :attributes => { :id => "text-editor-sidebar" }
   end
   should "display 'Publish' when profile is a person" do
@@ -1618,4 +1480,67 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     end
   end
+  should 'search for content for inclusion in articles' do
+    file = UploadedFile.create!(:profile => @profile, :uploaded_data => fixture_file_upload('files/test.txt', 'text/plain'))
+    get :search, :profile => @profile.identifier, :q => 'test.txt'
+    assert_match /test.txt/, @response.body
+    assert_equal 'application/json', @response.content_type
+
+    data = parse_json_response
+    assert_equal 'test.txt', data.first['title']
+    assert_match /\/testinguser\/test.txt$/, data.first['url']
+    assert_match /text/, data.first['icon']
+    assert_match /text/, data.first['content_type']
+  end
+
+  should 'upload media by AJAX' do
+    post :media_upload, :profile => profile.identifier, :file1 => fixture_file_upload('/files/test.txt', 'text/plain'), :file2 => fixture_file_upload('/files/rails.png', 'image/png'), :file3 => ''
+    assert_match 'test.txt', @response.body
+    assert_equal 'text/plain', @response.content_type
+
+    data = parse_json_response
+
+    assert_equal 'test.txt', data[0]['title']
+    assert_match /\/testinguser\/test.txt$/, data[0]['url']
+    assert_match /text/, data[0]['icon']
+    assert_match /text/, data[0]['content_type']
+    assert_nil data[0]['error']
+
+    assert_equal 'rails.png', data[1]['title']
+    assert_no_match /\/public\/articles\/.*\/rails.png$/, data[1]['url']
+    assert_match /png$/, data[1]['icon']
+    assert_match /image/, data[1]['content_type']
+    assert_nil data[1]['error']
+
+  end
+
+  should 'not when media upload via AJAX contains empty files' do
+    post :media_upload, :profile => @profile.identifier
+  end
+
+  should 'mark unsuccessfull uploads' do
+    file = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('files/rails.png', 'image/png'))
+
+    post :media_upload, :profile => profile.identifier, :media_listing => true, :file1 => fixture_file_upload('files/rails.png', 'image/png'), :file2 => fixture_file_upload('/files/test.txt', 'text/plain')
+
+    assert_equal 'text/plain', @response.content_type
+    data = parse_json_response
+
+    assert_equal 'rails.png', data[0]['title']
+    assert_not_nil data[0]['error']
+    assert_match /rails.png/, data[0]['error']
+
+    assert_equal 'test.txt', data[1]['title']
+    assert_nil data[1]['error']
+  end
+
+  protected
+
+  # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
+  # For now we are assuming that the JSON is close enough to Ruby and just
+  # making some adjustments.
+  def parse_json_response
+    eval(@response.body.gsub('":', '"=>').gsub('null', 'nil'))
+  end
+
 end
	@@ -1,10 +0,0 @@	@@ -1,10 +0,0 @@
1	-<div id='media-listing-folder-documents' >
2	- <ul>
3	- <% documents.each do \|document\| %>
4	- <li><%= link_to(document.name, document.view_url, :class => icon_for_article(document)) %></li>
5	- <% end %>
6	- </ul>
7	- <div id='pagination-documents'>
8	- <%= pagination_links documents, :param_name => 'dpage', :params => {:document_folder_id => params[:document_folder_id]} %>
9	- </div>
10	-</div>
@@ -0,0 +1,4 @@		@@ -0,0 +1,4 @@
	1	+<p>
	2	+<em><%= _('Drag images to add them to the text.') unless @article.is_a?(TextileArticle) %>
	3	+<%= _('Drag item names to the text to add links.') %></em>
	4	+</p>
	@@ -1,10 +0,0 @@	@@ -1,10 +0,0 @@
1	-<div id='media-listing-folder-images' >
2	- <ul>
3	- <% images.each do \|image\| %>
4	- <li><%= image_tag image.public_filename %></li>
5	- <% end %>
6	- </ul>
7	- <div id='pagination-images'>
8	- <%= pagination_links images, :param_name => 'ipage', :params => {:image_folder_id => params[:image_folder_id]} %>
9	- </div>
10	-</div>
	@@ -1,3 +0,0 @@	@@ -1,3 +0,0 @@
1	-<iframe id='media-listing-iframe' src="<%= url_for(:controller => 'cms', :action => 'media_listing', :profile => profile.identifier, :type => @type) %>">
2	- <p><%= _('Your browser does not support iframes.') %></p>
3	-</iframe>
	@@ -1 +0,0 @@		@@ -1 +0,0 @@
1	-<%= select('folder', 'folder_id', @image_folders.collect {\|f\| [ f.name, f.id ] }, {:include_blank => "#{profile.identifier}"}, :onchange => remote_function(:update => 'media-listing-folder-images', :with => "'folder_id=' + value", :url => { :action => :get_images }) ) %>
@@ -0,0 +1,44 @@		@@ -0,0 +1,44 @@
	1	+<div class='text-editor-sidebar'>
	2	+ <%= render(:partial => 'textile_quick_reference') if @article.is_a?(TextileArticle) %>
	3	+ <div class='text-editor-sidebar-box' id='media-upload-box'>
	4	+ <p><strong><%= _('Media upload') %></strong></p>
	5	+ <div id='media-upload-form'>
	6	+ <% form_tag({ :action => 'media_upload' }, :multipart => true) do %>
	7	+ <div class='formfield'>
	8	+ <%# TODO duplicated from partial upload_file_form %>
	9	+ <%= labelled_form_field(_('Choose folder to upload files:'), select_tag('parent_id', options_for_select([[profile.identifier, '']] + profile.folders.collect {\|f\| [ profile.identifier + '/' + f.full_name, f.id ] }))) %>
	10	+ </div>
	11	+ <p><%= file_field_tag('file1') %></p>
	12	+ <p><%= file_field_tag('file2') %></p>
	13	+ <p><%= file_field_tag('file3') %></p>
	14	+ <% button_bar do %>
	15	+ <%= submit_button(:save, _('Upload')) %>
	16	+ <% end %>
	17	+ <% end %>
	18	+ </div>
	19	+ <div id='media-upload-results' style='display: none'>
	20	+ <%= render :partial => 'drag_and_drop_note' %>
	21	+ <div class='items'>
	22	+ </div>
	23	+ <p><%= link_to(_('Upload more files ...'), '#', :id => 'media-upload-more-files')%></p>
	24	+ </div>
	25	+ </div>
	26	+ <div id='media-search-box' class='text-editor-sidebar-box'>
	27	+ <p><strong><%= _('Media search') %></strong></p>
	28	+ <p>
	29	+ <% form_tag({ :action => 'search' }) do %>
	30	+ <span class='formfield'>
	31	+ <input name='q' type='text' id='media-search-query' style='width: 250px;'/>
	32	+ </span>
	33	+ <%= submit_button :search, _('Search'), :id => 'media-search-button' %>
	34	+ <% end %>
	35	+ </p>
	36	+ <div id='media-search-results' style='display: none'>
	37	+ <%= render :partial => 'drag_and_drop_note' %>
	38	+ <div class='items'>
	39	+ </div>
	40	+ </div>
	41	+ </div>
	42	+</div>
	43	+
	44	+
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2		2
3	<%# TODO add Textile help here %>	3	<%# TODO add Textile help here %>
4		4
5	-<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64')) %>	5	+<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '72')) %>
6		6
7	<%= render :partial => 'translatable' %>	7	<%= render :partial => 'translatable' %>
8	<%= render :partial => 'shared/lead_and_body' %>	8	<%= render :partial => 'shared/lead_and_body' %>
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+<div class='text-editor-sidebar-box'>
	2	+ <p>
	3	+ <strong><%= _('Textile markup quick reference') %></strong>
	4	+ <%= link_to(_('(show)'), '#', :id => 'textile-quickref-show') %>
	5	+ <%= link_to(_('(hide)'), '#', :id => 'textile-quickref-hide', :style => 'display: none') %>
	6	+ </p>
	7	+ <div id='textile-quickref' style='display: none;'>
	8	+ <p><%= _('Simple formatting:') %> <code>_<%= _('italics') %>_</code> <code><%= _('bold') %></code>, <code>-<%= _('striked')%>-</code>.</p>
	9	+ <p><%= _('Links:') %> <code>"Noosfero":http://noosfero.org/</code></p>
	10	+ <p><%= _('Images:') %> <code>!http://example.com/image.png!</code></p>
	11	+ <p><%= _('Bullet lists:') %></p>
	12	+ <pre>* <%= _('first item') %>
	13	+* <%= _('second item') %></pre>
	14	+ <p><%= _('Numbered lists:') %></p>
	15	+ <pre># <%= _('first item') %>
	16	+# <%= _('second item') %></pre>
	17	+ <p><%= h(_('For code, use HTML tags <pre> and <code>, and indent the code inside them:')) %>
	18	+ <pre>
	19	+<pre>
	20	+<code>
	21	+ a.gsub!( /</, '' )
	22	+</code>
	23	+</pre>
	24	+</pre>
	25	+ <p><%= _('See also a more complete <a href="%s">Textile Reference</a>.') % 'http://redcloth.org/hobix.com/textile/' %></p>
	26	+ </div>
	27	+</div>
	28	+
	@@ -1,75 +0,0 @@	@@ -1,75 +0,0 @@
1	-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
2	-<head>
3	- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4	- <%= stylesheet_link_tag 'application', 'media_listing', :cache => 'cache-media-listing' %>
5	- <%= stylesheet_import 'button', :themed_source => true %>
6	- <%= javascript_include_tag :defaults %>
7	- <%= javascript_include_tag 'lowpro' %>
8	- <%= stylesheet_link_tag icon_theme_stylesheet_path %>
9	-</head>
10	-<body class='noosfero'>
11	- <script type="text/javascript">
12	- /* Adds a class to "msie" to the body element if a Microsoft browser is
13	- * detected. This is needed to workaround several of their limitations.
14	- */
15	- if ( navigator.appVersion.indexOf("MSIE") > -1 ) {
16	- document.body.className += " msie msie" +
17	- navigator.appVersion.replace(/^.MSIE\s+([0-9]+).$/, "$1");
18	- }
19	- function registerDocumentSize() {
20	- document.body.className = document.body.className.replace(/(^\| )docSize.+( \|$)/g, " ");
21	- for ( var x=100; x<=1500; x+=100 ) {
22	- if ( document.body.clientWidth > x ) {
23	- document.body.className += " docSize-GT-" + x;
24	- } else {
25	- document.body.className += " docSize-LT-" + x;
26	- }
27	- }
28	- }
29	- registerDocumentSize();
30	- </script>
31	- <div id='media-listing-upload'>
32	- <p><%= _("Include files in some folder or select from the list below to add images and documents to the text editor beside (max size %s)") % UploadedFile.max_size.to_humanreadable %></p>
33	-
34	- <div id="notice" onclick="Element.hide('notice');" style="display:none">
35	- <% unless flash[:notice].nil? %>
36	- <%= flash[:notice] %>
37	- <%= javascript_tag(visual_effect( :appear, 'notice')) %>
38	- <% end %>
39	- </div>
40	-
41	- <% form_for('uploaded_file', :url => {:action => 'upload_files'}, :html => {:multipart => true}) do \|f\| %>
42	- <%= hidden_field_tag('media_listing', @media_listing) %>
43	- <%= render :partial => 'upload_file_form', :locals => { :size => '30' } %>
44	- <% end %>
45	- </div><!-- id='media-listing-upload' -->
46	- <hr/>
47	-
48	- <script type='text/javascript'>
49	- document.observe("dom:loaded", function() {
50	- Event.addBehavior.reassignAfterAjax = true;
51	- Event.addBehavior({
52	- 'div#pagination-images .pagination a' : Remote.Link,
53	- 'div#pagination-documents .pagination a' : Remote.Link
54	- })
55	- });
56	- </script>
57	-
58	- <div id='media-listing'>
59	- <h3><%= _('Folders') %></h3>
60	- <p><%= _('Drag images and documents to add them to the text. If needed, resize images by clicking the tree icon on editor.') %></p>
61	-
62	- <div id='media-listing-images'>
63	- <h4><%= _('Images') %></h4>
64	- <%= select_folder('', 'folder', 'image_folder_id', @image_folders, {}, :onchange => remote_function(:with => "'image_folder_id=' + value + '&ipage=1'", :url => { :action => :media_listing, :format => 'js' }) ) %>
65	- <%= render :partial => 'image_thumb', :locals => { :images => @images } %>
66	- </div><!-- id='media-listing-images' -->
67	- <div id='media-listing-documents'>
68	- <h4><%= _('Documents') %></h4>
69	- <%= select_folder('', 'folder', 'document_folder_id', @document_folders, {}, :onchange => remote_function(:with => "'document_folder_id=' + value + '&dpage=1'", :url => { :action => :media_listing }) ) %>
70	- <%= render :partial => 'document_link', :locals => { :documents => @documents } %>
71	- </div><!-- id='media-listing-documents' -->
72	- <br style="clear:both" />
73	- </div><!-- id='media-listing' -->
74	-</body>
75	-</html>
1	-(function($) {	1	+jQuery(function($) {
2	$(".lead-button").live('click', function(){	2	$(".lead-button").live('click', function(){
3	article_id = this.getAttribute("article_id");	3	article_id = this.getAttribute("article_id");
4	$(this).toggleClass('icon-add').toggleClass('icon-remove');	4	$(this).toggleClass('icon-add').toggleClass('icon-remove');
	@@ -10,4 +10,67 @@		@@ -10,4 +10,67 @@
10	$('#article-body-field').slideToggle();	10	$('#article-body-field').slideToggle();
11	return false;	11	return false;
12	})	12	})
13	-})(jQuery)	13	+
		14	+ $("#textile-quickref-show").click(function(){
		15	+ $('#textile-quickref-hide').show();
		16	+ $(this).hide();
		17	+ $('#textile-quickref').slideToggle();
		18	+ return false;
		19	+ })
		20	+ $("#textile-quickref-hide").click(function(){
		21	+ $('#textile-quickref-show').show();
		22	+ $(this).hide();
		23	+ $('#textile-quickref').slideToggle();
		24	+ return false;
		25	+ })
		26	+ function insert_items(items, selector) {
		27	+ var html_for_items = '';
		28	+ $.each(items, function(i, item) {
		29	+ if (item.error) {
		30	+ html_for_items += '<div class="media-upload-error">' + item.error + '</div>';
		31	+ return;
		32	+ }
		33	+ if (item.content_type && item.content_type.match(/^image/)) {
		34	+ html_for_items += '<div class="icon-photos"><img src="' + item.url + '"/><br/><a href="' + item.url + '">' + item.title + '</a></div>';
		35	+ } else {
		36	+ html_for_items += '<div class="' + item.icon + '"><a href="' + item.url + '">' + item.title + '</a></div>';
		37	+ }
		38	+ });
		39	+ $(selector).html(html_for_items);
		40	+ }
		41	+ $('#media-search-button').click(function() {
		42	+ var query = '' + $('#media-search-query').val() + '';
		43	+ var $button = $(this);
		44	+ $('#media-search-box').toggleClass('icon-loading');
		45	+ $.get($(this).parent().attr('action'), { 'q': query }, function(data) {
		46	+ insert_items(data, '#media-search-results .items');
		47	+ if (data.length && data.length > 0) {
		48	+ $('#media-search-results').slideDown();
		49	+ }
		50	+ $('#media-search-box').toggleClass('icon-loading');
		51	+ });
		52	+ return false;
		53	+ });
		54	+ $('#media-upload-form form').ajaxForm({
		55	+ dataType: 'json',
		56	+ resetForm: true,
		57	+ beforeSubmit:
		58	+ function() {
		59	+ $('#media-upload-form').slideUp();
		60	+ $('#media-upload-box').toggleClass('icon-loading');
		61	+ },
		62	+ success:
		63	+ function(data) {
		64	+ insert_items(data, '#media-upload-results .items');
		65	+ if (data.length && data.length > 0) {
		66	+ $('#media-upload-results').slideDown();
		67	+ }
		68	+ $('#media-upload-box').toggleClass('icon-loading');
		69	+ }
		70	+ });
		71	+ $('#media-upload-more-files').click(function() {
		72	+ $('#media-upload-results').hide();
		73	+ $('#media-upload-form').show();
		74	+ });
		75	+
		76	+});