[Rt-commit] r9811 - in rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html: Elements Helpers NoAuth/js/lightwindow

audreyt at bestpractical.com audreyt at bestpractical.com
Mon Dec 3 17:32:59 EST 2007


Author: audreyt
Date: Mon Dec  3 17:32:59 2007
New Revision: 9811

Modified:
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/EmailInput
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Helpers/EmailPopup.html
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/NoAuth/js/lightwindow/lightwindow.js
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/NoAuth/js/prototype/prototype.js

Log:
* Email popup selection now works!

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/EmailInput
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/EmailInput	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/EmailInput	Mon Dec  3 17:32:59 2007
@@ -479,7 +479,7 @@
 % my $popup = "$id-Popup";
 % my $indicator = "$id-Indicator";
 <input id="<% $id %>" class="ajaxautocompletes" name="<% $Name %>" size="<% $Size %>" value="<% $Default %>" />
-<a class="lightwindow page-options" params="lightwindow_type=external,lightwindow_width=300,lightwindow_height=500" id="<% $popup %>" href="<%$RT::WebPath%>/Helpers/EmailPopup.html?id=<% $id %>" style="visibility: hidden" />
+<a class="lightwindow page-options" params="lightwindow_type=external,lightwindow_width=400,lightwindow_height=500" id="<% $popup %>" title="<&|/l&>Select a user</&>" caption="<&|/l&>Press 'Esc' to close this window.</&>" href="<%$RT::WebPath%>/Helpers/EmailPopup.html?id=<% $id %>" style="visibility: hidden" />
 <div id="<% $div %>" class="autocomplete"></div>
 <script type="text/javascript">
 <!--//--><![CDATA[//><!--

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Helpers/EmailPopup.html
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Helpers/EmailPopup.html	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Helpers/EmailPopup.html	Mon Dec  3 17:32:59 2007
@@ -47,20 +47,98 @@
 %# END BPS TAGGED BLOCK }}}
 <& /Elements/Header, ShowBar => 0 &>
 <body>
-% my $users = RT::Users->new($session{'CurrentUser'});
-% $users->OrderBy( FIELD => 'Name' );
-% $users->UnLimit;
+<script type="text/javascript">
+<!--//--><![CDATA[//><!--
+function add_or_remove(addr) {
+    var elm = parent.document.getElementById('<% $id %>');
+    var vals = elm.value.split(/\s*,\s*/);
+    var to_concat = addr;
+    var new_vals = [];
+    for (var i = 0, length = vals.length; i < length; i++) {
+        if (vals[i] == addr) {
+            to_concat = [];
+        }
+        else if (vals[i].length > 0) {
+            new_vals.push(vals[i]);
+        }
+    }
+    elm.value = new_vals.concat(to_concat).join(', ');
+}
+document.onkeydown = function(e) {
+    if (e == null) {
+        var keycode = event.keyCode;
+    } else {
+        var keycode = e.which;
+    }
+    if (keycode == 27) {
+        parent.myLightWindow.deactivate();
+    }
+}
+//--><!]]>
+</script>
+<div class="titlebox"><div class="titlebox">
+<form method="get" action="<% $RT::WebPath %>/Helpers/EmailPopup.html" class="titlebox-content">
+<input type="hidden" name="id" value="<% $id %>" />
+<input style="float: right" type="submit" class="button" value="<&|/l&>Go!</&>" />
+<& /Elements/SelectUsers, %ARGS &><br />
+<label><input style="float: left" type="checkbox" class="checkbox" name="FindDisabledUsers" value="1" /> <&|/l&>Include disabled users in search.</&></label>
+</form></div>
+<div class="titlebox-title">
+<%$caption%>
+</div>
+</div>
 <ul>
-% while (my $addr = $users->next) {
-%   my $email = $addr->EmailAddress or next;
-%   my $name = $addr->Name;
-%   undef $name if $name eq $email;
-%   my $this = Mail::Address->new($name, $email)->format;
-<li><a class="lightwindow_action" rel="deactivate" href="javascript:(parent.document.getElementById('<% $id %>').value='<% $this %>') && parent.myLightWindow.deactivate()"><% $this %></a></li>
+%if ($users->Count == 0) {
+<li><em><&|/l&>No users matching search criteria found.</&></em></li>
 % }
+%my @ids;
+%require Mail::Address;
+%while ( $user = $users->Next) {
+%    my $email = $user->EmailAddress or next;
+%    my $name = $user->Name;
+%    undef $name if $name eq $email;
+%    my $this = Mail::Address->new($name, $email)->format;
+<li><a href="javascript:add_or_remove('<% $this %>')"><% $this %></a></li>
+%}
 </ul>
-</body>
+</body></html>
 % $m->abort;
+<%INIT>
+my ($user, $caption);
+my $users = new RT::Users($session{'CurrentUser'});
+
+if ($FindDisabledUsers) {
+	$users->{'find_disabled_rows'} = 1;
+}
+
+if (length $UserString) {
+    $caption = loc("Users matching search criteria");
+    if ($UserField =~ /^CustomField-(\d+)/) {
+	$users->LimitCustomField(
+	    CUSTOMFIELD => $1,
+	    OPERATOR => $UserOp,
+	    VALUE => $UserString,
+	); 
+    }
+    else {
+	$users->Limit(
+	    FIELD => $UserField,
+	    OPERATOR => $UserOp,
+	    VALUE => $UserString,
+	); 
+    }
+}
+else {
+    $caption = loc("Privileged users");
+    $users->LimitToPrivileged;
+}
+</%INIT>
 <%ARGS>
 $id
+$UserString        => undef
+$UserOp            => '='
+$UserField         => 'Name'
+$IdLike            => undef
+$EmailLike         => undef
+$FindDisabledUsers => 0
 </%ARGS>

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/NoAuth/js/lightwindow/lightwindow.js
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/NoAuth/js/lightwindow/lightwindow.js	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/NoAuth/js/lightwindow/lightwindow.js	Mon Dec  3 17:32:59 2007
@@ -88,7 +88,7 @@
 				page : {height : 250, width : 250},
 				inline : {height : 250, width : 250},
 				media : {height : 250, width : 250},
-				external : {height : 500, width : 300},
+				external : {height : 500, width : 400},
 				titleHeight : 25
 			},
 			classNames : {	
@@ -161,7 +161,7 @@
 							'<div id="lightwindow_title_bar" >'+
 								'<div id="lightwindow_title_bar_inner" >'+
 									'<span id="lightwindow_title_bar_title"></span>'+
-									'<a id="lightwindow_title_bar_close_link" >close</a>'+
+									'<a id="lightwindow_title_bar_close_link" >[ X ]</a>'+
 								'</div>'+
 							'</div>'+
 							'<div id="lightwindow_stage" >'+

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/NoAuth/js/prototype/prototype.js
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/NoAuth/js/prototype/prototype.js	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/NoAuth/js/prototype/prototype.js	Mon Dec  3 17:32:59 2007
@@ -4181,4 +4181,4 @@
 
 /*--------------------------------------------------------------------------*/
 
-Element.addMethods();
\ No newline at end of file
+Element.addMethods();


More information about the Rt-commit mailing list