Adding Views, testing header stuff, fixing layout issues
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/8817d9ec Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/8817d9ec Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/8817d9ec Branch: refs/heads/secondary-indexes Commit: 8817d9eccf6838554c1687c47c7f5fa73a7ff046 Parents: b2bb3dd Author: deathbearbrown <[email protected]> Authored: Tue Jul 29 09:12:34 2014 -0400 Committer: deathbearbrown <[email protected]> Committed: Tue Aug 5 16:37:46 2014 -0400 ---------------------------------------------------------------------- .../documents/templates/header_alldocs.html | 1 - app/addons/indexes/templates/index_editor.html | 18 ------------- app/addons/indexes/templates/index_header.html | 28 ++++++++++++++++++++ app/addons/indexes/templates/list_editor.html | 27 +++---------------- .../indexes/templates/new_placeholder.html | 16 ----------- .../indexes/templates/preview_screen.html | 2 +- 6 files changed, 32 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8817d9ec/app/addons/documents/templates/header_alldocs.html ---------------------------------------------------------------------- diff --git a/app/addons/documents/templates/header_alldocs.html b/app/addons/documents/templates/header_alldocs.html index e37a2ae..61eb2d8 100644 --- a/app/addons/documents/templates/header_alldocs.html +++ b/app/addons/documents/templates/header_alldocs.html @@ -13,7 +13,6 @@ the License. --> <div class="header-left"> - BLOOP <!--back arrow--> <!--title with dropdown DB search--> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8817d9ec/app/addons/indexes/templates/index_editor.html ---------------------------------------------------------------------- diff --git a/app/addons/indexes/templates/index_editor.html b/app/addons/indexes/templates/index_editor.html deleted file mode 100644 index 8644909..0000000 --- a/app/addons/indexes/templates/index_editor.html +++ /dev/null @@ -1,18 +0,0 @@ -<!-- -Licensed under the Apache License, Version 2.0 (the "License"); you may not -use this file except in compliance with the License. You may obtain a copy of -the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -License for the specific language governing permissions and limitations under -the License. ---> - -<form> - <label> A FORM</label> - -</form> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8817d9ec/app/addons/indexes/templates/index_header.html ---------------------------------------------------------------------- diff --git a/app/addons/indexes/templates/index_header.html b/app/addons/indexes/templates/index_header.html new file mode 100644 index 0000000..ac8ac56 --- /dev/null +++ b/app/addons/indexes/templates/index_header.html @@ -0,0 +1,28 @@ +<!-- +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations under +the License. +--> + +<div class="header-left"> +<!--back arrow--> + +<!--title--> + +<!-- Menu gear--> + +</div> + + +<div class="header-right"> + <!-- Query Options--> + <!--right margin for api bar--> +</div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8817d9ec/app/addons/indexes/templates/list_editor.html ---------------------------------------------------------------------- diff --git a/app/addons/indexes/templates/list_editor.html b/app/addons/indexes/templates/list_editor.html index 9eaa420..8644909 100644 --- a/app/addons/indexes/templates/list_editor.html +++ b/app/addons/indexes/templates/list_editor.html @@ -11,29 +11,8 @@ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<div class="all-docs-list errors-container"></div> -<div id="define-view" class="ddoc-alert index-form"> - <div class="errors-container"></div> - <form class="form-horizontal view-query-save"> - <div class="control-group"> - <p>Views are the primary tool used for querying and reporting on CouchDB databases.</p> - </div> - <div class="control-group design-doc-group"> - </div> +<form> + <label> A FORM</label> - - <div class="control-group"> - <label for="index-name">Index name <a class="help-link" href="<%-getDocUrl('view_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label> - <input type="text" id="index-name" value="<%- viewName %>" placeholder="Index name" /> - </div> - - <div class="control-group"> - <button class="btn btn-success save"><i class="icon fonticon-ok-circled"></i> Save & Build Index</button> - <% if (!newView) { %> - <button class="btn btn-danger delete"><i class="icon fonticon-cancel-circled"></i> Delete</button> - <% } %> - </div> - <div class="clearfix"></div> - </form> -</div> +</form> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8817d9ec/app/addons/indexes/templates/new_placeholder.html ---------------------------------------------------------------------- diff --git a/app/addons/indexes/templates/new_placeholder.html b/app/addons/indexes/templates/new_placeholder.html deleted file mode 100644 index 1fcf6d9..0000000 --- a/app/addons/indexes/templates/new_placeholder.html +++ /dev/null @@ -1,16 +0,0 @@ -<!-- -Licensed under the Apache License, Version 2.0 (the "License"); you may not -use this file except in compliance with the License. You may obtain a copy of -the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -License for the specific language governing permissions and limitations under -the License. ---> - -<h3>No Index Created Yet!</h3> -<p> Run <a href="#/preview" class="btn btn-success save"> Preview</a> To query result</p> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8817d9ec/app/addons/indexes/templates/preview_screen.html ---------------------------------------------------------------------- diff --git a/app/addons/indexes/templates/preview_screen.html b/app/addons/indexes/templates/preview_screen.html index 654e557..1fcf6d9 100644 --- a/app/addons/indexes/templates/preview_screen.html +++ b/app/addons/indexes/templates/preview_screen.html @@ -13,4 +13,4 @@ the License. --> <h3>No Index Created Yet!</h3> -<p> Run <span class="btn btn-success preview icon fonticon-play"> Preview</span> to query result</p> +<p> Run <a href="#/preview" class="btn btn-success save"> Preview</a> To query result</p>
