Download as
Browse Code »

Commit 4b6f2bd3d80f0a0c5c4682d0775588dd63afd181

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

ActionItem413: zen3 is OK on MSIE 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1904 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 8 changed files with 44 additions and 23 deletions   Show diff stats
app/views/search/_directory.rhtml
  Diff comments   View file @4b6f2bd
1   -<div style='text-align: center'>
  1 +<div class="search-index">
2 2 <%= link_to_unless_current(_('Recent'), :action => 'index') %>
3 3 &nbsp;
4 4 <%= (?a..?z).map { |initial| link_to_unless_current(('' << initial).upcase, :action => 'directory', :asset => @asset, :initial => ('' << initial)) }.join(' &nbsp; ') %>
... ...
app/views/search/_display_results.rhtml
  Diff comments   View file @4b6f2bd
... ... @@ -26,9 +26,8 @@
26 26 <%= render :partial => partial, :object => hit %>
27 27 <% end %>
28 28 </ul>
29   - <br />
  29 + <hr />
30 30 </div><!-- end class="search-results-innerbox" -->
31   -
32 31 </div><!-- end class="search-results-<%= name %>" -->
33 32 <% else %>
34 33 <div class="search-results-<%= name %> search-results-empty search-results-box <%= pos2 %> <%= 'col%s_of3' % pos3.to_s %>">
... ... @@ -39,6 +38,7 @@
39 38 <% end %>
40 39 <div class="search-results-innerbox search-results-type-empty">
41 40 <div> <%= _('None') %> </div>
  41 + <hr />
42 42 </div><!-- end class="search-results-innerbox" -->
43 43 </div><!-- end class="search-results-<%= name %>" -->
44 44 <% end %>
... ...
app/views/search/index.rhtml
  Diff comments   View file @4b6f2bd
  1 +<div id="search-page">
  2 +
1 3 <h1> <%=h @category ? (_('Search results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Search results for "%s"') % @query) %> </h1>
2 4  
3 5 <%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>
4 6  
5 7 <%= render :partial => 'display_results' %>
6 8  
  9 +</div><!-- end id="search-page" -->
7 10 <br style="clear:both" />
... ...
public/designs/icons/default/calendar-HC.gif 0 → 100644
View file @4b6f2bd

151 Bytes
public/designs/icons/default/calendar.gif
View file @a77dc98
... ... @@ -1 +0,0 @@
1   -../../../images/calendar_date_select/calendar.gif
2 0 \ No newline at end of file
public/designs/icons/default/style.css
  Diff comments   View file @4b6f2bd
... ... @@ -24,6 +24,7 @@
24 24 .icon-firefox { background-image: url(firefox-24x24.gif) }
25 25 .icon-help32on { background-image: url(help-on-32x32-HC.gif) }
26 26 .icon-help32off { background-image: url(help-off-32x32-HC.gif) }
  27 +.icon-todo { background-image: url(stock_todo.png) }
27 28 .icon-menu- { background-image: url(menu-without-ico-HC.gif) }
28 29 .icon-menu-home { background-image: url(home-HC.gif) }
29 30 .icon-menu-blog { background-image: url(blog-HC.gif) }
... ... @@ -37,9 +38,7 @@
37 38 .icon-menu-logout { background-image: url(exit-HC.gif) }
38 39 .icon-menu-search { background-image: url(search-HC.gif) }
39 40 .icon-menu-ed-design { background-image: url(edit-design-HC.gif) }
40   -.icon-menu-events { background-image: url(calendar.gif) }
41   -.icon-todo { background-image: url(stock_todo.png); }
42   -
43   -.icon-menu-articles { background-image: url(edit-HC.gif) }
44   -.icon-menu-comments { background-image: url(blog-HC.gif) }
45   -.icon-menu-people { background-image: url(album-HC.gif) }
  41 +.icon-menu-events { background-image: url(calendar-HC.gif) }
  42 +.icon-menu-articles { background-image: url(edit-HC.gif) }
  43 +.icon-menu-comments { background-image: url(blog-HC.gif) }
  44 +.icon-menu-people { background-image: url(album-HC.gif) }
... ...
public/designs/themes/zen3/stylesheets/controller_search.css
  Diff comments   View file @4b6f2bd
1 1  
  2 +.search-index {
  3 + color: #EA5;
  4 +}
  5 +
2 6 #view-category,
3 7 #search-results {
4 8 padding: 0% 2% 10px 2%;
... ... @@ -52,18 +56,6 @@
52 56 -moz-border-radius: 15px;
53 57 }
54 58  
55   -.search-results-innerbox hr {
56   - display: none;
57   -}
58   -
59   -.msie .search-results-innerbox hr {
60   - display: inline;
61   - clear: both;
62   - margin: -10px 0px 0px 0px;
63   - height: 0px;
64   - visibility: hidden;
65   -}
66   -
67 59 .search-results-type-product li li a {
68 60 color: #000;
69 61 }
... ...
public/stylesheets/controller_search.css
  Diff comments   View file @4b6f2bd
  1 +#search-page {
  2 + position: relative; /* to the text appear on MSIE 6 */
  3 +}
  4 +
1 5 .search-index {
2 6 text-align: center;
3 7 position: relative;
4   - color: #EA5;
5 8 font-weight: bold;
6 9 }
7 10  
... ... @@ -28,6 +31,9 @@
28 31 float: left;
29 32 width: 49%;
30 33 }
  34 +.msie .search-results-box {
  35 + width: 47% !important;
  36 +}
31 37  
32 38 .only-one-result-box .search-results-box {
33 39 width: 100%;
... ... @@ -44,10 +50,25 @@
44 50 overflow: auto;
45 51 }
46 52  
  53 +.search-results-innerbox hr {
  54 + display: none;
  55 +}
  56 +
  57 +.msie .search-results-innerbox hr {
  58 + display: inline;
  59 + clear: both;
  60 + margin: -10px 0px 0px 0px;
  61 + height: 0px;
  62 + visibility: hidden;
  63 +}
  64 +
47 65 .search-results-innerbox.common-profile-list-block {
48 66 padding: 10px 0px 0px 10px;
49 67 height: 215px;
50 68 }
  69 +.msie .search-results-innerbox.common-profile-list-block.search-results-type-profile {
  70 + height: 205px;
  71 +}
51 72  
52 73 .only-one-result-box .search-results-innerbox,
53 74 .only-one-result-box .search-results-innerbox.common-profile-list-block {
... ... @@ -96,6 +117,7 @@
96 117 margin: 0px;
97 118 padding: 0px;
98 119 list-style: none;
  120 + list-style-image: none;
99 121 font-size: 10px;
100 122 }
101 123 #content .search-results-type-product li strong {
... ... @@ -110,6 +132,9 @@
110 132 #content .search-results-type-product li li {
111 133 padding-bottom: 0px;
112 134 }
  135 +.msie #content .search-results-type-product li li {
  136 + line-height: 12px;
  137 +}
113 138  
114 139 .product-pic {
115 140 display: block;
... ... @@ -121,6 +146,9 @@
121 146 position: relative;
122 147 top: 5px;
123 148 }
  149 +.product-pic {
  150 + height: 60px;
  151 +}
124 152 .product-pic span {
125 153 display: none;
126 154 }
... ...