Download as
Browse Code »

Commit 232ef4500edfeb7e50525c94ec623006a53dced4

Authored by AurelioAHeckert
1 parent 08503301
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

ActionItem491: botao "mais" convertido para aba inferior nas caixas de resultados 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2113 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 5 changed files with 46 additions and 38 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @232ef45
@@ -210,7 +210,6 @@ module ApplicationHelper @@ -210,7 +210,6 @@ module ApplicationHelper
210 end 210 end
211 link_to(content_tag('span', label), url, html_options.merge(:class => the_class )) 211 link_to(content_tag('span', label), url, html_options.merge(:class => the_class ))
212 end 212 end
213 - alias icon_button button_without_text  
214 213
215 def button_to_function(type, label, js_code, html_options = {}) 214 def button_to_function(type, label, js_code, html_options = {})
216 html_options[:class] = "" unless html_options[:class] 215 html_options[:class] = "" unless html_options[:class]
app/views/search/_display_results.rhtml
  Diff comments   View file @232ef45
@@ -15,9 +15,9 @@ @@ -15,9 +15,9 @@
15 <% if @results.size != 1 %> 15 <% if @results.size != 1 %>
16 <h3> 16 <h3>
17 <%= @names[name] %> 17 <%= @names[name] %>
18 - <%= icon_button :more, _('more...'), params.merge(:action => 'index', :find_in => [ name ]) %>  
19 </h3> 18 </h3>
20 <% end %> 19 <% end %>
  20 + <%= link_to _('see more...'), params.merge(:action => 'index', :find_in => [ name ]), :class => 'see-more' %>
21 <% end %> 21 <% end %>
22 <% partial = partial_for_class results.first.class %> 22 <% partial = partial_for_class results.first.class %>
23 <div class="search-results-innerbox search-results-type-<%= partial %> <%= 'common-profile-list-block' if partial == 'profile' %>"> 23 <div class="search-results-innerbox search-results-type-<%= partial %> <%= 'common-profile-list-block' if partial == 'profile' %>">
public/designs/themes/ecosol/stylesheets/controller_search.css
  Diff comments   View file @232ef45
@@ -88,6 +88,20 @@ body.category4 .search-results-innerbox { @@ -88,6 +88,20 @@ body.category4 .search-results-innerbox {
88 background: #CFDFF7; 88 background: #CFDFF7;
89 } 89 }
90 90
  91 +#content .search-results-box a.see-more {
  92 + -moz-border-radius-bottomleft: 7px;
  93 + -moz-border-radius-bottomright: 7px;
  94 +}
  95 +
  96 +body.category1 #content .search-results-box a.see-more { background: #FDD79E; border-color: #FDD79E }
  97 +body.category1 #content .search-results-box a.see-more:hover { background: #FDD79E }
  98 +body.category2 #content .search-results-box a.see-more { background: #C4F099; border-color: #C4F099 }
  99 +body.category2 #content .search-results-box a.see-more:hover { background: #8AE234 }
  100 +body.category3 #content .search-results-box a.see-more { background: #D6BFD3; border-color: #D6BFD3 }
  101 +body.category3 #content .search-results-box a.see-more:hover { background: #AD7FA8 }
  102 +body.category4 #content .search-results-box a.see-more { background: #F79494; border-color: #F79494 }
  103 +body.category4 #content .search-results-box a.see-more:hover { background: #EF2929 }
  104 +
91 .search-results-type-empty div { 105 .search-results-type-empty div {
92 color: #729FCF; 106 color: #729FCF;
93 } 107 }
@@ -97,20 +111,6 @@ body.category4 .search-results-innerbox { @@ -97,20 +111,6 @@ body.category4 .search-results-innerbox {
97 padding: 0px 0px 5px 0px; 111 padding: 0px 0px 5px 0px;
98 } 112 }
99 113
100 -/*  
101 -.Xsearch-results-type-profile.common-profile-list-block a {  
102 - width: 90px;  
103 -}  
104 -.Xsearch-results-type-profile.common-profile-list-block li div {  
105 - width: 88px;  
106 - height: 64px;  
107 -}  
108 -.Xsearch-results-type-profile.common-profile-list-block li span {  
109 - display: block;  
110 - width: 82px;  
111 -}  
112 -*/  
113 -  
114 .search-results-type-profile.common-profile-list-block li a { 114 .search-results-type-profile.common-profile-list-block li a {
115 color: #000; 115 color: #000;
116 } 116 }
public/designs/themes/zen3/stylesheets/controller_search.css
  Diff comments   View file @232ef45
@@ -28,21 +28,6 @@ @@ -28,21 +28,6 @@
28 border: 1px solid #E26B00; 28 border: 1px solid #E26B00;
29 } 29 }
30 30
31 -/*  
32 -.search-results-box {  
33 - Xwidth: 32.5%;  
34 -}  
35 -  
36 -.search-results-box.odd {  
37 - Xmargin-left: 0px;  
38 -}  
39 -  
40 -.search-results-box.col2_of3,  
41 -.search-results-box.col3_of3 {  
42 - Xmargin-left: 1.25%;  
43 -}  
44 -*/  
45 -  
46 .category-innerbox, 31 .category-innerbox,
47 .search-results-innerbox { 32 .search-results-innerbox {
48 padding: 10px 0px 10px 10px; 33 padding: 10px 0px 10px 10px;
@@ -52,6 +37,16 @@ @@ -52,6 +37,16 @@
52 -moz-border-radius: 15px; 37 -moz-border-radius: 15px;
53 } 38 }
54 39
  40 +#content .search-results-box a.see-more {
  41 + -moz-border-radius-bottomleft: 7px;
  42 + -moz-border-radius-bottomright: 7px;
  43 + background: #FD8;
  44 + border-color: #FD8;
  45 +}
  46 +#content .search-results-box a.see-more:hover {
  47 + background: #FC6;
  48 +}
  49 +
55 .search-results-type-product li li a { 50 .search-results-type-product li li a {
56 color: #000; 51 color: #000;
57 } 52 }
public/stylesheets/controller_search.css
  Diff comments   View file @232ef45
@@ -24,19 +24,15 @@ @@ -24,19 +24,15 @@
24 } 24 }
25 25
26 #search-results h3 { 26 #search-results h3 {
27 - margin: 20px 0px 0px 20px; 27 + margin: 0px 0px 0px 20px;
28 position: relative; 28 position: relative;
29 } 29 }
30 30
31 -#search-results h3 .button {  
32 - position: absolute;  
33 - right: 0px;  
34 - bottom: 0px;  
35 -}  
36 -  
37 .search-results-box { 31 .search-results-box {
38 float: left; 32 float: left;
39 width: 49%; 33 width: 49%;
  34 + padding-bottom: 14px;
  35 + position: relative;
40 } 36 }
41 37
42 .only-one-result-box .search-results-box { 38 .only-one-result-box .search-results-box {
@@ -50,6 +46,24 @@ @@ -50,6 +46,24 @@
50 float: right; 46 float: right;
51 } 47 }
52 48
  49 +#content .search-results-box a.see-more {
  50 + position: absolute;
  51 + bottom: 0px;
  52 + right: 25px;
  53 + font-size: 11px;
  54 + line-height: 11px;
  55 + background: #B8CFE7;
  56 + border: 1px solid #B8CFE7;
  57 + border-top: none;
  58 + padding: 0px 5px 2px 5px;
  59 +}
  60 +#content .search-results-box a.see-more:hover {
  61 + background: #729FCF;
  62 + color: #FFF;
  63 + text-decoration: none;
  64 +}
  65 +
  66 +
53 .search-results-innerbox { 67 .search-results-innerbox {
54 border: 1px solid #2A5896; 68 border: 1px solid #2A5896;
55 padding: 10px 0px 10px 10px; 69 padding: 10px 0px 10px 10px;