cd862b3253
Conflicts: cms/djangoapps/contentstore/tests/test_contentstore.py cms/djangoapps/contentstore/views/component.py cms/djangoapps/contentstore/views/item.py cms/djangoapps/contentstore/views/preview.py cms/djangoapps/contentstore/views/tests/test_container.py cms/static/js/spec/views/unit_spec.js cms/static/js/utils/module.js cms/templates/container.html cms/templates/studio_vertical_wrapper.html cms/templates/studio_xblock_wrapper.html common/djangoapps/student/views.py lms/templates/notes.html lms/templates/textannotation.html lms/templates/videoannotation.html
77 lines
3.1 KiB
HTML
77 lines
3.1 KiB
HTML
<%! from django.utils.translation import ugettext as _ %>
|
|
|
|
<<<<<<< HEAD
|
|
% if xblock.location != xblock_context['root_xblock'].location:
|
|
<% section_class = "level-nesting" if xblock.has_children else "level-element" %>
|
|
<section class="wrapper-xblock ${section_class}" data-locator="${xblock.location}" data-display-name="${xblock.display_name_with_default | h}" data-category="${xblock.category | h}" data-course-key="${xblock.location.course_key}">
|
|
=======
|
|
% if not is_root:
|
|
% if is_reorderable:
|
|
<li class="studio-xblock-wrapper is-draggable" data-locator="${locator}">
|
|
% else:
|
|
<div class="studio-xblock-wrapper" data-locator="${locator}">
|
|
% endif
|
|
|
|
<%
|
|
section_class = "level-nesting" if xblock.has_children else "level-element"
|
|
collapsible_class = "is-collapsible" if xblock.has_children else ""
|
|
%>
|
|
<section class="wrapper-xblock ${section_class} ${collapsible_class}">
|
|
>>>>>>> edx/master
|
|
% endif
|
|
|
|
<header class="xblock-header">
|
|
<div class="header-details">
|
|
% if xblock.has_children:
|
|
<a href="#" data-tooltip="${_('Expand or Collapse')}" class="action expand-collapse collapse">
|
|
<i class="icon-caret-down ui-toggle-expansion"></i>
|
|
<span class="sr">${_('Expand or Collapse')}</span>
|
|
</a>
|
|
% endif
|
|
<span>${xblock.display_name_with_default | h}</span>
|
|
</div>
|
|
<div class="header-actions">
|
|
<ul class="actions-list">
|
|
% if not xblock_context['read_only']:
|
|
% if not xblock.has_children:
|
|
<li class="action-item action-edit">
|
|
<a href="#" class="edit-button action-button">
|
|
<i class="icon-pencil"></i>
|
|
<span class="action-button-text">${_("Edit")}</span>
|
|
</a>
|
|
</li>
|
|
<li class="action-item action-duplicate">
|
|
<a href="#" data-tooltip="${_("Duplicate")}" class="duplicate-button action-button">
|
|
<i class="icon-copy"></i>
|
|
<span class="sr">${_("Duplicate")}</span>
|
|
</a>
|
|
</li>
|
|
<li class="action-item action-delete">
|
|
<a href="#" data-tooltip="${_("Delete")}" class="delete-button action-button">
|
|
<i class="icon-trash"></i>
|
|
<span class="sr">${_("Delete")}</span>
|
|
</a>
|
|
</li>
|
|
% endif
|
|
% if not is_root and is_reorderable:
|
|
<li class="action-item action-drag">
|
|
<span data-tooltip="${_('Drag to reorder')}" class="drag-handle action"></span>
|
|
</li>
|
|
% endif
|
|
% endif
|
|
</ul>
|
|
</div>
|
|
</header>
|
|
<article class="xblock-render">
|
|
${content}
|
|
</article>
|
|
|
|
% if not is_root:
|
|
</section>
|
|
% if is_reorderable:
|
|
</li>
|
|
% else:
|
|
</div>
|
|
% endif
|
|
% endif
|