From 854153e69079f5508ed8d773488b1f410e88f9bf Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Tue, 9 Aug 2011 11:27:08 -0700
Subject: [PATCH] Using the new media panel for all text editing

---
 app/views/cms/_text_editor_sidebar.rhtml | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/views/cms/_textile_media.rhtml       | 65 -----------------------------------------------------------------
 app/views/cms/edit.rhtml                 |  7 ++-----
 public/stylesheets/application.css       | 20 ++++++++++----------
 4 files changed, 79 insertions(+), 80 deletions(-)
 create mode 100644 app/views/cms/_text_editor_sidebar.rhtml
 delete mode 100644 app/views/cms/_textile_media.rhtml

diff --git a/app/views/cms/_text_editor_sidebar.rhtml b/app/views/cms/_text_editor_sidebar.rhtml
new file mode 100644
index 0000000..9c417f8
--- /dev/null
+++ b/app/views/cms/_text_editor_sidebar.rhtml
@@ -0,0 +1,67 @@
+<div class='text-editor-sidebar'>
+  <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><%= _('See also a more complete <a href="%s">Textile Reference</a>') % 'http://redcloth.org/hobix.com/textile/' %></p>
+    </div>
+  </div>
+  <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 |f| %>
+        <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' class='media-list-results' style='display: none'>
+      <ul>
+      </ul>
+      <p>
+      <em><%= _('Drag item names to the text to add their URL') %></em>
+      </p>
+      <p><%= link_to(_('Upload more files ...'), '#', :id => 'media-upload-more-files')%></p>
+    </div>
+  </div>
+  <div 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>
+    </form>
+    <div id='media-search-results' class='media-list-results' style='display: none'>
+      <ul>
+      </ul>
+      <p>
+      <em><%= _('Drag item names to the text to add their URL') %></em>
+      </p>
+    </div>
+  </div>
+</div>
+
+
diff --git a/app/views/cms/_textile_media.rhtml b/app/views/cms/_textile_media.rhtml
deleted file mode 100644
index 56d94a5..0000000
--- a/app/views/cms/_textile_media.rhtml
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class='textile-editor-sidebar'>
-  <div class='textile-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><%= _('See also a more complete <a href="%s">Textile Reference</a>') % 'http://redcloth.org/hobix.com/textile/' %></p>
-    </div>
-  </div>
-  <div class='textile-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 |f| %>
-        <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' class='media-list-results' style='display: none'>
-      <ul>
-      </ul>
-      <p>
-      <em><%= _('Drag item names to the text to add their URL') %></em>
-      </p>
-      <p><%= link_to(_('Upload more files ...'), '#', :id => 'media-upload-more-files')%></p>
-    </div>
-  </div>
-  <div class='textile-editor-sidebar-box'>
-    <p><strong>Media search</strong></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 %>
-    </form>
-    <div id='media-search-results' class='media-list-results' style='display: none'>
-      <ul>
-      </ul>
-      <p>
-      <em><%= _('Drag item names to the text to add their URL') %></em>
-      </p>
-    </div>
-  </div>
-</div>
-
-
diff --git a/app/views/cms/edit.rhtml b/app/views/cms/edit.rhtml
index e5a7806..566ae87 100644
--- a/app/views/cms/edit.rhtml
+++ b/app/views/cms/edit.rhtml
@@ -49,11 +49,8 @@
 <% end %>
 </div>
 
-<% if environment.enabled?('media_panel') && [TinyMceArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
-  <%= render :partial => 'media_listing' %>
-<% end %>
-<% if @article.is_a?(TextileArticle) %>
-  <%= render :partial => 'textile_media' %>
+<% 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'/>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b633527..aa3ae76 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -3371,36 +3371,36 @@ div.with_media_panel .formfield input {
 
 /* Textile sidebar */
 
-.textile-editor-sidebar {
+.text-editor-sidebar {
   position: absolute;
   width: 380px;
   right: 20px;
   top: 70px;
 }
 
-.textile-editor-sidebar-box  {
+.text-editor-sidebar-box  {
   background: #eeeeec;
   border: 1px solid #d3d7cf;
   padding: 10px 10px 0px 10px;
   margin-bottom: 10px;
 }
-.textile-editor-sidebar-box p {
+.text-editor-sidebar-box p {
   margin-top: 0px;
 }
-.textile-editor-sidebar code,
-.textile-editor-sidebar pre {
+.text-editor-sidebar code,
+.text-editor-sidebar pre {
   border: 1px solid #d3d7cf;
   color: black;
   padding: 2px;
 }
-.textile-editor-sidebar .icon-loading {
+.text-editor-sidebar .icon-loading {
   background-image: url(../images/loading-small.gif);
 }
-.textile-editor-sidebar .media-list-results ul {
+.text-editor-sidebar .media-list-results ul {
   padding: 0px;
   list-style: none;
 }
-.textile-editor-sidebar .media-list-results li {
+.text-editor-sidebar .media-list-results li {
   background-repeat: no-repeat;
   background-position: 0px 0px;
   padding-left: 20px;
@@ -3409,11 +3409,11 @@ div.with_media_panel .formfield input {
   border: none;
   margin-bottom: 2px;
 }
-.textile-editor-sidebar .media-list-results li:hover {
+.text-editor-sidebar .media-list-results li:hover {
   background-color: transparent;
   border: none;
 }
-.textile-editor-sidebar #media-upload-box {
+.text-editor-sidebar #media-upload-box {
   background-repeat: no-repeat;
   background-position: top right ;
 }
--
libgit2 0.21.2