Download as
Browse Code »

Commit 616ddb33cc6367fc632d83891061b12b7f6c25bf

Authored by Arthur Sturzbecher
1 parent 205cb054
Exists in refactor_download_block

download option style fixes

Showing 4 changed files with 72 additions and 37 deletions   Show diff stats
src/noosfero-spb/software_communities/public/blocks/software-download.js
  Diff comments   View file @616ddb3
@@ -16,10 +16,16 @@ modulejs.define('SoftwareDownload', ['jquery', 'NoosferoRoot'], function($, Noos @@ -16,10 +16,16 @@ modulejs.define('SoftwareDownload', ['jquery', 'NoosferoRoot'], function($, Noos
16 var download_option = $(element).find('.file-size').closest('.download-option'); 16 var download_option = $(element).find('.file-size').closest('.download-option');
17 download_option.find('#block_downloads__link').val(path); 17 download_option.find('#block_downloads__link').val(path);
18 download_option.find('#block_downloads__size').val(size); 18 download_option.find('#block_downloads__size').val(size);
  19 +
  20 + var fileElements = $(element).parent().parent().find('.file-item');
  21 + for (var i = 0; i < fileElements.length; i++) {
  22 + fileElements[i].classList.remove('selected');
  23 + }
  24 + $(element).parent()[0].classList.add('selected');
19 } 25 }
20 26
21 - SoftwareDownload.prototype.toggleFiles = function(element) {  
22 - var files_ul = $(element).parent().find('ul')[0]; 27 + SoftwareDownload.prototype.toggleForm = function(element) {
  28 + var files_ul = $(element).parent().find('.toggle-form')[0];
23 files_ul.classList.toggle('opened'); 29 files_ul.classList.toggle('opened');
24 files_ul.classList.toggle('closed'); 30 files_ul.classList.toggle('closed');
25 } 31 }
src/noosfero-spb/software_communities/public/style.css
  Diff comments   View file @616ddb3
@@ -118,11 +118,43 @@ @@ -118,11 +118,43 @@
118 margin-top: 5px; 118 margin-top: 5px;
119 } 119 }
120 120
  121 +/* profile_design download block */
  122 +
121 #droppable-list-downloads .download-forms{ 123 #droppable-list-downloads .download-forms{
122 margin-bottom: 20px; 124 margin-bottom: 20px;
123 margin-left: 0; 125 margin-left: 0;
124 } 126 }
125 127
  128 +#edit-download-block ul.link-list-header{
  129 + display: none;
  130 +}
  131 +
  132 +#edit-download-block{
  133 + margin-top: 10px;
  134 + width: 450px;
  135 +}
  136 +
  137 +.download-forms {
  138 + position: relative;
  139 +}
  140 +
  141 +.download-forms .toggle-form {
  142 + transition: all ease .35s;
  143 + overflow: hidden;
  144 +}
  145 +
  146 +.download-forms .toggle-form.closed {
  147 + height: 0px;
  148 +}
  149 +
  150 +.download-forms .toggle-form.opened {
  151 + height: auto;
  152 +}
  153 +
  154 +.download-forms .toggle-form ul {
  155 + background: #DEDEDE;
  156 +}
  157 +
126 .download-forms ul li{ 158 .download-forms ul li{
127 margin-bottom: 10px; 159 margin-bottom: 10px;
128 } 160 }
@@ -132,27 +164,27 @@ @@ -132,27 +164,27 @@
132 margin-bottom: 5px; 164 margin-bottom: 5px;
133 } 165 }
134 166
135 -#edit-download-block ul.link-list-header{  
136 - display: none; 167 +.download-forms .formfieldline input[type="text"] {
  168 + width: 380px;
137 } 169 }
138 170
139 -#edit-download-block{  
140 - margin-top: 10px; 171 +.download-forms .file-item {
  172 + cursor: pointer;
  173 + line-height: 30px;
141 } 174 }
142 175
143 -.download-option .files ul {  
144 - width: 450px; 176 +.download-forms .file-item.selected {
  177 + font-weight: bold;
145 background: #9E9E9E; 178 background: #9E9E9E;
146 - transition: height ease .35s;  
147 - overflow: scroll;  
148 } 179 }
149 -  
150 -.download-option ul.closed {  
151 - height: 0px; 180 +.download-forms a.icon-edit {
  181 + position: absolute;
  182 + right: 0;
  183 + top: 20px;
  184 + background-position: left;
  185 + padding: 3px 5px 3px 15px;
152 } 186 }
153 -  
154 -.download-option ul.opened {  
155 - height: 70px; 187 +.download-forms a.icon-edit span {
  188 + display: inline;
156 } 189 }
157 -  
158 /* end of profile_design download block */ 190 /* end of profile_design download block */
src/noosfero-spb/software_communities/views/box_organizer/_download_file.html.erb
  Diff comments   View file @616ddb3
1 -<li> 1 +<li class="file-item">
2 <a onclick="softwareDownload.selectFile(this)"> 2 <a onclick="softwareDownload.selectFile(this)">
3 - <span class="file-path"><%= file.path %></span> - <span class="file-size"><%= number_to_human_size(file.size, precision: 2) %></span> 3 + <span class="file-path"><%= file.full_name%></span> - <span class="file-size"><%= number_to_human_size(file.size, precision: 2) %></span>
4 </a> 4 </a>
5 </li> 5 </li>
src/noosfero-spb/software_communities/views/box_organizer/_download_list_item.html.erb
  Diff comments   View file @616ddb3
1 <li class='download-option download-forms'> 1 <li class='download-option download-forms'>
  2 + <%= labelled_form_field(_('Name'), text_field_tag('block[downloads][][name]', (defined? download) ? download[:name] : '')) %>
  3 + <%= button_without_text(:edit, _('Edit'), "#" , { :onclick => 'softwareDownload.toggleForm(this); return false', :class=>"edit-link-list-row" }) %>
2 4
3 - <%= labelled_form_field(_('Name'), text_field_tag('block[downloads][][name]', (defined? download) ? download[:name] : '')) %> 5 + <div class="toggle-form <%= (defined? download) ? 'closed' : 'opened' %>">
  6 + <%= labelled_form_field(_('Link'), text_field_tag('block[downloads][][link]', (defined? download) ? download[:link] : '')) %>
  7 + <ul>
  8 + <% @block.uploaded_files.each do |file| %>
  9 + <%= render :partial => 'download_file', :locals => {:file => file} %>
  10 + <% end %>
  11 + <li style="clear: both"></li>
  12 + </ul>
4 13
5 - <%= labelled_form_field(_('Link'), text_field_tag('block[downloads][][link]', (defined? download) ? download[:link] : '')) %>  
6 - <div class="files">  
7 - <%= button_without_text(:edit, _('Edit'), "#" , { :onclick => 'softwareDownload.toggleFiles(this); return false', :class=>"edit-link-list-row" }) %>  
8 - <ul class=<%= (defined? download) ? "closed" : "opened" %>>  
9 - <% @block.uploaded_files.each do |file| %>  
10 - <%= render :partial => 'download_file', :locals => {:file => file} %>  
11 - <% end %>  
12 - <li style="clear: both"></li>  
13 - </ul>  
14 - </div>  
15 -  
16 - <%= labelled_form_field(_('Platforms'), text_field_tag('block[downloads][][software_description]', (defined? download) ? download[:software_description] : '')) %>  
17 -  
18 - <%= labelled_form_field(_('Minimum Requirements'), text_field_tag('block[downloads][][minimum_requirements]', (defined? download) ? download[:minimum_requirements] : '')) %>  
19 -  
20 - <%= labelled_form_field(_('Size'), text_field_tag('block[downloads][][size]', (defined? download) ? download[:size] : '')) %> 14 + <%= labelled_form_field(_('Platforms'), text_field_tag('block[downloads][][software_description]', (defined? download) ? download[:software_description] : '')) %>
  15 + <%= labelled_form_field(_('Minimum Requirements'), text_field_tag('block[downloads][][minimum_requirements]', (defined? download) ? download[:minimum_requirements] : '')) %>
  16 + <%= labelled_form_field(_('Size'), text_field_tag('block[downloads][][size]', (defined? download) ? download[:size] : '')) %>
21 17
22 <span class='delete-download-button'> 18 <span class='delete-download-button'>
23 <%= button_without_text(:delete, _('Delete'), "#" , { :onclick => 'softwareDownload.deleteDownload(this); return false', :class=>"delete-link-list-row" }) %> 19 <%= button_without_text(:delete, _('Delete'), "#" , { :onclick => 'softwareDownload.deleteDownload(this); return false', :class=>"delete-link-list-row" }) %>
24 </span> 20 </span>
25 - </li> 21 + </div>
  22 +</li>