Bugzilla – Attachment 151447 Details for
Bug 17015
New Koha Calendar
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17015: UI tweaks
Bug-17015-UI-tweaks.patch (text/plain), 4.67 KB, created by
Maryse Simard
on 2023-05-18 20:27:19 UTC
(
hide
)
Description:
Bug 17015: UI tweaks
Filename:
MIME Type:
Creator:
Maryse Simard
Created:
2023-05-18 20:27:19 UTC
Size:
4.67 KB
patch
obsolete
>From 2830cd454b57baafcbdf639b2550f41dbbc77760 Mon Sep 17 00:00:00 2001 >From: Maryse Simard <maryse.simard@inlibro.com> >Date: Thu, 20 Oct 2022 17:25:59 -0400 >Subject: [PATCH] Bug 17015: UI tweaks > >--- > .../en/modules/tools/discrete_calendar.tt | 27 +++++++++++++------ > 1 file changed, 19 insertions(+), 8 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt >index 5593d554b7..ede2ef91b0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt >@@ -3,7 +3,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% Branches.GetName( branch ) | html %] calendar; Tools › Koha &rsaquo</title> >+<title>[% Branches.GetName( branch ) | html %] calendar › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("css/calendar.css") | $raw %] > </head> >@@ -56,7 +56,7 @@ > </div> > [% END %] > >- <h2>[% Branches.GetName( branch ) | html %] calendar</h2> >+ <h1>[% Branches.GetName( branch ) | html %] calendar</h1> > > <div class="row"> > <div class="col-sm-8"> >@@ -131,6 +131,17 @@ > <option value="F">Floating holiday</option> > <option value="N" disabled>Need validation</option> > </select> >+ <a href="#" class="helptext">[?]</a> >+ <div class="hint"> >+ <ol> >+ <li><strong>Working day:</strong> the library is open on that day.</li> >+ <li><strong>Unique holiday:</strong> make a single holiday. For example, selecting August 1, 2012 will make it a holiday, but will not affect August 1 in other years.</li> >+ <li><strong>Weekly holiday:</strong> make this weekday a holiday, every week. For example, if your library is closed on Saturdays, use this option to make every Saturday a holiday.</li> >+ <li><strong>Repeatable holiday:</strong> this will take this day and month as a reference to make it a holiday. Through this option, you can repeat this rule for every year. For example, selecting August 1 will make August 1 a holiday every year.</li> >+ <li><strong>Floating holiday:</strong> this will take this day and month as a reference to make it a floating holiday. Through this option, you can add a holiday that repeats every year but not necessarily on the exact same day. On subsequent years the date will need validation.</li> >+ <li><strong>Need validation:</strong> this holiday has been added automatically, but needs to be validated.</li> >+ </ol> >+ </div> > </li> > <li id="days_of_week"> > <label for="day_of_week">Week day</label> >@@ -468,6 +479,12 @@ > var today = new Date(); > today.setHours(0, 0, 0, 0); > >+ if (date.date_obj < today) { >+ formatDay( [ "past-date", _("Past day")], dayElem ); >+ } else { >+ formatDay( [ "normalday", _("Normal day")], dayElem ); >+ } >+ > if (datesInfos[dateString] && datesInfos[dateString].holiday_type =='W') { > formatDay( [ "repeatableweekly", _("Weekly holiday: %s").format(datesInfos[dateString].title)], dayElem ); > } else if (datesInfos[dateString] && datesInfos[dateString].holiday_type == 'R') { >@@ -478,12 +495,6 @@ > formatDay( [ "float", _("Floating holiday: %s").format(datesInfos[dateString].title)], dayElem ); > } else if (datesInfos[dateString] && datesInfos[dateString].holiday_type == 'E') { > formatDay( [ "holiday", _("Single holiday: %s").format(datesInfos[dateString].title)], dayElem ); >- } else { >- if (date.date_obj < today) { >- formatDay( [ "past-date", _("Past day")], dayElem ); >- }else { >- formatDay( [ "normalday", _("Normal day")], dayElem ); >- } > } > } > >-- >2.34.1
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 17015
:
53859
|
54318
|
54419
|
59166
|
59167
|
59168
|
59169
|
59170
|
59171
|
59267
|
59268
|
59269
|
59270
|
59271
|
59463
|
59516
|
59517
|
59518
|
59519
|
59520
|
59561
|
59562
|
59586
|
59587
|
59888
|
59889
|
60902
|
60903
|
60904
|
60905
|
60906
|
60986
|
61737
|
62375
|
62376
|
62380
|
63257
|
63282
|
63362
|
63363
|
63364
|
63365
|
63366
|
63367
|
64235
|
65073
|
65074
|
65075
|
65076
|
65077
|
67721
|
67722
|
67723
|
67724
|
67725
|
67879
|
67929
|
67930
|
67931
|
67932
|
67933
|
67934
|
68392
|
68393
|
68394
|
68395
|
68396
|
68397
|
71634
|
71635
|
71636
|
71637
|
71638
|
72890
|
73145
|
74859
|
74860
|
74861
|
74862
|
74863
|
74864
|
74865
|
74866
|
75444
|
75479
|
76594
|
77249
|
77250
|
77607
|
77608
|
77609
|
77610
|
77611
|
77612
|
77613
|
77770
|
77771
|
77772
|
77773
|
77774
|
79035
|
80523
|
80524
|
80525
|
80526
|
80527
|
80528
|
80529
|
80530
|
80531
|
80532
|
80533
|
80534
|
80535
|
83547
|
85394
|
85677
|
85678
|
85679
|
85680
|
85681
|
85682
|
85683
|
85684
|
85685
|
85686
|
85687
|
85688
|
85689
|
85690
|
85691
|
92595
|
92596
|
92597
|
92598
|
100079
|
110383
|
110384
|
110386
|
110387
|
110388
|
110389
|
113541
|
113905
|
115501
|
115502
|
115503
|
115504
|
115505
|
115506
|
115507
|
115508
|
115509
|
115510
|
115511
|
118554
|
118555
|
118556
|
118557
|
118558
|
118559
|
119095
|
119097
|
119099
|
119100
|
119101
|
119102
|
131619
|
131620
|
131621
|
131622
|
131623
|
131624
|
131625
|
131626
|
131634
|
131635
|
131636
|
131637
|
131638
|
131639
|
131640
|
131641
|
131667
|
132199
|
133596
|
133597
|
133598
|
133599
|
133600
|
133601
|
133602
|
133603
|
133604
|
133605
|
133678
|
137219
|
137220
|
137221
|
137222
|
137223
|
137224
|
137225
|
137226
|
137227
|
137228
|
137229
|
139378
|
139379
|
139380
|
139381
|
139382
|
139599
|
139600
|
139601
|
139602
|
139603
|
139851
|
140150
|
141176
|
144257
|
144258
|
144259
|
144260
|
144261
|
144262
|
144264
|
144268
|
144269
|
144270
|
144271
|
144272
|
144273
|
151438
|
151439
|
151440
|
151441
|
151442
|
151443
|
151444
|
151445
|
151446
|
151447
|
151448
|
151449
|
151450
|
156340
|
156341
|
156342
|
156343
|
156344
|
156345
|
156346
|
156347
|
156348
|
156349
|
156350
|
156351
|
156352
|
156353
|
156354
|
156355
|
157656
|
157657
|
157658
|
157659
|
157660
|
157661
|
157662
|
157663
|
157664
|
157665
|
157666
|
157667
|
157668
|
157669
|
157670
|
157671
|
157672
|
167805
|
167806
|
167807
|
167808
|
167809