From 3ca935240ee08d5d5d650f9d54b74d530d421674 Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Wed, 16 Jul 2014 15:20:29 -0300
Subject: [PATCH] [media-panel-improvements] Published media box

---
 app/controllers/my_profile/cms_controller.rb |  2 +-
 app/views/cms/_text_editor_sidebar.html.erb  | 16 ++++++++++++----
 app/views/cms/media_panel/_generic.html.erb  |  5 +++++
 app/views/cms/media_panel/_image.html.erb    |  9 +++++++++
 app/views/cms/media_upload.js.erb            |  7 +++++++
 public/stylesheets/application.css           | 21 +++++++++++++++------
 6 files changed, 49 insertions(+), 11 deletions(-)
 create mode 100644 app/views/cms/media_panel/_generic.html.erb
 create mode 100644 app/views/cms/media_panel/_image.html.erb
 create mode 100644 app/views/cms/media_upload.js.erb

diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb
index 9da564e..a1dbeae 100644
--- a/app/controllers/my_profile/cms_controller.rb
+++ b/app/controllers/my_profile/cms_controller.rb
@@ -322,8 +322,8 @@ class CmsController < MyProfileController
     if request.post?
       @file = UploadedFile.create(:uploaded_data => params[:file], :profile => profile, :parent => parent) unless params[:file] == ''
     end
+    @file = FilePresenter.for(@file)
     #render :text => article_list_to_json([file]), :content_type => 'text/plain'
-    render :text => ''
   end
 
   protected
diff --git a/app/views/cms/_text_editor_sidebar.html.erb b/app/views/cms/_text_editor_sidebar.html.erb
index 389e09b..edb3499 100644
--- a/app/views/cms/_text_editor_sidebar.html.erb
+++ b/app/views/cms/_text_editor_sidebar.html.erb
@@ -19,13 +19,21 @@
         <p><%= file_field_tag('file', :multiple => true) %></p>
       <% end %>
     </div>
-    <div id='media-upload-results' style='display: none'>
-      <%= render :partial => 'drag_and_drop_note' %>
-      <div class='items'>
+  </div>
+
+  <div id='published-media' class='text-editor-sidebar-box'>
+    <div class='header'><strong><%= _('Published media') %></strong></div>
+    <%= render :partial => 'drag_and_drop_note' %>
+    <div class='items'>
+      <div class='images'>
+        <h3><%= _('Images') %></h3>
+      </div>
+      <div class='generics'>
+        <h3><%= _('Files') %></h3>
       </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'>
     <div class='header'><strong><%= _('Media search') %></strong></div>
     <p>
diff --git a/app/views/cms/media_panel/_generic.html.erb b/app/views/cms/media_panel/_generic.html.erb
new file mode 100644
index 0000000..abb98d8
--- /dev/null
+++ b/app/views/cms/media_panel/_generic.html.erb
@@ -0,0 +1,5 @@
+<div class="item file <%= icon_for_article(@file) %>" data-item="div">
+  <div>
+    <a href="<%= url_for(@file.url) %>"><%= @file.title %></a>
+  </div>
+</div>
diff --git a/app/views/cms/media_panel/_image.html.erb b/app/views/cms/media_panel/_image.html.erb
new file mode 100644
index 0000000..abc79cd
--- /dev/null
+++ b/app/views/cms/media_panel/_image.html.erb
@@ -0,0 +1,9 @@
+<div class="item image" data-item="span">
+  <span>
+    <img src="<%= @file.public_filename(:uploaded) %>"/>
+  </span>
+  <div class="controls image-controls">
+    <a class="button icon-add add-to-text" href="#"><span><%= _('Add to the text') %></span></a>
+    <a class="button icon-zoom zoom" href="#" title="<%= _('Zoom in') %>"><span><%= _('Zoom in') %></span></a>
+  </div>
+</div>
diff --git a/app/views/cms/media_upload.js.erb b/app/views/cms/media_upload.js.erb
new file mode 100644
index 0000000..f026fa2
--- /dev/null
+++ b/app/views/cms/media_upload.js.erb
@@ -0,0 +1,7 @@
+<% if @file.valid? %>
+  <% klass = @file.class.name.split('::').last.to_css_class %>
+  jQuery("#published-media .items .<%= klass.pluralize %>").append("<%= j render :partial => "cms/media_panel/#{klass}" %>");
+  jQuery("#published-media .items .<%= klass.pluralize %>").show();
+<% else %>
+  alert("Failed to upload file: <%= j @file.errors.full_messages.join(', ').html_safe %>");
+<% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1b8005b..a9aebd3 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -3384,21 +3384,25 @@ div.with_media_panel .formfield input[type="checkbox"] {
   padding-bottom: 5px;
 }
 
-.upload {
+#media-upload-form .upload {
   border-top: solid 1px #CCC;
   width: 100%;
   padding-top: 5px;
   margin-top: 5px;
 }
 
-.percentage {
+#media-upload-form .percentage {
   float: right;
 }
 
-.bar {
-  height: 18px;
+#media-upload-form .bar {
+  height: 10px;
   background: #729fcf;
-  border-radius: 4px;
+  border-radius: 3px;
+}
+
+#media-upload-form input#file {
+  width: 100%;
 }
 
 .text-editor-sidebar {
@@ -3437,6 +3441,11 @@ div.with_media_panel .formfield input[type="checkbox"] {
   margin-bottom: 10px;
 }
 
+#published-media .items .images,
+#published-media .items .generics {
+  display: none;
+}
+
 .text-editor-sidebar .items .file {
   background-repeat: no-repeat;
   background-position: 0px 0px;
@@ -3487,7 +3496,7 @@ div.with_media_panel .formfield input[type="checkbox"] {
 }
 .text-editor-sidebar img {
  max-height: 70px;
- max-width: 110px;
+ max-width: 74px;
 }
 .text-editor-sidebar .media-upload-error {
   color: red;
--
libgit2 0.21.2