couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chewbra...@apache.org
Subject [22/27] git commit: Merge remote-tracking branch 'upstream/fauxton' into fauxton
Date Fri, 15 Mar 2013 16:53:43 GMT
Merge remote-tracking branch 'upstream/fauxton' into fauxton

Conflicts:
	src/fauxton/app/templates/databases/sidebar.html
	src/fauxton/app/templates/fauxton/api_bar.html


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/25881bb1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/25881bb1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/25881bb1

Branch: refs/heads/fauxton
Commit: 25881bb138b9341c1b31f573efe094f26ce66de9
Parents: f0b587c 60ff959
Author: Russell Branca <chewbranca@gmail.com>
Authored: Wed Mar 13 10:31:02 2013 -0700
Committer: Russell Branca <chewbranca@gmail.com>
Committed: Wed Mar 13 10:31:02 2013 -0700

----------------------------------------------------------------------
 src/fauxton/app/templates/databases/sidebar.html   |    6 ++-
 src/fauxton/app/templates/fauxton/api_bar.html     |   12 ++++-
 .../app/templates/layouts/with_sidebar.html        |   10 ++--
 .../app/templates/layouts/with_tabs_sidebar.html   |    2 +-
 src/fauxton/readme.md                              |   31 ++++++++-------
 src/fauxton/tasks/fauxton.js                       |    9 ++--
 src/fauxton/tasks/templates/base.js.underscore     |   21 ++++++++++
 .../tasks/templates/resources.js.underscore        |   21 ++++++++++
 src/fauxton/tasks/templates/route.js.underscore    |   21 ++++++++++
 src/fauxton/writing_addons.md                      |    3 +
 10 files changed, 107 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/25881bb1/src/fauxton/app/templates/databases/sidebar.html
----------------------------------------------------------------------
diff --cc src/fauxton/app/templates/databases/sidebar.html
index 35cd860,af4c438..87c7fd8
--- a/src/fauxton/app/templates/databases/sidebar.html
+++ b/src/fauxton/app/templates/databases/sidebar.html
@@@ -22,4 -25,4 +24,4 @@@ the License
  <div class="well">
    <p>Here be news.</p>
  </div>
- <a href="http://couchdb.org" target="_couchdb"><img src="img/couchdblogo.png"/></a>
 -<img src="img/couchdblogo.png"/>
++<a href="http://couchdb.org" target="_blank"><img src="img/couchdblogo.png"/></a>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/25881bb1/src/fauxton/app/templates/fauxton/api_bar.html
----------------------------------------------------------------------
diff --cc src/fauxton/app/templates/fauxton/api_bar.html
index ff35ee9,3bf9daf..0ca6c69
--- a/src/fauxton/app/templates/fauxton/api_bar.html
+++ b/src/fauxton/app/templates/fauxton/api_bar.html
@@@ -16,8 -16,7 +16,14 @@@ the License
    <div class="navbar-inner">
      <div class="container">
        <div class="input-prepend input-append">
-         <span class="add-on">API reference <a href="http://docs.couchdb.org/en/latest/"
target="_couchdb"><i class="icon-question-sign"></i></a></span><input
type="text" class="input-xxlarge" value="<%= endpoint %>"><a href="#" class="btn">Show
me</a>
- 
 -        <span class="add-on">API reference <i class="icon-question-sign"></i></span><input
type="text" class="input-xxlarge" value="<%= endpoint %>"><a href="<%= endpoint
%>" target="_blank" class="btn">Show me</a>
++        <span class="add-on">
++          API reference
++          <a href="http://docs.couchdb.org/en/latest/" target="_blank">
++            <i class="icon-question-sign"></i>
++          </a>
++        </span>
++        <input type="text" class="input-xxlarge" value="<%= endpoint %>">
++        <a href="<%= endpoint %>" target="_blank" class="btn">Show me</a>
        </div>
      </div>
    </div>


Mime
View raw message