[rt-commit] [svn] r656 - in rt/branches/rt-3.3/html/Admin:
CustomFields Elements
jesse at fsck.com
jesse at fsck.com
Thu Apr 1 16:54:22 EST 2004
Author: jesse
Date: Thu Apr 1 16:54:22 2004
New Revision: 656
Modified:
rt/branches/rt-3.3/html/Admin/CustomFields/Objects.html
rt/branches/rt-3.3/html/Admin/CustomFields/index.html
rt/branches/rt-3.3/html/Admin/Elements/EditCustomFields
rt/branches/rt-3.3/html/Admin/Elements/PickCustomFields
rt/branches/rt-3.3/html/Admin/Elements/PickObjects
rt/branches/rt-3.3/html/Admin/Elements/QueueTabs
Log:
UI updates to remove unneeded options and clarify some language
Modified: rt/branches/rt-3.3/html/Admin/CustomFields/Objects.html
==============================================================================
--- rt/branches/rt-3.3/html/Admin/CustomFields/Objects.html (original)
+++ rt/branches/rt-3.3/html/Admin/CustomFields/Objects.html Thu Apr 1 16:54:22 2004
@@ -30,24 +30,13 @@
<& /Elements/ListActions, actions => \@results &>
-<TABLE>
-<TR>
-<TD VALIGN=TOP>
-<h2><%$caption%></h2>
-</TD></TR></TABLE>
-<FORM METHOD=GET ACTION="Objects.html">
-<INPUT TYPE=HIDDEN NAME="id" VALUE="<% $id %>">
-<input type="checkbox" name="FindDisabledObjects"> <&|/l&>Include disabled objects in listing.</&>
-<input type=submit value="<&|/l&>Go!</&>">
-</FORM>
-<hr>
<FORM ACTION="Objects.html" METHOD=POST>
<INPUT TYPE=HIDDEN NAME="id" VALUE="<% $id %>">
<INPUT TYPE=HIDDEN NAME="UpdateObjs" VALUE="1">
-<h3><&|/l&>Assigned Objects (uncheck to remove)</&></h3>
+<h2><&|/l&>Selected objects</&></h2>
<& /Admin/Elements/PickObjects, Objects => \@AssignedObjs, id => $id, Checked => 1 &>
-<h3><&|/l&>Unassigned Objects (check to assign)</&></h3>
+<h2><&|/l&>Unselected objects</&></h2>
<& /Admin/Elements/PickObjects, Objects => \@UnassignedObjs, id => $id &>
<& /Elements/Submit, CheckAll => 1, ClearAll => 1 &>
@@ -67,18 +56,12 @@
my $title = loc('Modify associated objects for [_1]', $CF->Name);
my $Objects = $CollectionClass->new($session{'CurrentUser'});
-my ($caption, @results);
+my (@results);
my (@AssignedObjs, @UnassignedObjs);
$Objects->UnLimit;
$Objects->OrderBy( FIELD => 'Name' );
-if ($FindDisabledObjects) {
- $caption = loc("All [_1]", loc($CollectionType));
- $Objects->{'find_disabled_rows'} = 1;
-} else {
- $caption = loc("Enabled [_1]", loc($CollectionType));
-}
my $ObjectCFs;
$ObjectCFs = RT::ObjectCustomFields->new($session{'CurrentUser'});
Modified: rt/branches/rt-3.3/html/Admin/CustomFields/index.html
==============================================================================
--- rt/branches/rt-3.3/html/Admin/CustomFields/index.html (original)
+++ rt/branches/rt-3.3/html/Admin/CustomFields/index.html Thu Apr 1 16:54:22 2004
@@ -11,7 +11,7 @@
% if ($prev_lookup) {
</UL>
% }
-<H2><% loc("Custom Fields of [_1]", $lookup) %></H2>
+<H2><% loc("Custom Fields for [_1]", $lookup) %></H2>
<UL>
% $prev_lookup = $lookup;
% }
Modified: rt/branches/rt-3.3/html/Admin/Elements/EditCustomFields
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Elements/EditCustomFields (original)
+++ rt/branches/rt-3.3/html/Admin/Elements/EditCustomFields Thu Apr 1 16:54:22 2004
@@ -23,19 +23,6 @@
%# END LICENSE BLOCK
<& /Elements/ListActions, actions => \@results &>
-<TABLE>
-<TR>
-<TD VALIGN=TOP>
-<h2><%$caption%></h2>
-</TD></TR></TABLE>
-<FORM METHOD=GET ACTION="CustomFields.html">
-<INPUT TYPE=HIDDEN NAME="id" VALUE="<% $Object->Id %>">
-<INPUT TYPE=HIDDEN NAME="ObjectType" VALUE="<% $ObjectType %>">
-<INPUT TYPE=HIDDEN NAME="SubType" VALUE="<% $SubType %>">
-<input type="checkbox" name="FindDisabledCustomFields"> <&|/l&>Include disabled custom fields in listing.</&>
-<input type=submit value="<&|/l&>Go!</&>">
-</FORM>
-<hr>
<FORM ACTION="CustomFields.html" METHOD=POST>
<INPUT TYPE=HIDDEN NAME="id" VALUE="<% $Object->Id %>">
<INPUT TYPE=HIDDEN NAME="ObjectType" VALUE="<% $ObjectType %>">
@@ -43,12 +30,12 @@
<INPUT TYPE=HIDDEN NAME="UpdateCFs" VALUE="1">
% if ($Object->Id) {
-<h3><&|/l&>Global Custom Fields</&></h3>
+<h2><&|/l&>Global Custom Fields</&></h2>
<& PickCustomFields, CustomFields => \@GlobalCFs, ReadOnly => 1, id => $id &>
% }
-<h3><&|/l&>Assigned Custom Fields (uncheck to remove)</&></h3>
+<h2><&|/l&>Selected Custom Fields</&></h2>
<& PickCustomFields, CustomFields => [$ObjectCFs->CustomFields], id => $id, Checked => 1 &>
-<h3><&|/l&>Unassigned Custom Fields (check to assign)</&></h3>
+<h2><&|/l&>Unselected Custom Fields</&></h2>
<& PickCustomFields, CustomFields => \@UnassignedCFs, id => $id &>
<& /Elements/Submit, CheckAll => 1, ClearAll => 1 &>
@@ -57,7 +44,6 @@
<%INIT>
my $CustomFields = RT::CustomFields->new($session{'CurrentUser'});
-my $caption;
my @results;
my (@GlobalCFs, @UnassignedCFs);
@@ -73,12 +59,6 @@
$CustomFields->LimitToLookupType($lookup);
$CustomFields->OrderBy( FIELD => 'Name' );
-if ($FindDisabledCustomFields) {
- $caption = loc("All Custom Fields");
- $CustomFields->{'find_disabled_rows'} = 1;
-} else {
- $caption = loc("Enabled Custom Fields");
-}
my ($GlobalCFs, $ObjectCFs);
$ObjectCFs = RT::ObjectCustomFields->new($session{'CurrentUser'});
Modified: rt/branches/rt-3.3/html/Admin/Elements/PickCustomFields
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Elements/PickCustomFields (original)
+++ rt/branches/rt-3.3/html/Admin/Elements/PickCustomFields Thu Apr 1 16:54:22 2004
@@ -22,7 +22,7 @@
%#
%# END LICENSE BLOCK
% if (@CustomFields == 0) {
-<P><i><&|/l&>(No custom fields)</&></i></P>
+<p><i><&|/l&>(None)</&></i></p>
% } else {
<TABLE cellspacing=0 cellpadding=2>
% my $count;
Modified: rt/branches/rt-3.3/html/Admin/Elements/PickObjects
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Elements/PickObjects (original)
+++ rt/branches/rt-3.3/html/Admin/Elements/PickObjects Thu Apr 1 16:54:22 2004
@@ -22,7 +22,7 @@
%#
%# END LICENSE BLOCK
% if (@Objects == 0) {
-<P><i><&|/l&>(No objects)</&></i></P>
+<P><i><&|/l&>(None)</&></i></P>
% } else {
<TABLE cellspacing=0 cellpadding=2>
% my $count;
Modified: rt/branches/rt-3.3/html/Admin/Elements/QueueTabs
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Elements/QueueTabs (original)
+++ rt/branches/rt-3.3/html/Admin/Elements/QueueTabs Thu Apr 1 16:54:22 2004
@@ -49,11 +49,11 @@
path => "Admin/Queues/Templates.html?id=".$id,
},
- G1 => { title => loc('CF: Tickets'),
+ G1 => { title => loc('Ticket Custom Fields'),
path => 'Admin/Queues/CustomFields.html?SubType=RT::Ticket&id='.$id,
},
- G2 => { title => loc('CF: TicketTxns'),
+ G2 => { title => loc('Transaction Custom Fields'),
path => 'Admin/Queues/CustomFields.html?SubType=RT::Ticket-RT::Transaction&id='.$id,
},
@@ -73,10 +73,10 @@
$tabs->{"B"} = { title => loc('New queue'),
path => "Admin/Queues/Modify.html?Create=1",
};
- $tabs->{"G1"} = { title => loc('CF: Tickets'),
+ $tabs->{"G1"} = { title => loc('Ticket Custom Fields'),
path => 'Admin/Queues/CustomFields.html?SubType=RT::Ticket',
};
- $tabs->{"G2"} = { title => loc('CF: TicketTxns'),
+ $tabs->{"G2"} = { title => loc('Transaction Custom Fields'),
path => 'Admin/Queues/CustomFields.html?SubType=RT::Ticket-RT::Transaction',
separator => 1, };
}
More information about the Rt-commit
mailing list