[Rt-commit] r16108 - in rt/branches/3.999-DANGEROUS: lib/RT/View share/html/Elements share/web/static/css
clkao at bestpractical.com
clkao at bestpractical.com
Sat Sep 27 07:51:29 EDT 2008
Author: clkao
Date: Sat Sep 27 07:51:28 2008
New Revision: 16108
Modified:
rt/branches/3.999-DANGEROUS/lib/RT/View/Ticket.pm
rt/branches/3.999-DANGEROUS/share/html/Elements/EditLinks
rt/branches/3.999-DANGEROUS/share/html/Ticket/ModifyLinks.html
rt/branches/3.999-DANGEROUS/share/web/static/css/base.css
rt/branches/3.999-DANGEROUS/share/web/static/css/ticket.css
Log:
turn EditLink's left pane (removing current links) to use
the new BulkdUpdateLink action.
Modified: rt/branches/3.999-DANGEROUS/lib/RT/View/Ticket.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/View/Ticket.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/View/Ticket.pm Sat Sep 27 07:51:28 2008
@@ -53,48 +53,52 @@
__PACKAGE__->use_mason_wrapper;
-
template '_elements/edit_links' => sub {
- h1 { 'Hi here' };
- my $ticket = HTML::Mason::Commands::load_ticket(get('id'));
- h2 { $ticket->subject };
- my $delete_links = new_action(class => 'BulkUpdateLinks');
- form {
-# $delete_links->hidden('delete' => 1)->render;
- render_param($delete_links => 'delete', default_value => 1, render_as => 'hidden');
- input { { type is 'hidden', class is 'hidden', name is 'id', value is $ticket->id } }; # remove later.
+ my $ticket = HTML::Mason::Commands::load_ticket( get('id') );
+ div { { class is 'ticket-links-current' };
h3 { _("Current Links") };
+ my $delete_links = new_action( class => 'BulkUpdateLinks' );
+ $delete_links->register; # don't need this if we open form{} with jifty
+ render_param( $delete_links => 'delete', default_value => 1, render_as => 'hidden' );
+ input { { type is 'hidden', class is 'hidden', name is 'id', value is $ticket->id } }; # remove later.
+
+ table { tbody {
- show('_edit_link_type', _('Depends on'), $ticket->depends_on, $delete_links, 'target_uri');
+ show( '_edit_link_type', _('Depends on'), $ticket->depends_on, $delete_links, 'target_uri' );
- show('_edit_link_type', _('Depended on by'), $ticket->depended_on_by, $delete_links, 'base_uri');
+ show( '_edit_link_type', _('Depended on by'), $ticket->depended_on_by, $delete_links, 'base_uri' );
- show('_edit_link_type', _('Parents'), $ticket->member_of, $delete_links, 'target_uri');
+ show( '_edit_link_type', _('Parents'), $ticket->member_of, $delete_links, 'target_uri' );
- show('_edit_link_type', _('Children'), $ticket->members, $delete_links, 'base_uri');
+ show( '_edit_link_type', _('Children'), $ticket->members, $delete_links, 'base_uri' );
- show('_edit_link_type', _('Refers to'), $ticket->refers_to, $delete_links, 'target_uri');
+ show( '_edit_link_type', _('Refers to'), $ticket->refers_to, $delete_links, 'target_uri' );
- show('_edit_link_type', _('Referred to by'), $ticket->referred_to_by, $delete_links, 'base_uri');
+ show( '_edit_link_type', _('Referred to by'), $ticket->referred_to_by, $delete_links, 'base_uri' );
+
+ row { cell {}; cell { i { _('(Check box to delete)') } } };
+ } };
- form_submit( label => _('Save Changes') );
};
};
private template '_elements/_edit_link_type' => sub {
my ($self, $type, $collection, $delete_links, $link_target) = @_;
- h4 { $type.':' };
-
- while (my $link = $collection->next) {
- warn $link->id;
- Jifty::Web::Form::Field->new( action => $delete_links,
- name => 'ids',
- render_as => 'Checkbox',
- value => $link->id,
- checked => 0 )->render_widget;
- m_comp('/Elements/ShowLink', { uri => $link->$link_target });
- }
+ row {
+ cell { { class is 'labeltop' }; $type };
+ cell { { class is 'value' };
+ while (my $link = $collection->next) {
+ Jifty::Web::Form::Field->new( action => $delete_links,
+ name => 'ids',
+ render_as => 'Checkbox',
+ value => $link->id,
+ checked => 0 )->render_widget;
+ m_comp('/Elements/ShowLink', { uri => $link->$link_target });
+ br {};
+ }
+ }
+ };
};
sub m_comp {
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/EditLinks
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/EditLinks (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/EditLinks Sat Sep 27 07:51:28 2008
@@ -45,76 +45,10 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<table width="100%">
- <tr>
- <td valign="top" width="50%">
- <h3><&|/l&>Current Links</&></h3>
-<table>
- <tr>
- <td class="labeltop"><&|/l&>Depends on</&>:</td>
- <td class="value">
-% while (my $link = $object->depends_on->next) {
- <input type="checkbox" class="checkbox" name="delete_link--<%$link->type%>-<%$link->target%>" value="1" />
- <& ShowLink, uri => $link->target_uri &><br />
-% }
- </td>
- </tr>
- <tr>
- <td class="labeltop"><&|/l&>Depended on by</&>:</td>
- <td class="value">
-% while (my $link = $object->depended_on_by->next) {
- <input type="checkbox" class="checkbox" name="delete_link-<%$link->base%>-<%$link->type%>-" value="1" />
- <& ShowLink, uri => $link->base_uri &><br />
-% }
- </td>
- </tr>
- <tr>
- <td class="labeltop"><&|/l&>Parents</&>:</td>
- <td class="value">
-% while (my $link = $object->member_of->next) {
- <input type="checkbox" class="checkbox" name="delete_link--<%$link->type%>-<%$link->target%>" value="1" />
- <& ShowLink, uri => $link->target_uri &><br />
-% }
- </td>
- </tr>
- <tr>
- <td class="labeltop"><&|/l&>Children</&>:</td>
- <td class="value">
-% while (my $link = $object->members->next) {
- <input type="checkbox" class="checkbox" name="delete_link-<%$link->base%>-<%$link->type%>-" value="1" />
- <& ShowLink, uri => $link->base_uri &><br />
-% }
- </td>
- </tr>
- <tr>
- <td class="labeltop"><&|/l&>Refers to</&>:</td>
- <td class="value">
-% while (my $link = $object->refers_to->next) {
- <input type="checkbox" class="checkbox" name="delete_link--<%$link->type%>-<%$link->target%>" value="1" />
- <& ShowLink, uri => $link->target_uri &><br />
-%}
- </td>
- </tr>
- <tr>
- <td class="labeltop"><&|/l&>Referred to by</&>:</td>
- <td class="value">
-% while (my $link = $object->referred_to_by->next) {
-% # Skip reminders
-% next if (UNIVERSAL::isa($link->base_obj, 'RT::Model::Ticket') && $link->base_obj->type eq 'reminder');
- <input type="checkbox" class="checkbox" name="delete_link-<%$link->base%>-<%$link->type%>-" value="1" />
- <& ShowLink, uri => $link->base_uri &><br />
-% }
- </td>
- </tr>
- <tr>
- <td></td>
- <td><i><&|/l&>(Check box to delete)</&></i></td>
- </tr>
-</table>
-
-</td>
-<td valign="top">
+% Jifty->web->region( name => 'modify_links', path => '/ticket/_elements/edit_links', arguments => { ticket => $object->id } );
+
+<div class="ticket-links-new">
<h3><&|/l&>New Links</&></h3>
% if (ref($object) eq 'RT::Model::Ticket') {
<i><&|/l&>Enter tickets or URIs to link tickets to. Separate multiple entries with spaces.</&>
@@ -159,9 +93,9 @@
</tr>
% $m->callback( Callbackname => 'new_link' );
</table>
-</td>
-</tr>
-</table>
+</div>
+
+<div class="divclear">
<%INIT>
my $id;
Modified: rt/branches/3.999-DANGEROUS/share/html/Ticket/ModifyLinks.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Ticket/ModifyLinks.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Ticket/ModifyLinks.html Sat Sep 27 07:51:28 2008
@@ -65,8 +65,6 @@
<& /Elements/Submit, label => _('Save Changes') &>
</form>
-% Jifty->web->region( name => 'modify_links', path => '/ticket/_elements/edit_links', arguments => { ticket => $Ticket->id } );
-
</&>
Modified: rt/branches/3.999-DANGEROUS/share/web/static/css/base.css
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/web/static/css/base.css (original)
+++ rt/branches/3.999-DANGEROUS/share/web/static/css/base.css Sat Sep 27 07:51:28 2008
@@ -1,7 +1,7 @@
.hide { display: none; }
.clear { display: none;}
-
+.divclear { clear: both; }
Modified: rt/branches/3.999-DANGEROUS/share/web/static/css/ticket.css
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/web/static/css/ticket.css (original)
+++ rt/branches/3.999-DANGEROUS/share/web/static/css/ticket.css Sat Sep 27 07:51:28 2008
@@ -162,3 +162,8 @@
color: #666
}
+
+.ticket-info-links .ticket-links-current, .ticket-info-links .ticket-links-new {
+ width: 50%;
+ float: left;
+}
More information about the Rt-commit
mailing list