diff --git a/app/views/search/_directory.rhtml b/app/views/search/_directory.rhtml
index 4ba29ad..2fa2fc8 100644
--- a/app/views/search/_directory.rhtml
+++ b/app/views/search/_directory.rhtml
@@ -1,4 +1,4 @@
-
+
<%= link_to_unless_current(_('Recent'), :action => 'index') %>
<%= (?a..?z).map { |initial| link_to_unless_current(('' << initial).upcase, :action => 'directory', :asset => @asset, :initial => ('' << initial)) }.join(' ') %>
diff --git a/app/views/search/_display_results.rhtml b/app/views/search/_display_results.rhtml
index 6691b6f..a9f8ea6 100644
--- a/app/views/search/_display_results.rhtml
+++ b/app/views/search/_display_results.rhtml
@@ -26,9 +26,8 @@
<%= render :partial => partial, :object => hit %>
<% end %>
-
+
-
@@ -39,6 +38,7 @@
<% end %>
+
<%=h @category ? (_('Search results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Search results for "%s"') % @query) %>
<%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>
<%= render :partial => 'display_results' %>
+
diff --git a/public/designs/icons/default/calendar-HC.gif b/public/designs/icons/default/calendar-HC.gif
new file mode 100644
index 0000000..15e01b0
Binary files /dev/null and b/public/designs/icons/default/calendar-HC.gif differ
diff --git a/public/designs/icons/default/calendar.gif b/public/designs/icons/default/calendar.gif
deleted file mode 120000
index f1a3483..0000000
--- a/public/designs/icons/default/calendar.gif
+++ /dev/null
@@ -1 +0,0 @@
-../../../images/calendar_date_select/calendar.gif
\ No newline at end of file
diff --git a/public/designs/icons/default/style.css b/public/designs/icons/default/style.css
index b000d66..248ae49 100644
--- a/public/designs/icons/default/style.css
+++ b/public/designs/icons/default/style.css
@@ -24,6 +24,7 @@
.icon-firefox { background-image: url(firefox-24x24.gif) }
.icon-help32on { background-image: url(help-on-32x32-HC.gif) }
.icon-help32off { background-image: url(help-off-32x32-HC.gif) }
+.icon-todo { background-image: url(stock_todo.png) }
.icon-menu- { background-image: url(menu-without-ico-HC.gif) }
.icon-menu-home { background-image: url(home-HC.gif) }
.icon-menu-blog { background-image: url(blog-HC.gif) }
@@ -37,9 +38,7 @@
.icon-menu-logout { background-image: url(exit-HC.gif) }
.icon-menu-search { background-image: url(search-HC.gif) }
.icon-menu-ed-design { background-image: url(edit-design-HC.gif) }
-.icon-menu-events { background-image: url(calendar.gif) }
-.icon-todo { background-image: url(stock_todo.png); }
-
-.icon-menu-articles { background-image: url(edit-HC.gif) }
-.icon-menu-comments { background-image: url(blog-HC.gif) }
-.icon-menu-people { background-image: url(album-HC.gif) }
+.icon-menu-events { background-image: url(calendar-HC.gif) }
+.icon-menu-articles { background-image: url(edit-HC.gif) }
+.icon-menu-comments { background-image: url(blog-HC.gif) }
+.icon-menu-people { background-image: url(album-HC.gif) }
diff --git a/public/designs/themes/zen3/stylesheets/controller_search.css b/public/designs/themes/zen3/stylesheets/controller_search.css
index d109bc9..64f3521 100644
--- a/public/designs/themes/zen3/stylesheets/controller_search.css
+++ b/public/designs/themes/zen3/stylesheets/controller_search.css
@@ -1,4 +1,8 @@
+.search-index {
+ color: #EA5;
+}
+
#view-category,
#search-results {
padding: 0% 2% 10px 2%;
@@ -52,18 +56,6 @@
-moz-border-radius: 15px;
}
-.search-results-innerbox hr {
- display: none;
-}
-
-.msie .search-results-innerbox hr {
- display: inline;
- clear: both;
- margin: -10px 0px 0px 0px;
- height: 0px;
- visibility: hidden;
-}
-
.search-results-type-product li li a {
color: #000;
}
diff --git a/public/stylesheets/controller_search.css b/public/stylesheets/controller_search.css
index 0b42f62..f67ac28 100644
--- a/public/stylesheets/controller_search.css
+++ b/public/stylesheets/controller_search.css
@@ -1,7 +1,10 @@
+#search-page {
+ position: relative; /* to the text appear on MSIE 6 */
+}
+
.search-index {
text-align: center;
position: relative;
- color: #EA5;
font-weight: bold;
}
@@ -28,6 +31,9 @@
float: left;
width: 49%;
}
+.msie .search-results-box {
+ width: 47% !important;
+}
.only-one-result-box .search-results-box {
width: 100%;
@@ -44,10 +50,25 @@
overflow: auto;
}
+.search-results-innerbox hr {
+ display: none;
+}
+
+.msie .search-results-innerbox hr {
+ display: inline;
+ clear: both;
+ margin: -10px 0px 0px 0px;
+ height: 0px;
+ visibility: hidden;
+}
+
.search-results-innerbox.common-profile-list-block {
padding: 10px 0px 0px 10px;
height: 215px;
}
+.msie .search-results-innerbox.common-profile-list-block.search-results-type-profile {
+ height: 205px;
+}
.only-one-result-box .search-results-innerbox,
.only-one-result-box .search-results-innerbox.common-profile-list-block {
@@ -96,6 +117,7 @@
margin: 0px;
padding: 0px;
list-style: none;
+ list-style-image: none;
font-size: 10px;
}
#content .search-results-type-product li strong {
@@ -110,6 +132,9 @@
#content .search-results-type-product li li {
padding-bottom: 0px;
}
+.msie #content .search-results-type-product li li {
+ line-height: 12px;
+}
.product-pic {
display: block;
@@ -121,6 +146,9 @@
position: relative;
top: 5px;
}
+.product-pic {
+ height: 60px;
+}
.product-pic span {
display: none;
}
--
libgit2 0.21.2