This should be applied with the original 2 patches, it's a follow up to fix errors, but not the full patch over again.
Nicole On Thu, Feb 25, 2010 at 3:19 PM, Nicole Engard <[email protected]> wrote: > bug 4170 updated overdue rules > bug 4220 add additional search buttons to advanced search > --- > .../prog/en/modules/catalogue/advsearch.tmpl | 8 ++++---- > .../prog/en/modules/help/admin/smart-rules.tmpl | 10 +++++----- > 2 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl > b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl > index 2071374..e4ff2b1 100644 > --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl > +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl > @@ -89,7 +89,7 @@ > <!-- TMPL_ELSE --> > <a > href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1">[More options]</a> > <!-- /TMPL_IF --> > - <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New > search]</a> > + <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New > search]</a> > </p> > <!-- /SEARCH BUTTONS --> > > @@ -120,7 +120,7 @@ > <!-- TMPL_ELSE --> > <a > href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1">[More options]</a> > <!-- /TMPL_IF --> > - <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New > search]</a> > + <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New > search]</a> > </p> > <!-- /SEARCH BUTTONS --> > > @@ -278,7 +278,7 @@ > <!-- TMPL_ELSE --> > <a > href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1">[More options]</a> > <!-- /TMPL_IF --> > - <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New > search]</a> > + <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New > search]</a> > </p> > <!-- /SEARCH BUTTONS --> > > @@ -333,7 +333,7 @@ > <!-- TMPL_ELSE --> > <a > href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1">[More options]</a> > <!-- /TMPL_IF --> > - <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New > search]</a> > + <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New > search]</a> > </p> > <!-- /SEARCH BUTTONS --> > </form> > diff --git > a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tmpl > b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tmpl > index 163c4ea..ead8c51 100644 > --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tmpl > +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tmpl > @@ -28,7 +28,7 @@ > <li>Choose the 'Item Type' you would like this rule to apply to. If you > leave this to 'Default' it will apply to all item types</li> > <li>Limit the number of items a patron can have checked out at the same > time by entering a number in the 'Current Checkouts Allowed' field</li> > <li>Define the period of time and item can be checked out to a patron by > entering the number of days in the 'Loan Period' box.</li> > -<li>'Fine Amount' should have the amount you would like to charge for > overdue items > +<li>'Fine Amount' should have the amount you would like to charge for > overdue items</li> > <ul><li><span style="color: #ff0000">IMPORTANT: Enter only numbers and > decimal points.</span></li></ul></li> > <li>The 'Fine Grace Period' is the period of time an item can be overdue > before you start charging fines.</li> > <li>Enter the 'Fine Charging Interval' in days (ex. charge fines every 1 > day, or every 2 days)</li> > @@ -50,11 +50,11 @@ > <p>From this menu you can set a default to apply to all item types and > patrons in the library. </p> > > <ul><li>In 'Total Current Checkouts Allowed' enter the total number of > items patrons can have checked out at one time</li> > -<li>Control where patrons can place holds from using the 'Hold Policy' menu > +<li>Control where patrons can place holds from using the 'Hold Policy' > menu</li> > <ul><li>From Any Library: Patrons from any library may put this item on > hold. (default if none is defined)</li> > <li>From Home Library: Only patrons from the item's home library may put > this book on hold.</li> > <li>No Holds Allowed: No patron may put this book on hold.</li></ul></li> > -<li>Once your policy is set, you can unset it by clicking the 'Unset' link > to the right of the rule</li></ul> > +<li>Once your policy is set, you can unset it by clicking the 'Unset' link > to the right of the rule</li></ul> > > <h3 class="section">Checkouts Per Patron</h3> > > @@ -70,8 +70,8 @@ > > <ul><li>From Any Library: Patrons from any library may put this item on > hold. (default if none is defined)</li> > <li>From Home Library: Only patrons from the item's home library may put > this book on hold.</li> > -<li>No Holds Allowed: No patron may put this book on hold.</li></ul> > - > +<li>No Holds Allowed: No patron may put this book on hold.</li></ul> > + > <p><span style="color: #ff0000">IMPORTANT: Note that if the system > preference AllowHoldPolicyOverride set to 'allow', these policies can be > overridden by your circulation staff.</span></p> > > <p><span style="color: #ff0000">IMPORTANT: These policies are based on the > patron's home branch, not the branch that the reserving staff member is > from.</span> </p> > -- > 1.5.6.5 > > _______________________________________________ Koha-patches mailing list [email protected] http://lists.koha.org/mailman/listinfo/koha-patches
