[Koha-patches] [PATCH 1/2] [SIGNED-OFF] bug 5149 fix broken link to noItemTypeImages preference

[Chris Cormack]

This patch no longer applies


Applying: bug 5149 fix broken link to noItemTypeImages preference
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl

Could you please rebase, and fix the conflict and resend the patch please
The follow up patch of course no longer applies also.

Chris
On 30 October 2010 01:20, Galen Charlton <gmcharlt at gmail.com> wrote:
> From: Nicole Engard <nengard at bywatersolutions.com>
>
> Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
> ---
>  .../prog/en/modules/admin/itemtypes.tmpl           |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
> index 4c34695..8111182 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
> +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
> @@ -162,7 +162,7 @@ Item Types Administration
>       <li>
>           <label for="description">Description</label><input type="text" id="description" name="description" size="48" maxlength="80" value="<!-- TMPL_VAR name="description" escape="HTML" -->" />      </li>
>      <!-- TMPL_IF NAME="noItemTypeImages" -->
> -        <li><span class="label">Image: </span>Item type images are disabled. To enable them, turn off the <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=all&searchfield=noItemTypeImages">noItemTypeImages system preference</a></li></ol>
> +        <li><span class="label">Image: </span>Item type images are disabled. To enable them, turn off the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=+noItemTypeImages">noItemTypeImages system preference</a></li></ol>
>         <!-- TMPL_ELSE --></ol>
>                <div id="icons" class="toptabs">
>                <h5 style="margin-left:10px;">Choose an Icon:</h5>
> --
> 1.7.0
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
>