Changeset 11
- Timestamp:
- 10/07/07 14:56:28 (1 year ago)
- Files:
-
- trunk/apps/frontend/modules/sfLucene/actions/actions.class.php (modified) (1 diff)
- trunk/apps/frontend/modules/sfLucene/templates/searchNoResults.php (modified) (1 diff)
- trunk/apps/frontend/modules/sfLucene/templates/searchResults.php (modified) (3 diffs)
- trunk/apps/frontend/templates/layout.php (modified) (1 diff)
- trunk/web/css/forum.css (modified) (1 diff)
- trunk/web/js/fast_search.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/apps/frontend/modules/sfLucene/actions/actions.class.php
r10 r11 44 44 return new sfLucenePager( sfLucene::getInstance()->friendlyFind($query) ); 45 45 } 46 47 protected function configurePager($pager) 48 { 49 $pager->setPage($this->getRequestParameter('page', 1)); 50 $pager->setMaxPerPage(sfConfig::get('app_sfSimpleForumPlugin_max_per_page', 10)); 51 } 52 46 53 } trunk/apps/frontend/modules/sfLucene/templates/searchNoResults.php
r10 r11 17 17 <p><?php echo __('No post in this forum is matching your query. Try with other terms.') ?></p> 18 18 19 <br/>20 21 19 <?php include_component($sf_context->getModuleName(), 'controls') ?> 22 20 <p><?php echo __('Type one or more keywords. The engine will return posts matching all the terms. Wildcards are not accepted') ?></p> trunk/apps/frontend/modules/sfLucene/templates/searchResults.php
r10 r11 2 2 <?php use_javascript('jquery.highlight-1.js') ?> 3 3 4 <?php use_helper('sfLucene', 'sfSimpleForum', 'I18N' ) ?>4 <?php use_helper('sfLucene', 'sfSimpleForum', 'I18N', 'Pagination') ?> 5 5 6 6 <?php if (sfConfig::get('app_sfSimpleForum_include_breadcrumb', true)): ?> … … 29 29 )) ?> 30 30 <?php endif; ?> 31 - 32 <?php if ($sf_params->get('most_recent_first')): ?> 33 <?php echo __('Most recent first') ?> 34 (<?php echo link_to(__('get most relevant first'), str_replace('&most_recent_first=true', '', $sf_request->getUri())) ?>) 35 <?php else: ?> 36 <?php echo __('Most relevant first') ?> 37 (<?php echo link_to(__('get most recent first'), $sf_request->getUri().'&most_recent_first=true') ?>) 31 32 <?php if ($pager->getNbResults() > 1): ?> 33 - 34 <?php if ($sf_params->get('most_recent_first')): ?> 35 <?php echo __('Most recent first') ?> 36 (<?php echo link_to(__('get most relevant first'), str_replace('&most_recent_first=true', '', $sf_request->getUri())) ?>) 37 <?php else: ?> 38 <?php echo __('Most relevant first') ?> 39 (<?php echo link_to(__('get most recent first'), $sf_request->getUri().'&most_recent_first=true') ?>) 40 <?php endif; ?> 41 38 42 <?php endif; ?> 39 43 </div> … … 45 49 </table> 46 50 47 <?php include_pager($pager, 5) ?>51 <?php echo pager_navigation($pager, 'sfLucene/search?query='.$query) ?> 48 52 49 53 <style type="text/css" media="screen"> trunk/apps/frontend/templates/layout.php
r10 r11 46 46 47 47 </div> 48 <script type="text/javascript" charset="utf-8">49 //<![CDATA[50 // Fixme: when PJS are available, do this in the js51 search_form_action = '<?php echo url_for('sfLucene/search') ?>';52 //]]>53 </script>54 48 55 49 <?php use_javascript('fast_search') ?> trunk/web/css/forum.css
r7 r11 113 113 margin-top: 10px; 114 114 } 115 116 form.search-controls 117 { 118 margin: 5px 0; 119 } trunk/web/js/fast_search.js
r10 r11 1 $(document).ready(function() { 1 $(document).ready(function() 2 { 3 search_link = document.getElementById('search_link'); 2 4 form = document.createElement('form'); 3 5 form.id = 'small_search_form'; 4 form.action = search_ form_action;6 form.action = search_link.href; 5 7 form.style.display = "none"; 6 8 form.style.paddingLeft = "5px"; … … 9 11 input.name = 'query'; 10 12 input.size = '10'; 13 submit = document.createElement('input'); 14 submit.type = 'submit'; 15 submit.value = 'Go'; 11 16 form.appendChild(input); 17 form.appendChild(submit); 12 18 document.getElementById('search_li').appendChild(form); 13 19 14 document.getElementById('search_link').onclick = function()20 search_link.onclick = function() 15 21 { 16 22 document.getElementById('small_search_form').style.display = 'inline';
