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 381BF11F57 for ; Tue, 12 Aug 2014 19:10:51 +0000 (UTC) Received: (qmail 77380 invoked by uid 500); 12 Aug 2014 19:10:50 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 77326 invoked by uid 500); 12 Aug 2014 19:10:50 -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 77317 invoked by uid 99); 12 Aug 2014 19:10:50 -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, 12 Aug 2014 19:10:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 119FD921A9D; Tue, 12 Aug 2014 19:10:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: deathbear@apache.org To: commits@couchdb.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: fauxton commit: updated refs/heads/secondary-indexes to 5125c4f Date: Tue, 12 Aug 2014 19:10:50 +0000 (UTC) Repository: couchdb-fauxton Updated Branches: refs/heads/secondary-indexes 0fc34c0ac -> 5125c4f61 Design doc selector fix pagination fix Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/5125c4f6 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/5125c4f6 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/5125c4f6 Branch: refs/heads/secondary-indexes Commit: 5125c4f61927d2e1535beaccc5d2625c10ea0b0d Parents: 0fc34c0 Author: deathbearbrown Authored: Tue Aug 12 15:10:55 2014 -0400 Committer: deathbearbrown Committed: Tue Aug 12 15:10:55 2014 -0400 ---------------------------------------------------------------------- app/addons/fauxton/components.js | 1 + app/addons/fauxton/templates/pagination.html | 29 ++++++++++---------- .../indexes/templates/design_doc_selector.html | 16 +++++------ app/addons/indexes/templates/show_editor.html | 2 +- app/addons/indexes/templates/view_editor.html | 2 +- app/addons/indexes/views.js | 3 ++ 6 files changed, 27 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5125c4f6/app/addons/fauxton/components.js ---------------------------------------------------------------------- diff --git a/app/addons/fauxton/components.js b/app/addons/fauxton/components.js index d225cd9..28a9070 100644 --- a/app/addons/fauxton/components.js +++ b/app/addons/fauxton/components.js @@ -154,6 +154,7 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) { Components.Pagination = FauxtonAPI.View.extend({ + tagName: "ul", className: "pagination pagination-centered", template: "addons/fauxton/templates/pagination", http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5125c4f6/app/addons/fauxton/templates/pagination.html ---------------------------------------------------------------------- diff --git a/app/addons/fauxton/templates/pagination.html b/app/addons/fauxton/templates/pagination.html index 614fd06..3958f63 100644 --- a/app/addons/fauxton/templates/pagination.html +++ b/app/addons/fauxton/templates/pagination.html @@ -11,18 +11,17 @@ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -
    - <% if (page > 1) { %> -
  • «
    • - <% } else { %> -
  • «
    • - <% } %> - <% _.each(_.range(1, totalPages+1), function(i) { %> -
  • class="active"<% } %>> <%- i %>
    • - <% }) %> - <% if (page < totalPages) { %> -
  • »
    • - <% } else { %> -
  • »
    • - <% } %> -
+<% if (page > 1) { %> +
  • «
    • +<% } else { %> +
  • «
    • +<% } %> +<% _.each(_.range(1, totalPages+1), function(i) { %> +
  • class="active"<% } %>> <%- i %>
    • +<% }) %> +<% if (page < totalPages) { %> +
  • »
    • +<% } else { %> +
  • »
    • +<% } %> + http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5125c4f6/app/addons/indexes/templates/design_doc_selector.html ---------------------------------------------------------------------- diff --git a/app/addons/indexes/templates/design_doc_selector.html b/app/addons/indexes/templates/design_doc_selector.html index 7d58116..2cad6af 100644 --- a/app/addons/indexes/templates/design_doc_selector.html +++ b/app/addons/indexes/templates/design_doc_selector.html @@ -16,21 +16,19 @@ the License.
    - + style="display:none"<% } %> placeholder="Enter a design doc name" /> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5125c4f6/app/addons/indexes/templates/show_editor.html ---------------------------------------------------------------------- diff --git a/app/addons/indexes/templates/show_editor.html b/app/addons/indexes/templates/show_editor.html index 9afa2bf..ef36110 100644 --- a/app/addons/indexes/templates/show_editor.html +++ b/app/addons/indexes/templates/show_editor.html @@ -17,7 +17,7 @@ the License.
    -

    Views are the primary tool used for querying and reporting on CouchDB databases.

    +

    Views are the primary tool used for querying and reporting.

    http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5125c4f6/app/addons/indexes/templates/view_editor.html ---------------------------------------------------------------------- diff --git a/app/addons/indexes/templates/view_editor.html b/app/addons/indexes/templates/view_editor.html index f33d3f9..2b8c540 100644 --- a/app/addons/indexes/templates/view_editor.html +++ b/app/addons/indexes/templates/view_editor.html @@ -16,7 +16,7 @@ the License.
    -

    Views are the primary tool used for querying and reporting on CouchDB databases.

    +

    Views are the primary tool used for querying and reporting.

    http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5125c4f6/app/addons/indexes/views.js ---------------------------------------------------------------------- diff --git a/app/addons/indexes/views.js b/app/addons/indexes/views.js index fa84708..51f37fa 100644 --- a/app/addons/indexes/views.js +++ b/app/addons/indexes/views.js @@ -580,6 +580,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, this.designDocSelector = this.setView('.design-doc-group', new Views.DesignDocSelector({ collection: designDocs, + newView: this.newView, ddocName: this.currentDdoc || this.model.id, database: this.database })); @@ -646,6 +647,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, }, initialize: function (options) { + this.newView = options.newView; this.ddocName = options.ddocName; this.database = options.database; this.listenTo(this.collection, 'add', this.ddocAdded); @@ -659,6 +661,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, serialize: function () { return { + newView: this.newView, ddocName: this.ddocName, ddocs: this.collection };