[Bps-public-commit] rt-extension-repeatticket branch, rt5, repushed
? sunnavy
sunnavy at bestpractical.com
Wed Sep 30 15:22:13 EDT 2020
The branch rt5 was deleted and repushed:
was af776b08ea0e00de14d9ea09c0381f0efa85fd38
now 66d618eb2bf64efe68157fbff54af67e3f92e0fb
1: 96e5150 ! 1: 633312f Migrate to elevator themes for RT 5
@@ -7,7 +7,7 @@
+++ b/html/Callbacks/RepeatTicket/Ticket/Create.html/AfterBasics
@@
-<&| /Widgets/TitleBox, title => loc("Recurrence"), class=>'ticket-info-repeat-recurrence', title_class => 'inverse' &>
-+<&| /Widgets/TitleBox, title => loc("Recurrence"), class=>'ticket-info-repeat' &>
++<&| /Widgets/TitleBox, title => loc("Recurrence"), class=>'ticket-info-repeat-recurrence' &>
<& /Ticket/Elements/EditRecurrence, ARGSRef => $ARGSRef, Initial => 1 &>
</&>
<%init>
@@ -17,7 +17,7 @@
+++ b/html/Callbacks/RepeatTicket/Ticket/Elements/ShowSummary/LeftColumn
@@
-<&| /Widgets/TitleBox, title => loc("Recurrence"), class=>'ticket-info-repeat-recurrence', title_class => 'inverse',
-+<&| /Widgets/TitleBox, title => loc("Recurrence"), class=>'ticket-info-repeat',
++<&| /Widgets/TitleBox, title => loc("Recurrence"), class=>'ticket-info-repeat-recurrence',
($can_modify ? (title_href => RT->Config->Get('WebPath')."/Ticket/ModifyRecurrence.html?id=".$Ticket->Id) : ()) &>
<& /Ticket/Elements/EditRecurrence, Ticket => $Ticket, ReadOnly => 1 &>
</&>
@@ -195,7 +195,7 @@
- <&|/l&>Start</&>:
+ <div class="form-row">
+ <div class="label col-4"></div>
-+ <div class="value col-auto">
++ <div class="value col-8">
+ <div class="custom-control custom-checkbox">
+ <input type="checkbox" id="repeat-enabled" name="repeat-enabled" class="custom-control-input" value="1" <% $ARGSRef->{'repeat-enabled'} ? ' checked="checked"': '' |n %>>
+ <label class="custom-control-label" for="repeat-enabled"><&|/l&>Enable Recurrence?</&></label>
@@ -209,7 +209,7 @@
+ <div class="label input col-4">
+ <&|/l&>Ticket lead time (days)</&>:
+ </div>
-+ <div class="value col-auto">
++ <div class="value col-8">
+ <input class="form-control" size="3" name="repeat-lead-time" type="text" value="<% $ARGSRef->{'repeat-lead-time'} %>" />
+ </div>
+ </div>
@@ -218,7 +218,7 @@
+ <div class="label input col-4">
+ <&|/l&>Concurrent active tickets</&>:
+ </div>
-+ <div class="value col-auto">
++ <div class="value col-8">
+ <input class="form-control" size="3" name="repeat-coexistent-number" type="text" value="<% $ARGSRef->{'repeat-coexistent-number'} %>" />
+ </div>
+ </div>
@@ -227,7 +227,7 @@
+ <div class="label input col-4">
+ <&|/l&>Recurrence pattern</&>:
+ </div>
-+ <div class="value col-auto">
++ <div class="value col-8">
+
+ <div class="form-check form-check-inline">
+ <div class="custom-control custom-radio">
@@ -353,7 +353,7 @@
+ <div class="label input col-4">
+ <&|/l&>Start of recurrence</&>:
+ </div>
-+ <div class="value col-auto">
++ <div class="value col-8">
<& /Elements/SelectDate, Name => 'repeat-start-date', ShowTime => 0, Default => $ARGSRef->{'repeat-start-date'} || '' &>
- </label>
- </td>
@@ -390,7 +390,7 @@
+ <div class="label input col-4">
+ <&|/l&>End of recurrence</&>:
+ </div>
-+ <div class="value col-auto form-check">
++ <div class="value col-8 form-check">
+
+ <div class="custom-control custom-radio">
+ <input type="radio" id="repeat-end-none" name="repeat-end" class="custom-control-input" value="none" <% ($ARGSRef->{'repeat-end'} || '') eq 'none' ? ' checked="checked"': '' |n %>>
@@ -491,22 +491,21 @@
+ border-top: 3px solid #B23;
+}
+
-+.ticket-info-repeat .form-row .form-check {
++.repeat .form-row .form-check {
+ margin-top: 5px;
+}
+
-+
-+.ticket-info-repeat .custom-control-label.has-text-input::before,
-+.ticket-info-repeat .custom-control-label.has-text-input::after {
++.repeat .custom-control-label.has-text-input::before,
++.repeat .custom-control-label.has-text-input::after {
+ top: 0.5rem;
+}
+
-+.ticket-info-repeat .form-control {
++.repeat .form-control {
+ display: inline;
+ width: auto;
+}
+
-+.ticket-info-repeat .bootstrap-select > .dropdown-toggle {
++.repeat .bootstrap-select > .dropdown-toggle {
+ width: auto;
+}
2: 9829635 = 2: adfab4c Update tests to make them pass on RT 5
3: 36a899b = 3: 328cf6d Remove unnecessary "undef $m"
4: 760ad95 = 4: 93a099e Bump version to 2.0 for RT 5
5: 0bd166c = 5: 9747fed Support RT 5.0 and update docs accordingly
6: 40f66a6 = 6: b9d246e Update M:I
7: 639209b = 7: 82cfe1d Add "." to @INC for perl 5.26+
8: 271cecf = 8: c65904b Update copyright year to 2020
9: 6a865ad = 9: e20a552 Prep 2.00
10: e694501 = 10: cdba911 Check ModifyTicket right before making changes
11: 3c436ed ! 11: f2d7d35 Add $InputIdPrefix support to have multiple EditRecurrence HTML on a page
@@ -11,7 +11,7 @@
+++ b/html/Ticket/Elements/EditRecurrence
@@
<div class="label col-4"></div>
- <div class="value col-auto">
+ <div class="value col-8">
<div class="custom-control custom-checkbox">
- <input type="checkbox" id="repeat-enabled" name="repeat-enabled" class="custom-control-input" value="1" <% $ARGSRef->{'repeat-enabled'} ? ' checked="checked"': '' |n %>>
- <label class="custom-control-label" for="repeat-enabled"><&|/l&>Enable Recurrence?</&></label>
@@ -173,14 +173,14 @@
@@
<&|/l&>Start of recurrence</&>:
</div>
- <div class="value col-auto">
+ <div class="value col-8">
- <& /Elements/SelectDate, Name => 'repeat-start-date', ShowTime => 0, Default => $ARGSRef->{'repeat-start-date'} || '' &>
+ <& /Elements/SelectDate, Name => 'repeat-start-date', id => "${InputIdPrefix}repeat-start-date_Date", ShowTime => 0, Default => $ARGSRef->{'repeat-start-date'} || '' &>
</div>
</div>
@@
- <div class="value col-auto form-check">
+ <div class="value col-8 form-check">
<div class="custom-control custom-radio">
- <input type="radio" id="repeat-end-none" name="repeat-end" class="custom-control-input" value="none" <% ($ARGSRef->{'repeat-end'} || '') eq 'none' ? ' checked="checked"': '' |n %>>
12: c9e97e3 ! 12: c217ec0 Add inline edit support for "Recurrence" panel on ticket display page
@@ -32,12 +32,12 @@
--- a/html/Callbacks/RepeatTicket/Ticket/Elements/ShowSummary/LeftColumn
+++ b/html/Callbacks/RepeatTicket/Ticket/Elements/ShowSummary/LeftColumn
@@
- <&| /Widgets/TitleBox, title => loc("Recurrence"), class=>'ticket-info-repeat',
+ <&| /Widgets/TitleBox, title => loc("Recurrence"), class=>'ticket-info-repeat-recurrence',
- ($can_modify ? (title_href => RT->Config->Get('WebPath')."/Ticket/ModifyRecurrence.html?id=".$Ticket->Id) : ()) &>
-<& /Ticket/Elements/EditRecurrence, Ticket => $Ticket, ReadOnly => 1 &>
+ ($can_modify ? (title_href => $modify_url) : ()),
+ ($can_modify && $modify_behavior =~ /^(link|click)$/ ? (titleright_raw => $modify_basics) : ()),
-+ class => (join " ", 'ticket-info-repeat', ($modify_behavior eq 'always' ? 'editing' : ())),
++ class => (join " ", 'ticket-info-repeat-recurrence', ($modify_behavior eq 'always' ? 'editing' : ())),
+ data => { 'inline-edit-behavior' => $modify_behavior },
+&>
+% unless ($modify_behavior eq 'always') {
13: af776b0 ! 13: 22f5d19 Add patch to make radio/checkbox checkable with inline edit
@@ -71,3 +71,4 @@
+--
+2.24.3 (Apple Git-128)
+
+
--: ------- > 14: 66d618e Tweak "Enable Recurrence" row to put label to the left side
More information about the Bps-public-commit
mailing list