[Rt-commit] rt branch, 4.2/label-fields, updated. rt-4.0.0rc7-254-g44cc937
Alex Vandiver
alexmv at bestpractical.com
Sat Dec 29 00:01:08 EST 2012
The branch, 4.2/label-fields has been updated
via 44cc9378ddb8a8f396a8dc8729c3030d48df2e37 (commit)
from 03c3d946e6c40ea5acba701876bc09d3e5cdccb9 (commit)
Summary of changes:
share/html/Admin/Groups/Modify.html | 3 ++-
share/html/Admin/Groups/index.html | 3 ++-
share/html/Admin/Queues/Modify.html | 12 ++++++------
share/html/Admin/Queues/index.html | 4 ++--
share/html/Admin/Users/index.html | 4 ++--
share/html/Ticket/Elements/BulkLinks | 24 ++++++++++++------------
share/html/Ticket/Elements/Reminders | 4 ++--
share/html/Ticket/Elements/UpdateCc | 7 ++++---
8 files changed, 32 insertions(+), 29 deletions(-)
- Log -----------------------------------------------------------------
commit 44cc9378ddb8a8f396a8dc8729c3030d48df2e37
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Fri Dec 28 22:38:11 2012 -0500
More labels for checkboxes
diff --git a/share/html/Admin/Groups/Modify.html b/share/html/Admin/Groups/Modify.html
index cb0ae9a..9918df7 100755
--- a/share/html/Admin/Groups/Modify.html
+++ b/share/html/Admin/Groups/Modify.html
@@ -83,7 +83,8 @@
<tr>
<td colspan="2">
<input type="hidden" class="hidden" name="SetEnabled" value="1" />
-<input type="checkbox" class="checkbox" name="Enabled" value="1" <%$EnabledChecked%> /> <&|/l&>Enabled (Unchecking this box disables this group)</&><br />
+<input type="checkbox" class="checkbox" id="Enabled" name="Enabled" value="1" <%$EnabledChecked%> />
+<label for="Enabled"><&|/l&>Enabled (Unchecking this box disables this group)</&></label><br />
</td>
</tr>
% $m->callback( %ARGS, GroupObj => $Group, results => \@results );
diff --git a/share/html/Admin/Groups/index.html b/share/html/Admin/Groups/index.html
index 3727321..672739c 100755
--- a/share/html/Admin/Groups/index.html
+++ b/share/html/Admin/Groups/index.html
@@ -68,7 +68,8 @@
% }
<form method="post" action="<% RT->Config->Get('WebPath') %>/Admin/Groups/index.html">
-<input type="checkbox" class="checkbox" name="FindDisabledGroups" value="1" <% $FindDisabledGroups? 'checked="checked"': '' |n %> /> <&|/l&>Include disabled groups in listing.</&><br />
+<input type="checkbox" class="checkbox" id="FindDisabledGroups" name="FindDisabledGroups" value="1" <% $FindDisabledGroups? 'checked="checked"': '' |n %> />
+<label for="FindDisabledGroups"><&|/l&>Include disabled groups in listing.</&></label><br />
<&|/l&>Find groups whose</&> <& /Elements/SelectGroups &><br />
<div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div>
</form>
diff --git a/share/html/Admin/Queues/Modify.html b/share/html/Admin/Queues/Modify.html
index 011678b..ac549d3 100755
--- a/share/html/Admin/Queues/Modify.html
+++ b/share/html/Admin/Queues/Modify.html
@@ -114,15 +114,15 @@
% }
% if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
-<tr><td align="right"><input type="checkbox" class="checkbox" name="Sign" value="1" <% $QueueObj->Sign? 'checked="checked"': '' |n%> /></td>
-<td><&|/l&>Sign by default</&></td>
-<td align="right"><input type="checkbox" class="checkbox" name="Encrypt" value="1" <% $QueueObj->Encrypt? 'checked="checked"': '' |n%> /></td>
-<td><&|/l&>Encrypt by default</&></td>
+<tr><td align="right"><input type="checkbox" class="checkbox" id="Sign" name="Sign" value="1" <% $QueueObj->Sign? 'checked="checked"': '' |n%> /></td>
+<td><label for="Sign"><&|/l&>Sign by default</&></label></td>
+<td align="right"><input type="checkbox" class="checkbox" id="Encrypt" name="Encrypt" value="1" <% $QueueObj->Encrypt? 'checked="checked"': '' |n%> /></td>
+<td><label for="Encrypt"><&|/l&>Encrypt by default</&></label></td>
</tr>
% }
-<tr><td align="right"><input type="checkbox" class="checkbox" name="Enabled" value="1" <%$EnabledChecked|n%> /></td>
-<td colspan="3"><&|/l&>Enabled (Unchecking this box disables this queue)</&><br />
+<tr><td align="right"><input type="checkbox" class="checkbox" id="Enabled" name="Enabled" value="1" <%$EnabledChecked|n%> /></td>
+<td colspan="3"><label for="Enabled"><&|/l&>Enabled (Unchecking this box disables this queue)</&></label><br />
% $m->callback( %ARGS, QueueObj => $QueueObj, results => \@results );
</td></tr>
diff --git a/share/html/Admin/Queues/index.html b/share/html/Admin/Queues/index.html
index ffca0f6..aefb97f 100755
--- a/share/html/Admin/Queues/index.html
+++ b/share/html/Admin/Queues/index.html
@@ -83,8 +83,8 @@
<input size="8" name="QueueString" value="<% $QueueString %>" />
<br />
-<input type="checkbox" class="checkbox" name="FindDisabledQueues" value="1" <% $FindDisabledQueues? 'checked="checked"': '' |n%> />
-<&|/l&>Include disabled queues in listing.</&>
+<input type="checkbox" class="checkbox" id="FindDisabledQueues" name="FindDisabledQueues" value="1" <% $FindDisabledQueues? 'checked="checked"': '' |n%> />
+<label for="FindDisabledQueues"><&|/l&>Include disabled queues in listing.</&></label>
<div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div>
</form>
diff --git a/share/html/Admin/Users/index.html b/share/html/Admin/Users/index.html
index 3db68fa..4795d5d 100755
--- a/share/html/Admin/Users/index.html
+++ b/share/html/Admin/Users/index.html
@@ -76,8 +76,8 @@
<input type="hidden" name="<% $field %>" value="<% $ARGS{ $field } %>" />
% }
<&|/l&>Find all users whose</&> <& /Elements/SelectUsers, %ARGS, Fields => \@fields &><br />
-<input type="checkbox" class="checkbox" name="FindDisabledUsers" value="1" <% $FindDisabledUsers? 'checked="checked"': '' %> />
-<&|/l&>Include disabled users in search.</&>
+<input type="checkbox" class="checkbox" id="FindDisabledUsers" name="FindDisabledUsers" value="1" <% $FindDisabledUsers? 'checked="checked"': '' %> />
+<label for="FindDisabledUsers"><&|/l&>Include disabled users in search.</&></label>
<br />
<div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div>
</form>
diff --git a/share/html/Ticket/Elements/BulkLinks b/share/html/Ticket/Elements/BulkLinks
index b97270e..7853af5 100755
--- a/share/html/Ticket/Elements/BulkLinks
+++ b/share/html/Ticket/Elements/BulkLinks
@@ -55,8 +55,8 @@
<td class="value">
% if ( $hash{DependsOn} ) {
% for my $link ( values %{$hash{DependsOn}} ) {
- <input type="checkbox" class="checkbox" name="DeleteLink--<%$link->Type%>-<%$link->Target%>" value="1" />
- <& /Elements/ShowLink, URI => $link->TargetURI &><br />
+ <input type="checkbox" class="checkbox" id="DeleteLink--<%$link->Type%>-<%$link->Target%>" name="DeleteLink--<%$link->Type%>-<%$link->Target%>" value="1" />
+ <label for="DeleteLink--<%$link->Type%>-<%$link->Target%>"><& /Elements/ShowLink, URI => $link->TargetURI &></label><br />
% } }
</td>
</tr>
@@ -65,8 +65,8 @@
<td class="value">
% if ( $hash{DependedOnBy} ) {
% for my $link ( values %{$hash{DependedOnBy}} ) {
- <input type="checkbox" class="checkbox" name="DeleteLink-<%$link->Base%>-<%$link->Type%>-" value="1" />
- <& /Elements/ShowLink, URI => $link->BaseURI &><br />
+ <input type="checkbox" class="checkbox" id="DeleteLink-<%$link->Base%>-<%$link->Type%>-" name="DeleteLink-<%$link->Base%>-<%$link->Type%>-" value="1" />
+ <label for="DeleteLink-<%$link->Base%>-<%$link->Type%>-"><& /Elements/ShowLink, URI => $link->BaseURI &></label><br />
% } }
</td>
</tr>
@@ -75,8 +75,8 @@
<td class="value">
% if ( $hash{MemberOf} ) {
% for my $link ( values %{$hash{MemberOf}} ) {
- <input type="checkbox" class="checkbox" name="DeleteLink--<%$link->Type%>-<%$link->Target%>" value="1" />
- <& /Elements/ShowLink, URI => $link->TargetURI &><br />
+ <input type="checkbox" class="checkbox" id="DeleteLink--<%$link->Type%>-<%$link->Target%>" name="DeleteLink--<%$link->Type%>-<%$link->Target%>" value="1" />
+ <label for="DeleteLink--<%$link->Type%>-<%$link->Target%>"><& /Elements/ShowLink, URI => $link->TargetURI &></label><br />
% } }
</td>
</tr>
@@ -85,8 +85,8 @@
<td class="value">
% if ( $hash{Members} ) {
% for my $link ( values %{$hash{Members}} ) {
- <input type="checkbox" class="checkbox" name="DeleteLink-<%$link->Base%>-<%$link->Type%>-" value="1" />
- <& /Elements/ShowLink, URI => $link->BaseURI &><br />
+ <input type="checkbox" class="checkbox" id="DeleteLink-<%$link->Base%>-<%$link->Type%>-" name="DeleteLink-<%$link->Base%>-<%$link->Type%>-" value="1" />
+ <label for="DeleteLink-<%$link->Base%>-<%$link->Type%>-"><& /Elements/ShowLink, URI => $link->BaseURI &></label><br />
% } }
</td>
</tr>
@@ -95,8 +95,8 @@
<td class="value">
% if ( $hash{RefersTo} ) {
% for my $link ( values %{$hash{RefersTo}} ) {
- <input type="checkbox" class="checkbox" name="DeleteLink--<%$link->Type%>-<%$link->Target%>" value="1" />
- <& /Elements/ShowLink, URI => $link->TargetURI &><br />
+ <input type="checkbox" class="checkbox" id="DeleteLink--<%$link->Type%>-<%$link->Target%>" name="DeleteLink--<%$link->Type%>-<%$link->Target%>" value="1" />
+ <label for="DeleteLink--<%$link->Type%>-<%$link->Target%>"><& /Elements/ShowLink, URI => $link->TargetURI &></label><br />
% } }
</td>
</tr>
@@ -107,8 +107,8 @@
% for my $link ( values %{$hash{ReferredToBy}} ) {
% # Skip reminders
% next if (UNIVERSAL::isa($link->BaseObj, 'RT::Ticket') && $link->BaseObj->Type eq 'reminder');
- <input type="checkbox" class="checkbox" name="DeleteLink-<%$link->Base%>-<%$link->Type%>-" value="1" />
- <& /Elements/ShowLink, URI => $link->BaseURI &><br />
+ <input type="checkbox" class="checkbox" id="DeleteLink-<%$link->Base%>-<%$link->Type%>-" name="DeleteLink-<%$link->Base%>-<%$link->Type%>-" value="1" />
+ <label for="DeleteLink-<%$link->Base%>-<%$link->Type%>-"><& /Elements/ShowLink, URI => $link->BaseURI &></label><br />
% } }
</td>
</tr>
diff --git a/share/html/Ticket/Elements/Reminders b/share/html/Ticket/Elements/Reminders
index 287a3e2..21b8cf6 100644
--- a/share/html/Ticket/Elements/Reminders
+++ b/share/html/Ticket/Elements/Reminders
@@ -198,12 +198,12 @@ $Index
<input name="Complete-Reminder-<% $Reminder->id %>" type="hidden"
value=<% $Reminder->Status eq 'resolved' ? 1 : 0 %> />
% }
-<input type="checkbox" value="1" name="Complete-Reminder-<% $Reminder->id %>" <% $Reminder->Status eq 'resolved' ? 'checked="checked"' : '' |n %>
+<input type="checkbox" value="1" id="Complete-Reminder-<% $Reminder->id %>" name="Complete-Reminder-<% $Reminder->id %>" <% $Reminder->Status eq 'resolved' ? 'checked="checked"' : '' |n %>
% unless ( $Reminder->CurrentUserHasRight('ModifyTicket') ) {
disabled="disabled"
% }
/></td>
-<td class="collection-as-table"><% $Reminder->Subject %></td>
+<td class="collection-as-table"><label for="Complete-Reminder-<% $Reminder->id %>"><% $Reminder->Subject %></label></td>
<td class="collection-as-table"><% $overdue ? '<span class="overdue">' : '' |n %><% $dueobj->AgeAsString || loc('Not set') %><% $overdue ? '</span>' : '' |n %></td>
<td class="collection-as-table"><& /Elements/ShowUser, User => $Reminder->OwnerObj &></td>
</tr>
diff --git a/share/html/Ticket/Elements/UpdateCc b/share/html/Ticket/Elements/UpdateCc
index aee311c..be5f863 100644
--- a/share/html/Ticket/Elements/UpdateCc
+++ b/share/html/Ticket/Elements/UpdateCc
@@ -63,7 +63,8 @@
% my $clean_addr = $txn_addresses{$addr}->format;
% $clean_addr =~ s/'/\\'/g;
onClick="checkboxToInput('UpdateCc', 'UpdateCc-<%$addr%>','<%$clean_addr%>' );"
- <% $ARGS{'UpdateCc-'.$addr} ? 'checked="checked"' : ''%> > <& /Elements/ShowUser, Address => $txn_addresses{$addr}&>
+ <% $ARGS{'UpdateCc-'.$addr} ? 'checked="checked"' : ''%> >
+ <label for="UpdateCc-<%$addr%>"><& /Elements/ShowUser, Address => $txn_addresses{$addr}&></label>
%}
</td></tr>
<tr><td class="label"><&|/l&>One-time Bcc</&>:</td><td><& /Elements/EmailInput, Name => 'UpdateBcc', Size => undef, Default => $ARGS{UpdateBcc} &><br />
@@ -79,8 +80,8 @@
% my $clean_addr = $txn_addresses{$addr}->format;
% $clean_addr =~ s/'/\\'/g;
onClick="checkboxToInput('UpdateBcc', 'UpdateBcc-<%$addr%>','<%$clean_addr%>' );"
- <% $ARGS{'UpdateBcc-'.$addr} ? 'checked="checked"' : ''%>>
-<& /Elements/ShowUser, Address => $txn_addresses{$addr}&>
+ <% $ARGS{'UpdateBcc-'.$addr} ? 'checked="checked"' : ''%> >
+ <label for="UpdateBcc-<%$addr%>"><& /Elements/ShowUser, Address => $txn_addresses{$addr}&></label>
%}
</td></tr>
<%args>
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list