diff options
author | Christian Hogan <github@infliction.org> | 2014-05-02 11:59:16 -0400 |
---|---|---|
committer | Alexander Shorin <kxepal@apache.org> | 2014-05-05 20:35:16 +0400 |
commit | d1bc0a9cfe6e95b166131829b1b154027731a5d8 (patch) | |
tree | 5540086a031460b85bc13ec31949e61e5def20f9 | |
parent | c2196197a9d067f6ce01cd0292b17002b971276b (diff) | |
download | couchdb-d1bc0a9cfe6e95b166131829b1b154027731a5d8.tar.gz |
COUCHDB-2233 - Correct HTML interpolation instances in documents.1.6.0
Further updating instances of <%= and to <%- within documents to correctly handle HTML interpolation.
Tested for regression in
- 34.0.1847.131
- Safari 7.0.2
Signed-off-by: Alexander Shorin <kxepal@apache.org>
6 files changed, 26 insertions, 26 deletions
diff --git a/src/fauxton/app/addons/fauxton/templates/api_bar.html b/src/fauxton/app/addons/fauxton/templates/api_bar.html index 4fb597172..8b6142311 100644 --- a/src/fauxton/app/addons/fauxton/templates/api_bar.html +++ b/src/fauxton/app/addons/fauxton/templates/api_bar.html @@ -20,11 +20,11 @@ the License. <div class="input-prepend input-append"> <span class="add-on"> API reference - <a href="<%=getDocUrl(documentation)%>" target="_blank"> + <a href="<%-getDocUrl(documentation)%>" target="_blank"> <i class="icon-question-sign"></i> </a> </span> - <input type="text" class="input-xxlarge" value="<%= endpoint %>"> - <a href="<%= endpoint %>" target="_blank" class="btn">Show me</a> + <input type="text" class="input-xxlarge" value="<%- endpoint %>"> + <a href="<%- endpoint %>" target="_blank" class="btn">Show me</a> </div> </div> diff --git a/src/fauxton/app/addons/fauxton/templates/breadcrumbs.html b/src/fauxton/app/addons/fauxton/templates/breadcrumbs.html index 026db89fb..18961b7be 100644 --- a/src/fauxton/app/addons/fauxton/templates/breadcrumbs.html +++ b/src/fauxton/app/addons/fauxton/templates/breadcrumbs.html @@ -15,10 +15,10 @@ the License. <ul class="breadcrumb"> <% _.each(_.initial(crumbs), function(crumb) { %> <li> - <a href="#<%= crumb.link %>"><%= crumb.name %></a> + <a href="#<%- crumb.link %>"><%- crumb.name %></a> <span class="divider fonticon fonticon-carrot"> </span> </li> <% }); %> <% var last = _.last(crumbs) || {name: ''} %> - <li class="active"><%= last.name %></li> + <li class="active"><%- last.name %></li> </ul> diff --git a/src/fauxton/app/addons/fauxton/templates/footer.html b/src/fauxton/app/addons/fauxton/templates/footer.html index 593c11f38..591b5a80f 100644 --- a/src/fauxton/app/addons/fauxton/templates/footer.html +++ b/src/fauxton/app/addons/fauxton/templates/footer.html @@ -12,4 +12,4 @@ License for the specific language governing permissions and limitations under the License. --> -<p>Fauxton on <a href="http://couchdb.apache.org/">Apache CouchDB</a> <%=version%></p> +<p>Fauxton on <a href="http://couchdb.apache.org/">Apache CouchDB</a> <%-version%></p> diff --git a/src/fauxton/app/addons/fauxton/templates/nav_bar.html b/src/fauxton/app/addons/fauxton/templates/nav_bar.html index 9ba24f4ab..756411181 100644 --- a/src/fauxton/app/addons/fauxton/templates/nav_bar.html +++ b/src/fauxton/app/addons/fauxton/templates/nav_bar.html @@ -25,10 +25,10 @@ the License. <ul id="nav-links" class="nav pull-right"> <% _.each(navLinks, function(link) { %> <% if (link.view) {return;} %> - <li data-nav-name= "<%= link.title %>" > - <a href="<%= link.href %>"> - <i class="<%= link.icon %> fonticon"></i> - <%= link.title %> + <li data-nav-name= "<%- link.title %>" > + <a href="<%- link.href %>"> + <i class="<%- link.icon %> fonticon"></i> + <%- link.title %> </a> </li> <% }); %> @@ -38,7 +38,7 @@ the License. <ul id="bottom-nav-links" class="nav"> <li data-nav-name= "Documentation"> - <a href="<%=getDocUrl('docs')%>" target="_blank"> + <a href="<%-getDocUrl('docs')%>" target="_blank"> <i class="fonticon-bookmark fonticon"></i> Documentation </a> @@ -47,10 +47,10 @@ the License. <% _.each(bottomNavLinks, function(link) { %> <% if (link.view) {return;} %> - <li data-nav-name= "<%= link.title %>"> - <a href="<%= link.href %>"> - <i class="<%= link.icon %> fonticon"></i> - <%= link.title %> + <li data-nav-name= "<%- link.title %>"> + <a href="<%- link.href %>"> + <i class="<%- link.icon %> fonticon"></i> + <%- link.title %> </a> </li> <% }); %> @@ -59,10 +59,10 @@ the License. <ul id="footer-nav-links" class="nav"> <% _.each(footerNavLinks, function(link) { %> <% if (link.view) {return;} %> - <li data-nav-name= "<%= link.title %>"> - <a href="<%= link.href %>"> - <i class="<%= link.icon %> fonticon"></i> - <%= link.title %> + <li data-nav-name= "<%- link.title %>"> + <a href="<%- link.href %>"> + <i class="<%- link.icon %> fonticon"></i> + <%- link.title %> </a> </li> <% }); %> diff --git a/src/fauxton/app/addons/fauxton/templates/notification.html b/src/fauxton/app/addons/fauxton/templates/notification.html index ca8a9033a..1cf121b29 100644 --- a/src/fauxton/app/addons/fauxton/templates/notification.html +++ b/src/fauxton/app/addons/fauxton/templates/notification.html @@ -12,7 +12,7 @@ License for the specific language governing permissions and limitations under the License. --> -<div class="alert alert-<%= type %>"> +<div class="alert alert-<%- type %>"> <button type="button" class="close" data-dismiss="alert">×</button> - <%= msg %> + <%- msg %> </div> diff --git a/src/fauxton/app/addons/fauxton/templates/pagination.html b/src/fauxton/app/addons/fauxton/templates/pagination.html index 19dfc8cfd..0674c225a 100644 --- a/src/fauxton/app/addons/fauxton/templates/pagination.html +++ b/src/fauxton/app/addons/fauxton/templates/pagination.html @@ -15,17 +15,17 @@ the License. <div class="pagination pagination-centered"> <ul> <% if (page > 1) { %> - <li> <a href="<%= urlFun(page-1) %>">«</a></li> + <li> <a href="<%- urlFun(page-1) %>">«</a></li> <% } else { %> - <li class="disabled"> <a href="<%= urlFun(page) %>">«</a></li> + <li class="disabled"> <a href="<%- urlFun(page) %>">«</a></li> <% } %> <% _.each(_.range(1, totalPages+1), function(i) { %> - <li <% if (page == i) { %>class="active"<% } %>> <a href="<%= urlFun(i) %>"><%= i %></a></li> + <li <% if (page == i) { %>class="active"<% } %>> <a href="<%- urlFun(i) %>"><%- i %></a></li> <% }) %> <% if (page < totalPages) { %> - <li><a href="<%= urlFun(page+1) %>">»</a></li> + <li><a href="<%- urlFun(page+1) %>">»</a></li> <% } else { %> - <li class="disabled"> <a href="<%= urlFun(page) %>">»</a></li> + <li class="disabled"> <a href="<%- urlFun(page) %>">»</a></li> <% } %> </ul> </div> |