[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-224-gaa588c0

Thomas Sibley trs at bestpractical.com
Fri Aug 6 13:09:41 EDT 2010


The branch, 3.9-trunk has been updated
       via  aa588c030d621d041eea5dedb274be5c2aae690e (commit)
      from  6731eb2567c978d985fe20dffd68f05519808d42 (commit)

Summary of changes:
 share/html/Elements/Footer                         |    1 +
 share/html/NoAuth/css/base/main.css                |    2 +-
 share/html/NoAuth/css/base/misc.css                |    5 +-
 .../base/{ticket-update.css => ticket-form.css}    |   29 +++--
 share/html/Ticket/Create.html                      |  119 +++++++++++++-------
 share/html/Ticket/Elements/EditCustomFields        |   16 ++-
 6 files changed, 112 insertions(+), 60 deletions(-)
 rename share/html/NoAuth/css/base/{ticket-update.css => ticket-form.css} (69%)

- Log -----------------------------------------------------------------
commit aa588c030d621d041eea5dedb274be5c2aae690e
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Aug 6 13:10:24 2010 -0400

    Give ticket create the same layout treatment as ticket update

diff --git a/share/html/Elements/Footer b/share/html/Elements/Footer
index b70c9e7..a4ddda1 100755
--- a/share/html/Elements/Footer
+++ b/share/html/Elements/Footer
@@ -46,6 +46,7 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 %# End of div#body from /Elements/PageLayout
+  <hr class="clear" />
 </div>
 % $m->callback( %ARGS );
 <div id="footer">
diff --git a/share/html/NoAuth/css/base/main.css b/share/html/NoAuth/css/base/main.css
index 5f1bb5a..753c39f 100644
--- a/share/html/NoAuth/css/base/main.css
+++ b/share/html/NoAuth/css/base/main.css
@@ -48,7 +48,7 @@
 % $m->callback(CallbackName => 'Begin');
 
 @import "misc.css";
- at import "ticket-update.css";
+ at import "ticket-form.css";
 
 % $m->callback(CallbackName => 'End');
 
diff --git a/share/html/NoAuth/css/base/misc.css b/share/html/NoAuth/css/base/misc.css
index 9e4192d..f730cff 100644
--- a/share/html/NoAuth/css/base/misc.css
+++ b/share/html/NoAuth/css/base/misc.css
@@ -102,13 +102,14 @@ hr.clear {
 
 /* Custom fields */
 
-.edit-custom-field {
+/* Only apply these when we're not rendering in a table, hence the leading div. */
+div.edit-custom-field {
     width: 48%;
     float: left;
     margin: 0.5em;
 }
 
-.edit-custom-field .cflabel {
+div.edit-custom-field .cflabel {
     float: left;
     padding-right: 0.5em;
 }
diff --git a/share/html/NoAuth/css/base/ticket-update.css b/share/html/NoAuth/css/base/ticket-form.css
similarity index 69%
rename from share/html/NoAuth/css/base/ticket-update.css
rename to share/html/NoAuth/css/base/ticket-form.css
index 6ad9f8c..710a8c0 100644
--- a/share/html/NoAuth/css/base/ticket-update.css
+++ b/share/html/NoAuth/css/base/ticket-form.css
@@ -2,31 +2,36 @@
     padding-top: 3em;
 }
 
-#ticket-update-metadata {
-    float: right;
-    width: 40%;
-    clear: right;
-}
-
-#ticket-update-message {
-    float: left;
-    width: 58%;
-    clear: left;
-}
-
+#ticket-create-message .button[name="AddMoreAttach"],
 #ticket-update-message .button[name="AddMoreAttach"] {
     float: right;
 }
 
+#ticket-create-metadata .cflabel .name,
 #ticket-update-metadata .cflabel .name {
     font-weight: normal;
 }
 
+#ticket-create-message .messagedetails,
 #ticket-update-message .messagedetails {
     margin-bottom: 0.5em;
 }
 
+#ticket-create-message #SubmitTicket,
 #ticket-update-message #SubmitTicket {
     padding-bottom: 2em;
 }
 
+#ticket-create-metadata,
+#ticket-update-metadata {
+    float: right;
+    width: 40%;
+    clear: right;
+}
+
+#ticket-create-message,
+#ticket-update-message {
+    float: left;
+    width: 58%;
+    clear: left;
+}
diff --git a/share/html/Ticket/Create.html b/share/html/Ticket/Create.html
index 6ccc9cc..bc5235c 100755
--- a/share/html/Ticket/Create.html
+++ b/share/html/Ticket/Create.html
@@ -52,34 +52,66 @@
     current_toptab => "Ticket/Create.html", 
     Title => $title,
     actions => $actions &>
+    
 <& /Elements/ListActions, actions => \@results &>
+
 <form action="<% RT->Config->Get('WebPath') %>/Ticket/Create.html" method="post" enctype="multipart/form-data" name="TicketCreate">
-<input type="hidden" class="hidden" name="id" value="new" />
+  <input type="hidden" class="hidden" name="id" value="new" />
+  
 % $m->callback( CallbackName => 'FormStart', QueueObj => $QueueObj, ARGSRef => \%ARGS );
+
 % if ($gnupg_widget) {
-<& /Elements/GnuPG/SignEncryptWidget:ShowIssues, self => $gnupg_widget &>
+  <& /Elements/GnuPG/SignEncryptWidget:ShowIssues, self => $gnupg_widget &>
 % }
+
 <div id="Ticket-Create-basics">
 <a name="basics"></a>
-<&| /Widgets/TitleBox, title => $title &>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td class="label"><&|/l&>Queue</&>:</td>
-<td class="value"><& Elements/ShowQueue, QueueObj => $QueueObj &>
-<input type="hidden" class="hidden" name="Queue" value="<% $QueueObj->Name %>" />
-</td>
-<td class="label"><&|/l&>Status</&>:
-</td>
-<td class="value">
-<& /Elements/SelectStatus, Name => "Status", Default => $ARGS{Status}||'new', DefaultValue => 0, SkipDeleted => 1 &>
-</td>
-<td class="label">
-<&|/l&>Owner</&>:
-</td>
-<td class="value">
-<& /Elements/SelectOwner, Name => "Owner", QueueObj => $QueueObj, Default => $ARGS{Owner}||$RT::Nobody->Id, DefaultValue => 0 &>
-</td>
+
+<div id="ticket-create-metadata">
+  <&| /Widgets/TitleBox, title => loc("Ticket") &>
+    <input type="hidden" class="hidden" name="Queue" value="<% $QueueObj->Name %>" />
+    <table border="0">
+    <& /Ticket/Elements/EditBasics,
+        InTable => 1,
+        fields  => [
+            {   name => 'Queue',
+                comp => '/Ticket/Elements/ShowQueue',
+                args => {
+                    QueueObj => $QueueObj,
+                },
+            },
+            {   name => 'Status',
+                comp => '/Elements/SelectStatus',
+                args => {
+                    Name            => "Status",
+                    Default         => $ARGS{Status} || 'new',
+                    DefaultValue    => 0,
+                    SkipDeleted     => 1,
+                },
+            },
+            {   name => 'Owner',
+                comp => '/Elements/SelectOwner',
+                args => {
+                    Name            => "Owner",
+                    Default         => $ARGS{Owner} || $RT::Nobody->Id,
+                    DefaultValue    => 0,
+                    QueueObj        => $QueueObj,
+                },
+            }
+        ]
+        &>
+
 % $m->callback( CallbackName => 'AfterOwner', ARGSRef => \%ARGS );
-</tr>
+
+      <& /Ticket/Elements/EditCustomFields, %ARGS, QueueObj => $QueueObj, AsTable => 1 &>
+      <& /Ticket/Elements/EditTransactionCustomFields, %ARGS, QueueObj => $QueueObj &>
+    </table>
+  </&>
+</div>
+
+<div id="ticket-create-message">
+  <&| /Widgets/TitleBox, title => $title, class => 'messagedetails' &>
+<table border="0" cellpadding="0" cellspacing="0">
 <tr>
 <td class="label">
 <&|/l&>Requestors</&>:
@@ -92,20 +124,34 @@
 <td class="label">
 <&|/l&>Cc</&>:
 </td>
-<td class="value" colspan="3"><& /Elements/EmailInput, Name => 'Cc', Size => '40', Default => $ARGS{Cc} &></td>
-<td class="comment" colspan="2"><i><font size="-2">
-<&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <strong>will</strong> receive future updates.)</&></font></i>
-</td>
+<td class="value" colspan="5"><& /Elements/EmailInput, Name => 'Cc', Size => '40', Default => $ARGS{Cc} &></td>
 </tr>
+
+<tr>
+  <td class="label">&nbsp;</td>
+  <td class="comment" colspan="5">
+    <i><font size="-2">
+      <&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <strong>will</strong> receive future updates.)</&>
+    </font></i>
+  </td>
+</tr>
+
 <tr>
 <td class="label">
 <&|/l&>Admin Cc</&>:
 </td>
-<td class="value" colspan="3"><& /Elements/EmailInput, Name => 'AdminCc', Size => '40', Default => $ARGS{AdminCc} &></td>
-<td class="comment" colspan="2"><i><font size="-2">
-<&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <strong>will</strong> receive future updates.)</&></font></i>
-</td>
+<td class="value" colspan="5"><& /Elements/EmailInput, Name => 'AdminCc', Size => '40', Default => $ARGS{AdminCc} &></td>
 </tr>
+
+<tr>
+  <td class="label">&nbsp;</td>
+  <td class="comment" colspan="5">
+    <i><font size="-2">
+      <&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <strong>will</strong> receive future updates.)</&>
+    </font></i>
+  </td>
+</tr>
+
 <tr>
 <td class="label">
 <&|/l&>Subject</&>:
@@ -115,14 +161,6 @@
 % $m->callback( %ARGS, CallbackName => 'AfterSubject' );
 </td>
 </tr>
-<tr>
-<td colspan="6">
-<& /Ticket/Elements/EditCustomFields, %ARGS, QueueObj => $QueueObj &>
-</td>
-</tr>
-<& /Ticket/Elements/EditTransactionCustomFields, %ARGS, QueueObj => $QueueObj &>
-
-<& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $QueueObj &>
 
 % if ( $gnupg_widget ) {
 <tr><td>&nbsp;</td><td colspan="5">
@@ -144,9 +182,12 @@
 <br />
 </td>
 </tr>
-</table>
-</&>
-<& /Elements/Submit, Label => loc("Create")&>
+
+        <& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $QueueObj &>
+      </table>
+    </&>
+    <& /Elements/Submit, Label => loc("Create"), id => 'SubmitTicket' &>
+  </div>
 </div>
 
 <div id="Ticket-Create-details">
diff --git a/share/html/Ticket/Elements/EditCustomFields b/share/html/Ticket/Elements/EditCustomFields
index e5040a6..ec438cf 100755
--- a/share/html/Ticket/Elements/EditCustomFields
+++ b/share/html/Ticket/Elements/EditCustomFields
@@ -50,12 +50,12 @@
 % while ( my $CustomField = $CustomFields->Next ) {
 % next unless $CustomField->CurrentUserHasRight('ModifyCustomField');
 % my $Type = $CustomField->Type || 'Unknown';
-  <div class="edit-custom-field cftype-<% $Type %>">
-    <div class="cflabel">
+  <<% $FIELD %> class="edit-custom-field cftype-<% $Type %>">
+    <<% $CELL %> class="cflabel">
       <span class="name"><% loc($CustomField->Name) %></span><br />
       <span class="type"><% $CustomField->FriendlyType %></span>
-    </div>
-    <div class="entry">
+    </<% $CELL %>>
+    <<% $CELL %> class="entry">
 % my $default = $m->notes('Field-' . $CustomField->Id);
 % $default ||= $ARGS{"CustomField-". $CustomField->Id };
       <& /Elements/EditCustomField, 
@@ -69,8 +69,8 @@
         <br />
         <span class="cfinvalidfield"><% $msg %></span>
 %  }
-    </div>
-  </div>
+    </<% $CELL %>>
+  </<% $FIELD %>>
 % }
 
 </div>
@@ -88,6 +88,9 @@ if ($TicketObj && !$OnCreate) {
 
 $m->callback( %ARGS, CallbackName => 'MassageCustomFields', CustomFields => $CustomFields );
 
+my $FIELD = $AsTable ? 'tr' : 'div';
+my $CELL  = $AsTable ? 'td' : 'div';
+
 </%INIT>
 <%ARGS>
 $NamePrefix => ''
@@ -95,4 +98,5 @@ $TicketObj => undef
 $QueueObj => undef
 $OnCreate => undef
 $DefaultsFromTopArguments => 1
+$AsTable => 0
 </%ARGS>

-----------------------------------------------------------------------


More information about the Rt-commit mailing list