diff options
Diffstat (limited to 'rt/html/Approvals/Elements')
-rw-r--r-- | rt/html/Approvals/Elements/Approve | 70 | ||||
-rw-r--r-- | rt/html/Approvals/Elements/PendingMyApproval | 35 | ||||
-rw-r--r-- | rt/html/Approvals/Elements/ShowDependency | 28 | ||||
-rw-r--r-- | rt/html/Approvals/Elements/Tabs | 6 |
4 files changed, 80 insertions, 59 deletions
diff --git a/rt/html/Approvals/Elements/Approve b/rt/html/Approvals/Elements/Approve index bf786fb03..6dd562a32 100644 --- a/rt/html/Approvals/Elements/Approve +++ b/rt/html/Approvals/Elements/Approve @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# You should have received a copy of the GNU General Public License %# along with this program; if not, write to the Free Software -%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +%# 02110-1301 or visit their web page on the internet at +%# http://www.gnu.org/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,36 +45,50 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<tr bgcolor="#b9b9ff"> -<td colspan=2><font size="3"> -<a href="<%$RT::WebPath%>/Approvals/Display.html?id=<%$ticket->Id%>"><% loc("#[_1]: [_2]", $ticket->Id, $ticket->Subject) %></a> (<%loc($ticket->Status)%>)</font></td> -</tr> +<div class="approval"> + <div class="name"> + <a href="<%$RT::WebPath%>/Approvals/Display.html?id=<%$ticket->Id%>"><% loc("#[_1]: [_2]", $ticket->Id, $ticket->Subject) %></a> (<%loc($ticket->Status)%>) + </div> % if ($ShowApproving) { % foreach my $approving ( $ticket->AllDependedOnBy( Type => 'ticket' ) ) { -<tr bgcolor="#e9e9e9"> -<td colspan=2> -<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<% $approving->Id %>"><&|/l, $approving->Id, $approving->Subject &>Originating ticket: #[_1]</&></a> -</td> -</tr> -<tr><td colspan=2> -<& /Ticket/Elements/ShowCustomFields, Ticket => $approving &> -<& /Ticket/Elements/ShowHistory, Ticket => $approving, Collapsed => 0, ShowTitle => 0, ShowHeaders => 0, ShowDisplayModes => 0, ShowTitleBarCommands => 0 &> -</td></tr> + <div class="originating-ticket"> + <span class="link"><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<% $approving->Id %>"><&|/l, $approving->Id, $approving->Subject &>Originating ticket: #[_1]</&></a></span> + <div class="info"> +% if ($ShowCustomFields) { + <& /Ticket/Elements/ShowCustomFields, Ticket => $approving &> +% } +% if ($ShowHistory) { + <& /Ticket/Elements/ShowHistory, Ticket => $approving, Collapsed => 0, ShowTitle => 0, ShowHeaders => 0, ShowDisplayModes => 0, ShowTitleBarCommands => 0 &> +% } + </div> + </div> % } % } -<tr <%$class && "class=\"$class\""%>> -<td valign=top> -<input type="radio" name="Approval-<%$ticket->Id%>-Action" value="approve"><&|/l&>Approve</&><br> -<input type="radio" name="Approval-<%$ticket->Id%>-Action" value="deny"><&|/l&>Deny</&><br> -<input type="radio" name="Approval-<%$ticket->Id%>-Action" value="none" checked><&|/l&>No action</&> -</td> -<td> -<&|/l&>Notes</&><br> -<textarea name="Approval-<%$ticket->Id%>-Notes" rows=2 cols=70></textarea> -</td> -</tr> + <div class="form"> + <div class="action"> + <div> + <input type="radio" class="radio" id="Approval-<%$ticket->Id%>-Action-approve" name="Approval-<%$ticket->Id%>-Action" value="approve" /> + <label for="Approval-<%$ticket->Id%>-Action-approve"><&|/l&>Approve</&></label> + </div> + <div> + <input type="radio" class="radio" id="Approval-<%$ticket->Id%>-Action-deny" name="Approval-<%$ticket->Id%>-Action" value="deny" /> + <label for="Approval-<%$ticket->Id%>-Action-deny"><&|/l&>Deny</&></label> + </div> + <div> + <input type="radio" class="radio" id="Approval-<%$ticket->Id%>-Action-none" name="Approval-<%$ticket->Id%>-Action" value="none" checked="checked" /> + <label for="Approval-<%$ticket->Id%>-Action-none"><&|/l&>No action</&></label> + </div> + </div> + <div class="notes"> + <label for="Approval-<%$ticket->Id%>-Notes"><&|/l&>Notes</&></label> + <textarea name="Approval-<%$ticket->Id%>-Notes" id="Approval-<%$ticket->Id%>-Notes" rows="2" cols="70"></textarea> + </div> + <div class="clear"></div> + </div> +</div> <%ARGS> $ShowApproving => 1 +$ShowCustomFields => 1 +$ShowHistory => 1 $ticket => undef -$class => undef </%ARGS> diff --git a/rt/html/Approvals/Elements/PendingMyApproval b/rt/html/Approvals/Elements/PendingMyApproval index 8d19399ab..e03145e18 100644 --- a/rt/html/Approvals/Elements/PendingMyApproval +++ b/rt/html/Approvals/Elements/PendingMyApproval @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# You should have received a copy of the GNU General Public License %# along with this program; if not, write to the Free Software -%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +%# 02110-1301 or visit their web page on the internet at +%# http://www.gnu.org/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,33 +45,32 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<table width="100%"> -% my ($i, $class); +<script type="text/javascript"><!-- + onLoadHook('createCalendarLink("CreatedBefore");'); + onLoadHook('createCalendarLink("CreatedAfter");'); +--></script> % my %done; % foreach ($tickets, $group_tickets) { % while (my $ticket = $_->Next() ) { % next if !$ARGS{'ShowDependent'} and $ticket->HasUnresolvedDependencies( Type => 'approval' ); % next if $done{$ticket->Id}++; # don't show duplicate tickets -% $i++; -% $class = ($i%2) ? "oddline" : "evenline"; -<& Approve, ticket => $ticket, class => $class &> +<& Approve, ticket => $ticket &> % } % } -</table> -<& /Elements/TitleBoxStart, title => loc("Search for approvals") &> -<input type=checkbox value="1" name="ShowPending" +<&| /Widgets/TitleBox, title => loc("Search for approvals") &> +<input type="checkbox" class="checkbox" value="1" name="ShowPending" <%((!$ARGS{'ShowRejected'} && !$ARGS{'ShowResolved'}) || $ARGS{'ShowPending'}) - && "checked"%>> <&|/l&>Show pending requests</&><br> -<input type=checkbox value="1" name="ShowResolved" <%$ARGS{'ShowResolved'} && "checked"%>> <&|/l&>Show approved requests</&><br> -<input type=checkbox value="1" name="ShowRejected" <%$ARGS{'ShowRejected'} && "checked"%>> <&|/l&>Show denied requests</&><br> -<input type=checkbox value="1" name="ShowDependent" <%$ARGS{'ShowDependent'} && "checked"%>> <&|/l&>Show requests awaiting other approvals</&><br> + && "checked"%> /> <&|/l&>Show pending requests</&><br /> +<input type="checkbox" class="checkbox" value="1" name="ShowResolved" <%$ARGS{'ShowResolved'} && "checked"%> /> <&|/l&>Show approved requests</&><br /> +<input type="checkbox" class="checkbox" value="1" name="ShowRejected" <%$ARGS{'ShowRejected'} && "checked"%> /> <&|/l&>Show denied requests</&><br /> +<input type="checkbox" class="checkbox" value="1" name="ShowDependent" <%$ARGS{'ShowDependent'} && "checked"%> /> <&|/l&>Show requests awaiting other approvals</&><br /> -<&|/l,"<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>"&>Only show approvals for requests created before [_1]</&><br> +<&|/l,"<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore' id='CreatedBefore' />"&>Only show approvals for requests created before [_1]</&><br /> -<&|/l, "<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>"&>Only show approvals for requests created after [_1]</&> -<& /Elements/TitleBoxEnd &> +<&|/l, "<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter' id='CreatedAfter' />"&>Only show approvals for requests created after [_1]</&> +</&> <%init> my $tickets = RT::Tickets->new( $session{'CurrentUser'} ); diff --git a/rt/html/Approvals/Elements/ShowDependency b/rt/html/Approvals/Elements/ShowDependency index e8d0b00d5..6da28f180 100644 --- a/rt/html/Approvals/Elements/ShowDependency +++ b/rt/html/Approvals/Elements/ShowDependency @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# You should have received a copy of the GNU General Public License %# along with this program; if not, write to the Free Software -%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +%# 02110-1301 or visit their web page on the internet at +%# http://www.gnu.org/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -47,9 +49,9 @@ % if ($approving->Count) { <h3><&|/l&>Tickets which depend on this approval:</&></h3> -<table width=100%> -<TR> -<TD WIDTH="25" bgcolor="#999999"> </TD><TD> +<table width="100%"> +<tr> +<td width="25" bgcolor="#999999"> </td><td> <%PERL> my %show; while (my $link = $approving->Next()) { @@ -60,22 +62,22 @@ while (my $link = $approving->Next()) { my $dep = $m->scomp('ShowDependency', Ticket => $link->BaseObj, _seen => $_seen); if ($type eq 'approval') { - $head .= $m->scomp('/Elements/TitleBoxStart', title => loc("Approval #[_1]: [_2]", $link->BaseObj->Id, $link->BaseObj->Subject)); + $head .= $m->scomp('/Widgets/TitleBoxStart', title => loc("Approval #[_1]: [_2]", $link->BaseObj->Id, $link->BaseObj->Subject)); $text .= $head; $text .= $m->scomp('/Ticket/Elements/ShowCustomFields', Ticket => $link->BaseObj); } elsif ($type eq 'ticket') { - $head .= $m->scomp('/Elements/TitleBoxStart', title => loc("Ticket #[_1]: [_2]", $link->BaseObj->Id, $link->BaseObj->Subject)); + $head .= $m->scomp('/Widgets/TitleBoxStart', title => loc("Ticket #[_1]: [_2]", $link->BaseObj->Id, $link->BaseObj->Subject)); $text .= $head; $text .= $m->scomp('/Ticket/Elements/ShowSummary', Ticket => $link->BaseObj); } else { - $head .= $m->scomp('/Elements/TitleBoxStart', title => loc("#[_1]: [_2]", $link->BaseObj->Id, $link->BaseObj->Subject)); + $head .= $m->scomp('/Widgets/TitleBoxStart', title => loc("#[_1]: [_2]", $link->BaseObj->Id, $link->BaseObj->Subject)); $text .= $head; } $text .= $m->scomp('/Ticket/Elements/ShowHistory' , Ticket => $link->BaseObj, Collapsed => ($type ne 'ticket'), ShowTitle => 0, ShowHeaders => 0, ShowDisplayModes => 0, ShowTitleBarCommands => 0); - $head .= $m->scomp('/Elements/TitleBoxEnd'); - $text .= $m->scomp('/Elements/TitleBoxEnd'); + $head .= $m->scomp('/Widgets/TitleBoxEnd'); + $text .= $m->scomp('/Widgets/TitleBoxEnd'); $text .= $dep; $text .= '</a>'; $show{$link->BaseObj->Id} = { @@ -96,9 +98,9 @@ foreach my $id (sort keys %show) { $m->print($refer); </%PERL> -</TD> -</TR> -</TABLE> +</td> +</tr> +</table> % } <%ARGS> diff --git a/rt/html/Approvals/Elements/Tabs b/rt/html/Approvals/Elements/Tabs index 03bdc262e..9ba425059 100644 --- a/rt/html/Approvals/Elements/Tabs +++ b/rt/html/Approvals/Elements/Tabs @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# You should have received a copy of the GNU General Public License %# along with this program; if not, write to the Free Software -%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +%# 02110-1301 or visit their web page on the internet at +%# http://www.gnu.org/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: |