[Bps-public-commit] App-Changeloggr branch, master, updated. 91b9ef65e86d12a0e3e74979744d0b78782abd2b

[sartak at bestpractical.com]

The branch, master has been updated
       via  91b9ef65e86d12a0e3e74979744d0b78782abd2b (commit)
       via  7ee7cd70c8a594e35bdacfad5df10fc56db38e14 (commit)
       via  63938b49f88e302b46c0d4d1188ddf7916b55488 (commit)
       via  fe8c2ac467e345fd7bdbbc94f184f00d30620d40 (commit)
       via  4b4cd83421e5f653cc6d37513235a549ef7383eb (commit)
       via  4903e3ea9396c73ea256a8bb1dcf2298b005a525 (commit)
      from  51f3e7a70cb20dd0ee2a60811308c7912d5d2204 (commit)

Summary of changes:
 lib/App/Changeloggr/View.pm     |   51 ++++++++++++++++++++++++++++----------
 share/web/static/css/change.css |    4 ---
 2 files changed, 37 insertions(+), 18 deletions(-)

- Log -----------------------------------------------------------------
commit 4903e3ea9396c73ea256a8bb1dcf2298b005a525
Author: Shawn M Moore <sartak at gmail.com>
Date:   Wed Aug 5 19:40:01 2009 -0400

    Don't show the reword textarea by default

diff --git a/lib/App/Changeloggr/View.pm b/lib/App/Changeloggr/View.pm
index 6ea66a9..6592993 100644
--- a/lib/App/Changeloggr/View.pm
+++ b/lib/App/Changeloggr/View.pm
@@ -234,9 +234,6 @@ sub show_change {
                 };
             }
         }
-
-        hr {};
-        show_rewording_form($change);
     };
 }
 

commit 4b4cd83421e5f653cc6d37513235a549ef7383eb
Author: Shawn M Moore <sartak at gmail.com>
Date:   Wed Aug 5 21:20:30 2009 -0400

    Turn change message into a region

diff --git a/lib/App/Changeloggr/View.pm b/lib/App/Changeloggr/View.pm
index 6592993..7bb7bce 100644
--- a/lib/App/Changeloggr/View.pm
+++ b/lib/App/Changeloggr/View.pm
@@ -179,14 +179,13 @@ sub show_change {
             }
         };
 
-        p {
-            { class is "change_message" };
-            my $message = Jifty->web->escape($change->message);
-            $message =~ s{\n}{<br />}g;
-            my $links = $change->changelog->commit_links;
-            $message = $_->linkify($message) while $_ = $links->next;
-            outs_raw( $message );
-        };
+        render_region(
+            name => "change_message",
+            path => "/change/message",
+            arguments => {
+                change => $change->id,
+            },
+        );
 
         ul {
             { class is "change_metadata" };
@@ -237,6 +236,18 @@ sub show_change {
     };
 }
 
+template '/change/message' => sub {
+    my $change = M('Change', id => get('change'));
+    p {
+        { class is "change_message" };
+        my $message = Jifty->web->escape($change->message);
+        $message =~ s{\n}{<br />}g;
+        my $links = $change->changelog->commit_links;
+        $message = $_->linkify($message) while $_ = $links->next;
+        outs_raw( $message );
+    };
+};
+
 template '/change/external_source' => sub {
     my $url = get('url');
 

commit fe8c2ac467e345fd7bdbbc94f184f00d30620d40
Author: Shawn M Moore <sartak at gmail.com>
Date:   Wed Aug 5 21:44:47 2009 -0400

    Ajax replace link for rewording form

diff --git a/lib/App/Changeloggr/View.pm b/lib/App/Changeloggr/View.pm
index 7bb7bce..b06447d 100644
--- a/lib/App/Changeloggr/View.pm
+++ b/lib/App/Changeloggr/View.pm
@@ -239,13 +239,30 @@ sub show_change {
 template '/change/message' => sub {
     my $change = M('Change', id => get('change'));
     p {
-        { class is "change_message" };
+        attr { class is "change_message" };
         my $message = Jifty->web->escape($change->message);
         $message =~ s{\n}{<br />}g;
         my $links = $change->changelog->commit_links;
         $message = $_->linkify($message) while $_ = $links->next;
         outs_raw( $message );
     };
+
+    my $rewording = Rewording(
+        change_id => $change->id,
+        user_id => Jifty->web->current_user->id,
+    );
+    if ($rewording->id) {
+        p { "You submitted the following rewording:" };
+        pre { $rewording->message };
+    }
+    else {
+        hyperlink(
+            label   => _("Reword this message?"),
+            onclick => {
+                replace_with => '/change/reword',
+            },
+        );
+    }
 };
 
 template '/change/external_source' => sub {

commit 63938b49f88e302b46c0d4d1188ddf7916b55488
Author: Shawn M Moore <sartak at gmail.com>
Date:   Wed Aug 5 21:45:41 2009 -0400

    The rewording prose is no longer needed

diff --git a/lib/App/Changeloggr/View.pm b/lib/App/Changeloggr/View.pm
index b06447d..bce21ad 100644
--- a/lib/App/Changeloggr/View.pm
+++ b/lib/App/Changeloggr/View.pm
@@ -437,8 +437,6 @@ template '/change/reword' => sub {
     else {
         my $create_rewording = new_action('CreateRewording');
 
-        p { "Do you want to improve the content or wording of this change's message?" };
-
         render_hidden $create_rewording => 'change_id' => $change_id;
         render_param $create_rewording => (
             'message',

commit 7ee7cd70c8a594e35bdacfad5df10fc56db38e14
Author: Shawn M Moore <sartak at gmail.com>
Date:   Wed Aug 5 21:45:52 2009 -0400

    When we submit rewording, go back to static change display

diff --git a/lib/App/Changeloggr/View.pm b/lib/App/Changeloggr/View.pm
index bce21ad..75910aa 100644
--- a/lib/App/Changeloggr/View.pm
+++ b/lib/App/Changeloggr/View.pm
@@ -448,7 +448,7 @@ template '/change/reword' => sub {
             label => 'Reword',
             onclick => {
                 submit => $create_rewording,
-                refresh_self => 1,
+                replace_with => '/change/message',
             },
         );
     }

commit 91b9ef65e86d12a0e3e74979744d0b78782abd2b
Author: Shawn M Moore <sartak at gmail.com>
Date:   Wed Aug 5 21:46:33 2009 -0400

    Don't flush the external source link right

diff --git a/share/web/static/css/change.css b/share/web/static/css/change.css
index e44a341..5abac17 100644
--- a/share/web/static/css/change.css
+++ b/share/web/static/css/change.css
@@ -66,10 +66,6 @@ ul.change_metadata {
    color: #f99;
 }
 
-a.external_source {
-  float: right;
-}
-
 iframe.external_source {
     width: 100%;
     height: 300px;

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