Download as
Browse Code »

Commit e3d3992fa3b663da433db299a7e8c83c269cb3cc

Authored by Gabriela Navarro
1 parent bc8a2881
Exists in master and in 5 other branches fix_search_by_software_highlight_block, r4, refactor_software_info_365, stable, update_translations

Fixing download view and adding dynamic behavior 

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1709@gmail.com>
Showing 4 changed files with 51 additions and 31 deletions   Show diff stats
lib/download_block.rb
  Diff comments   View file @e3d3992
1 class DownloadBlock < Block 1 class DownloadBlock < Block
2 2
3 attr_accessible :name, :link, :software_description, :show_name, 3 attr_accessible :name, :link, :software_description, :show_name,
4 - :version_news, :minimum_requirements 4 + :version_news, :minimum_requirements, :downloads
5 5
6 settings_items :name, :type => :string, :default => '' 6 settings_items :name, :type => :string, :default => ''
7 settings_items :link, :type => :string, :default => '' 7 settings_items :link, :type => :string, :default => ''
@@ -9,6 +9,7 @@ class DownloadBlock &lt; Block @@ -9,6 +9,7 @@ class DownloadBlock &lt; Block
9 settings_items :show_name, :type => :boolean, :default => false 9 settings_items :show_name, :type => :boolean, :default => false
10 settings_items :version_news, :type => :string, :default => '' 10 settings_items :version_news, :type => :string, :default => ''
11 settings_items :minimum_requirements, :type => :string, :default => '' 11 settings_items :minimum_requirements, :type => :string, :default => ''
  12 + settings_items :downloads, :type => Array, :default => []
12 13
13 def self.description 14 def self.description
14 _('Download Stable Version') 15 _('Download Stable Version')
views/blocks/download.html.erb
  Diff comments   View file @e3d3992
1 <% if block.owner.software_info.nil? %> 1 <% if block.owner.software_info.nil? %>
2 <%= _("This community needs a software to use this block") %> 2 <%= _("This community needs a software to use this block") %>
3 <% else %> 3 <% else %>
4 - <div id="download-block">  
5 - <div id="download_spb">  
6 - <h2> <%= _("Download") %> </h2>  
7 -  
8 - <span class="download-name">  
9 - <%= link_to block.name, block.link %>  
10 - </span>  
11 -  
12 - <span class="download-system">  
13 - <%= _(block.software_description) %>  
14 - </span> 4 + <div id="download-block-2">
  5 + <div id="download_spb-2">
  6 + <h3> <%= _("Download #{block.owner.software_info.community.name}") %> </h3>
15 </div> 7 </div>
16 8
17 - <p id="download_info">  
18 - <span class="req_spb">  
19 - <%= link_to _("Minimal Requirements") , block.minimum_requirements, :class => "anchor-link", :target => "_self" unless block.minimum_requirements.blank? %>  
20 - </span> 9 + <% block.downloads.each_with_index do |download, index| %>
  10 + <div id="download-info-<%=index%>">
  11 + <div id="version01">
  12 + <%= link_to _(""), download[:link], {:id => "image-download", :title => "Baixar o software"} %>
  13 + <%= link_to _(download[:size]), download[:link], {:id => "size-download", :title => "Baixar o software"} %>
  14 + <div id="info-software-download">
  15 + <span class="download-name"><%= _("#{download[:name]}") %></span>
  16 + <span class="download-system"><%= _("#{download[:software_description]}") %> </span>
  17 + <span class="req_min_spb"><%= link_to _("Minimum Requirements"), download[:minimum_requirements] %></span>
  18 + </div>
  19 + </div>
21 20
22 - <span class="nov_spb">  
23 - <%= link_to(_("Version News"), block.version_news, :class => "anchor-link", :target => "_self") unless block.version_news.blank? %>  
24 - </span> 21 + <% end %>
  22 +<% end %>
25 23
26 - <span class="licensed">  
27 - <%= _("Licensed by") %>  
28 - <%= link_to block.owner.software_info.license_info.version , block.owner.software_info.license_info.link, :target => "_blank" %>  
29 - </span>  
30 - </p>  
31 - </div>  
32 -<% end %>  
33 \ No newline at end of file 24 \ No newline at end of file
views/box_organizer/_download_block.html.erb
  Diff comments   View file @e3d3992
  1 +<%= javascript_include_tag "edit-link-list.js" %>
1 <div id='edit-download-block'> 2 <div id='edit-download-block'>
2 - <%= labelled_form_field _('Name:'), text_field_tag('block[name]', @block.name) %>  
3 - <%= labelled_form_field _('Link:'), text_field_tag('block[link]', @block.link) %>  
4 - <%= labelled_form_field _('Software Description:'), text_field_tag('block[software_description]', @block.software_description) %>  
5 - <%= labelled_form_field _('Link to Version News:'), text_field_tag('block[version_news]', @block.version_news) %>  
6 - <%= labelled_form_field _('Link to Minimum Requirements:'), text_field_tag('block[minimum_requirements]', @block.minimum_requirements) %> 3 + <ul class="link-list-header">
  4 + <li class='download-list-name'><%= _('Name') %></li>
  5 + <li class='download-list-link'><%= _('Link') %></li>
  6 + <li class='download-list-software-description'><%= _('Software Description') %></li>
  7 + <li class='download-list-version-news'><%= _('Link to Versio News') %></li>
  8 + <li class='download-list-minimum-requirements'><%= _('Link to Minimum Requirements') %></li>
  9 + <li class='download-list-size'><%= _('Size:') %></li>
  10 + </ul>
  11 +
  12 + <ul id="droppable-list-downloads">
  13 + <% for download in @block.downloads %>
  14 + <%= render :partial => 'download_list', :locals => {:download => download} %>
  15 + <% end %>
  16 + </ul>
  17 +
  18 + <div id = "new" >
  19 + <% new = {'icon' => 'ok'} %>
  20 + <%= render :partial => 'download_list', :locals => {:download => new} %>
  21 + </div>
  22 +
  23 +<%= link_to_function(_('New link'), 'add_new_link();', :class => 'button icon-add with-text') %>
7 </div> 24 </div>
views/box_organizer/_download_list.html.erb 0 → 100644
  Diff comments   View file @e3d3992
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
  1 +<li>
  2 + <ul class="download-item-row">
  3 + <li><%= text_field_tag('block[downloads][][name]', download[:name]) %></li>
  4 + <li><%= text_field_tag('block[downloads][][link]', download[:link]) %></li>
  5 + <li><%= text_field_tag('block[downloads][][software_description]', download[:software_description]) %></li>
  6 + <li><%= text_field_tag('block[downloads][][version_news]', download[:version_news]) %></li>
  7 + <li><%= text_field_tag('block[downloads][][minimum_requirements]', download[:minimum_requirements]) %></li>
  8 + <li><%= text_field_tag('block[downloads][][size]', download[:size]) %></li>
  9 + <li><%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row") %></li>
  10 + </ul>
  11 +</li>