Bugzilla – Attachment 22110 Details for
Bug 11019
Require some fields when adding authorized value category
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11019 follow-up : reindenting
Bug-11019-follow-up--reindenting.patch (text/plain), 12.60 KB, created by
Joy Nelson
on 2013-10-20 21:03:56 UTC
(
hide
)
Description:
Bug 11019 follow-up : reindenting
Filename:
MIME Type:
Creator:
Joy Nelson
Created:
2013-10-20 21:03:56 UTC
Size:
12.60 KB
patch
obsolete
>From 0e1a494394d9b9c93dc2df8c72695446bfbb069b Mon Sep 17 00:00:00 2001 >From: Paul Poulain <paul.poulain@biblibre.com> >Date: Sun, 20 Oct 2013 20:54:25 +0200 >Subject: [PATCH] Bug 11019 follow-up : reindenting > >While working on bug 11019, I saw many tabs & silly indenting. >This patch fixes both > >Signed-off-by: Joy Nelson <joy@bywatersolutions.com> >--- > .../prog/en/modules/admin/authorised_values.tt | 170 ++++++++++---------- > 1 files changed, 88 insertions(+), 82 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >index 0628d20..f0258e8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >@@ -1,7 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Authorized values [% IF ( add_form ) %] › [% IF ( action_modify ) %]Modify authorized value[% END %] >- [% IF ( action_add_value ) %] › New authorized value[% END %] >- [% IF ( action_add_category ) %] › New category[% END %][% END %] >+[% IF ( action_add_value ) %] › New authorized value[% END %] >+[% IF ( action_add_category ) %] › New category[% END %][% END %] > [% IF ( delete_confirm ) %] › Confirm deletion[% END %] > [% IF ( else ) %]Authorized values[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -43,9 +43,9 @@ $(document).ready(function() { > [% END %] > > <style type="text/css"> >- fieldset.rows div.toptabs li { clear:none;margin-right:.5em;padding-bottom:0;width:auto; } >+ fieldset.rows div.toptabs li { clear:none;margin-right:.5em;padding-bottom:0;width:auto; } > fieldset.rows div.toptabs .ui-tabs-nav li.ui-tabs-selected {background-color : #F4F8F9; } >- fieldset.rows .ui-tabs-panel { margin-right : 10px; margin-left : 10px;margin-bottom:10px;} >+ fieldset.rows .ui-tabs-panel { margin-right : 10px; margin-left : 10px;margin-bottom:10px;} > fieldset.rows .ui-tabs-nav { margin-left : 10px; } > </style> > </head> >@@ -53,51 +53,52 @@ $(document).ready(function() { > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a> › [% IF ( action_modify ) %]Modify authorized value[% END %] >- [% IF ( action_add_value ) %]New authorized value[% END %] >- [% IF ( action_add_category ) %]New category[% END %][% END %] >+[% IF ( action_add_value ) %]New authorized value[% END %] >+[% IF ( action_add_category ) %]New category[% END %][% END %] > [% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a> › Confirm deletion[% END %] > [% IF ( else ) %]Authorized values[% END %]</div> > > <div id="doc3" class="yui-t2"> > > <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >+ <div id="yui-main"> >+ <div class="yui-b"> > > [% IF ( add_form ) %] >- <h1> >- [% IF ( action_modify ) %]Modify authorized value[% END %] >- [% IF ( action_add_value ) %]New authorized value[% END %] >- [% IF ( action_add_category ) %]New category[% END %] >- </h1> >+ <h1> >+ [% IF ( action_modify ) %]Modify authorized value[% END %] >+ [% IF ( action_add_value ) %]New authorized value[% END %] >+ [% IF ( action_add_category ) %]New category[% END %] >+ </h1> > > [% IF ( action_modify ) %]<div class="note"><strong>NOTE:</strong> If you change an authorized value, existing records using it won't be updated.</div>[% END %] > >- <form action="[% script_name %]" name="Aform" class="validated" method="post"> >- <input type="hidden" name="op" value="add_validate" /> >+ <form action="[% script_name %]" name="Aform" class="validated" method="post"> >+ <input type="hidden" name="op" value="add_validate" /> > <input type="hidden" name="offset" value="[% offset %]" /> >- <fieldset class="rows"><ol> >+ <fieldset class="rows"> >+ <ol> > <li> >- [% IF ( action_add_category ) %]<label for="category">Category: </label> >- <input type="text" name="category" id="category" size="16" maxlength="16" class="focus,required" required="required" /> >- [% ELSE %]<span class="label">Category</span> >- <input type="hidden" name="category" value="[% category %]" /> [% category %] >- [% END %] >+ [% IF ( action_add_category ) %]<label for="category">Category: </label> >+ <input type="text" name="category" id="category" size="16" maxlength="16" class="focus,required" required="required" /> >+ [% ELSE %]<span class="label">Category</span> >+ <input type="hidden" name="category" value="[% category %]" /> [% category %] >+ [% END %] > </li> > <li> > <label for="authorised_value">Authorized value: </label> >- [% IF ( action_modify ) %]<input type="hidden" id="id" name="id" value="[% id %]" />[% END %] >+ [% IF ( action_modify ) %]<input type="hidden" id="id" name="id" value="[% id %]" />[% END %] > [% IF ( action_add_category ) %] >- <input type="text" id="authorised_value" name="authorised_value" value="[% authorised_value %]" maxlength="80" /> >+ <input type="text" id="authorised_value" name="authorised_value" value="[% authorised_value %]" maxlength="80" /> > [% ELSE %] >- <input type="text" id="authorised_value" name="authorised_value" value="[% authorised_value %]" maxlength="80" class="focus" /> >+ <input type="text" id="authorised_value" name="authorised_value" value="[% authorised_value %]" maxlength="80" class="focus" /> > [% END %] > </li> > <li> > <label for="lib">Description: </label> > <input type="text" name="lib" id="lib" value="[% lib %]" maxlength="200" /> > </li> >- <li> >+ <li> > <label for="lib_opac">Description (OPAC): </label> > <input type="text" name="lib_opac" id="lib_opac" value="[% lib_opac %]" maxlength="200" /> > </li> >@@ -116,37 +117,40 @@ $(document).ready(function() { > </span> > </li> > >- </ol> >+ </ol> > <div id="icons" class="toptabs" style="clear:both"> > <h5 style="margin-left:10px;">Choose an icon:</h5> >- <ul> >- <li><a href="#none">None</a></li> >- [% FOREACH imageset IN imagesets %] >- [% IF ( imageset.imagesetactive ) %]<li class="ui-tabs-selected">[% ELSE %]<li>[% END %]<a href="#[% imageset.imagesetname %]">[% imageset.imagesetname %]</a></li> >- [% END %] >- </ul> >+ <ul> >+ <li><a href="#none">None</a></li> >+ [% FOREACH imageset IN imagesets %] >+ [% IF ( imageset.imagesetactive ) %]<li class="ui-tabs-selected">[% ELSE %]<li>[% END %]<a href="#[% imageset.imagesetname %]">[% imageset.imagesetname %]</a></li> >+ [% END %] >+ </ul> > <div id="none"><ul> > <li><label for="noimage">No image: </label><input type="radio" name="imageurl" id="noimage" value="removeImage" /></li> > </ul> > <br class="clear" /></div> > [% FOREACH imageset IN imagesets %] >- <div id="[% imageset.imagesetname %]"><ul> >+ <div id="[% imageset.imagesetname %]"> >+ <ul> > [% FOREACH image IN imageset.images %] >- <li style="float: none; display: inline-block; clear : none; width: auto;"> >- <label> [% IF ( image.StaffImageUrl ) %] >- <img src="[% image.StaffImageUrl %]" alt="[% image.StaffImageUrl %]" title="[% image.StaffImageUrl %]" /> >- [% ELSE %] >- [% END %] >- [% IF ( image.checked ) %] >- <input type="radio" name="imageurl" value="[% image.KohaImage %]" checked="checked" /> >- [% ELSE %] >- [% IF ( image.KohaImage ) %] <!-- to delete the radio button if there is no image after --> >- <input type="radio" name="imageurl" value="[% image.KohaImage %]" /> >- [% END %] >- [% END %] >+ <li style="float: none; display: inline-block; clear : none; width: auto;"> >+ <label> >+ [% IF ( image.StaffImageUrl ) %] >+ <img src="[% image.StaffImageUrl %]" alt="[% image.StaffImageUrl %]" title="[% image.StaffImageUrl %]" /> >+ [% ELSE %] >+ [% END %] >+ [% IF ( image.checked ) %] >+ <input type="radio" name="imageurl" value="[% image.KohaImage %]" checked="checked" /> >+ [% ELSE %] >+ [% IF ( image.KohaImage ) %] <!-- to delete the radio button if there is no image after --> >+ <input type="radio" name="imageurl" value="[% image.KohaImage %]" /> >+ [% END %] >+ [% END %] > </label> >- </li> >- [% END %]</ul> >+ </li> >+ [% END %] >+ </ul> > <br class="clear" /> > </div> > [% END %] >@@ -159,27 +163,28 @@ $(document).ready(function() { > > > [% IF ( delete_confirm ) %] >- <div class="dialog alert"> >-<h3>Confirm deletion</h3> >-<table> >- <tr> >- <th>Category</th> >- <th>Value</th> >- <th>Description</th> >- <th>Description (OPAC)</th> >- </tr> >- <tr> >- <td>[% searchfield %]</td> >- <td>[% Tvalue %]</td> >- <td>[% Tlib %]</td> >- <td>[% Tlib_opac %]</td> >- </tr> >- </table> >- <form action="[% script_name %]" method="post"> >- <input type="hidden" name="op" value="delete_confirmed" /> >- <input type="hidden" name="id" value="[% id %]" /> >+<div class="dialog alert"> >+ <h3>Confirm deletion</h3> >+ <table> >+ <tr> >+ <th>Category</th> >+ <th>Value</th> >+ <th>Description</th> >+ <th>Description (OPAC)</th> >+ </tr> >+ <tr> >+ <td>[% searchfield %]</td> >+ <td>[% Tvalue %]</td> >+ <td>[% Tlib %]</td> >+ <td>[% Tlib_opac %]</td> >+ </tr> >+ </table> >+ <form action="[% script_name %]" method="post"> >+ <input type="hidden" name="op" value="delete_confirmed" /> >+ <input type="hidden" name="id" value="[% id %]" /> > <input type="hidden" name="searchfield" value="[% searchfield %]" /><fieldset class="action"><input type="submit" value="Yes, delete" class="approve" /></form> >-<form action="[% script_name %]" method="get"><input type="hidden" name="searchfield" value="[% searchfield %]" /><input type="submit" value="No, do not delete" class="deny" /></form> >+ <form action="[% script_name %]" method="get"><input type="hidden" name="searchfield" value="[% searchfield %]" /><input type="submit" value="No, do not delete" class="deny" /> >+ </form> > </div> > [% END %] > >@@ -241,14 +246,14 @@ $(document).ready(function() { > > [% IF ( loop ) %]<table id="table_authorized_values" class="tablesorter"> > <thead><tr> >- <th>Authorized value</th> >- <th>Description</th> >- <th>Description (OPAC)</th> >- <th>Icon</th> >+ <th>Authorized value</th> >+ <th>Description</th> >+ <th>Description (OPAC)</th> >+ <th>Icon</th> > <th>Branches limitations</th> >- <th>Edit</th> >- <th>Delete</th> >- </tr> >+ <th>Edit</th> >+ <th>Delete</th> >+ </tr> > </thead><tbody> > [% FOREACH loo IN loop %] > [% UNLESS ( loop.odd ) %] >@@ -256,10 +261,10 @@ $(document).ready(function() { > [% ELSE %] > <tr> > [% END %] >- <td>[% loo.authorised_value %]</td> >- <td>[% loo.lib %]</td> >- <td>[% loo.lib_opac %]</td> >- <td>[% IF ( loo.imageurl ) %]<img src="[% loo.imageurl %]" alt=""/>[% ELSE %] [% END %]</td> >+ <td>[% loo.authorised_value %]</td> >+ <td>[% loo.lib %]</td> >+ <td>[% loo.lib_opac %]</td> >+ <td>[% IF ( loo.imageurl ) %]<img src="[% loo.imageurl %]" alt=""/>[% ELSE %] [% END %]</td> > <td> > [% IF loo.branches.size > 0 %] > [% branches_str = "" %] >@@ -276,8 +281,8 @@ $(document).ready(function() { > No limitation > [% END %] > </td> >- <td><a href="[% loo.edit %]">Edit</a></td> >- <td><a href="[% loo.delete %]">Delete</a></td> >+ <td><a href="[% loo.edit %]">Edit</a></td> >+ <td><a href="[% loo.delete %]">Delete</a></td> > </tr> > [% END %] > </tbody></table>[% ELSE %] >@@ -286,8 +291,9 @@ $(document).ready(function() { > > [% IF ( isprevpage ) %] > <form class="inline" action="[% script_name %]" method="post"> >-<input type="hidden" name="offset" value="[% prevpage %]" /><input type="hidden" name="searchfield" value="[% searchfield %]" /> >- <input type="submit" value="<< Previous" /></form> >+ <input type="hidden" name="offset" value="[% prevpage %]" /><input type="hidden" name="searchfield" value="[% searchfield %]" /> >+ <input type="submit" value="<< Previous" /> >+</form> > [% END %] > > [% END %] >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11019
:
21890
|
21899
|
22096
|
22097
|
22110
|
54577
|
54723
|
54761
|
54924
|
54948