[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-219-g0a594df
Thomas Sibley
trs at bestpractical.com
Thu Aug 5 16:20:49 EDT 2010
The branch, 3.9-trunk has been updated
via 0a594dff384c4f87ba4a48d01ce4a771f49d9e41 (commit)
from 5de7c6062e11f6c4ee2c514839f6fc3b41ca9cc3 (commit)
Summary of changes:
share/html/Elements/EditCustomFieldSelect | 2 +-
share/html/NoAuth/css/base/main.css | 1 +
share/html/NoAuth/css/base/misc.css | 13 ++--
share/html/NoAuth/css/base/ticket-update.css | 32 +++++++
.../Ticket/Elements/EditTransactionCustomFields | 6 +-
share/html/Ticket/Update.html | 90 ++++++++++++-------
6 files changed, 102 insertions(+), 42 deletions(-)
create mode 100644 share/html/NoAuth/css/base/ticket-update.css
- Log -----------------------------------------------------------------
commit 0a594dff384c4f87ba4a48d01ce4a771f49d9e41
Author: Thomas Sibley <trs at bestpractical.com>
Date: Thu Aug 5 16:21:54 2010 -0400
Relayout the ticket update page to be more space efficient
diff --git a/share/html/Elements/EditCustomFieldSelect b/share/html/Elements/EditCustomFieldSelect
index f1ca1cb..2ea4117 100644
--- a/share/html/Elements/EditCustomFieldSelect
+++ b/share/html/Elements/EditCustomFieldSelect
@@ -93,7 +93,7 @@ doOnLoad( function () {
% }
% if ( $RenderType eq 'List' ) {
-<fieldset>
+<fieldset class="cfedit">
% if ( $checktype eq 'radio' ) {
<input type="<% $checktype %>" name="<% $name %>" id="<% $name %>-none" value="" <% keys %default ? '' : ' checked="checked"' |n%> />
<label for="<% $name %>-none"><&|/l&>(no value)</&><label><br />
diff --git a/share/html/NoAuth/css/base/main.css b/share/html/NoAuth/css/base/main.css
index a8649ff..5f1bb5a 100644
--- a/share/html/NoAuth/css/base/main.css
+++ b/share/html/NoAuth/css/base/main.css
@@ -48,6 +48,7 @@
% $m->callback(CallbackName => 'Begin');
@import "misc.css";
+ at import "ticket-update.css";
% $m->callback(CallbackName => 'End');
diff --git a/share/html/NoAuth/css/base/misc.css b/share/html/NoAuth/css/base/misc.css
index 50d0e75..9e4192d 100644
--- a/share/html/NoAuth/css/base/misc.css
+++ b/share/html/NoAuth/css/base/misc.css
@@ -102,22 +102,23 @@ hr.clear {
/* Custom fields */
-.cflabel {
- float: left;
- padding-right: 0.5em;
-}
-
.edit-custom-field {
width: 48%;
float: left;
margin: 0.5em;
}
+.edit-custom-field .cflabel {
+ float: left;
+ padding-right: 0.5em;
+}
+
.cflabel .name { font-weight: bold; }
.cflabel .type { font-style: italic; }
-.edit-custom-field .entry fieldset {
+fieldset.cfedit {
border: none;
padding: 0;
margin: 0;
}
+
diff --git a/share/html/NoAuth/css/base/ticket-update.css b/share/html/NoAuth/css/base/ticket-update.css
new file mode 100644
index 0000000..6ad9f8c
--- /dev/null
+++ b/share/html/NoAuth/css/base/ticket-update.css
@@ -0,0 +1,32 @@
+#comp-Ticket-Update #body {
+ padding-top: 3em;
+}
+
+#ticket-update-metadata {
+ float: right;
+ width: 40%;
+ clear: right;
+}
+
+#ticket-update-message {
+ float: left;
+ width: 58%;
+ clear: left;
+}
+
+#ticket-update-message .button[name="AddMoreAttach"] {
+ float: right;
+}
+
+#ticket-update-metadata .cflabel .name {
+ font-weight: normal;
+}
+
+#ticket-update-message .messagedetails {
+ margin-bottom: 0.5em;
+}
+
+#ticket-update-message #SubmitTicket {
+ padding-bottom: 2em;
+}
+
diff --git a/share/html/Ticket/Elements/EditTransactionCustomFields b/share/html/Ticket/Elements/EditTransactionCustomFields
index f79ef1d..97f7aef 100644
--- a/share/html/Ticket/Elements/EditTransactionCustomFields
+++ b/share/html/Ticket/Elements/EditTransactionCustomFields
@@ -50,13 +50,15 @@
% while (my $CF = $CustomFields->Next()) {
% next unless $CF->CurrentUserHasRight('ModifyCustomField');
<tr>
-<td class="label"><% loc($CF->Name) %>:</td>
+<td class="label cflabel">
+ <span class="name"><% loc($CF->Name) %>:</span><br />
+ <span class="type"><% $CF->FriendlyType %></span>
+</td>
<td>
<& /Elements/EditCustomField,
CustomField => $CF,
NamePrefix => $NamePrefix
&>
-<em><% $CF->FriendlyType %></em>
</td>
</td></tr>
% }
diff --git a/share/html/Ticket/Update.html b/share/html/Ticket/Update.html
index 7ea7475..4c1d1e0 100755
--- a/share/html/Ticket/Update.html
+++ b/share/html/Ticket/Update.html
@@ -62,28 +62,11 @@
<& /Elements/GnuPG/SignEncryptWidget:ShowIssues, self => $gnupg_widget &>
+<div id="ticket-update-metadata">
+ <&|/Widgets/TitleBox, title => loc('Ticket and Transaction') &>
<table width="100%" border="0">
% $m->callback(CallbackName => 'AfterTableOpens', ARGSRef => \%ARGS, Ticket => $TicketObj);
-<tr><td class="label"><&|/l&>Status</&>:</td>
-<td>
-<& /Elements/SelectStatus, Name=>"Status", DefaultLabel => loc("[_1] (Unchanged)", loc($TicketObj->Status)), Default => $ARGS{'Status'} || ($TicketObj->Status eq $DefaultStatus ? undef : $DefaultStatus)&>
-<span class="label"><&|/l&>Owner</&>:</span>
-<& /Elements/SelectOwner,
- Name => "Owner",
- TicketObj => $TicketObj,
- QueueObj => $TicketObj->QueueObj,
- DefaultLabel => loc("[_1] (Unchanged)", $TicketObj->OwnerObj->Name),
- Default => $ARGS{'Owner'}
-&>
-<span class="label"><&|/l&>Worked</&>:</span>
-<& /Elements/EditTimeValue,
- Name => 'UpdateTimeWorked',
- Default => $ARGS{UpdateTimeWorked}||'',
- InUnits => $ARGS{'UpdateTimeWorked-TimeUnits'}||'minutes',
-&>
-% $m->callback( %ARGS, CallbackName => 'AfterWorked', Ticket => $TicketObj );
-</td></tr>
% my $skip;
% $m->callback( %ARGS, CallbackName => 'BeforeUpdateType', skip => \$skip );
% if (!$skip) {
@@ -100,15 +83,50 @@
</select>
% $m->callback( %ARGS, CallbackName => 'AfterUpdateType' );
</td></tr>
-<tr><td class="label"><&|/l&>Subject</&>:</td><td> <input name="UpdateSubject" size="60" value="<% $ARGS{UpdateSubject} || $TicketObj->Subject()%>" />
-% $m->callback( %ARGS, CallbackName => 'AfterSubject' );
-</td></tr>
-<& /Ticket/Elements/UpdateCc, %ARGS, TicketObj => $TicketObj &>
+<tr>
+ <td class="label"><&|/l&>Status</&>:</td>
+ <td class="value">
+ <& /Elements/SelectStatus, Name=>"Status", DefaultLabel => loc("[_1] (Unchanged)", loc($TicketObj->Status)), Default => $ARGS{'Status'} || ($TicketObj->Status eq $DefaultStatus ? undef : $DefaultStatus)&>
+ </td>
+</tr>
+
+<tr>
+ <td class="label"><&|/l&>Owner</&>:</td>
+ <td class="value">
+ <& /Elements/SelectOwner,
+ Name => "Owner",
+ TicketObj => $TicketObj,
+ QueueObj => $TicketObj->QueueObj,
+ DefaultLabel => loc("[_1] (Unchanged)", $TicketObj->OwnerObj->Name),
+ Default => $ARGS{'Owner'}
+ &>
+ </td>
+</tr>
+
+<tr>
+ <td class="label"><&|/l&>Worked</&>:</td>
+ <td class="value">
+ <& /Elements/EditTimeValue,
+ Name => 'UpdateTimeWorked',
+ Default => $ARGS{UpdateTimeWorked}||'',
+ InUnits => $ARGS{'UpdateTimeWorked-TimeUnits'}||'minutes',
+ &>
+ </td>
+</tr>
+
+% $m->callback( %ARGS, CallbackName => 'AfterWorked', Ticket => $TicketObj );
+
+ <& /Ticket/Elements/EditTransactionCustomFields, %ARGS, TicketObj => $TicketObj &>
-<& /Ticket/Elements/EditTransactionCustomFields, %ARGS, TicketObj => $TicketObj &>
+ </table>
+ </&>
+</div>
-<& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $TicketObj &>
+<div id="ticket-update-message">
+ <&|/Widgets/TitleBox, title => loc('Message'), class => 'messagedetails' &>
+ <table width="100%" border="0">
+<& /Ticket/Elements/UpdateCc, %ARGS, TicketObj => $TicketObj &>
% if ( $gnupg_widget ) {
<tr><td> </td><td>
@@ -120,6 +138,10 @@
% }
% $m->callback( %ARGS, CallbackName => 'AfterGnuPG' );
+<tr><td class="label"><&|/l&>Subject</&>:</td><td> <input name="UpdateSubject" size="60" value="<% $ARGS{UpdateSubject} || $TicketObj->Subject()%>" />
+% $m->callback( %ARGS, CallbackName => 'AfterSubject' );
+</td></tr>
+
<tr><td class="label" valign="top"><&|/l&>Message</&>:</td><td>
% $m->callback( %ARGS, CallbackName => 'BeforeMessageBox' );
% if (exists $ARGS{UpdateContent}) {
@@ -134,19 +156,21 @@
<& /Elements/MessageBox, Name=>"UpdateContent", IncludeSignature => $IncludeSignature, %ARGS &>
% }
</td></tr>
-</table>
-
-
-
-<& /Elements/Submit, Label => loc('Update Ticket'), Name => 'SubmitTicket' &>
-% if ($TicketObj->CurrentUserHasRight('ShowOutgoingEmail')) {
-<&|/Widgets/TitleBox, title => loc('Scrips and Recipients') &>
-<& /Ticket/Elements/PreviewScrips, TicketObj => $TicketObj, %ARGS &>
+ <& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $TicketObj &>
+ </table>
</&>
+ <& /Elements/Submit, Label => loc('Update Ticket'), Name => 'SubmitTicket', id => 'SubmitTicket' &>
+% if ($TicketObj->CurrentUserHasRight('ShowOutgoingEmail')) {
+ <&|/Widgets/TitleBox, title => loc('Scrips and Recipients') &>
+ <& /Ticket/Elements/PreviewScrips, TicketObj => $TicketObj, %ARGS &>
+ </&>
% }
+</div>
+
</form>
+<hr class="clear" />
<%INIT>
my $CanRespond = 0;
my $CanComment = 0;
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list