[Bps-public-commit] RT-Extension-TicketLocking branch, master, updated. 0f77b062a4f55889dc0942ae7d0e62a49343fcac

[? sunnavy]

The branch, master has been updated
       via  0f77b062a4f55889dc0942ae7d0e62a49343fcac (commit)
       via  8d9ec1a98acec61cb4f263bd74ca269950373a18 (commit)
       via  ba222ca9863de0de685a2750cbd1e540a978078d (commit)
       via  b4b38554e0ddc4c06a6952cfd24886ebf2cbacaa (commit)
      from  65ba06df76713d2b07e68bc21054f8fd6143a1c9 (commit)

Summary of changes:
 html/Elements/MyLocks              |    6 +++---
 html/Elements/ShowLock             |    5 +++--
 html/NoAuth/css/ticket-locking.css |   28 ++++++++++++++++------------
 3 files changed, 22 insertions(+), 17 deletions(-)

- Log -----------------------------------------------------------------
commit b4b38554e0ddc4c06a6952cfd24886ebf2cbacaa
Author: Christian Loos <cloos at netsandbox.de>
Date:   Thu Oct 14 22:47:30 2010 +0200

    add class to table

diff --git a/html/Elements/MyLocks b/html/Elements/MyLocks
index 7f4aa11..21980c1 100644
--- a/html/Elements/MyLocks
+++ b/html/Elements/MyLocks
@@ -49,7 +49,7 @@
     <&|/Widgets/TitleBox, title => loc("Tickets locked by you") &>
 % if(@locks) {
     <a href="index.html?UnlockAll=1">Unlock All</a>
-    <table border="0" cellspacing="0" cellpadding="1" width="100%">
+    <table border="0" cellspacing="0" cellpadding="1" width="100%" class="ticket-list">
 
 <%PERL>    
     my $expire_title;

commit ba222ca9863de0de685a2750cbd1e540a978078d
Author: Christian Loos <cloos at netsandbox.de>
Date:   Thu Oct 14 23:51:53 2010 +0200

    style update for better integration

diff --git a/html/NoAuth/css/ticket-locking.css b/html/NoAuth/css/ticket-locking.css
index bc2266a..36c6348 100644
--- a/html/NoAuth/css/ticket-locking.css
+++ b/html/NoAuth/css/ticket-locking.css
@@ -1,18 +1,22 @@
-div.locked-by-you {
-    width: 80%;
-    align: center;
-    border: 2px solid green;
-    padding: 1em;
-    margin: 1em;
+.locked-by-you, .locked {
+    border-color: #AAAA99 #999900 #999900 #AAAA99;
+    border-style: solid;
+    border-width: 1px 2px 2px 1px;
+    -moz-border-radius: 0.5em;
+    -webkit-border-radius: 0.5em;
+    margin-top: 1em;
+    margin-bottom: 2em;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+    padding-left: 1em;
+}
+
+.locked-by-you {
+    background: none repeat scroll 0 0 #80FFCC;
 }
 
 .locked {
-    background: #ffcccc;
-    width: 80%;
-    align: center;
-    border: 2px solid red;
-    padding: 1em;
-    margin: 1em;
+    background: none repeat scroll 0 0 #FFCCCC;
 }
 
 % $m->abort;

commit 8d9ec1a98acec61cb4f263bd74ca269950373a18
Author: Christian Loos <cloos at netsandbox.de>
Date:   Fri Oct 15 00:14:59 2010 +0200

    use /Elements/ShowUser component

diff --git a/html/Elements/ShowLock b/html/Elements/ShowLock
index d3695ac..e5321da 100644
--- a/html/Elements/ShowLock
+++ b/html/Elements/ShowLock
@@ -39,10 +39,10 @@
 
 </div>
 % } else {
-%    return unless $u->Name;
+%    return unless $u_str;
 %     $TicketLabel = 'This ticket' if $TicketLabel eq 'this ticket';    
 <div class="locked">
-<&|/l, $TicketLabel, $u->Name, $ago &>[_1] has been locked by [_2] for [_3]</&>.
+<&|/l, $TicketLabel, $u_str, $ago &>[_1] has been locked by [_2] for [_3]</&>.
 </div>
 %}
 <%INIT>
@@ -71,6 +71,7 @@ my $ago = $date->DurationAsString($timePassed);
 
 my $u = RT::User->new($session{'CurrentUser'});
 $u->Load($Lock->Content->{'User'}) if $Lock;
+my $u_str = $m->scomp('/Elements/ShowUser', User => $u);
 
 </%INIT>
 <%ARGS>

commit 0f77b062a4f55889dc0942ae7d0e62a49343fcac
Author: Christian Loos <cloos at netsandbox.de>
Date:   Mon Nov 15 23:04:06 2010 +0100

    correct header format

diff --git a/html/Elements/MyLocks b/html/Elements/MyLocks
index 21980c1..111a34d 100644
--- a/html/Elements/MyLocks
+++ b/html/Elements/MyLocks
@@ -53,9 +53,9 @@
 
 <%PERL>    
     my $expire_title;
-    $expire_title = {title => '__Expires in__'} if $expiry;
+    $expire_title = {title => 'Expires in'} if $expiry;
     $m->comp('/Elements/CollectionAsTable/Header', 
-        Format => [{title => '__#__'}, {title => '__Subject__'}, {title => '__Time Locked__'}, $expire_title, {title => 'NBSP'}],
+        Format => [{title => '#'}, {title => 'Subject'}, {title => 'Time Locked'}, $expire_title, {title => 'NBSP'}],
         maxitems => ($expiry ? 5 : 4)
     ); 
     

-----------------------------------------------------------------------