Download as
Browse Code »

Commit 6bc0d01ce105ef7dfbe976ff9cb449cee7ace18b

Authored by Dylan Guedes
Committed by Melissa Wen
1 parent 147297e0
Exists in master and in 48 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, header_fix, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, sisp_catalog_header, sisp_dev_master, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories, update_softwares_boxes

Create labels for blocks of softwares download - Closes #511 

Reuse of partial to fill in with the download info
Replaced label/input by "standard" noosfero method

Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Signed-off-by: Peter Lima <peterlima@gmail.com>
Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
Signed-off-by: Melissa Wen <melissa.srw@gmail.com>
Showing 4 changed files with 49 additions and 25 deletions   Show diff stats
src/noosfero-spb/software_communities/public/style.css
  Diff comments   View file @6bc0d01
... ... @@ -117,3 +117,27 @@
117 117 .catalog_rating_block {
118 118 margin-top: 5px;
119 119 }
  120 +
  121 +#droppable-list-downloads .download-forms{
  122 + margin-bottom: 20px;
  123 + margin-left: 0;
  124 +}
  125 +
  126 +.download-forms ul li{
  127 + margin-bottom: 10px;
  128 +}
  129 +
  130 +.download-forms ul li label{
  131 + display: block;
  132 + margin-bottom: 5px;
  133 +}
  134 +
  135 +#edit-download-block ul.link-list-header{
  136 + display: none;
  137 +}
  138 +
  139 +#edit-download-block{
  140 + margin-top: 10px;
  141 +}
  142 +
  143 +/* end of profile_design download block */
... ...
src/noosfero-spb/software_communities/views/box_organizer/_download_block.html.erb
  Diff comments   View file @6bc0d01
1 1 <div id='edit-download-block'>
2   - <ul class="link-list-header">
3   - <li class='download-list-name'><%= _('Name') %></li>
4   - <li class='download-list-link'><%= _('Link') %></li>
5   - <li class='download-list-software-description'><%= _('Platforms') %></li>
6   - <li class='download-list-minimum-requirements'><%= _('Minimum Requirements') %></li>
7   - <li class='download-list-size'><%= _('Size:') %></li>
8   - </ul>
9 2  
  3 + <h3><%= _('Download options') %></h3>
10 4 <div id ="droppable-list-downloads">
11 5 <% @block.downloads.each do |download| %>
12 6 <%= render :partial => 'download_list', :locals => {:download => download} %>
... ...
src/noosfero-spb/software_communities/views/box_organizer/_download_list.html.erb
  Diff comments   View file @6bc0d01
1   -<li>
2   - <ul class="download-list-row">
3   - <li><%= text_field_tag('block[downloads][][name]', download[:name], :class => "block_download_name") %></li>
4   - <li><%= text_field_tag('block[downloads][][link]', download[:link], :class => "block_download_link") %></li>
5   - <li><%= text_field_tag('block[downloads][][software_description]', download[:software_description], :class => "block_download_software_description") %></li>
6   - <li><%= text_field_tag('block[downloads][][minimum_requirements]', download[:minimum_requirements], :class => "block_download_minimum_requirements") %></li>
7   - <li><%= text_field_tag('block[downloads][][size]', download[:size], :class => "block_download_size") %></li>
8   - <li><%= button_without_text(:delete, _('Delete'), "#" , { :onclick => 'softwareDownload.deleteDownload(this); return false', :class=>"delete-link-list-row" }) %></li>
9   - </ul>
10   -</li>
  1 +<%= render :partial => 'box_organizer/download_list_template' %>
... ...
src/noosfero-spb/software_communities/views/box_organizer/_download_list_template.html.erb
  Diff comments   View file @6bc0d01
1   -<li>
2   - <ul class="download-list-row">
3   - <li><%= text_field_tag('block[downloads][][name]', '', :class => "block_download_name") %></li>
4   - <li><%= text_field_tag('block[downloads][][link]', '', :class => "block_download_link") %></li>
5   - <li><%= text_field_tag('block[downloads][][software_description]', '', :class => "block_download_software_description") %></li>
6   - <li><%= text_field_tag('block[downloads][][minimum_requirements]', '', :class => "block_download_minimum_requirements") %></li>
7   - <li><%= text_field_tag('block[downloads][][size]', '', :class => "block_download_size") %></li>
8   - <li><%= button_without_text(:delete, _('Delete'), "#" , { :onclick => 'softwareDownload.deleteDownload(this); return false', :class=>"delete-link-list-row" }) %></li>
  1 +<li class='download-option download-forms'>
  2 + <ul>
  3 + <li>
  4 + <%= labelled_form_field(_('Name'), text_field_tag('block[downloads][][name]')) %>
  5 + </li>
  6 +
  7 + <li>
  8 + <%= labelled_form_field(_('Link'), text_field_tag('block[downloads][][link]')) %>
  9 + </li>
  10 +
  11 + <li>
  12 + <%= labelled_form_field(_('Platforms'), text_field_tag('block[downloads][][software_description]')) %>
  13 + </li>
  14 +
  15 + <li>
  16 + <%= labelled_form_field(_('Minimum Requirements'), text_field_tag('block[downloads][][minimum_requirements]')) %>
  17 + </li>
  18 +
  19 + <li>
  20 + <%= labelled_form_field(_('Size'), text_field_tag('block[downloads][][size]')) %>
  21 + </li>
  22 +
  23 + <li class='delete-download-button'><%= button_without_text(:delete, _('Delete'), "#" , { :onclick => 'softwareDownload.deleteDownload(this); return false', :class=>"delete-link-list-row" }) %></li>
9 24 </ul>
10 25 </li>
... ...