Bugzilla – Attachment 9882 Details for
Bug 7351
ability to edit a range of holidays
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
this is an addon after M. de Rooy's patch
0001-Bug-7351-Patch-for-minor-visual-changes.patch (text/plain), 7.90 KB, created by
Christophe Croullebois
on 2012-06-01 14:17:19 UTC
(
hide
)
Description:
this is an addon after M. de Rooy's patch
Filename:
MIME Type:
Creator:
Christophe Croullebois
Created:
2012-06-01 14:17:19 UTC
Size:
7.90 KB
patch
obsolete
>From 6c881bc0ef5f0ab897e3d4a8b40844e579ff9e89 Mon Sep 17 00:00:00 2001 >From: Christophe Croullebois <christophe.croullebois@biblibre.com> >Date: Fri, 1 Jun 2012 15:49:21 +0200 >Subject: [PATCH 1/1] Bug 7351 : Patch for minor visual changes > >I have just put a space between the radio button and the text for the new lines.. >And I have replaced tabulations by space. >You must have applied before : >"[SIGN OFF]Bug 7351 : feature that allows to delete a range of dates" >"Patch for minor textual changes" >--- > .../prog/en/modules/tools/holidays.tt | 66 +++++++++++--------- > 1 files changed, 36 insertions(+), 30 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >index aa578cf..1cf239c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >@@ -215,36 +215,42 @@ > <!-- showTitle is necessary for exception radio button to work properly --> > <label for="showDescription">Description:</label> > <textarea rows="2" cols="40" id="showDescription" name="showDescription"></textarea> >- </li> >- <li class="radio"><div id="exceptionPosibility" style="position:static"> >- <input type="radio" name="showOperation" id="showOperationExc" value="exception" /> <label for="showOperationExc">Generate an exception for this repeated holiday.</label> >- <a href="#" class="helptext">[?]</a> >- <div class="hint">You can make an exception for this holiday rule. This means that you will be able to say that for a repeatable holiday there is one day which is going to be an exception.</div> >- </div></li> >- <li class="radio"><input type="radio" name="showOperation" id="showOperationExcRange" value="exceptionrange" /> >- <label for="newOperationFieldException">Generate exceptions on a range of dates.</label>. >- <a href="#" class="helptext">[?]</a> >- <div class="hint">You can make an exception on a range of dates repeated yearly.</div> >- </li> >- <li class="radio"><input type="radio" name="showOperation" id="showOperationDel" value="delete" /> <label for="showOperationDel" id="showOperationDelLabel">Delete this holiday</label> >- <a href="#" class="helptext">[?]</a> >- <div class="hint">This will delete this holiday rule. If it is a repeatable holiday, this option checks for possible exceptions. If an exception exists, this option will remove the exception and set the date to a regular holiday.</div></li> >- <li class="radio"><input type="radio" name="showOperation" id="showOperationDelRange" value="deleterange" /><label for="showOperationDelRange" id="showOperationDelLabelRange">Delete the single holidays on a range</label>. >- <a href="#" class="helptext">[?]</a> >- <div class="hint">This will delete the single holidays rules only. The repeatable holidays and exceptions will not be deleted.</div> >- </li> >- <li class="radio"><input type="radio" name="showOperation" id="showOperationDelRangeRepeat" value="deleterangerepeat" /><label for="showOperationDelRangeRepeat" id="showOperationDelLabelRangeRepeat">Delete the repeated holidays on a range</label>. >- <a href="#" class="helptext">[?]</a> >- <div class="hint">This will delete the repeated holidays rules only. The repeatable holidays will be deleted but not the exceptions.</div> >- </li> >- <li class="radio"><input type="radio" name="showOperation" id="showOperationDelRangeRepeatExcept" value="deleterangerepeatexcept" /><label for="showOperationDelRangeRepeatExcept" id="showOperationDelLabelRangeRepeatExcept">Delete the exceptions on a range</label>. >- <a href="#" class="helptext">[?]</a> >- <div class="hint">This will delete the exceptions inside a given range. Be careful about your scope range. If it is oversized, you could slow down Koha.</div> >- </li> >- <li class="radio"><input type="radio" name="showOperation" id="showOperationEdit" value="edit" checked="checked" /> <label for="showOperationEdit">Edit this holiday</label> >- <a href="#" class="helptext">[?]</a> >- <div class="hint">This will save changes to the holiday's title and description. If the information for a repeatable holiday is modified, it affects all of the dates on which the holiday is repeated.</div></li> >- </ol> >+ </li> >+ <li class="radio"><div id="exceptionPosibility" style="position:static"> >+ <input type="radio" name="showOperation" id="showOperationExc" value="exception" /> >+ <label for="showOperationExc">Generate an exception for this repeated holiday.</label> >+ <a href="#" class="helptext">[?]</a> >+ <div class="hint">You can make an exception for this holiday rule. This means that you will be able to say that for a repeatable holiday there is one day which is going to be an exception.</div> >+ </div></li> >+ <li class="radio"><input type="radio" name="showOperation" id="showOperationExcRange" value="exceptionrange" /> >+ <label for="newOperationFieldException">Generate exceptions on a range of dates.</label>. >+ <a href="#" class="helptext">[?]</a> >+ <div class="hint">You can make an exception on a range of dates repeated yearly.</div> >+ </li> >+ <li class="radio"><input type="radio" name="showOperation" id="showOperationDel" value="delete" /> >+ <label for="showOperationDel" id="showOperationDelLabel">Delete this holiday</label> >+ <a href="#" class="helptext">[?]</a> >+ <div class="hint">This will delete this holiday rule. If it is a repeatable holiday, this option checks for possible exceptions. If an exception exists, this option will remove the exception and set the date to a regular holiday.</div></li> >+ <li class="radio"><input type="radio" name="showOperation" id="showOperationDelRange" value="deleterange" /> >+ <label for="showOperationDelRange" id="showOperationDelLabelRange">Delete the single holidays on a range</label>. >+ <a href="#" class="helptext">[?]</a> >+ <div class="hint">This will delete the single holidays rules only. The repeatable holidays and exceptions will not be deleted.</div> >+ /li> >+ <li class="radio"><input type="radio" name="showOperation" id="showOperationDelRangeRepeat" value="deleterangerepeat" /> >+ <label for="showOperationDelRangeRepeat" id="showOperationDelLabelRangeRepeat">Delete the repeated holidays on a range</label>. >+ <a href="#" class="helptext">[?]</a> >+ <div class="hint">This will delete the repeated holidays rules only. The repeatable holidays will be deleted but not the exceptions.</div> >+ </li> >+ <li class="radio"><input type="radio" name="showOperation" id="showOperationDelRangeRepeatExcept" value="deleterangerepeatexcept" /> >+ <label for="showOperationDelRangeRepeatExcept" id="showOperationDelLabelRangeRepeatExcept">Delete the exceptions on a range</label>. >+ <a href="#" class="helptext">[?]</a> >+ <div class="hint">This will delete the exceptions inside a given range. Be careful about your scope range. If it is oversized, you could slow down Koha.</div> >+ </li> >+ <li class="radio"><input type="radio" name="showOperation" id="showOperationEdit" value="edit" checked="checked" /> >+ <label for="showOperationEdit">Edit this holiday</label> >+ <a href="#" class="helptext">[?]</a> >+ <div class="hint">This will save changes to the holiday's title and description. If the information for a repeatable holiday is modified, it affects all of the dates on which the holiday is repeated.</div></li> >+ </ol> > <fieldset class="action"> > <input type="submit" name="submit" value="Save" /> > <a href="#" class="cancel" name="cancel2" onclick=" hidePanel('showHoliday');">Cancel</a> >-- >1.7.0.4 >
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 7351
:
7459
|
7502
|
7503
|
7504
|
7505
|
8005
|
8370
|
8382
|
8506
|
8585
|
8964
|
9075
|
9621
|
9691
|
9869
|
9882
|
10862
|
11214