Commit efe3833a by cahrens

Use display_name_with_default instead of display_name.

parent 0dbabc7a
...@@ -16,7 +16,7 @@ from django.utils.translation import ugettext as _ ...@@ -16,7 +16,7 @@ from django.utils.translation import ugettext as _
<% <%
xblock_info = { xblock_info = {
'id': str(xblock_locator), 'id': str(xblock_locator),
'display-name': xblock.display_name, 'display-name': xblock.display_name_with_default,
'category': xblock.category, 'category': xblock.category,
}; };
%> %>
...@@ -53,10 +53,10 @@ xblock_info = { ...@@ -53,10 +53,10 @@ xblock_info = {
%> %>
% if parent_url: % if parent_url:
<a href="${parent_url}" <a href="${parent_url}"
class="navigation-link navigation-parent">${parent.display_name | h}</a> class="navigation-link navigation-parent">${parent.display_name_with_default | h}</a>
% endif % endif
% endfor % endfor
<a href="#" class="navigation-link navigation-current">${xblock.display_name | h}</a> <a href="#" class="navigation-link navigation-current">${xblock.display_name_with_default | h}</a>
</small> </small>
</h1> </h1>
......
...@@ -7,7 +7,7 @@ from contentstore.views.helpers import xblock_studio_url ...@@ -7,7 +7,7 @@ from contentstore.views.helpers import xblock_studio_url
<section class="wrapper-xblock xblock-type-container level-element" data-locator="${locator}"> <section class="wrapper-xblock xblock-type-container level-element" data-locator="${locator}">
<header class="xblock-header"> <header class="xblock-header">
<div class="header-details"> <div class="header-details">
${xblock.display_name} ${xblock.display_name_with_default}
</div> </div>
<div class="header-actions"> <div class="header-actions">
<ul class="actions-list"> <ul class="actions-list">
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<i class="icon-caret-down ui-toggle-expansion"></i> <i class="icon-caret-down ui-toggle-expansion"></i>
<span class="sr">${_('Expand or Collapse')}</span> <span class="sr">${_('Expand or Collapse')}</span>
</a> </a>
<span>${xblock.display_name | h}</span> <span>${xblock.display_name_with_default | h}</span>
</div> </div>
<div class="header-actions"> <div class="header-actions">
<ul class="actions-list"> <ul class="actions-list">
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
% endif % endif
<header class="xblock-header"> <header class="xblock-header">
<div class="header-details"> <div class="header-details">
${xblock.display_name | h} ${xblock.display_name_with_default | h}
</div> </div>
<div class="header-actions"> <div class="header-actions">
<ul class="actions-list"> <ul class="actions-list">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment