Return-Path: 
 <allura-commits-return-1234-apmail-incubator-allura-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id BEFD1D54D
	for <apmail-incubator-allura-commits-archive@minotaur.apache.org>;
 Tue, 18 Dec 2012 04:29:35 +0000 (UTC)
Received: (qmail 16206 invoked by uid 500); 18 Dec 2012 04:29:34 -0000
Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org
Received: (qmail 16003 invoked by uid 500); 18 Dec 2012 04:29:31 -0000
Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:allura-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:allura-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:allura-commits@incubator.apache.org>
List-Id: <allura-commits.incubator.apache.org>
Reply-To: allura-dev@incubator.apache.org
Delivered-To: mailing list allura-commits@incubator.apache.org
Received: (qmail 15831 invoked by uid 99); 18 Dec 2012 04:29:29 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2012 04:29:29 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id D134881E27F; Tue, 18 Dec 2012 04:29:28 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: tvansteenburgh@apache.org
To: allura-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: [2/41] git commit: [#5389] Minor tweak to diff switch UI
Message-Id: <20121218042928.D134881E27F@tyr.zones.apache.org>
Date: Tue, 18 Dec 2012 04:29:28 +0000 (UTC)

[#5389] Minor tweak to diff switch UI

Signed-off-by: Cory Johns <johnsca@geek.net>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/0a7b1853
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/0a7b1853
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/0a7b1853

Branch: refs/heads/tv/4957
Commit: 0a7b1853741f48b198e952d8505284a049e100de
Parents: b770d92
Author: Cory Johns <johnsca@geek.net>
Authored: Mon Dec 17 22:54:58 2012 +0000
Committer: Cory Johns <johnsca@geek.net>
Committed: Mon Dec 17 23:00:40 2012 +0000

----------------------------------------------------------------------
 Allura/allura/templates/repo/commit.html           |    4 +++-
 Allura/allura/templates/repo/diff.html             |    2 +-
 .../forgegit/tests/functional/test_controllers.py  |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0a7b1853/Allura/allura/templates/repo/commit.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/commit.html b/Allura/allura/templates/repo/commit.html
index a6054af..c4ca330 100644
--- a/Allura/allura/templates/repo/commit.html
+++ b/Allura/allura/templates/repo/commit.html
@@ -68,11 +68,13 @@ Commit <a href="{{commit.url()}}">{{commit.shorthand_id()}}</a> {{commit_labels(
           href = href + '&diformat=regular';
           $('#' + diffid).load(href, function() {
             self.attr('data-diformat', 'regular');
+            self.text('Switch to side-by-side view');
           });
         } else {
           href = href + '&diformat=sidebyside';
           $('#' + diffid).load(href, function() {
             self.attr('data-diformat', 'sidebyside');
+            self.text('Switch to unified view');
           });
         }
         return false;
@@ -107,7 +109,7 @@ Commit <a href="{{commit.url()}}">{{commit.shorthand_id()}}</a> {{commit_labels(
             {% if type in ('added', 'changed') %}
                 <a href="{{commit.url()}}tree/{{h.really_unicode(file)}}">{{h.really_unicode(file)}}</a>
                 <a class="commit-diff-link" href="{{commit.url()}}tree/{{h.really_unicode(file)}}?diff={{prev[0]._id if prev else ''}}">Diff</a>
-                <a class="commit-diff-link switch-diff-format-link" data-diformat="{{session.diformat}}" data-diffid="diff-{{loop.index}}" href="{{commit.url()}}tree/{{h.really_unicode(file)}}?barediff={{prev[0]._id if prev else ''}}">Switch regular/side-by-side view</a>
+                <a class="commit-diff-link switch-diff-format-link" data-diformat="{{session.diformat}}" data-diffid="diff-{{loop.index}}" href="{{commit.url()}}tree/{{h.really_unicode(file)}}?barediff={{prev[0]._id if prev else ''}}">Switch to {{'unified' if session.diformat == 'sidebyside' else 'side-by-side'}} view</a>
             {% elif type == 'removed' %}
                 <a href="{{prev[0].url()}}tree/{{h.really_unicode(file)}}">{{h.really_unicode(file)}}</a>
             {% elif type == 'copied' %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0a7b1853/Allura/allura/templates/repo/diff.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/diff.html b/Allura/allura/templates/repo/diff.html
index 6faede2..4c5ba93 100644
--- a/Allura/allura/templates/repo/diff.html
+++ b/Allura/allura/templates/repo/diff.html
@@ -34,7 +34,7 @@
       <span class="fright">
         {% if session.diformat == 'sidebyside' %}
           {% set switch_url = request.url.replace('&diformat=sidebyside', '') + '&diformat=regular' %}
-          {% set switch_text = 'regular' %}
+          {% set switch_text = 'unified' %}
         {% else %}
           {% set switch_url = request.url.replace('&diformat=regular', '') + '&diformat=sidebyside' %}
           {% set switch_text = 'side-by-side' %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0a7b1853/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 7a83039..d89ee0f 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -169,7 +169,7 @@ class TestRootController(_TestCase):
         assert fn + '&amp;diformat=sidebyside">Switch to side-by-side view</a>' in r
 
         r = self.app.get(ci + fn + '&diformat=sidebyside')
-        assert fn + '&amp;diformat=regular">Switch to regular view</a>' in r
+        assert fn + '&amp;diformat=regular">Switch to unified view</a>' in r
         assert '<table class="side-by-side-diff">' in r
 
     def test_refresh(self):