Download as
Browse Code »

Commit cdf28861f8b6ecd2099baa01dfe78e314a8dc962

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

Fixing box organizer layout

Showing 4 changed files with 98 additions and 23 deletions   Show diff stats
public/style.css
  Diff comments   View file @cdf2886
@@ -2,6 +2,84 @@ @@ -2,6 +2,84 @@
2 display: none; 2 display: none;
3 } 3 }
4 4
  5 +#edit-download-block{
  6 + width: 820px;
  7 + position: relative;
  8 + left: -24px;
  9 +}
  10 +.download-list-name{
  11 + margin-left: 40px;
  12 +}
  13 +
  14 +.download-list-link{
  15 + margin-left: 150px;
  16 +}
  17 +
  18 +.download-list-software-description{
  19 + margin-left: 100px;
  20 +}
  21 +
  22 +.download-list-minimum-requirements{
  23 + margin-left: 70px;
  24 +}
  25 +
  26 +.download-list-size{
  27 + margin-left: 35px;
  28 +}
  29 +
  30 +#droppable-list-downloads{
  31 + padding-left: 23px;
  32 + margin-top: -12px;
  33 +}
  34 +#droppable-list-downloads li{
  35 + list-style-type: none;
  36 +}
  37 +
  38 +.download-list-row{
  39 + line-height: 25px;
  40 + margin-bottom: 5px;
  41 + padding: 10px 1px 10px 0px;
  42 + cursor: pointer;
  43 + width: 97%;
  44 +}
  45 +.download-list-row li{
  46 + list-style-type: none;
  47 + display: inline;
  48 + margin-left: 5px;
  49 +}
  50 +
  51 +.download-list-row li div{
  52 + float: left;
  53 + margin-top: 4px;
  54 +}
  55 +
  56 +.download-list-row li a{
  57 + line-height: 27px !important;
  58 + padding-right: 5px;
  59 +}
  60 +
  61 +.block_download_name {
  62 + width: 100px;
  63 +}
  64 +
  65 +.block_download_link {
  66 + width: 200px;
  67 + margin-left: 10px;
  68 +}
  69 +
  70 +.block_download_minimum_requirements {
  71 + width: 200px;
  72 + margin-left: 10px;
  73 +}
  74 +
  75 +.block_download_software_description {
  76 + width: 100px;
  77 +}
  78 +
  79 +.block_download_size {
  80 + width: 50px;
  81 +}
  82 +
5 #signup-form small#secondary-email-balloon , 83 #signup-form small#secondary-email-balloon ,
6 #signup-form small#area-interest-balloon { 84 #signup-form small#area-interest-balloon {
7 display: none; 85 display: none;
@@ -444,4 +522,4 @@ input[type=checkbox] { @@ -444,4 +522,4 @@ input[type=checkbox] {
444 text-align: right; 522 text-align: right;
445 } 523 }
446 524
447 -/* End software catalog definitions */  
448 \ No newline at end of file 525 \ No newline at end of file
  526 +/* End software catalog definitions */
views/blocks/download.html.erb
  Diff comments   View file @cdf2886
@@ -20,4 +20,3 @@ @@ -20,4 +20,3 @@
20 20
21 <% end %> 21 <% end %>
22 <% end %> 22 <% end %>
23 -  
views/box_organizer/_download_block.html.erb
  Diff comments   View file @cdf2886
@@ -2,24 +2,23 @@ @@ -2,24 +2,23 @@
2 <ul class="link-list-header"> 2 <ul class="link-list-header">
3 <li class='download-list-name'><%= _('Name') %></li> 3 <li class='download-list-name'><%= _('Name') %></li>
4 <li class='download-list-link'><%= _('Link') %></li> 4 <li class='download-list-link'><%= _('Link') %></li>
5 - <li class='download-list-software-description'><%= _('Software Description') %></li>  
6 - <li class='download-list-version-news'><%= _('Link to Versio News') %></li>  
7 - <li class='download-list-minimum-requirements'><%= _('Link to Minimum Requirements') %></li> 5 + <li class='download-list-software-description'><%= _('Platforms') %></li>
  6 + <li class='download-list-minimum-requirements'><%= _('Minimum Requirements') %></li>
8 <li class='download-list-size'><%= _('Size:') %></li> 7 <li class='download-list-size'><%= _('Size:') %></li>
9 </ul> 8 </ul>
10 9
11 - <ul id="droppable-list-downloads">  
12 - <% if @block.downloads.count > 0 %>  
13 - <% for download in @block.downloads %>  
14 - <%= render :partial => 'download_list', :locals => {:download => download} %> 10 + <div id ="droppable-list-downloads">
  11 + <% if @block.downloads.count > 0 %>
  12 + <% for download in @block.downloads %>
  13 + <%= render :partial => 'download_list', :locals => {:download => download} %>
  14 + <% end %>
  15 + <% else %>
  16 + <div id = "new">
  17 + <% new = {'icon' => 'ok'} %>
  18 + <%= render :partial => 'download_list', :locals => {:download => new} %>
  19 + </div>
15 <% end %> 20 <% end %>
16 - <% else %>  
17 - <div id = "new">  
18 - <% new = {'icon' => 'ok'} %>  
19 - <%= render :partial => 'download_list', :locals => {:download => new} %>  
20 - </div>  
21 - <% end %>  
22 - </ul> 21 + </div>
23 22
24 <div id ="new-template" style="display: none"> 23 <div id ="new-template" style="display: none">
25 <% new = {'icon' => 'ok'} %> 24 <% new = {'icon' => 'ok'} %>
views/box_organizer/_download_list.html.erb
  Diff comments   View file @cdf2886
1 <li> 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> 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>
9 <li><%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row") %></li> 8 <li><%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row") %></li>
10 </ul> 9 </ul>
11 </li> 10 </li>