From e3d3992fa3b663da433db299a7e8c83c269cb3cc Mon Sep 17 00:00:00 2001
From: Gabriela Navarro <navarro1703@gmail.com>
Date: Mon, 2 Mar 2015 14:52:10 -0300
Subject: [PATCH] Fixing download view and adding dynamic behavior

---
 lib/download_block.rb                        |  3 ++-
 views/blocks/download.html.erb               | 41 ++++++++++++++++-------------------------
 views/box_organizer/_download_block.html.erb | 27 ++++++++++++++++++++++-----
 views/box_organizer/_download_list.html.erb  | 11 +++++++++++
 4 files changed, 51 insertions(+), 31 deletions(-)
 create mode 100644 views/box_organizer/_download_list.html.erb

diff --git a/lib/download_block.rb b/lib/download_block.rb
index 6545dc3..00aac73 100644
--- a/lib/download_block.rb
+++ b/lib/download_block.rb
@@ -1,7 +1,7 @@
 class DownloadBlock < Block
 
   attr_accessible :name, :link, :software_description, :show_name,
-                  :version_news, :minimum_requirements
+                  :version_news, :minimum_requirements, :downloads
 
   settings_items :name, :type => :string, :default => ''
   settings_items :link, :type => :string, :default => ''
@@ -9,6 +9,7 @@ class DownloadBlock < Block
   settings_items :show_name, :type => :boolean, :default => false
   settings_items :version_news, :type => :string, :default => ''
   settings_items :minimum_requirements, :type => :string, :default => ''
+  settings_items :downloads, :type => Array, :default => []
 
   def self.description
     _('Download Stable Version')
diff --git a/views/blocks/download.html.erb b/views/blocks/download.html.erb
index 9f0e2cd..7611554 100644
--- a/views/blocks/download.html.erb
+++ b/views/blocks/download.html.erb
@@ -1,32 +1,23 @@
 <% if block.owner.software_info.nil? %>
   <%= _("This community needs a software to use this block") %>
 <% else %>
-  <div id="download-block">
-    <div id="download_spb">
-      <h2> <%= _("Download") %> </h2>
-
-      <span class="download-name">
-        <%= link_to block.name, block.link %>
-      </span>
-
-      <span class="download-system">
-        <%= _(block.software_description) %>
-      </span>
+  <div id="download-block-2">
+    <div id="download_spb-2">
+      <h3> <%= _("Download #{block.owner.software_info.community.name}") %> </h3>
     </div>
 
-    <p id="download_info">
-      <span class="req_spb">
-        <%= link_to _("Minimal Requirements") , block.minimum_requirements, :class => "anchor-link", :target => "_self" unless block.minimum_requirements.blank? %>
-      </span>
+    <% block.downloads.each_with_index do |download, index| %>
+      <div id="download-info-<%=index%>">
+      <div id="version01">
+        <%= link_to _(""), download[:link], {:id => "image-download", :title => "Baixar o software"} %>
+        <%= link_to _(download[:size]), download[:link], {:id => "size-download", :title => "Baixar o software"} %>
+      <div id="info-software-download">
+        <span class="download-name"><%= _("#{download[:name]}") %></span>
+        <span class="download-system"><%= _("#{download[:software_description]}") %> </span>
+        <span class="req_min_spb"><%= link_to _("Minimum Requirements"), download[:minimum_requirements] %></span>
+      </div>
+    </div>
 
-      <span class="nov_spb">
-        <%= link_to(_("Version News"), block.version_news, :class => "anchor-link", :target => "_self") unless block.version_news.blank? %>
-      </span>
+  <% end %>
+<% end %>
 
-       <span class="licensed">
-        <%= _("Licensed by") %>
-        <%= link_to block.owner.software_info.license_info.version , block.owner.software_info.license_info.link, :target => "_blank" %>
-      </span>
-    </p>
-  </div>
-<% end %>
\ No newline at end of file
diff --git a/views/box_organizer/_download_block.html.erb b/views/box_organizer/_download_block.html.erb
index 224ada9..6473177 100644
--- a/views/box_organizer/_download_block.html.erb
+++ b/views/box_organizer/_download_block.html.erb
@@ -1,7 +1,24 @@
+<%= javascript_include_tag "edit-link-list.js" %>
 <div id='edit-download-block'>
-  <%= labelled_form_field _('Name:'), text_field_tag('block[name]', @block.name) %>
-  <%= labelled_form_field _('Link:'), text_field_tag('block[link]', @block.link) %>
-  <%= labelled_form_field _('Software Description:'), text_field_tag('block[software_description]', @block.software_description) %>
-  <%= labelled_form_field _('Link to Version News:'), text_field_tag('block[version_news]', @block.version_news) %>
-  <%= labelled_form_field _('Link to Minimum Requirements:'), text_field_tag('block[minimum_requirements]', @block.minimum_requirements) %>
+  <ul class="link-list-header">
+    <li class='download-list-name'><%= _('Name') %></li>
+    <li class='download-list-link'><%= _('Link') %></li>
+    <li class='download-list-software-description'><%= _('Software Description') %></li>
+    <li class='download-list-version-news'><%= _('Link to Versio News') %></li>
+    <li class='download-list-minimum-requirements'><%= _('Link to Minimum Requirements') %></li>
+    <li class='download-list-size'><%= _('Size:') %></li>
+  </ul>
+
+  <ul id="droppable-list-downloads">
+    <% for download in @block.downloads %>
+      <%= render :partial => 'download_list', :locals => {:download => download} %>
+    <% end %>
+  </ul>
+
+  <div id = "new" >
+    <% new = {'icon' => 'ok'} %>
+    <%= render :partial => 'download_list', :locals => {:download => new} %>
+  </div>
+
+<%= link_to_function(_('New link'), 'add_new_link();', :class => 'button icon-add with-text') %>
 </div>
diff --git a/views/box_organizer/_download_list.html.erb b/views/box_organizer/_download_list.html.erb
new file mode 100644
index 0000000..334f983
--- /dev/null
+++ b/views/box_organizer/_download_list.html.erb
@@ -0,0 +1,11 @@
+<li>
+  <ul class="download-item-row">
+    <li><%= text_field_tag('block[downloads][][name]', download[:name]) %></li>
+    <li><%= text_field_tag('block[downloads][][link]', download[:link]) %></li>
+    <li><%= text_field_tag('block[downloads][][software_description]', download[:software_description]) %></li>
+    <li><%= text_field_tag('block[downloads][][version_news]', download[:version_news]) %></li>
+    <li><%= text_field_tag('block[downloads][][minimum_requirements]', download[:minimum_requirements]) %></li>
+    <li><%= text_field_tag('block[downloads][][size]', download[:size]) %></li>
+    <li><%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row") %></li>
+  </ul>
+</li>
--
libgit2 0.21.2