From 42cc1b2f4070fb921f8d5d8fe54350d2d9e2563a Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Tue, 9 Aug 2011 11:34:20 -0700
Subject: [PATCH] Make it work better with TinyMCE

---
 app/views/cms/_text_editor_sidebar.rhtml     | 20 +-------------------
 app/views/cms/_textile_quick_reference.rhtml | 20 ++++++++++++++++++++
 public/javascripts/article.js                |  2 +-
 public/stylesheets/application.css           |  5 +++++
 4 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 app/views/cms/_textile_quick_reference.rhtml

diff --git a/app/views/cms/_text_editor_sidebar.rhtml b/app/views/cms/_text_editor_sidebar.rhtml
index 9c417f8..4669555 100644
--- a/app/views/cms/_text_editor_sidebar.rhtml
+++ b/app/views/cms/_text_editor_sidebar.rhtml
@@ -1,23 +1,5 @@
 <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>
+  <%= 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'>
diff --git a/app/views/cms/_textile_quick_reference.rhtml b/app/views/cms/_textile_quick_reference.rhtml
new file mode 100644
index 0000000..dc227ac
--- /dev/null
+++ b/app/views/cms/_textile_quick_reference.rhtml
@@ -0,0 +1,20 @@
+<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>
+
diff --git a/public/javascripts/article.js b/public/javascripts/article.js
index 24108bc..8a761d3 100644
--- a/public/javascripts/article.js
+++ b/public/javascripts/article.js
@@ -27,7 +27,7 @@ jQuery(function($) {
     var html_for_items = '';
     $.each(items, function(i, item) {
       if (item.content_type && item.content_type.match(/^image/)) {
-        html_for_items += '<li class="icon-photos"><img src="' + item.url + '" style="max-height: 96px; max-width: 96px; border: 1px solid #d3d7cf;" alt="' + item.url + '"/><br/><a href="' + item.url + '">' + item.title + '</a></li>';
+        html_for_items += '<li class="icon-photos"><img src="' + item.url + '"/><br/><a href="' + item.url + '">' + item.title + '</a></li>';
       } else {
         html_for_items += '<li class="' + item.icon + '"><a href="' + item.url + '">' + item.title + '</a></li>';
       }
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index aa3ae76..b8abe9c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -3417,6 +3417,11 @@ div.with_media_panel .formfield input {
   background-repeat: no-repeat;
   background-position: top right ;
 }
+.text-editor-sidebar img {
+ max-height: 96px;
+ max-width: 96px;
+ border: 1px solid #d3d7cf;
+}
 
 /* ==> public/stylesheets/controller_contact.css <== */
 /*** SELECT CITY ***/
--
libgit2 0.21.2