Merge pull request openedx#477 from WeJie/fix-underscore

fix(underscore): move underscore to theme did not work
xavierchan · Jul 2, 2019 · bdb5ac8 · bdb5ac8
2 parents 78b9b18 + 9fd4ab6
commit bdb5ac8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/lms/templates/fields/field_order_history.underscore b/lms/templates/fields/field_order_history.underscore
@@ -1,7 +1,13 @@
 <div class="field u-field-order" <% if (receiptUrl) { %> role="group" aria-labelledby="order-title-<%- orderId %>" <% } else { %> aria-hidden="true" <% } %>>
     <span class="u-field-order-number"><span class="sr"><%- gettext('Order Number') %>: </span><%- orderId %></span>
     <span class="u-field-order-date"><span class="sr"><%- gettext('Date Placed') %>: </span><%- orderDate %></span>
-    <span class="u-field-order-price"><span class="sr"><%- gettext('Cost') %>: </span><% if (!isNaN(parseFloat(totalPrice))) { %>$<% } %><%- totalPrice %></span>
+    <span class="u-field-order-price">
+        <span class="sr"> <%- gettext('Cost') %>: </span>
+        <% if (!isNaN(parseFloat(totalPrice))) { %>
+        <%= currency.symbol %>
+        <% } %>
+        <%- totalPrice %>
+    </span>
     <span class="u-field-order-link">
         <% if (receiptUrl) { %>
             <a class="u-field-link" target="_blank" href="<%- receiptUrl %>"><%- gettext('Order Details') %><span class="sr"> <%- gettext('for') %> <%- orderId %></span></a>
@@ -11,7 +17,13 @@
         <div class="field u-field-order-lines">
             <span class="u-field-order-number"><span class="sr"><%- gettext('Product Name') %>: </span><%- item.title %></span>
             <span class="u-field-order-date"><span class="sr"><%- gettext('Date Placed') %>: </span><%- orderDate %></span>
-            <span class="u-field-order-price"><span class="sr"><%- gettext('Cost') %>: </span><% if (!isNaN(parseFloat(item.line_price_excl_tax))) { %>$<% } %><%- item.line_price_excl_tax %></span>
+            <span class="u-field-order-price">
+                <span class="sr"><%- gettext('Cost') %>: </span>
+                <% if (!isNaN(parseFloat(item.line_price_excl_tax))) { %>
+                <%= currency.symbol %>
+                <% } %>
+                <%- item.line_price_excl_tax %>
+            </span>
         </div>
     <% }); %>
 </div>
diff --git a/lms/templates/student_account/login.underscore b/lms/templates/student_account/login.underscore
@@ -16,7 +16,7 @@
         <h2><%- gettext("Sign in to continue learning") %></h2>
     <% } %>
     <p>
-        <%- gettext("You already have an edX account with your {enterprise_name} email address.").replace(/{enterprise_name}/g, context.enterpriseName) %>
+        <%- gettext("You already have an EliteMBA account with your {enterprise_name} email address.").replace(/{enterprise_name}/g, context.enterpriseName) %>
         <% if (context.syncLearnerProfileData) {
             %><%- gettext("Going forward, your account information will be updated and maintained by {enterprise_name}.").replace(/{enterprise_name}/g, context.enterpriseName) %>
         <% } %>
@@ -27,7 +27,7 @@
     <h2><%- gettext("Sign In") %></h2>
 <% } %>
 
-<form id="login" class="login-form" tabindex="-1" method="POST">
+<form id="login" class="login-form" autocomplet="off" tabindex="-1" method="POST">
 
     <p class="sr">
         <% if ( context.providers.length > 0 && !context.currentProvider || context.hasSecondaryProviders ) { %>