Fauxton: do not underline help icons on hover

Addtionally, use <%- where no <%= is needed

7 files changed, 26 insertions, 22 deletions

diff --git a/src/fauxton/app/addons/documents/templates/design_doc_selector.html b/src/fauxton/app/addons/documents/templates/design_doc_selector.html
index b8f8b3f4b..769ca3bdd 100644
--- a/src/fauxton/app/addons/documents/templates/design_doc_selector.html
+++ b/src/fauxton/app/addons/documents/templates/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">Save to 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 class="help-link" href="<%-getDocUrl('design_doc')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
   <select id="ddoc">
     <optgroup label="Select a document">
       <option value="new-doc">New document</option>
@@ -30,6 +30,6 @@ the License.
 <div id="new-ddoc-section" class="span5" style="display:none">
   <label class="control-label" for="new-ddoc"> _design/ </label>
   <div class="controls">
-    <input type="text" id="new-ddoc" placeholder="newDesignDoc">
+    <input type="text" id="new-ddoc" placeholder="newDesignDoc" />
   </div>
 </div>
diff --git a/src/fauxton/app/addons/documents/templates/view_editor.html b/src/fauxton/app/addons/documents/templates/view_editor.html
index e08e36e67..7ba6e23d1 100644
--- a/src/fauxton/app/addons/documents/templates/view_editor.html
+++ b/src/fauxton/app/addons/documents/templates/view_editor.html
@@ -34,13 +34,13 @@ the License.
           </div>
 
           <div class="control-group">
-            <label for="index-name">Index name <a 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" />
+            <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">
-            <label for="map-function">Map function <a href="<%=getDocUrl('map_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
+            <label for="map-function">Map function <a class="help-link" href="<%-getDocUrl('map_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
             <% if (newView) { %>
             <div class="js-editor" id="map-function"><%= langTemplates.map %></div>
             <% } else { %>
@@ -51,12 +51,12 @@ the License.
 
 
           <div class="control-group">
-            <label for="reduce-function-selector">Reduce (optional) <a href="<%=getDocUrl('reduce_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
+            <label for="reduce-function-selector">Reduce (optional) <a class="help-link" 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>
+              <option value="" <%- !reduceFunStr ? 'selected="selected"' : '' %>>None</option>
               <% _.each(["_sum", "_count", "_stats"], function(reduce) { %>
-              <option value="<%= reduce %>" <% if (reduce == reduceFunStr) { %>selected<% } %>><%= reduce %></option>
+              <option value="<%- reduce %>" <% if (reduce == reduceFunStr) { %>selected<% } %>><%= reduce %></option>
               <% }) %>
               <option value="CUSTOM" <% if (isCustomReduce) { %>selected<% } %>>Custom Reduce function</option>
             </select>
@@ -65,7 +65,7 @@ the License.
           <div class="control-group reduce-function">
             <label for="reduce-function">Custom Reduce function</label>
             <% if (newView) { %>
-            <div class="js-editor" id="reduce-function"><%= langTemplates.reduce %></div>
+            <div class="js-editor" id="reduce-function"><%- langTemplates.reduce %></div>
             <% } else { %>
             <div class="js-editor" id="reduce-function"><%- ddoc.get('views')[viewName].reduce %></div>
             <button class="beautify beautify_reduce btn btn-primary btn-large hide beautify-tooltip" type="button" data-toggle="tooltip" title="Reformat your minified code to make edits to it.">beautify this code</button>
diff --git a/src/fauxton/app/addons/fauxton/templates/api_bar.html b/src/fauxton/app/addons/fauxton/templates/api_bar.html
index 8b6142311..ecd92f1d4 100644
--- a/src/fauxton/app/addons/fauxton/templates/api_bar.html
+++ b/src/fauxton/app/addons/fauxton/templates/api_bar.html
@@ -13,14 +13,14 @@ the License.
 -->
 
 <button class="btn btn-primary pull-right api-url-btn">
-  API URL 
+  API URL
   <i class="fonticon-plus icon"></i>
 </button>
 <div class="api-navbar" style="display: none">
     <div class="input-prepend input-append">
       <span class="add-on">
         API reference
-        <a href="<%-getDocUrl(documentation)%>" target="_blank">
+        <a class="help-link" href="<%-getDocUrl(documentation)%>" target="_blank">
           <i class="icon-question-sign"></i>
         </a>
       </span>
diff --git a/src/fauxton/app/addons/permissions/templates/item.html b/src/fauxton/app/addons/permissions/templates/item.html
index 490cff481..4682dcb33 100644
--- a/src/fauxton/app/addons/permissions/templates/item.html
+++ b/src/fauxton/app/addons/permissions/templates/item.html
@@ -12,6 +12,6 @@ License for the specific language governing permissions and limitations under
 the License.
 -->
 
-<span> <%= item %> </span>
+<span> <%- item %> </span>
 <button type="button" class="pull-right close">&times;</button>
 
diff --git a/src/fauxton/app/addons/permissions/templates/section.html b/src/fauxton/app/addons/permissions/templates/section.html
index fe228f5ff..69b9e53b6 100644
--- a/src/fauxton/app/addons/permissions/templates/section.html
+++ b/src/fauxton/app/addons/permissions/templates/section.html
@@ -12,35 +12,35 @@ License for the specific language governing permissions and limitations under
 the License.
 -->
 <header class="page-header">
-<h3> <%= (section) %> </h3>
-<p class="help"> <%= help %> <a href="<%-getDocUrl('database_permission')%>" target="_blank"><i class="icon-question-sign"> </i> </a></p>
+<h3> <%- section %> </h3>
+<p class="help"> <%- help %> <a class="help-link" href="<%-getDocUrl('database_permission')%>" target="_blank"><i class="icon-question-sign"> </i> </a></p>
 </header>
 
 <div class="row-fluid">
   <div class="span6">
     <header>
       <h4> Users </h4>
-      <p>Specify users who will have <%= section %> access to this database.</p>
+      <p>Specify users who will have <%- section %> access to this database.</p>
     </header>
     <form class="permission-item-form form-inline">
-      <input data-section="<%= section %>" data-type="names" type="text" class="item input-small" placeholder="Add Name">
+      <input data-section="<%- section %>" data-type="names" type="text" class="item input-small" placeholder="Add Name">
       <button type="submit" class="btn btn-success"><i class="icon fonticon-circle-plus"></i> Add Name</button>
     </form>
-    <ul class="clearfix unstyled permission-items span10" id="<%= (section) %>-items-names">
+    <ul class="clearfix unstyled permission-items span10" id="<%- section %>-items-names">
     </ul>
   </div>
   <div class="span6">
     <header>
       <h4> Roles </h4>
-      <p>All users under the following role(s) will have <%= section %> access.</p>
+      <p>All users under the following role(s) will have <%- section %> access.</p>
     </header>
 
 
     <form class="permission-item-form form-inline">
-      <input data-section="<%= section %>" data-type="roles" type="text" class="item input-small" placeholder="Add Role">
+      <input data-section="<%- section %>" data-type="roles" type="text" class="item input-small" placeholder="Add Role">
       <button type="submit" class="btn btn-success"><i class="icon fonticon-circle-plus"></i> Add Role</button>
     </form>
-    <ul class="unstyled permission-items span10" id="<%= (section) %>-items-roles">
+    <ul class="unstyled permission-items span10" id="<%- (section) %>-items-roles">
     </ul>
   </div>
 </div>
diff --git a/src/fauxton/app/addons/replication/templates/form.html b/src/fauxton/app/addons/replication/templates/form.html
index 342a4fd9a..99e2d3d5a 100644
--- a/src/fauxton/app/addons/replication/templates/form.html
+++ b/src/fauxton/app/addons/replication/templates/form.html
@@ -22,7 +22,7 @@ the License.
 			<div class="from_local local_option">
 				<select id="from_name" name="source">
 					<% _.each( databases, function( db, i ){ %>
-					   <option value="<%=db.name%>" <% if(selectedDB == db.name){%>selected<%}%> ><%=db.name%></option>
+					   <option value="<%- db.name %>" <% if(selectedDB == db.name){%>selected<%}%> ><%- db.name %></option>
 					<% }); %>
 				</select>
 			</div>
@@ -63,7 +63,7 @@ the License.
 
 			<label for="createTarget">
 				<input type="checkbox" name="create_target" value="true" id="createTarget">
-				Create Target <a href="<%-getDocUrl('replication_doc')%>" target="_blank"><i class="icon-question-sign" rel="tooltip" title="Create the target database"></i></a>
+				Create Target <a class="help-link" href="<%-getDocUrl('replication_doc')%>" target="_blank"><i class="icon-question-sign" rel="tooltip" title="Create the target database"></i></a>
 			</label>
 		</div>
 
diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less
index ba80b5b76..aee3429df 100644
--- a/src/fauxton/assets/less/fauxton.less
+++ b/src/fauxton/assets/less/fauxton.less
@@ -262,6 +262,10 @@ label {
   font-size: 12px;
 }
 
+a.help-link:hover {
+  text-decoration: none;
+}
+
 input[type=text].error {
   border: red 1px solid;
 }