Download as
Browse Code »

Commit 87ba3ac36f0fa61e43f9bb04d3ad14ef7990d645

Authored by JoenioCosta
1 parent 4025cff3
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem544: autoscroll on edit LinkListBlock 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2186 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 20 additions and 29 deletions   Show diff stats
app/models/link_list_block.rb
  Diff comments   View file @87ba3ac
1 class LinkListBlock < Block 1 class LinkListBlock < Block
2 2
3 - settings_items :title, String  
4 settings_items :links, Array, :default => [] 3 settings_items :links, Array, :default => []
5 4
6 before_save do |block| 5 before_save do |block|
app/views/box_organizer/_link_list_block.rhtml
  Diff comments   View file @87ba3ac
1 <p> 1 <p>
2 -<label for='block_title'><strong><%= _('Block title') %></strong></label>  
3 -<%= text_field_tag 'block[title]', @block.title %>  
4 -</p>  
5 -  
6 -<p>  
7 <strong><%= _('Links') %></strong> 2 <strong><%= _('Links') %></strong>
8 <div id='edit-link-list-block'> 3 <div id='edit-link-list-block'>
9 <table id='links' class='noborder'> 4 <table id='links' class='noborder'>
@@ -14,14 +9,11 @@ @@ -14,14 +9,11 @@
14 <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address] %></td> 9 <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address] %></td>
15 </tr> 10 </tr>
16 <% end %> 11 <% end %>
17 - <tr>  
18 - <td><%= text_field_tag 'block[links][][name]' %></td>  
19 - <td class='cel-address'><%= text_field_tag 'block[links][][address]' %></td>  
20 - </tr>  
21 </table> 12 </table>
22 </div> 13 </div>
23 </p> 14 </p>
24 15
25 <%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do |page| 16 <%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do |page|
26 - page.insert_html :bottom, 'links', content_tag('tr', content_tag('td',text_field_tag('block[links][][name]')) + content_tag('td',text_field_tag('block[links][][address]', nil, :class => 'cel-address'))) 17 + page.insert_html :bottom, 'links', content_tag('tr', content_tag('td',text_field_tag('block[links][][name]')) + content_tag('td',text_field_tag('block[links][][address]', nil, :class => 'cel-address'))) +
  18 + javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
27 end %> 19 end %>
public/stylesheets/blocks/link-list-block.css
  Diff comments   View file @87ba3ac
  1 +#edit-link-list-block {
  2 + overflow: auto;
  3 + overflow-x: hidden;
  4 + height: 120px;
  5 +}
  6 +
  7 +#edit-link-list-block table {
  8 + width: 100%;
  9 +}
  10 +
  11 +#edit-link-list-block table .cel-address {
  12 + width: 300px;
  13 +}
  14 +
  15 +#edit-link-list-block table .cel-address input {
  16 + width: 100%;
  17 +}
  18 +
1 #content .link-list-block { 19 #content .link-list-block {
2 padding: 10px 20px 10px 10px; 20 padding: 10px 20px 10px 10px;
3 21
public/stylesheets/common.css
  Diff comments   View file @87ba3ac
@@ -244,24 +244,6 @@ table.noborder th, table.noborder td{ @@ -244,24 +244,6 @@ table.noborder th, table.noborder td{
244 border: none; 244 border: none;
245 } 245 }
246 246
247 -#edit-link-list-block {  
248 - overflow: auto;  
249 - overflow-x: hidden;  
250 - height: 120px;  
251 -}  
252 -  
253 -#edit-link-list-block table {  
254 - width: 100%;  
255 -}  
256 -  
257 -#edit-link-list-block table .cel-address {  
258 - width: 300px;  
259 -}  
260 -  
261 -#edit-link-list-block table .cel-address input {  
262 - width: 100%;  
263 -}  
264 -  
265 /* for fields with auto-completion */ 247 /* for fields with auto-completion */
266 div.auto-complete { 248 div.auto-complete {
267 display: block; 249 display: block;