oaeproject · gsilver · Apr 13, 2012 · Apr 17, 2012 · Apr 19, 2012
diff --git a/dev/css/sakai/sakai.base.css b/dev/css/sakai/sakai.base.css
@@ -2233,8 +2233,13 @@ ul li.s3d-list-item:hover {
 	-moz-box-shadow: 0 1px 1px 1px #CCC;
 }
 .s3d-search-header .s3d-search-header-type {
-	display: inline-block;
+    display: inline-block;
-	padding-top: 2px;
+    padding-top: 2px;
+    color: #666666;
+    font-size: 1em;
+    font-weight: normal;
+    text-align: left;
+    margin: 0;
 }
 .s3d-search-header .s3d-search-selects {
 	float: right;
@@ -2275,9 +2280,10 @@ ul li.s3d-list-item:hover {
 	margin-bottom: 15px;
 }
 .s3d-search-refineby .s3d-search-refineby-title {
-	margin-bottom: 5px;
+    margin: 0;
-	display: block;
+    font-size: 13px;
-	color: #64707E;
+    font-weight: normal;
+    color: #64707E;
 }
 .s3d-search-refineby button {
 	cursor: pointer;

diff --git a/dev/search.html b/dev/search.html
@@ -61,7 +61,7 @@
             {var tagsListed = false}
             {for t in tags}
                 {if t_index === "0"}
-                    <span class="s3d-search-refineby-title">__MSG__REFINE_YOUR_SEARCH_BY__</span>
+                    <h2 class="s3d-search-refineby-title">__MSG__REFINE_YOUR_SEARCH_BY__</h2>
                     <div class="s3d-search-refineby-list">
                     {var tagsListed = true}
                 {/if}

diff --git a/devwidgets/searchall/bundles/default.properties b/devwidgets/searchall/bundles/default.properties
@@ -5,6 +5,8 @@ CONTACT = contact
 CONTACTS = contacts
 CONTENT_ITEM = content items
 CONTENT_ITEMS = content items
+ITEM_FOUND = item found
+ITEMS_FOUND = items found
 MEMBERSHIP = membership
 MEMBERSHIPS = memberships
 NO_RESULTS_DESCRIPTION = No results? Try typing in a keyword to search on (above)

diff --git a/devwidgets/searchall/javascript/searchall.js b/devwidgets/searchall/javascript/searchall.js
@@ -139,6 +139,12 @@ require(["jquery", "sakai/sakai.api.core", "/dev/javascript/search_util.js"], fu
             }, function(items, total){
                 // Adjust display global total
                 $(searchConfig.global.numberFound, $rootel).text("" + (total || 0));
+                if (total === 1) {
+                    $(searchConfig.global.numberFound, $rootel).next('span.s3d-aural-text').text('' + sakai.api.i18n.getValueForKey('ITEM_FOUND', 'searchall'));
+                }
+                else {
+                    $(searchConfig.global.numberFound, $rootel).next('span.s3d-aural-text').text('' + sakai.api.i18n.getValueForKey('ITEMS_FOUND', 'searchall'));
+                }
                 return sakai.api.Util.TemplateRenderer(searchConfig.results.template, {
                     "items": items,
                     "sakai": sakai

diff --git a/devwidgets/searchall/searchall.html b/devwidgets/searchall/searchall.html
@@ -3,7 +3,7 @@
     <div class="searchall_content_main">
         <div class="s3d-search-refineby search_tags_refine_container"></div>
         <div class="fl-left fl-container s3d-search-header" id="results_header">
-            <span class="s3d-search-header-type">__MSG__ALL_TYPES__ (<strong id="searchall_numberFound">0</strong>)</span>
+            <h2 class="s3d-search-header-type">__MSG__ALL_TYPES__ (<strong id="searchall_numberFound">0</strong><span class="s3d-aural-text"> __MSG__ITEMS_FOUND__</span>)</h2>
             <div class="s3d-search-selects">
                 <div class="s3d-search-sort">
                     __MSG__SORT_BY__: <select>

diff --git a/devwidgets/searchcontent/bundles/default.properties b/devwidgets/searchcontent/bundles/default.properties
@@ -1,5 +1,7 @@
 ADD_CONTENT = Add content
 CONTENT = Content
+CONTENT_ITEM_FOUND = content item found
+CONTENT_ITEMS_FOUND = content items found
 NO_RESULTS_DESCRIPTION = No results? Try typing in a keyword to search on (above)
 OLDEST = Oldest
 SEARCH_THROUGH_CONTENT = Search through content

diff --git a/devwidgets/searchcontent/javascript/searchcontent.js b/devwidgets/searchcontent/javascript/searchcontent.js
@@ -183,6 +183,12 @@ require(["jquery", "sakai/sakai.api.core", "/dev/javascript/search_util.js"], fu
             }, function(items, total){
                 // Adjust display global total
                 $(searchConfig.global.numberFound, $rootel).text("" + total);
+                if (total === 1) {
+                    $(searchConfig.global.numberFound, $rootel).next('span.s3d-aural-text').text('' + sakai.api.i18n.getValueForKey('CONTENT_ITEM_FOUND', 'searchcontent'));
+                }
+                else {
+                    $(searchConfig.global.numberFound, $rootel).next('span.s3d-aural-text').text('' + sakai.api.i18n.getValueForKey('CONTENT_ITEMS_FOUND', 'searchcontent'));
+                }
                 return sakai.api.Util.TemplateRenderer(searchConfig.results.template, {
                     "items": items,
                     "sakai": sakai

diff --git a/devwidgets/searchcontent/searchcontent.html b/devwidgets/searchcontent/searchcontent.html
@@ -3,7 +3,7 @@
     <div class="searchcontent_content_main">
         <div class="s3d-search-refineby search_tags_refine_container"></div>
         <div class="fl-left fl-container s3d-search-header" id="results_header">
-            <span class="s3d-search-header-type">__MSG__CONTENT__ (<strong id="searchcontent_numberFound">0</strong>)</span>
+            <h2 class="s3d-search-header-type">__MSG__CONTENT__ (<strong id="searchcontent_numberFound">0</strong><span class="s3d-aural-text"> __MSG__CONTENT_ITEMS_FOUND__</span>)</h2>
             <div class="s3d-search-selects">
                 <!-- FACETED WIDGET -->
                 <div id="widget_faceted_98384013291" class="searchcontent_facted widget_inline"></div>

diff --git a/devwidgets/searchgroups/bundles/default.properties b/devwidgets/searchgroups/bundles/default.properties
@@ -4,6 +4,8 @@ CONTENT_ITEM = content item
 CONTENT_ITEMS = content items
 CREATED = created
 GROUPS = Groups
+GROUP_FOUND = group found
+GROUPS_FOUND = groups found
 NO_GROUPS_FOUND_CATEGORY = No ${category} found
 NO_RESULTS_DESCRIPTION = No results? Try typing in a keyword to search on (above)
 OLDEST = Oldest

diff --git a/devwidgets/searchgroups/javascript/searchgroups.js b/devwidgets/searchgroups/javascript/searchgroups.js
@@ -199,6 +199,12 @@ require(["jquery", "sakai/sakai.api.core", "/dev/javascript/search_util.js"], fu
             }, function(items, total){
                 // Adjust display global total
                 $(searchConfig.global.numberFound, $rootel).text("" + total);
+                if (total === 1) {
+                    $(searchConfig.global.numberFound, $rootel).next('span.s3d-aural-text').text('' + sakai.api.i18n.getValueForKey('GROUP_FOUND', 'searchgroups'));
+                }
+                else {
+                    $(searchConfig.global.numberFound, $rootel).next('span.s3d-aural-text').text('' + sakai.api.i18n.getValueForKey('GROUPS_FOUND', 'searchgroups'));
+                }
                 return sakai.api.Util.TemplateRenderer(searchConfig.results.template, {
                     "items": items,
                     "sakai": sakai

diff --git a/devwidgets/searchgroups/searchgroups.html b/devwidgets/searchgroups/searchgroups.html
@@ -3,7 +3,7 @@
     <div class="searchgroups_content_main">
         <div class="s3d-search-refineby search_tags_refine_container"></div>
         <div class="fl-left fl-container s3d-search-header" id="results_header">
-            <span class="s3d-search-header-type"><span id="searchgroups_type_title"></span> (<strong id="searchgroups_numberFound">0</strong>)</span>
+            <h2 class="s3d-search-header-type"><span id="searchgroups_type_title"></span> (<strong id="searchgroups_numberFound">0</strong><span class="s3d-aural-text"> __MSG__GROUPS_FOUND__</span>)</h2>
             <div class="s3d-search-selects">
                 <!-- FACETED WIDGET -->
                 <div id="searchgroups_results_faceted" class=""><!--

diff --git a/devwidgets/searchpeople/bundles/default.properties b/devwidgets/searchpeople/bundles/default.properties
@@ -2,6 +2,8 @@ CONTACT = contact
 CONTACTS = contacts
 CONTENT_ITEM = content item
 CONTENT_ITEMS = content items
+PEOPLE_FOUND = people found
+PERSON_FOUND = person found
 MEMBERSHIP = membership
 MEMBERSHIPS = memberships
 NO_RESULTS_DESCRIPTION = No results? Try typing in a keyword to search on (above)

diff --git a/devwidgets/searchpeople/javascript/searchpeople.js b/devwidgets/searchpeople/javascript/searchpeople.js
@@ -193,6 +193,12 @@ require(["jquery", "sakai/sakai.api.core", "/dev/javascript/search_util.js"], fu
             }, function(items, total){
                 // Adjust display global total
                 $(searchConfig.global.numberFound, $rootel).text("" + total);
+                if (total === 1) {
+                    $(searchConfig.global.numberFound, $rootel).next('span.s3d-aural-text').text('' + sakai.api.i18n.getValueForKey('PERSON_FOUND', 'searchpeople'));
+                }
+                else {
+                    $(searchConfig.global.numberFound, $rootel).next('span.s3d-aural-text').text('' + sakai.api.i18n.getValueForKey('PEOPLE_FOUND', 'searchpeople'));
+                }
                 return sakai.api.Util.TemplateRenderer(searchConfig.results.template, {
                     "items": items,
                     "sakai": sakai

diff --git a/devwidgets/searchpeople/searchpeople.html b/devwidgets/searchpeople/searchpeople.html
@@ -3,7 +3,7 @@
     <div class="searchpeople_content_main">
         <div class="s3d-search-refineby search_tags_refine_container"></div>
         <div class="fl-left fl-container s3d-search-header" id="results_header">
-            <span class="s3d-search-header-type">__MSG__PEOPLE__ (<strong id="searchpeople_numberFound">0</strong>)</span>
+            <h2 class="s3d-search-header-type">__MSG__PEOPLE__ (<strong id="searchpeople_numberFound">0</strong><span class="s3d-aural-text"> __MSG__PEOPLE_FOUND__</span>)</h2>
             <div class="s3d-search-selects">
                 <!-- FACETED WIDGET -->
                 <div id="widget_faceted_449529953" class="searchpeople_facted widget_inline"></div>