You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2013/12/10 09:25:59 UTC
[1/2] git commit: updated refs/heads/master to 6c71f2c
Updated Branches:
refs/heads/master 05d2f2983 -> 6c71f2c22
Fauxton copy tweaks
Fixed init caps on Add New Databases
Wwitched Add to New in Doc dropdown
Also (accordingly) switched "New doc" and
"New view" to "Document" and "Secondary Index"
accordingly.
tweaked Create/Edit Index labels
%s/Advanced Options/Query Options
empty tasks list just says No tasks
currentView was not being populated. Could come
back when it works.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6c71f2c2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6c71f2c2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6c71f2c2
Branch: refs/heads/master
Commit: 6c71f2c22891ecb80225d779a810f3dc14fb72e7
Parents: 4f557a2
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Thu Dec 5 15:53:18 2013 -0500
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Dec 10 10:25:22 2013 +0200
----------------------------------------------------------------------
src/fauxton/app/addons/activetasks/templates/table.html | 2 +-
src/fauxton/app/templates/databases/newdatabase.html | 2 +-
src/fauxton/app/templates/documents/all_docs_layout.html | 2 +-
.../app/templates/documents/design_doc_selector.html | 2 +-
src/fauxton/app/templates/documents/sidebar.html | 6 +++---
src/fauxton/app/templates/documents/view_editor.html | 9 ++++-----
6 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6c71f2c2/src/fauxton/app/addons/activetasks/templates/table.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/activetasks/templates/table.html b/src/fauxton/app/addons/activetasks/templates/table.html
index ee88e75..885cb47 100644
--- a/src/fauxton/app/addons/activetasks/templates/table.html
+++ b/src/fauxton/app/addons/activetasks/templates/table.html
@@ -29,7 +29,7 @@ the License.
<% if (collection.length === 0){%>
<tr>
<td>
- <p>There are no active tasks for <%=currentView%> right now.</p>
+ <p>No tasks.</p>
</td>
</tr>
<%}else{%>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6c71f2c2/src/fauxton/app/templates/databases/newdatabase.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/databases/newdatabase.html b/src/fauxton/app/templates/databases/newdatabase.html
index a39cd74..b357e0b 100644
--- a/src/fauxton/app/templates/databases/newdatabase.html
+++ b/src/fauxton/app/templates/databases/newdatabase.html
@@ -12,6 +12,6 @@ License for the specific language governing permissions and limitations under
the License.
-->
-<a class="button new" id="new"><i class="icon fonticon-new-database"></i>Add new database</a>
+<a class="button new" id="new"><i class="icon fonticon-new-database"></i>Add New Database</a>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6c71f2c2/src/fauxton/app/templates/documents/all_docs_layout.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/all_docs_layout.html b/src/fauxton/app/templates/documents/all_docs_layout.html
index 785937e..526c200 100644
--- a/src/fauxton/app/templates/documents/all_docs_layout.html
+++ b/src/fauxton/app/templates/documents/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">Index Options</a></li>
+ <li><a id="toggle-query" class="fonticon-plus fonticon" href="#query" data-toggle="tab">Query Options</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane" id="query">
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6c71f2c2/src/fauxton/app/templates/documents/design_doc_selector.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/design_doc_selector.html b/src/fauxton/app/templates/documents/design_doc_selector.html
index 0cd6bdf..457b76c 100644
--- a/src/fauxton/app/templates/documents/design_doc_selector.html
+++ b/src/fauxton/app/templates/documents/design_doc_selector.html
@@ -12,7 +12,7 @@ License for the specific language governing permissions and limitations under
the License.
-->
<div class="span3">
- <label for="ddoc">Design document <a href="<%=getDocUrl('design_doc')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
+ <label for="ddoc">Save to Design Document <a href="<%=getDocUrl('design_doc')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
<select id="ddoc">
<optgroup label="Select a document">
<option id="new-doc">New document</option>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6c71f2c2/src/fauxton/app/templates/documents/sidebar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/sidebar.html b/src/fauxton/app/templates/documents/sidebar.html
index 336946d..4becf93 100644
--- a/src/fauxton/app/templates/documents/sidebar.html
+++ b/src/fauxton/app/templates/documents/sidebar.html
@@ -33,17 +33,17 @@ the License.
<div class="btn-group">
<button class="btn dropdown-toggle dropdown-toggle-btn" data-toggle="dropdown">
- Add
+ New
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<!-- dropdown menu links -->
<li>
- <a id="doc" href="#<%= database.url('app') %>/new">New doc</a>
+ <a id="doc" href="#<%= database.url('app') %>/new">Document</a>
</li>
<% if (showNewView) { %>
<li>
- <a href="#<%= database.url('app') %>/new_view">New view</a>
+ <a href="#<%= database.url('app') %>/new_view">Secondary Index</a>
</li>
<% } %>
</ul>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6c71f2c2/src/fauxton/app/templates/documents/view_editor.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/view_editor.html b/src/fauxton/app/templates/documents/view_editor.html
index cd53fc7..8865625 100644
--- a/src/fauxton/app/templates/documents/view_editor.html
+++ b/src/fauxton/app/templates/documents/view_editor.html
@@ -46,20 +46,19 @@ the License.
<div class="control-group">
- <label for="reduce-function-selector">Reduce function <a href="<%=getDocUrl('reduce_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
+ <label for="reduce-function-selector">Reduce (optional) <a href="<%=getDocUrl('reduce_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
<select id="reduce-function-selector">
<option value="" <%= !reduceFunStr ? 'selected="selected"' : '' %>>None</option>
<% _.each(["_sum", "_count", "_stats"], function(reduce) { %>
<option value="<%= reduce %>" <% if (reduce == reduceFunStr) { %>selected<% } %>><%= reduce %></option>
<% }) %>
- <option value="CUSTOM" <% if (isCustomReduce) { %>selected<% } %>>Custom reduce</option>
+ <option value="CUSTOM" <% if (isCustomReduce) { %>selected<% } %>>Custom Reduce function</option>
</select>
- <span class="help-block">Reduce functions are optional.</span>
</div>
<div class="control-group reduce-function">
- <label for="reduce-function">Custom Reduce</label>
+ <label for="reduce-function">Custom Reduce function</label>
<% if (newView) { %>
<div class="js-editor" id="reduce-function"><%= langTemplates.reduce %></div>
<% } else { %>
@@ -68,7 +67,7 @@ the License.
</div>
<div class="control-group">
- <button class="button green save fonticon-circle-check">Save</button>
+ <button class="button green save fonticon-circle-check">Save & Build Index</button>
<button class="button btn-info preview">Preview</button>
<% if (!newView) { %>
<button class="button delete outlineGray fonticon-circle-x">Delete</button>
[2/2] git commit: updated refs/heads/master to 6c71f2c
Posted by ga...@apache.org.
hid code editor tab when editing a doc
The single tab was sad and lonely. Left all
the JS around, though, for when Feild Editor
decides to rejoin Code Editor.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4f557a20
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4f557a20
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4f557a20
Branch: refs/heads/master
Commit: 4f557a2029e495c8d1dc59ea435d1952f5cd19db
Parents: 05d2f29
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Fri Dec 6 15:13:43 2013 -0500
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Dec 10 10:25:22 2013 +0200
----------------------------------------------------------------------
src/fauxton/app/templates/documents/doc_field_editor_tabs.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4f557a20/src/fauxton/app/templates/documents/doc_field_editor_tabs.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/doc_field_editor_tabs.html b/src/fauxton/app/templates/documents/doc_field_editor_tabs.html
index af34b71..766647c 100644
--- a/src/fauxton/app/templates/documents/doc_field_editor_tabs.html
+++ b/src/fauxton/app/templates/documents/doc_field_editor_tabs.html
@@ -12,8 +12,8 @@ License for the specific language governing permissions and limitations under
the License.
-->
-<ul class="nav nav-tabs">
- <!--<li id="field_editor" class="<%= isSelectedClass('field_editor') %>"><a href="#<%= doc.url('app') %>/field_editor">Doc fields</a></li>-->
+<!--<ul class="nav nav-tabs">
+ <li id="field_editor" class="<%= isSelectedClass('field_editor') %>"><a href="#<%= doc.url('app') %>/field_editor">Doc fields</a></li>
<li id="code_editor" class="<%= isSelectedClass('code_editor') %>"><a href="#<%= doc.url('app') %>/code_editor"><i class="icon-pencil"> </i> Code editor</a>
</li>
-</ul>
+</ul>-->