[Rt-commit] rt branch, 4.6-theme/assets-pages, repushed
Craig Kaiser
craig at bestpractical.com
Thu Apr 11 17:55:01 EDT 2019
The branch 4.6-theme/assets-pages was deleted and repushed:
was 9003c6e0a462d089591901a8e8deb8e3f5df58f4
now 765baa7877c89d3339f8be4c87488e2a633a4033
1: 7f13f0055 = 1: 7f13f0055 Allow for multiple base themes by avoiding showing any to the user
2: 0ce97154b = 2: 0ce97154b Add unaltered copies of base and rudder themes to make responsive
3: 565e91062 = 3: 565e91062 rudder-responsive imports base-responsive rather than base
4: c151cf258 = 4: c151cf258 Make boxcontainer padding rules less demanding
5: 45e22b27c = 5: 45e22b27c Make RT at a glance two-column layout responsive
6: 66a41a296 = 6: 66a41a296 Improve whitespace around content for rudder-responsive
7: f0df65c03 = 7: f0df65c03 Generalize the two-column layout markup
8: 4a2814fdb = 8: 4a2814fdb Add a grid system
9: b7008bcd8 = 9: b7008bcd8 Make ticket display ShowSummary responsive
10: 2a14260d4 = 10: 2a14260d4 Make search field really narrow on narrow screens
11: 050d2b466 = 11: 050d2b466 Make the "new ticket in" and queue selector responsive
12: 7293efce0 = 12: 7293efce0 Narrow gap between new ticket and search fields on narrow screens
13: 26d3640d3 = 13: 26d3640d3 Display more of the title when the page is narrow
14: 743fca5fe = 14: 743fca5fe On narrow screens pop up a modal for selecting ticket queue
15: fc435d351 = 15: fc435d351 Hide "RT for example.com" on narrow screens
16: c12f7a2fd = 16: c12f7a2fd Eliminate history display's margin-left on narrow screens
17: 031767c67 = 17: 031767c67 On very narrow screens, zero out body padding
18: a70a12eb8 = 18: a70a12eb8 Get rid of horizontal padding on ticket history on narrow screens
19: ed77add0f = 19: ed77add0f Collapse padding at a wider (700px) viewport
20: bf6072713 = 20: bf6072713 Prevent reminders from breaking layout with its long text field
21: 3bf0b2783 = 21: 3bf0b2783 Convert Links table to have .fields/.field using table CSS
22: ef390831d = 22: ef390831d Improve styling of links for small screens
23: 9e0e238dc = 23: 9e0e238dc Don't wrap labels
24: abde98f8c = 24: abde98f8c Limit the breakdown of fields tables to just "wide" ones
25: a036b7218 = 25: a036b7218 Convert basics, dates, and people groupings away from tables
26: 18410558f = 26: 18410558f Add margin-left to <li>s within a wide fields table that breaks
27: abe679392 = 27: abe679392 Make padding on field names more consistent
28: 4535278a7 = 28: 4535278a7 Convert new reminder form from table to fields
29: 902013336 = 29: 902013336 Improve rendering of ticket update page
30: b83145a17 = 30: b83145a17 Add messagedetails to jumbo page titlebox
31: b30e4e3be = 31: b30e4e3be Improve display of reminders table and form
32: a3debdb88 = 32: a3debdb88 Avoid breaking layout with new reminder subject
33: a4ec31340 = 33: a4ec31340 Remove minimum height from titleboxes
34: 9e2e9f847 = 34: 9e2e9f847 Restore original titlebox padding rule but only for fields
35: f048c2714 = 35: f048c2714 Remove spurious <br> tag
36: 14bd5afdb = 36: 14bd5afdb Switch ticket update from tables to fields
37: b6076f108 = 37: b6076f108 Linearize ticket update form on narrow widths
38: 9847f9464 = 38: 9847f9464 Make update form take up 100% of the titlebox
39: 3f12ac4ab = 39: 3f12ac4ab Fix reply cc/bcc/subject fields to be 100% width
40: 7d903afc9 = 40: 7d903afc9 Rename .crypto to .empty to better explain what it's for
41: 0b1e7df31 = 41: 0b1e7df31 Make ticket create responsive
42: 21b722a26 = 42: 21b722a26 First pass at responsive for SelfService/Create
43: a5c7652c3 = 43: a5c7652c3 First pass at responsive for SelfService/Update
44: 8b58c4a15 = 44: 8b58c4a15 Remove AsTable from Edit CFs
45: 921d72c94 = 45: 921d72c94 Remove these pre-responsive CF edit styles
46: f5bcb7577 = 46: f5bcb7577 Wrap selfservice update form in a titlebox
47: 94e44ea62 = 47: 94e44ea62 Wrap selfservice create form in a titlebox
48: efe3f52d3 = 48: efe3f52d3 Convert selfservice display to responsive
49: fc80f17b7 = 49: fc80f17b7 Switch ShowCustomFields from table to fields
50: d26da2aa1 = 50: d26da2aa1 Fix transaction actions overlapping description
51: 726ff3ed2 = 51: 726ff3ed2 Switch QuickCreate from table to fields
52: 1dac409ae = 52: 1dac409ae Improve whitespace around fields
53: f99594d6b = 53: f99594d6b Improve padding and spacing on forms
54: 9b94580d3 = 54: 9b94580d3 Have searches use the full width of the viewport
55: df8c440d3 = 55: df8c440d3 Make login box more responsive
56: 6c19bf649 = 56: 6c19bf649 Add missing type="text" for login username input
57: ff38918b6 = 57: ff38918b6 Improve form rendering for Mobile Safari
58: bc548a5bb = 58: bc548a5bb Separate existing reminders from create form with hr only if there are reminders
59: 3d16535fd = 59: 3d16535fd Remove unnecessary margin-top on collection tables
60: a6e560500 = 60: a6e560500 Fix save button on ticket reminders to not use inline style
61: 33e559e98 = 61: 33e559e98 Fix error result background color for rudder
62: 6366d835d = 62: 6366d835d Make QueueList take up the full width
63: 753b2e278 = 63: 753b2e278 Give rudder the responsive viewport meta tag
64: 96258f3a2 = 64: 96258f3a2 Turn off autocapitalize on usernames
65: b738946b7 = 65: b738946b7 Don't let users select the "drop files here" dropzone text
66: ed9896623 = 66: ed9896623 Improve error transaction colors
67: fc2c7dd24 = 67: fc2c7dd24 Replace ShowAttachments's <font size="-2"> with CSS
68: 0ed134c2a = 68: 0ed134c2a Word-break very (perhaps maliciously) long attachment names
69: 329257c04 = 69: 329257c04 Limit the width of quickcreate since it looks silly when very very wide
70: 7e8fc73fa = 70: 7e8fc73fa Use full width for MyReminders table
71: 5acf57a6e = 71: 5acf57a6e Fix Modify Basics to be div.fields rather than table
72: 13b9aa7be = 72: 13b9aa7be Add missing type="text" to more input fields
73: 37a3c8190 = 73: 37a3c8190 Avoid menulist-button styling for multi-row select boxes
74: 76ebbf037 = 74: 76ebbf037 Middle valign fields
75: abd46fe43 = 75: abd46fe43 Convert EditPeople from nested tables to responsive
76: 6b1ed3291 = 76: 6b1ed3291 Load the correct version of msie.css
77: 55f62d910 = 77: 55f62d910 Add a BeforeNav stylesheet plugin
78: 713ae954b = 78: 713ae954b Make menus overflow into a "More" item on narrow viewports
79: 0817597f0 = 79: 0817597f0 Remove hyperlink behavior from top-level More menu items
80: 51ff61b95 = 80: 51ff61b95 Add type attribute to many input fields that were missing it
81: 9920a2bae = 81: 9920a2bae Fix css rule for one-time cc etc becoming email fields
82: 639ec0a0a = 82: 639ec0a0a Switch new ticket create popup to a list of links rather than a select
83: 263260d84 = 83: 263260d84 Fix a regression on legacy themes with CF edit panels
84: e7a24762e = 84: e7a24762e Override 400px width of jquery modals
85: d05db9319 = 85: d05db9319 Fix quick create on narrow screens
86: 1ce3e7535 = 86: 1ce3e7535 Fix width regression with quickcreate requestor field
87: 0bdd6b928 = 87: 0bdd6b928 Switch AddLinks from tables to fields
88: de71b019f = 88: de71b019f Improve rendering of date editing form
89: 7e88d621b = 89: 7e88d621b Improve padding to be more consistent
90: 15dd4d5e1 = 90: 15dd4d5e1 Make modify links use fluid two-column layout
91: 4bb74ee24 = 91: 4bb74ee24 Improve edit links to use fields instead of a table
92: 71adf4d59 = 92: 71adf4d59 Convert merge from table to fields
93: 8bed2a517 = 93: 8bed2a517 Use the same nomenclature "Message" not "Content" for jumbo
94: 821af7169 = 94: 821af7169 Switch Jumbo reply panel from table to fields
95: 451b94ebf = 95: 451b94ebf Jumbo: Wrap both basic fields and custom fields in a single fields table
96: 8e0edb097 = 96: 8e0edb097 Make message form on Jumbo more consistent
97: 3410d1f86 = 97: 3410d1f86 Make simple search form more responsive
98: ac878afd0 = 98: ac878afd0 Fix rudder-responsive getting bottom border radius
99: ee6fd153c = 99: ee6fd153c Remove margin-right from titleboxes in rudder-responsive
100: 19e92fb58 = 100: 19e92fb58 Improve design of more about requestors panel
101: 0795549da = 101: 0795549da Make user prefs page responsive to small screens
102: 3142b6f1e = 102: 3142b6f1e Remove 20em width from ticket subject on basics
103: d2c34c901 = 103: d2c34c901 Wrap forward message in a titlebox
104: e93736f6e = 104: e93736f6e Switch forward from table to fields
105: 865306bb5 = 105: 865306bb5 Fix "more about requestors" overlap
106: a91ad6b41 = 106: a91ad6b41 Update tests for the responsive HTML change
107: 309321394 = 107: 309321394 Fix Nav tweaking for installer mode
108: 5d80cac56 = 108: 5d80cac56 Initial elevator theme, copied from rudder-responsive
109: 9e2710667 = 109: 9e2710667 Add popper.js 1.14.6 dependency
110: d5361e4f8 = 110: d5361e4f8 Add bootstrap 4.2.1 dependency
111: ce6db31de = 111: ce6db31de Add missing "field" css class for Started field
112: 18b4c17ed = 112: 18b4c17ed Get rid of strikethrough in menu
113: 2c1913cea = 113: 2c1913cea Fix h1 position to make it vertically centered
114: 16a290165 = 114: 16a290165 Fix results position to make it vertically centered
115: fa1eddb07 = 115: fa1eddb07 Drop the incomplete rudder-responsive theme
116: 30c74df65 = 116: 30c74df65 Update copyright to 2019 for new added theme related files
117: 8202a7ed6 = 117: 8202a7ed6 Initial elevator-dark theme
118: 6e8c418d2 = 118: 6e8c418d2 Add bootstrap-select 1.13.7 dependency
119: 65a2b8e72 = 119: 65a2b8e72 Switch to bootstrap styled table
120: d3c438a8c = 120: d3c438a8c Switch to bootstrap card for titleboxes
121: 19983ce0c = 121: 19983ce0c Add %ThemeJSFiles config to serve different js for different themes
122: c20ba1ee1 = 122: c20ba1ee1 Migrate search builder for elevator themes
123: c381b52d6 = 123: c381b52d6 Migrate homepage to elevator themes
124: 2b95d7c55 = 124: 2b95d7c55 Add bootstrap-combobox 1.2.0 dependency
125: 16785047a = 125: 16785047a Migrate cf edit components to elevator themes
126: 3434d9955 = 126: 3434d9955 Migrate ticket modify pages to elevator themes
127: 9003c6e0a ! 127: 765baa787 Running work for assets
@@ -99,6 +99,34 @@
+ </div>
+</div>
\ No newline at end of file
+
+diff --git a/share/html/Asset/Display.html b/share/html/Asset/Display.html
+--- a/share/html/Asset/Display.html
++++ b/share/html/Asset/Display.html
+@@
+ <& /Elements/ListActions, actions => \@results &>
+
+ <span class="catalog <% CSSClass($asset->CatalogObj->Name) %>">
+-<& Elements/ShowSummary, AssetObj => $asset &>
++ <div class="boxcontainer col-md-12">
++
++ <& Elements/ShowSummary, AssetObj => $asset &>
+
+ % $m->callback(CallbackName => 'AfterShowSummary', ARGSRef => \%ARGS, Asset => $asset);
+
+-<& /Elements/ShowHistory,
++ <& /Elements/ShowHistory,
+ Object => $asset,
+ ShowDisplayModes => 0,
+ DisplayPath => 'History.html',
+- &>
++ &>
+
+ % $m->callback(CallbackName => 'AfterShowHistory', ARGSRef => \%ARGS, Asset => $asset);
++ </div>
+ </span>
+
+ <%args>
diff --git a/share/html/Asset/Elements/AddCatalogPeople b/share/html/Asset/Elements/AddCatalogPeople
--- a/share/html/Asset/Elements/AddCatalogPeople
@@ -201,9 +229,7 @@
+ <div class="col-md-12">
+ <&|/l_unsafe,
+ $m->scomp("/Elements/SelectNewTicketQueue"),
-+ @description &>Create a new ticket in queue: [_1]
-+ <div>about asset: #[_2]: [_3].</div>
-+ </&>
++ @description &>Create a new ticket in the [_1] queue about asset #[_2]: [_3].</&>
+ </div>
+ </div>
% }
@@ -215,9 +241,7 @@
+ <div class="col-md-12">
+ <&|/l_unsafe,
+ $m->scomp("/Elements/SelectNewTicketQueue"),
-+ &>Create a new ticket in queue: [_1]
-+ <div>about multiple assets</div>
-+ </&>
++ &>Create a new ticket in the [_1] queue about multiple assets.</&>
+ </div>
+ </div>
% }
@@ -306,16 +330,14 @@
+ <&|/l_unsafe,
+ $m->interp->apply_escapes($AssetObj->CreatedAsString, 'h'),
+ $m->scomp('/Elements/ShowUser', User => $AssetObj->CreatorObj)
-+ &>[_1] by [_2]
-+ </&>
++ &>[_1] by [_2]</&>
+ </div>
+ <div class="row col-md-12">
+ <&|/l&>Last Updated</&>:
+ <&|/l_unsafe,
+ $m->interp->apply_escapes($AssetObj->LastUpdatedAsString, 'h'),
+ $m->scomp('/Elements/ShowUser', User => $AssetObj->LastUpdatedByObj)
-+ &>[_1] by [_2]
-+ </&>
++ &>[_1] by [_2]</&>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
@@ -382,32 +404,205 @@
<option value=""></option>
% }
+diff --git a/share/html/Asset/Elements/ShowBasics b/share/html/Asset/Elements/ShowBasics
+--- a/share/html/Asset/Elements/ShowBasics
++++ b/share/html/Asset/Elements/ShowBasics
+@@
+ %# those contributions and any derivatives thereof.
+ %#
+ %# END BPS TAGGED BLOCK }}}
+-<table>
+- <tr class="asset-catalog">
+- <td class="label"><&|/l&>Catalog</&>:</td>
+- <td><& ShowCatalog, Asset => $AssetObj &></td>
+- </tr>
+- <tr class="asset-name">
+- <td class="label"><&|/l&>Name</&>:</td>
+- <td><% $AssetObj->Name || '' %></td>
+- </tr>
+- <tr class="asset-description">
+- <td class="label"><&|/l&>Description</&>:</td>
+- <td><% $AssetObj->Description || '' %></td>
+- </tr>
+- <tr class="asset-status">
+- <td class="label"><&|/l&>Status</&>:</td>
+- <td class="value"><% loc($AssetObj->Status) %></td>
+- </tr>
+- <& /Elements/ShowCustomFields, Object => $AssetObj, Grouping => 'Basics', Table => 0 &>
+-% $m->callback(%ARGS, CallbackName => "AfterFields");
+-</table>
++<div class="boxcontainer">
++ <div class="col-md-12">
++ <span class="col-md-3 asset-catalog label">
++ <&|/l&>Catalog</&>:
++ </span>
++ <span class="col-md-9 value">
++ <& ShowCatalog, Asset => $AssetObj &>
++ </span>
++ </div>
++
++ <div class="col-md-12">
++ <span class="col-md-4 asset-name label">
++ <&|/l&>Name</&>:
++ </span>
++ <span class="col-md-9 value">
++ <% $AssetObj->Name || '' %>
++ </span>
++ </div>
++
++ <div class="col-md-12">
++ <span class="col-md-3 asset-description label">
++ <&|/l&>Description</&>:
++ </span>
++ <span class="col-md-9 value">
++ <% $AssetObj->Description || '' %>
++ </span>
++ </div>
++
++ <div class="col-md-12">
++ <span class="col-md-3 asset-status label">
++ <&|/l&>Status</&>:
++ </span>
++ <span class="col-md-9 value">
++ <% $AssetObj->Status || '' %>
++ </span>
++ </div>
++
++ <div class="col-md-12">
++ <div class="col-md-12">
++ <& /Elements/ShowCustomFields, Object => $AssetObj, Grouping => 'Basics' &>
++ </div>
++ </div>
++</div>
+ <%args>
+ $AssetObj
+ </%args>
+
+diff --git a/share/html/Asset/Elements/ShowDates b/share/html/Asset/Elements/ShowDates
+--- a/share/html/Asset/Elements/ShowDates
++++ b/share/html/Asset/Elements/ShowDates
+@@
+ %# those contributions and any derivatives thereof.
+ %#
+ %# END BPS TAGGED BLOCK }}}
+-<table>
+- <tr>
+- <td class="label"><&|/l&>Created</&>:</td>
+- <td>
+- <&|/l_unsafe,
+- $m->interp->apply_escapes($AssetObj->CreatedAsString, 'h'),
+- $m->scomp('/Elements/ShowUser', User => $AssetObj->CreatorObj)
+- &>[_1] by [_2]</&>
+- </td>
+- </tr>
+- <tr>
+- <td class="label"><&|/l&>Last Updated</&>:</td>
+- <td>
+- <&|/l_unsafe,
+- $m->interp->apply_escapes($AssetObj->LastUpdatedAsString, 'h'),
+- $m->scomp('/Elements/ShowUser', User => $AssetObj->LastUpdatedByObj)
+- &>[_1] by [_2]</&>
+- </td>
+- </tr>
+- <& /Elements/ShowCustomFields, Object => $AssetObj, Grouping => 'Dates', Table => 0 &>
++<div class="boxcontainer">
++ <div class="col-md-12">
++ <span class="col-md-3 label"><&|/l&>Created</&>:</span>
++ <span class="col-md-9 value"><&|/l_unsafe,
++ $m->interp->apply_escapes($AssetObj->CreatedAsString, 'h'),
++ $m->scomp('/Elements/ShowUser', User => $AssetObj->CreatorObj)
++ &>[_1] by [_2]</&></span>
++ </div>
++ <div class="col-md-12">
++ <span class="col-md-3 label"><&|/l&>Last Updated</&>:</span>
++ <span class="col-md-9 value"><&|/l_unsafe,
++ $m->interp->apply_escapes($AssetObj->LastUpdatedAsString, 'h'),
++ $m->scomp('/Elements/ShowUser', User => $AssetObj->LastUpdatedByObj)
++ &>[_1] by [_2]</&></span>
++ </div>
++ <div class="col-md-12">
++ <& /Elements/ShowCustomFields, Object => $AssetObj, Grouping => 'Dates' &>
++ </div>
+ % $m->callback(%ARGS, CallbackName => "AfterFields");
+-</table>
++</div>
+ <%args>
+ $AssetObj
+ </%args>
+
+diff --git a/share/html/Asset/Elements/ShowPeople b/share/html/Asset/Elements/ShowPeople
+--- a/share/html/Asset/Elements/ShowPeople
++++ b/share/html/Asset/Elements/ShowPeople
+@@
+ <%init>
+ my $CatalogObj = $AssetObj->CatalogObj;
+ </%init>
+-<table>
++<div class="boxcontainer">
+ % for my $role ($AssetObj->Roles) {
+-<tr><td class="label"><% loc($role) %>:
++ <div class="col-md-12">
++ <span class="col-md-3 label"><% loc($role) %>:</span>
+ % if ($AssetObj->Role($role)->{Single}) {
+ % my $users = $AssetObj->RoleGroup($role)->UserMembersObj(Recursively => 0);
+ % $users->FindAllRows;
+ % my $user = $users->Next;
+-<& /Elements/ShowUser, User => $user, Link => 1 &></td></tr>
++ <span class="col-md-9 value">
++ <& /Elements/ShowUser, User => $user, Link => 1 &>
++ </span>
+ % next if $user->id == RT->Nobody->id;
+-<tr><td>
+-<& ShowRoleMembers, Group => $AssetObj->RoleGroup($role), Title => 0 &>
+-</div></td></tr>
++ <div>
++ <& ShowRoleMembers, Group => $AssetObj->RoleGroup($role), Title => 0 &>
++ </div>
+ % } else {
+-</td></tr><tr><td class="user-accordion">
++ <div class="user-accordion col-md-12">
+ <& ShowRoleMembers, Group => $AssetObj->RoleGroup($role) &>
+ <& ShowRoleMembers, Group => $CatalogObj->RoleGroup($role), Skip => $AssetObj->RoleGroup($role), Note => loc("(via this asset's catalog)") &>
+- </td></tr>
++ </div>
+ % }
++ </div>
+ % }
+-<& /Elements/ShowCustomFields, Object => $AssetObj, Grouping => 'People', Table => 0 &>
+-
+-</table>
++ <div class="col-md-12">
++ <& /Elements/ShowCustomFields, Object => $AssetObj, Grouping => 'People', Table => 0 &>
++ </div>
++</div>
+ % $m->callback( %ARGS, CallbackName => 'AfterPeople' );
+
diff --git a/share/html/Asset/Elements/ShowSummary b/share/html/Asset/Elements/ShowSummary
--- a/share/html/Asset/Elements/ShowSummary
+++ b/share/html/Asset/Elements/ShowSummary
@@
+ . "/Asset/$page?id="
. $AssetObj->id;
}
++my $count = 0;
</%init>
-<div class="asset-metadata">
-+<div class="boxcontainer col-md-12 asset-metadata">
-+ <div class="row">
-+% my $count = 0;
++<div class="boxcontainer asset-metadata">
++ <div class="col-md-12 row">
% for my $section (@sections) {
-<&| /Widgets/TitleBox, title => loc($section), title_href => $can_edit ? $link{$section} : "", title_class => "inverse", class => "asset-\L$section" &>
- <& "Show$section", AssetObj => $AssetObj &>
-</&>
-+% if ( $count == 3 ) {
-+ </div>
-+ <div class="row">
-+% $count = 0;
-+% }
++% if ( $count == 3 ) {
++ </div><div class="col-md-12 row">
++% $count = 0;
++% }
+ <div class="col-md-4">
+ <&| /Widgets/TitleBox, title => loc($section), title_href => $can_edit ? $link{$section} : "", title_class => "inverse", class => "asset-\L$section" &>
+ <& "Show$section", AssetObj => $AssetObj &>
+ </&>
+ </div>
-+% $count = $count + 1;
++% $count = $count + 1;
% }
-
-<& /Elements/ShowCustomFieldCustomGroupings,
@@ -415,7 +610,7 @@
- title_href => $can_edit ? RT->Config->Get("WebPath") . "/Asset/ModifyCFs.html" : "",
- TitleBoxARGS => { title_class => "inverse" },
- &>
-+ <% $count == 3 ? qq[</div><div class="row"] : "" %>
++<% $count == 3 ? qq[</div><div class="col-md-12 row">] : '' %>
+ <div class="col-md-4">
+ <& /Elements/ShowCustomFieldCustomGroupings,
+ Object => $AssetObj,
@@ -637,26 +832,7 @@
<span class="catalog <% CSSClass($asset->CatalogObj->Name) %>">
-<form method="post" enctype="multipart/form-data" id="ModifyAssetPeople" action="ModifyPeople.html">
- <input type="hidden" name="id" value="<% $asset->id %>">
-+ <div class="boxcontainer col-md-12">
-+ <form method="post" enctype="multipart/form-data" id="ModifyAssetPeople" action="ModifyPeople.html">
-+ <input type="hidden" name="id" value="<% $asset->id %>">
-+ <div class="col-md-12">
-+ <&| /Widgets/TitleBox, title => loc("People"), class => "asset-people", title_class => "inverse" &>
-+ <div class="form-row">
-+ <div class="col-md-3">
-+ <& /Asset/Elements/EditCatalogPeople, %ARGS, Object => $asset &>
-+ </div>
-+ <div class="col-md-3">
-+ <& /Asset/Elements/AddCatalogPeople, Object => $asset &>
-+ </div>
-+ </div>
-+ <div class="col-md-3">
-+ <& /Elements/EditCustomFields, Object => $asset, Grouping => 'People' &>
-+ <div>
-+ </&>
-+ </div>
-+ </div>
-
+-
- <&| /Widgets/TitleBox, title => loc("People"), class => "asset-people", title_class => "inverse" &>
- <table width="100%" class="edit">
- <tr>
@@ -671,7 +847,24 @@
-
- <& /Elements/Submit, Label => loc('Save'), Name => "Update" &>
-</form>
-+ <div class="form-row">
++ <div class="boxcontainer">
++ <div class="col-md-12">
++ <form method="post" enctype="multipart/form-data" id="ModifyAssetPeople" action="ModifyPeople.html">
++ <input type="hidden" name="id" value="<% $asset->id %>">
++ <&| /Widgets/TitleBox, title => loc("People"), class => "asset-people", title_class => "inverse" &>
++ <div class="form-row">
++ <div class="col-md-4">
++ <& /Asset/Elements/EditCatalogPeople, %ARGS, Object => $asset &>
++ </div>
++ <div class="col-md-4">
++ <& /Asset/Elements/AddCatalogPeople, Object => $asset &>
++ </div>
++ </div>
++ <div class="col-md-4">
++ <& /Elements/EditCustomFields, Object => $asset, Grouping => 'People' &>
++ </div>
++ </&>
++ </div>
+ <div class="col-md-12">
+ <& /Elements/Submit, Label => loc('Save'), Name => "Update" &>
+ </div>
@@ -951,13 +1144,3 @@
};
var assets = jQuery("#assets-accordion");
-@@
- ev.preventDefault();
- jQuery.get(
- RT.Config.WebHomePath + "/Asset/Helpers/CreateInCatalog",
-- showModal
-- );
-+ showModal,
-+ )
- });
- });
More information about the rt-commit
mailing list