diff options
| author | BigBlueHat <byoung@bigbluehat.com> | 2014-01-13 13:45:22 -0500 |
|---|---|---|
| committer | suelockwood <deathbear@apache.org> | 2014-01-13 15:09:15 -0500 |
| commit | 134dd40f259d0365b37db760e039f0873e81aa43 (patch) | |
| tree | 4793799a58813342b031b30acbdffbf186b4ce53 | |
| parent | a37a3eb4e3d52eba60d3c13b7d3e8b5a35fb7b41 (diff) | |
| download | couchdb-134dd40f259d0365b37db760e039f0873e81aa43.tar.gz | |
moving over post-addons refactor template changes
5 files changed, 11 insertions, 7 deletions
diff --git a/src/fauxton/app/addons/documents/templates/advanced_options.html b/src/fauxton/app/addons/documents/templates/advanced_options.html index 8e96574b1..e2563253f 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: <select name="limit" class="input-small"> <option>5</option> - <option selected="selected">10</option> - <option>25</option> + <option>10</option> + <option selected="selected">20</option> + <option>30</option> <option>50</option> <option>100</option> </select> 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 526c200d1..6b4a31bc4 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. --> <ul class="nav nav-tabs window-resizeable" id="db-views-tabs-nav"> - <li><a id="toggle-query" class="fonticon-plus fonticon" href="#query" data-toggle="tab">Query Options</a></li> + <li><a id="toggle-query" class="fonticon-plus fonticon" href="#query" data-bypass="true" data-toggle="tab">Query Options</a></li> </ul> <div class="tab-content"> <div class="tab-pane" id="query"> 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 c4ea8f64a..df8fe07b6 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. <a href="#/database/<%=database%>/new"> Create your first document.</a> -<% } else { %> +<% } else if (showNumbers) { %> Showing <%=offset%> - <%= numModels %> of <%= totalRows %> rows +<% } else { %> + Showing <%=pageStart%> - <%= pageEnd %> <%}%> <% if (updateSeq) { %> -- Update Sequence: <%= updateSeq %> 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 3f374b65a..dbb25bc07 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. </div> <div class="modal-body"> <div id="modal-error" class="hide alert alert-error"/> - <form id="file-upload" class="form" method="post"> + <form id="doc-duplicate" class="form" method="post"> <p class="help-block"> Set new documents ID: </p> diff --git a/src/fauxton/app/addons/documents/templates/index_row_docular.html b/src/fauxton/app/addons/documents/templates/index_row_docular.html index 383545359..f1b221757 100644 --- a/src/fauxton/app/addons/documents/templates/index_row_docular.html +++ b/src/fauxton/app/addons/documents/templates/index_row_docular.html @@ -11,8 +11,9 @@ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - -<td class="select"><input type="checkbox"></td> +<% if (doc.isEditable()) { %> + <td class="select"><input type="checkbox"></td> +<% } %> <td> <div> <pre class="prettyprint"><%- doc.prettyJSON() %></pre> |