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 6651710282 for ; Tue, 14 Jan 2014 10:48:31 +0000 (UTC) Received: (qmail 85414 invoked by uid 500); 14 Jan 2014 09:59:18 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 84630 invoked by uid 500); 14 Jan 2014 09:56:18 -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 83100 invoked by uid 99); 14 Jan 2014 09:50:36 -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, 14 Jan 2014 09:50:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ECEF28BC7E2; Tue, 14 Jan 2014 09:50:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: garren@apache.org To: commits@couchdb.apache.org Date: Tue, 14 Jan 2014 09:51:11 -0000 Message-Id: <2944e17752744a5b81b7cfe2f436ba10@git.apache.org> In-Reply-To: <77971da0720e412ba2cd9fb4ea69c45a@git.apache.org> References: <77971da0720e412ba2cd9fb4ea69c45a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [44/50] [abbrv] git commit: updated refs/heads/fauxton-xhr-abort to 8b35f0c moving over post-addons refactor template changes Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/134dd40f Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/134dd40f Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/134dd40f Branch: refs/heads/fauxton-xhr-abort Commit: 134dd40f259d0365b37db760e039f0873e81aa43 Parents: a37a3eb Author: BigBlueHat Authored: Mon Jan 13 13:45:22 2014 -0500 Committer: suelockwood Committed: Mon Jan 13 15:09:15 2014 -0500 ---------------------------------------------------------------------- .../app/addons/documents/templates/advanced_options.html | 5 +++-- src/fauxton/app/addons/documents/templates/all_docs_layout.html | 2 +- src/fauxton/app/addons/documents/templates/all_docs_number.html | 4 +++- .../app/addons/documents/templates/duplicate_doc_modal.html | 2 +- .../app/addons/documents/templates/index_row_docular.html | 5 +++-- 5 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/134dd40f/src/fauxton/app/addons/documents/templates/advanced_options.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/templates/advanced_options.html b/src/fauxton/app/addons/documents/templates/advanced_options.html index 8e96574..e256325 100644 --- a/src/fauxton/app/addons/documents/templates/advanced_options.html +++ b/src/fauxton/app/addons/documents/templates/advanced_options.html @@ -67,8 +67,9 @@ the License. Limit: http://git-wip-us.apache.org/repos/asf/couchdb/blob/134dd40f/src/fauxton/app/addons/documents/templates/all_docs_layout.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/templates/all_docs_layout.html b/src/fauxton/app/addons/documents/templates/all_docs_layout.html index 526c200..6b4a31b 100644 --- a/src/fauxton/app/addons/documents/templates/all_docs_layout.html +++ b/src/fauxton/app/addons/documents/templates/all_docs_layout.html @@ -12,7 +12,7 @@ License for the specific language governing permissions and limitations under the License. -->
http://git-wip-us.apache.org/repos/asf/couchdb/blob/134dd40f/src/fauxton/app/addons/documents/templates/all_docs_number.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/templates/all_docs_number.html b/src/fauxton/app/addons/documents/templates/all_docs_number.html index c4ea8f6..df8fe07 100644 --- a/src/fauxton/app/addons/documents/templates/all_docs_number.html +++ b/src/fauxton/app/addons/documents/templates/all_docs_number.html @@ -13,8 +13,10 @@ the License. --> <% if (totalRows === "unknown"){ %> Showing 0 documents. Create your first document. -<% } else { %> +<% } else if (showNumbers) { %> Showing <%=offset%> - <%= numModels %> of <%= totalRows %> rows +<% } else { %> + Showing <%=pageStart%> - <%= pageEnd %> <%}%> <% if (updateSeq) { %> -- Update Sequence: <%= updateSeq %> http://git-wip-us.apache.org/repos/asf/couchdb/blob/134dd40f/src/fauxton/app/addons/documents/templates/duplicate_doc_modal.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/templates/duplicate_doc_modal.html b/src/fauxton/app/addons/documents/templates/duplicate_doc_modal.html index 3f374b6..dbb25bc 100644 --- a/src/fauxton/app/addons/documents/templates/duplicate_doc_modal.html +++ b/src/fauxton/app/addons/documents/templates/duplicate_doc_modal.html @@ -19,7 +19,7 @@ the License.