You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/12/16 22:26:45 UTC
fauxton commit: updated refs/heads/master to 3949594
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master c328feb25 -> 394959493
Add prefab way to get "<" in breadcrumbs
This ticket just provides a semantic way to add the "<" to the
breadcrumbs section, containing a class that can uniquely styled.
Closes COUCHDB-2512
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/39495949
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/39495949
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/39495949
Branch: refs/heads/master
Commit: 394959493e18425741741c3ae47a486c9bbc00f9
Parents: c328feb
Author: Benjamin Keen <be...@gmail.com>
Authored: Fri Dec 12 13:06:23 2014 -0800
Committer: Benjamin Keen <be...@gmail.com>
Committed: Tue Dec 16 12:20:37 2014 -0800
----------------------------------------------------------------------
app/addons/documents/routes-documents.js | 4 ++--
app/addons/fauxton/templates/breadcrumbs.html | 19 +++++++++++++------
assets/less/fauxton.less | 11 +++++------
3 files changed, 20 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/39495949/app/addons/documents/routes-documents.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes-documents.js b/app/addons/documents/routes-documents.js
index 59e2044..2ee5985 100644
--- a/app/addons/documents/routes-documents.js
+++ b/app/addons/documents/routes-documents.js
@@ -32,14 +32,14 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou
var crumbs = {
allDocs: function (database) {
return [
- { "name": "", "className": "fonticon-left-open", "link": "/_all_dbs" },
+ { "type": "back", "link": "/_all_dbs" },
{ "name": database.id, "link": Databases.databaseUrl(database), className: "lookahead-tray-link" }
];
},
changes: function (database) {
return [
- { "name": "", "className": "fonticon-left-open", "link": "/_all_dbs" },
+ { "type": "back", "link": "/_all_dbs" },
{ "name": database.id, "link": Databases.databaseUrl(database), className: "lookahead-tray-link" }
];
}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/39495949/app/addons/fauxton/templates/breadcrumbs.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/breadcrumbs.html b/app/addons/fauxton/templates/breadcrumbs.html
index ead2d6c..c795877 100644
--- a/app/addons/fauxton/templates/breadcrumbs.html
+++ b/app/addons/fauxton/templates/breadcrumbs.html
@@ -13,13 +13,20 @@ the License.
*/%>
<% _.each(_.initial(crumbs), function(crumb, index) { %>
-<li class="pull-left">
- <a href="#<%- crumb.link %>" class="fonticon <%- crumb.className %>"><%- crumb.name %></a>
-</li>
-<% if (nextCrumbHasLabel(crumb, index)) { %>
-<li class="divider fonticon-right-open"></li>
-<% } %>
+ <% if (crumb.type === 'back') { %>
+ <li class="pull-left breadcrumb-back-link">
+ <a href="#<%- crumb.link %>" class="fonticon fonticon-left-open"></a>
+ </li>
+ <% } else { %>
+ <li class="pull-left">
+ <a href="#<%- crumb.link %>" class="fonticon <%- crumb.className %>"><%- crumb.name %></a>
+ </li>
+
+ <% if (nextCrumbHasLabel(crumb, index)) { %>
+ <li class="divider fonticon-right-open"></li>
+ <% } %>
+ <% } %>
<% }); %>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/39495949/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index 6596508..3f686e0 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -424,13 +424,12 @@ div.spinner {
> div{
display:inline-block;
}
- .breadcrumb {
- li:first-child {
- border-right: 1px solid #ccc;
- font-size: 16px;
- }
- }
}
+
+ .breadcrumb-back-link {
+ border-right: 1px solid #ccc;
+ }
+
.breadcrumb {
margin-bottom: 0;
background-color: transparent;