Changeset 51 for server/trunk


Ignore:
Timestamp:
11/29/10 15:33:05 (14 years ago)
Author:
nanardon
Message:
  • review search tree
Location:
server/trunk/web
Files:
1 added
4 edited
2 moved

Legend:

Unmodified
Added
Removed

  • server/trunk/web/lib/Sophie/Controller/Search.pm

    r48 r51  
    2424 
    2525sub index :Path :Args(0) { 
     26    my ($self, $c) = @_; 
     27} 
     28 
     29sub results :Local { 
    2630    my ( $self, $c ) = @_; 
    2731 
    … …  
    4347        }; 
    4448    } 
    45 } 
    46  
    47 sub adv :Local { 
    48     my ($self, $c) = @_; 
    4949} 
    5050 

  • server/trunk/web/root/templates/html/search/index.html

    r45 r51  
    11<!-- $Id --> 
    22 
    3 [% INCLUDE 'search/adv.tt' %] 
     3[% INCLUDE 'search/index.tt' %] 

  • server/trunk/web/root/templates/html/search/index.tt

    r45 r51  
    11<!-- $Id$ --> 
    2 <form action="[% c.uri_for('/search/adv') %]" method="POST"> 
     2<form action="[% c.uri_for('/search') %]" method="POST"> 
    33<input type="text" name="search" value="[% c.req.param('search') | html %]"> 
    44<select name="type"> 

  • server/trunk/web/root/templates/html/search/results.tt

    r48 r51  
    11<p> 
    22[% IF pager.current_page != pager.first_page %] 
    3 <a href="[% c.uri_for('/search', { 'page' => pager.first_page }) %]">First</a>  
     3<a href="[% c.uri_for('/', c.req.path, { 'page' => pager.first_page }) %]">First</a>  
    44[% END %] 
    55[% IF pager.previous_page != pager.first_page %] 
    6 <a href="[% c.uri_for('/search', { 'page' => pager.previous_page }) %]">[% 
     6<a href="[% c.uri_for('/', c.req.path, { 'page' => pager.previous_page }) %]">[% 
    77pager.previous_page %]</a>  
    88[% END %] 
    99[% pager.current_page %] / [% pager.last_page %] 
    1010[% IF pager.next_page != pager.last_page %] 
    11 <a href="[% c.uri_for('/search', { 'page' => pager.next_page }) %]">[% 
     11<a href="[% c.uri_for('/', c.req.path, { 'page' => pager.next_page }) %]">[% 
    1212pager.next_page %]</a>  
    1313[% END %] 
    1414[% IF pager.current_page != pager.last_page %] 
    15 <a href="[% c.uri_for('/search', { 'page' => pager.last_page }) %]">Last</a>  
     15<a href="[% c.uri_for('/', c.req.path, { 'page' => pager.last_page }) %]">Last</a>  
    1616[% END %] 
    1717</p> 

  • server/trunk/web/root/templates/html/search/simple_search.tt

    r43 r51  
    11<div id="sophie_search"> 
    2     <form action="[% c.uri_for('/search') %]"> 
     2    <form action="[% c.uri_for('/search/results') %]"> 
    33        <input type="text" name="search" value="[% c.req.param('search') %]"> 
    44        <input type="submit"> 

  • server/trunk/web/root/templates/includes/header.tt

    r50 r51  
    2323        <p id="sitename">Sophie</p> 
    2424        <p id="sophie_menu"> 
    25         <span><a href="[% c.uri_for('/search/adv') %]">Search</a></span> 
     25        <span><a href="[% c.uri_for('/search') %]">Search</a></span> 
    2626        <span><a href="[% c.uri_for('/distrib') %]">Distribution</a></span> 
    2727        <span><a href="[% c.uri_for('/explorer') %]">Explorer</a></span> 
Note: See TracChangeset for help on using the changeset viewer.