From aba449f03a56ef43208e2cc04e83d9b748fe9ded Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Tue, 9 Aug 2011 17:44:35 -0700
Subject: [PATCH] Use <div> instead of <li> for media items

---
 app/views/cms/_text_editor_sidebar.rhtml | 12 ++++++------
 public/javascripts/article.js            | 10 +++++-----
 public/stylesheets/application.css       |  9 ++++-----
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app/views/cms/_text_editor_sidebar.rhtml b/app/views/cms/_text_editor_sidebar.rhtml
index b59e825..4eab40c 100644
--- a/app/views/cms/_text_editor_sidebar.rhtml
+++ b/app/views/cms/_text_editor_sidebar.rhtml
@@ -16,10 +16,10 @@
         <% end %>
       <% end %>
     </div>
-    <div id='media-upload-results' class='media-list-results' style='display: none'>
+    <div id='media-upload-results' style='display: none'>
       <%= render :partial => 'drag_and_drop_note' %>
-      <ul>
-      </ul>
+      <div class='items'>
+      </div>
       <p><%= link_to(_('Upload more files ...'), '#', :id => 'media-upload-more-files')%></p>
     </div>
   </div>
@@ -33,10 +33,10 @@
       <%= submit_button :search, _('Search'), :id => 'media-search-button' %>
     <% end %>
     </p>
-    <div id='media-search-results' class='media-list-results' style='display: none'>
+    <div id='media-search-results' style='display: none'>
       <%= render :partial => 'drag_and_drop_note' %>
-      <ul>
-      </ul>
+      <div class='items'>
+      </div>
     </div>
   </div>
 </div>
diff --git a/public/javascripts/article.js b/public/javascripts/article.js
index 16fa2da..113a7c5 100644
--- a/public/javascripts/article.js
+++ b/public/javascripts/article.js
@@ -27,13 +27,13 @@ jQuery(function($) {
     var html_for_items = '';
     $.each(items, function(i, item) {
       if (item.error) {
-        html_for_items += '<li class="media-upload-error">' + item.error + '</li>';
+        html_for_items += '<div class="media-upload-error">' + item.error + '</div>';
         return;
       }
       if (item.content_type && item.content_type.match(/^image/)) {
-        html_for_items += '<li class="icon-photos"><img src="' + item.url + '"/><br/><a href="' + item.url + '">' + item.title + '</a></li>';
+        html_for_items += '<div class="icon-photos"><img src="' + item.url + '"/><br/><a href="' + item.url + '">' + item.title + '</a></div>';
       } else {
-        html_for_items += '<li class="' + item.icon + '"><a href="' + item.url + '">' + item.title + '</a></li>';
+        html_for_items += '<div class="' + item.icon + '"><a href="' + item.url + '">' + item.title + '</a></div>';
       }
     });
     $(selector).html(html_for_items);
@@ -43,7 +43,7 @@ jQuery(function($) {
     var $button = $(this);
     $('#media-search-box').toggleClass('icon-loading');
     $.get($(this).parent().attr('action'), { 'q': query }, function(data) {
-      insert_items(data, '#media-search-results ul');
+      insert_items(data, '#media-search-results .items');
       if (data.length && data.length > 0) {
         $('#media-search-results').slideDown();
       }
@@ -61,7 +61,7 @@ jQuery(function($) {
       },
     success:
       function(data) {
-        insert_items(data, '#media-upload-results ul');
+        insert_items(data, '#media-upload-results .items');
         if (data.length && data.length > 0) {
           $('#media-upload-results').slideDown();
         }
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 14b9b72..26af889 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -3380,11 +3380,10 @@ div.with_media_panel .formfield input {
 .text-editor-sidebar .icon-loading {
   background-image: url(../images/loading-small.gif);
 }
-.text-editor-sidebar .media-list-results ul {
-  padding: 0px;
-  list-style: none;
+.text-editor-sidebar .items {
+  margin-bottom: 10px;
 }
-.text-editor-sidebar .media-list-results li {
+.text-editor-sidebar .items div {
   background-repeat: no-repeat;
   background-position: 0px 0px;
   padding-left: 20px;
@@ -3393,7 +3392,7 @@ div.with_media_panel .formfield input {
   border: none;
   margin-bottom: 2px;
 }
-.text-editor-sidebar .media-list-results li:hover {
+.text-editor-sidebar .items :hover {
   background-color: transparent;
   border: none;
 }
--
libgit2 0.21.2