[Rt-commit] rt branch, 4.6/select-queue-dropdown, created. rt-4.4.4-373-g149bfc7cc
Jim Brandt
jbrandt at bestpractical.com
Fri Sep 6 11:41:20 EDT 2019
The branch, 4.6/select-queue-dropdown has been created
at 149bfc7cc4e748bdf843a3f2f960a55df12bf376 (commit)
- Log -----------------------------------------------------------------
commit ef8df92996b9b1acdea74a2304a54fd96d7141af
Author: Jim Brandt <jbrandt at bestpractical.com>
Date: Thu Sep 5 17:26:05 2019 -0400
Move accesskey attribute to the queue select element
The accesskey attribute needs to be on the targeted element,
so this change makes it functional again for browsers that support it.
The previous positioning with an unused label tag also impacted
the dropdown style. Correcting the positioning also corrects
the incorrect dropdown width.
diff --git a/share/html/Elements/SelectNewTicketQueue b/share/html/Elements/SelectNewTicketQueue
index 56a22bf6e..7a09867cb 100644
--- a/share/html/Elements/SelectNewTicketQueue
+++ b/share/html/Elements/SelectNewTicketQueue
@@ -45,9 +45,9 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<label accesskey="9" class="select-queue">
- <& /Elements/SelectQueue, Name => 'Queue', Default => $queue, %ARGS, ShowNullOption => 0, ShowAllQueues => 0 &>
-</label>
+
+<& /Elements/SelectQueue, Name => 'Queue', Default => $queue, %ARGS, ShowNullOption => 0, ShowAllQueues => 0, AccessKey => 9 &>
+
<%INIT>
my $queue = delete $ARGS{Default};
if ( !$queue ) {
diff --git a/share/html/Elements/SelectObject b/share/html/Elements/SelectObject
index 02b154a52..37db75ea4 100644
--- a/share/html/Elements/SelectObject
+++ b/share/html/Elements/SelectObject
@@ -64,7 +64,7 @@
</ul>
% }
% else {
-<select name="<%$Name%>" <% ($Multiple) ? qq{class="tall" multiple="multiple" size="$Size"} : '' |n%> <% ($OnChange) ? 'onchange="'.$OnChange.'"' : '' |n %> class="<%$Class%> selectpicker form-control">
+<select name="<%$Name%>" <% ($Multiple) ? qq{class="tall" multiple="multiple" size="$Size"} : '' |n%> <% ($OnChange) ? 'onchange="'.$OnChange.'"' : '' |n %> class="<%$Class%> selectpicker form-control" <% ($AccessKey) ? qq{accesskey="$AccessKey"} : '' |n%>>
% if ($ShowNullOption) {
<option value=""><% $DefaultLabel %></option>
% }
@@ -98,6 +98,7 @@ $Size => 6
$Class => ""
$CacheNeedsUpdate => undef
$Hyperlink => undef
+$AccessKey => undef
</%args>
<%init>
$ObjectType = "RT::$ObjectType" unless $ObjectType =~ /::/;
commit 9e8b49d9c48aef1b3d46a8572eb7b5edff7107c4
Author: Jim Brandt <jbrandt at bestpractical.com>
Date: Fri Sep 6 11:39:47 2019 -0400
Reposition new ticket form in header as horizontal row
diff --git a/share/html/Elements/CreateTicket b/share/html/Elements/CreateTicket
index ea8ca3c07..8aae5282f 100644
--- a/share/html/Elements/CreateTicket
+++ b/share/html/Elements/CreateTicket
@@ -52,29 +52,28 @@
% if ($IncludeExplanation) {
<p><&|/l&>Select a queue for your new ticket.</&></p>
% }
-
-% my $button_start = '<input type="submit" class="button btn btn-lg btn-primary form-control" value="';
-% my $button_start_modal = '<input type="submit" class="button btn btn-primary form-control ticket-create-modal" value="';
-% my $button_end = '" />';
-% my $queue_selector = $m->scomp('/Elements/SelectNewTicketQueue', AutoSubmit => 1, SendTo => $SendTo, Placeholder => loc('Queue'), Hyperlink => $Hyperlink );
+% my $button_start = '<div class="col"><input type="submit" class="button btn btn-lg btn-primary form-control-sm" value="';
+% my $button_start_modal = '<div class="col"><input type="submit" class="button btn btn-primary form-control-sm ticket-create-modal" value="';
+% my $button_end = '" /></div>';
+% my $queue_selector = '<div class="col">' . $m->scomp('/Elements/SelectNewTicketQueue', AutoSubmit => 1, SendTo => $SendTo, Placeholder => loc('Queue'), Hyperlink => $Hyperlink ) . '</div>';
% if ($Hyperlink) {
<% $queue_selector |n %>
% }
% else {
-<div class="create-wide">
+<div class="create-wide form-row">
<&|/l_unsafe, $button_start, $button_end, $queue_selector &>[_1]New ticket in[_2] [_3]</&>
</div>
-<div class="create-medium">
+<div class="create-medium form-row">
<&|/l_unsafe, $button_start_modal, $button_end &>[_1]New ticket[_2]</&>
</div>
-<div class="create-narrow">
+<div class="create-narrow form-row">
<&|/l_unsafe, $button_start_modal, $button_end &>[_1]+[_2]</&>
</div>
% }
% $m->callback(CallbackName => 'BeforeFormEnd');
-
+</div>
</form>
<%ARGS>
$SendTo => '/Ticket/Create.html',
diff --git a/share/static/css/base-responsive/nav.css b/share/static/css/base-responsive/nav.css
index 63fa43f52..d2cee9475 100644
--- a/share/static/css/base-responsive/nav.css
+++ b/share/static/css/base-responsive/nav.css
@@ -60,8 +60,8 @@
}
.create-wide { display: block; }
-.create-medium { display: none; }
-.create-narrow { display: none; }
+.create-medium { display: none !important; } /* Need to override display in .form-row */
+.create-narrow { display: none !important; }
/* be overly specific to defeat specificity */
#app-nav.sf-menu > li#li-overflow,
diff --git a/share/static/css/elevator-light/nav.css b/share/static/css/elevator-light/nav.css
index adb09cfd5..0f49064ff 100644
--- a/share/static/css/elevator-light/nav.css
+++ b/share/static/css/elevator-light/nav.css
@@ -117,6 +117,10 @@
}
+#CreateTicketInQueue {
+ margin-top: 0 !important;
+}
+
#topactions input,
#topactions button {
padding-top: 0;
@@ -139,9 +143,10 @@
}
@media (max-width: 900px) {
- #topactions .create-wide { display: none; }
- #topactions .create-medium { display: block; }
- #topactions .create-narrow { display: none; }
+ /* Need to override display in .form-row */
+ #topactions .create-wide { display: none !important; }
+ #topactions .create-medium { display: block !important; }
+ #topactions .create-narrow { display: none !important; }
#topactions input[type="search"] {
width: 2em;
@@ -156,9 +161,10 @@
}
@media (max-width: 600px) {
- #topactions .create-wide { display: none; }
- #topactions .create-medium { display: none; }
- #topactions .create-narrow { display: block; }
+ /* Need to override display in .form-row */
+ #topactions .create-wide { display: none !important; }
+ #topactions .create-medium { display: none !important; }
+ #topactions .create-narrow { display: block !important; }
#topactions input[type="submit"], #topactions input.button {
min-width: 2em;
commit 149bfc7cc4e748bdf843a3f2f960a55df12bf376
Author: Jim Brandt <jbrandt at bestpractical.com>
Date: Fri Sep 6 11:40:58 2019 -0400
Remove unused select-queue styles
diff --git a/share/static/css/base/portlets.css b/share/static/css/base/portlets.css
index ae2c169df..113151f8e 100644
--- a/share/static/css/base/portlets.css
+++ b/share/static/css/base/portlets.css
@@ -2,13 +2,3 @@ table.dashboard {
width: 100%;
border: 0;
}
-
-.quick-create .select-queue {
- width: 12em;
-}
-
-.quick-create input[type="text"],
-.quick-create input[type="email"],
-.quick-create textarea {
- width: 100%;
-}
diff --git a/share/static/css/elevator-light/forms.css b/share/static/css/elevator-light/forms.css
index c54e682ef..55b185ee0 100644
--- a/share/static/css/elevator-light/forms.css
+++ b/share/static/css/elevator-light/forms.css
@@ -122,11 +122,6 @@ button {
margin-top: 0.5em;
}
-div.field label.select-queue {
- display: block;
- margin-bottom: 0;
-}
-
.col-auto .datepicker {
width: 17em;
}
-----------------------------------------------------------------------
More information about the rt-commit
mailing list