jesse at bestpractical
Nov 19, 2009, 11:24 AM
Post #1 of 1
(165 views)
Permalink
|
|
rt branch, 3.999-trunk, updated. 5a6459ecaaa77f66e3cc671a28084b099466760d
|
|
The branch, 3.999-trunk has been updated
via 5a6459ecaaa77f66e3cc671a28084b099466760d (commit)
via b74f61b978dca7e801fe85b30f24d27ee4a9c05a (commit)
via 002f43d10ca2066e1f0605e1d18a76c9e03b97bd (commit)
via f276f1203506b04a33d7e411115303afd29cf7af (commit)
via 42486251523d7325e4c8821c66222d1fea832b1b (commit)
via 92d3d7adedeaf6a932c0c750e03269ac0785a546 (commit)
from 3e3df46f794a3b40190cafeb56100aff8d86c6eb (commit)
Summary of changes:
share/html/Elements/CreateTicket | 19 ++++++++++-
share/html/Elements/QuickCreate | 3 +-
share/html/Elements/SelectNewTicketQueue | 50 ------------------------------
share/html/Elements/SelectQueue | 3 +-
4 files changed, 21 insertions(+), 54 deletions(-)
delete mode 100755 share/html/Elements/SelectNewTicketQueue
- Log -----------------------------------------------------------------
commit 92d3d7adedeaf6a932c0c750e03269ac0785a546
Author: Jesse Vincent <jesse [at] bestpractical>
Date: Thu Nov 19 13:57:24 2009 -0500
Make SelectQueue able to take an alternate label for the null option
diff --git a/share/html/Elements/SelectQueue b/share/html/Elements/SelectQueue
index b21fa96..10ed7fd 100755
--- a/share/html/Elements/SelectQueue
+++ b/share/html/Elements/SelectQueue
@@ -53,7 +53,7 @@
% else {
<select name="<%$name%>" <% ($on_change) ? 'onchange="'.$on_change.'"' : '' |n %> class="<%$class%>">
% if ($show_null_option) {
- <option value="">-</option>
+ <option value=""><%$null_option_label%></option>
% }
% for my $queue (@{Jifty->web->session->get($cache_key)||[]}) {
<option value="<% ($named_values ? $queue->{name} : $queue->{id}) %>"
@@ -74,6 +74,7 @@
% }
<%args>
$check_queue_right => 'CreateTicket'
+$null_option_label => '-'
$show_null_option => 1
$show_all_queues => 1
$name => undef
commit 42486251523d7325e4c8821c66222d1fea832b1b
Author: Jesse Vincent <jesse [at] bestpractical>
Date: Thu Nov 19 13:57:47 2009 -0500
remove a layer of indirection in QuickCreate
diff --git a/share/html/Elements/QuickCreate b/share/html/Elements/QuickCreate
index 9d56c6f..278c3a7 100644
--- a/share/html/Elements/QuickCreate
+++ b/share/html/Elements/QuickCreate
@@ -53,7 +53,8 @@
<tr class="input-row"><td class="label"><&|/l&>Subject</&>:</td>
<td colspan="3" class="value"><input type="text" size="50" name="subject" /></td>
</tr><tr class="input-row">
-<td class="label"><&|/l&>Queue</&>:</td><td class="value"><& /Elements/SelectNewTicketQueue, name => 'queue' &>
+<td class="label"><&|/l&>Queue</&>:</td><td class="value">
+ <& /Elements/SelectQueue, name => 'queue', default => RT->config->get("default_queue", Jifty->web->current_user), %ARGS, show_null_option => 0, show_all_queues => 0 &>
</td>
<td class="label"><&|/l&>Owner</&>:</td><td class="value">
<select type="select" name="owner">
commit f276f1203506b04a33d7e411115303afd29cf7af
Author: Jesse Vincent <jesse [at] bestpractical>
Date: Thu Nov 19 13:58:10 2009 -0500
Get rid of the "submit" button in CreateTicket
diff --git a/share/html/Elements/CreateTicket b/share/html/Elements/CreateTicket
index fdaec42..d8c8154 100755
--- a/share/html/Elements/CreateTicket
+++ b/share/html/Elements/CreateTicket
@@ -45,6 +45,19 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<form action="<% RT->config->get('web_path') %>/Ticket/Create.html" name="create_ticket_in_queue" id="CreateTicketInQueue">
-<&|/l, $m->scomp('/Elements/SelectNewTicketQueue', on_change => 'document.CreateTicketInQueue.submit()')&><input type="submit" class="button" value="New ticket in" /> %1</&>
+<form
+ action="<% RT->config->get('web_path') %>/Ticket/Create.html"
+ name="CreateTicketInQueue"
+ id="CreateTicketInQueue">
+<label accesskey="9">
+ <& /Elements/SelectQueue,
+ default => '',
+ %ARGS,
+ name => 'queue',
+ show_null_option => 1,
+ null_option_label => _('New ticket')."...",
+ show_all_queues => 0,
+ on_change => "if (this.value != '') document.CreateTicketInQueue.submit();"
+ &>
+</label>
</form>
commit 002f43d10ca2066e1f0605e1d18a76c9e03b97bd
Author: Jesse Vincent <jesse [at] bestpractical>
Date: Thu Nov 19 13:58:33 2009 -0500
Get rid of a now-unused button
diff --git a/share/html/Elements/SelectNewTicketQueue b/share/html/Elements/SelectNewTicketQueue
deleted file mode 100755
index 36c5a4d..0000000
--- a/share/html/Elements/SelectNewTicketQueue
+++ /dev/null
@@ -1,50 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2008 Best Practical Solutions, LLC
-%# <jesse [at] bestpractical>
-%#
-%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
-%# LICENSE:
-%#
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-%# General Public License for more details.
-%#
-%# 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., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# CONTRIBUTION SUBMISSION POLICY:
-%#
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%#
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%#
-%# END BPS TAGGED BLOCK }}}
-<label accesskey="9">
- <& /Elements/SelectQueue, name => 'queue', default => RT->config->get("default_queue", Jifty->web->current_user), %ARGS, show_null_option => 0, show_all_queues => 0 &>
-</label>
commit b74f61b978dca7e801fe85b30f24d27ee4a9c05a
Author: Jesse Vincent <jesse [at] bestpractical>
Date: Thu Nov 19 14:05:35 2009 -0500
create a "go" button for CreateTicket and then make sure it never shows up if we have js
diff --git a/share/html/Elements/CreateTicket b/share/html/Elements/CreateTicket
index d8c8154..6f73b9a 100755
--- a/share/html/Elements/CreateTicket
+++ b/share/html/Elements/CreateTicket
@@ -60,4 +60,6 @@
on_change => "if (this.value != '') document.CreateTicketInQueue.submit();"
&>
</label>
+<input type="submit" value="<%_('Go')%>" id="create_ticket_go_button">
+<script>jQuery('#create_ticket_go_button').hide();</script>
</form>
commit 5a6459ecaaa77f66e3cc671a28084b099466760d
Author: Jesse Vincent <jesse [at] bestpractical>
Date: Thu Nov 19 14:21:45 2009 -0500
change the form name back to what other tests expexct
diff --git a/share/html/Elements/CreateTicket b/share/html/Elements/CreateTicket
index 6f73b9a..cde3943 100755
--- a/share/html/Elements/CreateTicket
+++ b/share/html/Elements/CreateTicket
@@ -47,8 +47,8 @@
%# END BPS TAGGED BLOCK }}}
<form
action="<% RT->config->get('web_path') %>/Ticket/Create.html"
- name="CreateTicketInQueue"
- id="CreateTicketInQueue">
+ name="create_ticket_in_queue"
+ id="create_ticket_in_queue">
<label accesskey="9">
<& /Elements/SelectQueue,
default => '',
@@ -57,7 +57,7 @@
show_null_option => 1,
null_option_label => _('New ticket')."...",
show_all_queues => 0,
- on_change => "if (this.value != '') document.CreateTicketInQueue.submit();"
+ on_change => "if (this.value != '') document.create_ticket_in_queue.submit();"
&>
</label>
<input type="submit" value="<%_('Go')%>" id="create_ticket_go_button">
-----------------------------------------------------------------------
_______________________________________________
Rt-commit mailing list
Rt-commit [at] lists
http://lists.bestpractical.com/cgi-bin/mailman/listinfo/rt-commit
|
