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.

6 files changed, 11 insertions, 12 deletions

diff --git a/src/fauxton/app/addons/activetasks/templates/table.html b/src/fauxton/app/addons/activetasks/templates/table.html
index ee88e7521..885cb47d4 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{%>
diff --git a/src/fauxton/app/templates/databases/newdatabase.html b/src/fauxton/app/templates/databases/newdatabase.html
index a39cd74ab..b357e0b15 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>
 
 
diff --git a/src/fauxton/app/templates/documents/all_docs_layout.html b/src/fauxton/app/templates/documents/all_docs_layout.html
index 785937ece..526c200d1 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">
diff --git a/src/fauxton/app/templates/documents/design_doc_selector.html b/src/fauxton/app/templates/documents/design_doc_selector.html
index 0cd6bdff7..457b76ce7 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>
diff --git a/src/fauxton/app/templates/documents/sidebar.html b/src/fauxton/app/templates/documents/sidebar.html
index 336946ddd..4becf93f7 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>
diff --git a/src/fauxton/app/templates/documents/view_editor.html b/src/fauxton/app/templates/documents/view_editor.html
index cd53fc750..886562545 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 &amp; Build Index</button>
             <button class="button btn-info preview">Preview</button>
             <% if (!newView) { %>
             <button class="button delete outlineGray fonticon-circle-x">Delete</button>