[Bps-public-commit] r15255 - in Pushmi/trunk: Pushmi-Admin/lib/Pushmi/Admin/Model

[alexmv at bestpractical.com]

Author: alexmv
Date: Tue Aug 19 19:52:33 2008
New Revision: 15255

Modified:
   Pushmi/trunk/   (props changed)
   Pushmi/trunk/Pushmi-Admin/lib/Pushmi/Admin/Model/Replica.pm

Log:
 r36204 at kohr-ah:  chmrr | 2008-08-19 19:51:57 -0400
  * Reword long messages to be slightly shorter, to avoid linewrap


Modified: Pushmi/trunk/Pushmi-Admin/lib/Pushmi/Admin/Model/Replica.pm
==============================================================================
--- Pushmi/trunk/Pushmi-Admin/lib/Pushmi/Admin/Model/Replica.pm	(original)
+++ Pushmi/trunk/Pushmi-Admin/lib/Pushmi/Admin/Model/Replica.pm	Tue Aug 19 19:52:33 2008
@@ -18,7 +18,8 @@
 
     column name =>
         type is 'text',
-        is mandatory, is unique, ajax validates;
+        is mandatory, is unique, ajax validates,
+        label is "Name";
 
     column clean_name =>
         type is 'text',
@@ -26,7 +27,8 @@
 
     column url =>
         type is 'text',
-        is mandatory, ajax validates;
+        is mandatory, ajax validates,
+        label is "URL";
 
     column status =>
         type is 'text',
@@ -293,20 +295,19 @@
     my $self   = shift;
     my $status = $self->status;
     if ( $status eq "ok" ) {
-        return "Up to date; mirrored "
-            . $self->local_revision . " of "
+        return
+              $self->local_revision . " of "
             . $self->remote_revision
-            . " revisions.";
+            . " revisions mirrored.";
     } elsif ( $status eq "behind" ) {
-        return "Lagging behind master; mirrored "
-            . $self->local_revision . " of "
+        return
+              $self->local_revision . " of "
             . $self->remote_revision
-            . " revisions.";
+            . " revisions mirrored.";
     } elsif ( $status eq "loading" ) {
-        return "Actively updating; mirrored "
-            . $self->local_revision . " of "
-            . $self->remote_revision
-            . " revisions.";
+        return "Mirroring revisions "
+            . $self->local_revision . " to "
+            . $self->remote_revision;
     } elsif ( $status eq "offline" ) {
         return "Remote master offline!  Mirrored "
             . $self->local_revision