Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1ABCB11438 for ; Sat, 2 Aug 2014 15:29:48 +0000 (UTC) Received: (qmail 40943 invoked by uid 500); 2 Aug 2014 15:29:48 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 40878 invoked by uid 500); 2 Aug 2014 15:29:47 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 40869 invoked by uid 99); 2 Aug 2014 15:29:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Aug 2014 15:29:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9A29081B933; Sat, 2 Aug 2014 15:29:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: robertkowalski@apache.org To: commits@couchdb.apache.org Message-Id: <009e84239b2340a6835f9bb44b9ea8ea@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: fauxton commit: updated refs/heads/master to 07945ec Date: Sat, 2 Aug 2014 15:29:47 +0000 (UTC) Repository: couchdb-fauxton Updated Branches: refs/heads/master 4382f43ef -> 07945ecfa Link local docs in Fauxton Instead of linking to the latest version online, we link to the docs for the locally installed version. The docs are generated automatically when running make / make install, if you have Sphinx installed. For development, the dev-server will just proxy the request. Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/07945ecf Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/07945ecf Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/07945ecf Branch: refs/heads/master Commit: 07945ecfacb57c9a0d31f07708e08018e265f49a Parents: 4382f43 Author: Robert Kowalski Authored: Sat Aug 2 17:24:51 2014 +0200 Committer: Robert Kowalski Committed: Sat Aug 2 17:24:51 2014 +0200 ---------------------------------------------------------------------- .../templates/design_doc_selector.html | 2 +- app/addons/documents/templates/view_editor.html | 6 ++-- app/addons/fauxton/templates/api_bar.html | 2 +- app/addons/fauxton/templates/nav_bar.html | 2 +- app/addons/permissions/templates/section.html | 2 +- app/addons/replication/templates/form.html | 2 +- app/helpers.js | 31 ++++++++++---------- tasks/couchserver.js | 7 +++-- 8 files changed, 27 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/07945ecf/app/addons/documents/templates/design_doc_selector.html ---------------------------------------------------------------------- diff --git a/app/addons/documents/templates/design_doc_selector.html b/app/addons/documents/templates/design_doc_selector.html index 828b5a5..d12cd64 100644 --- a/app/addons/documents/templates/design_doc_selector.html +++ b/app/addons/documents/templates/design_doc_selector.html @@ -12,7 +12,7 @@ License for the specific language governing permissions and limitations under the License. -->
- +
- + <% if (newView) { %>
<%= langTemplates.map %>
<% } else { %> @@ -52,7 +52,7 @@ the License.
- + - Create Target + Create Target
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/07945ecf/app/helpers.js ---------------------------------------------------------------------- diff --git a/app/helpers.js b/app/helpers.js index 208b0d9..6fa8481 100644 --- a/app/helpers.js +++ b/app/helpers.js @@ -36,25 +36,24 @@ function(utils, d3) { return path; }; - // Get the URL for documentation, wiki, wherever we store it. // update the URLs in documentation_urls.js Helpers.docs = { - "docs": "http://docs.couchdb.org/en/latest/intro/api.html#documents", - "all_dbs": "http://docs.couchdb.org/en/latest/api/server/common.html?highlight=all_dbs#get--_all_dbs", - "replication_doc": "http://docs.couchdb.org/en/latest/replication/replicator.html#basics", - "design_doc": "http://docs.couchdb.org/en/latest/couchapp/ddocs.html#design-docs", - "view_functions": "http://docs.couchdb.org/en/latest/couchapp/ddocs.html#view-functions", - "map_functions": "http://docs.couchdb.org/en/latest/couchapp/ddocs.html#map-functions", - "reduce_functions": "http://docs.couchdb.org/en/latest/couchapp/ddocs.html#reduce-and-rereduce-functions", - "api_reference": "http://docs.couchdb.org/en/latest/http-api.html", - "database_permission": "http://docs.couchdb.org/en/latest/api/database/security.html#db-security", - "stats": "http://docs.couchdb.org/en/latest/api/server/common.html?highlight=stats#get--_stats", - "_active_tasks": "http://docs.couchdb.org/en/latest/api/server/common.html?highlight=stats#active-tasks", - "log": "http://docs.couchdb.org/en/latest/api/server/common.html?highlight=stats#log", - "config": "http://docs.couchdb.org/en/latest/config/index.html", - "views": "http://docs.couchdb.org/en/latest/intro/overview.html#views", - "changes": "http://docs.couchdb.org/en/latest/api/database/changes.html?highlight=changes#post--db-_changes" + "docs": "/_utils/docs/intro/api.html#documents", + "all_dbs": "/_utils/docs/api/server/common.html?highlight=all_dbs#get--_all_dbs", + "replication_doc": "/_utils/docs/replication/replicator.html#basics", + "design_doc": "/_utils/docs/couchapp/ddocs.html#design-docs", + "view_functions": "/_utils/docs/couchapp/ddocs.html#view-functions", + "map_functions": "/_utils/docs/couchapp/ddocs.html#map-functions", + "reduce_functions": "/_utils/docs/couchapp/ddocs.html#reduce-and-rereduce-functions", + "api_reference": "/_utils/docs/http-api.html", + "database_permission": "/_utils/docs/api/database/security.html#db-security", + "stats": "/_utils/docs/api/server/common.html?highlight=stats#get--_stats", + "_active_tasks": "/_utils/docs/api/server/common.html?highlight=stats#active-tasks", + "log": "/_utils/docs/api/server/common.html?highlight=stats#log", + "config": "/_utils/docs/config/index.html", + "views": "/_utils/docs/intro/overview.html#views", + "changes": "/_utils/docs/api/database/changes.html?highlight=changes#post--db-_changes" }; Helpers.getDocUrl = function(docKey){ http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/07945ecf/tasks/couchserver.js ---------------------------------------------------------------------- diff --git a/tasks/couchserver.js b/tasks/couchserver.js index b12e8c2..45a4f9c 100644 --- a/tasks/couchserver.js +++ b/tasks/couchserver.js @@ -64,9 +64,6 @@ module.exports = function (grunt) { } else if (!!url.match(/\.css|img/)) { url = url.replace(/\?.*/, ''); filePath = path.join(dist_dir,url); - /*} else if (!!url.match(/\/js\//)) { - // serve any javascript or files from dist debug dir - filePath = path.join(dist_dir,req.url);*/ } else if (!!url.match(/\.js$|\.html$/)) { // server js from app directory filePath = path.join(app_dir, url.replace('/_utils/fauxton/','')); @@ -80,6 +77,10 @@ module.exports = function (grunt) { filePath = path.join(dist_dir, 'index.html'); }; + if (/_utils\/docs/.test(filePath)) { + filePath = false; + } + if (filePath) { return send(req, filePath) .on('error', function (err) {