Replace unit page with the container page.

STUD-1754
2014-06-16 14:21:42 -04:00
parent 3796f8c689
commit b1eccdf2d4
67 changed files with 712 additions and 2454 deletions
--- a/cms/templates/js/mock/mock-container-page.underscore
+++ b/cms/templates/js/mock/mock-container-page.underscore
@@ -2,13 +2,14 @@

    <div class="wrapper-mast wrapper" data-location="" data-display-name="" data-category="">
        <header class="mast has-actions has-navigation">
-            <h1 class="page-header">
+            <div class="page-header">
                <small class="navigation navigation-parents subtitle">
-                    <a href="/unit/TestCourse/branch/draft/block/vertical8eb" class="navigation-link navigation-parent">Unit 1</a>
-                    <a href="#" class="navigation-link navigation-current">Test Container</a>
+                    <a href="/unit/TestCourse/branch/draft/block/vertical8eb" class="navigation-item navigation-link navigation-parent">Unit 1</a>
                </small>
-                <span class="page-header-title">Test Container</span>
-            </h1>
+                <div class="wrapper-xblock-field is-editable" data-field="display_name">
+                    <h1 class="page-header-title xblock-field-value">Test Container</h1>
+                </div>
+            </div>

            <nav class="nav-actions">
                <h3 class="sr">Page Actions</h3>
@@ -31,9 +32,6 @@
                <article class="content-primary window">
                    <section class="wrapper-xblock level-page studio-xblock-wrapper" data-locator="locator-container">
                    </section>
-                    <div class="no-container-content is-hidden">
-                        <p>This page has no content yet.</p>
-                    </div>
                    <div class="ui-loading is-hidden">
                        <p><span class="spin"><i class="icon-refresh"></i></span> <span class="copy">Loading...</span></p>
                    </div>
--- a/cms/templates/js/mock/mock-container-xblock.underscore
+++ b/cms/templates/js/mock/mock-container-xblock.underscore
@@ -10,7 +10,7 @@
    </div>
 </header>
 <article class="xblock-render">
-    <div class="xblock" data-block-type="vertical" data-locator="locator-container"
+    <div class="xblock" data-locator="locator-container"
         data-init="MockXBlock" data-runtime-class="StudioRuntime" data-runtime-version="1">
        <ol class="reorderable-container">
            <li class="studio-xblock-wrapper is-draggable" data-locator="locator-group-A">
@@ -35,7 +35,7 @@
                    </header>

                    <article class="xblock-render">
-                        <div class="xblock" data-block-type="vertical">
+                        <div class="xblock">
                            <ol class="reorderable-container">
                                <li class="studio-xblock-wrapper is-draggable" data-locator="locator-component-A1">
                                    <section class="wrapper-xblock level-element"
@@ -144,7 +144,7 @@
                    </header>

                    <article class="xblock-render">
-                        <div class="xblock" data-block-type="vertical">
+                        <div class="xblock">
                            <ol class="reorderable-container">
                                <li class="studio-xblock-wrapper is-draggable" data-locator="locator-component-B1">
                                    <section class="wrapper-xblock level-element"
--- a/cms/templates/js/mock/mock-empty-container-xblock.underscore
+++ b/cms/templates/js/mock/mock-empty-container-xblock.underscore
@@ -13,7 +13,7 @@
    </div>
 </header>
 <article class="xblock-render">
-    <div class="xblock xblock-student_view xmodule_display xmodule_VerticalModule xblock-initialized" data-runtime-class="PreviewRuntime" data-init="XBlockToXModuleShim" data-runtime-version="1" data-usage-id="i4x:;_;_AndyA;_ABT101;_vertical;_131a499ddaa3474194c1aa2eced34455" data-type="None" data-block-type="vertical">
+    <div class="xblock xblock-student_view xmodule_display xmodule_VerticalModule xblock-initialized" data-runtime-class="PreviewRuntime" data-init="XBlockToXModuleShim" data-runtime-version="1" data-usage-id="i4x:;_;_AndyA;_ABT101;_vertical;_131a499ddaa3474194c1aa2eced34455" data-type="None">
        <ol class="reorderable-container">
        </ol>
    </div>
--- a/cms/templates/js/mock/mock-unit-page-child-container.underscore
+++ b/cms/templates/js/mock/mock-unit-page-child-container.underscore
@@ -1,37 +0,0 @@
-<section class="wrapper wrapper-xblock wrapper-component-action-header nopreview" data-locator="locator-child-container">
-    <div class="component-header">
-        Test Child Container
-    </div>
-    <ul class="component-actions">
-        <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>
-    </ul>
-</section>
-<div class="xblock-header-secondary">
-    <div class="meta-info">This block contains multiple components.</div>
-    <ul class="actions-list">
-        <li class="action-item action-view">
-            <a href="/container/locator-child-container" class="action-button">
-                <span class="action-button-text">View</span>
-                <i class="icon-arrow-right"></i>
-            </a>
-        </li>
-    </ul>
-</div>
-<span data-tooltip="Drag to reorder" class="drag-handle action"></span>
--- a/cms/templates/js/mock/mock-unit-page-xblock.underscore
+++ b/cms/templates/js/mock/mock-unit-page-xblock.underscore
@@ -1,27 +0,0 @@
-<div class="wrapper wrapper-component-action-header">
-    <div class="component-header">Mock Component</div>
-    <ul class="component-actions">
-        <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 this component</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 this component</span>
-            </a>
-        </li>
-    </ul>
-</div>
-<div class="xblock xblock-student_view" data-runtime-version="1" data-usage-id="i4x:;_;_edX;_mock"
-     data-init="MockXBlock" data-runtime-class="StudioRuntime" data-block-type="mock" tabindex="0">
-    <h2>Mock Component</h2>
-</div>
--- a/cms/templates/js/mock/mock-updated-container-xblock.underscore
+++ b/cms/templates/js/mock/mock-updated-container-xblock.underscore
@@ -10,7 +10,7 @@
    </div>
 </header>
 <article class="xblock-render">
-    <div class="xblock" data-block-type="vertical" data-locator="locator-container"
+    <div class="xblock" data-locator="locator-container"
         data-init="MockXBlock" data-runtime-class="StudioRuntime" data-runtime-version="1">
        <ol class="reorderable-container">
        </ol>
--- a/cms/templates/js/mock/mock-xblock-editor-with-custom-buttons.underscore
+++ b/cms/templates/js/mock/mock-xblock-editor-with-custom-buttons.underscore
@@ -1,5 +1,5 @@
 <div class="xblock xblock-studio_view" data-runtime-version="1" data-usage-id="i4x:;_;_edX;_mock"
-     data-init="MockXBlock" data-runtime-class="StudioRuntime" data-block-type="mock" tabindex="0">
+     data-init="MockXBlock" data-runtime-class="StudioRuntime" tabindex="0">

    <div class="mock-xblock editor-with-buttons">
        <h3>Mock XBlock Editor</h3>
--- a/cms/templates/js/mock/mock-xblock-editor.underscore
+++ b/cms/templates/js/mock/mock-xblock-editor.underscore
@@ -1,5 +1,5 @@
 <div class="xblock xblock-studio_view" data-runtime-version="1" data-usage-id="i4x:;_;_edX;_mock"
-     data-init="MockXBlock" data-runtime-class="StudioRuntime" data-block-type="mock" tabindex="0">
+     data-init="MockXBlock" data-runtime-class="StudioRuntime" tabindex="0">

    <div class="mock-xblock">
        <h3>Mock XBlock Editor</h3>
--- a/cms/templates/js/mock/mock-xmodule-editor-with-custom-tabs.underscore
+++ b/cms/templates/js/mock/mock-xmodule-editor-with-custom-tabs.underscore
@@ -1,4 +1,4 @@
-<div class="xblock xblock-studio_view xmodule_edit xmodule_WrapperDescriptor" data-runtime-class="StudioRuntime" data-init="XBlockToXModuleShim" data-runtime-version="1" data-usage-id="i4x:;_;_AndyA;_ABT101;_wrapper;_wrapper_l1_poll" data-type="VerticalDescriptor" data-block-type="wrapper" tabindex="0">
+<div class="xblock xblock-studio_view xmodule_edit xmodule_WrapperDescriptor" data-runtime-class="StudioRuntime" data-init="XBlockToXModuleShim" data-runtime-version="1" data-usage-id="i4x:;_;_AndyA;_ABT101;_wrapper;_wrapper_l1_poll" data-type="VerticalDescriptor" tabindex="0">
    <div class="wrapper-comp-editor is-active" id="editor-tab" data-base-asset-url="/c4x/AndyA/ABT101/asset/">
 <section class="editor-with-tabs">
     <div class="edit-header">
--- a/cms/templates/js/mock/mock-xmodule-editor.underscore
+++ b/cms/templates/js/mock/mock-xmodule-editor.underscore
@@ -1,4 +1,4 @@
-<div class="xblock xblock-studio_view xmodule_edit xmodule_WrapperDescriptor" data-runtime-class="StudioRuntime" data-init="XBlockToXModuleShim" data-runtime-version="1" data-usage-id="i4x:;_;_AndyA;_ABT101;_wrapper;_wrapper_l1_poll" data-type="MockDescriptor" data-block-type="wrapper" tabindex="0">
+<div class="xblock xblock-studio_view xmodule_edit xmodule_WrapperDescriptor" data-runtime-class="StudioRuntime" data-init="XBlockToXModuleShim" data-runtime-version="1" data-usage-id="i4x:;_;_AndyA;_ABT101;_wrapper;_wrapper_l1_poll" data-type="MockDescriptor" tabindex="0">
    <div class="wrapper-comp-editor is-active" id="editor-tab" data-base-asset-url="/c4x/AndyA/ABT101/asset/">
    </div>
    <section class="sequence-edit">
--- a/cms/templates/js/mock/mock-xmodule-settings-only-editor.underscore
+++ b/cms/templates/js/mock/mock-xmodule-settings-only-editor.underscore
@@ -1,4 +1,4 @@
-<div class="xblock xblock-studio_view xmodule_edit xmodule_WrapperDescriptor" data-runtime-class="StudioRuntime" data-init="XBlockToXModuleShim" data-runtime-version="1" data-usage-id="i4x:;_;_AndyA;_ABT101;_wrapper;_wrapper_l1_poll" data-type="VerticalDescriptor" data-block-type="wrapper" tabindex="0">
+<div class="xblock xblock-studio_view xmodule_edit xmodule_WrapperDescriptor" data-runtime-class="StudioRuntime" data-init="XBlockToXModuleShim" data-runtime-version="1" data-usage-id="i4x:;_;_AndyA;_ABT101;_wrapper;_wrapper_l1_poll" data-type="VerticalDescriptor" tabindex="0">
    <section class="sequence-edit">
        <script id="metadata-editor-tpl" type="text/template">
            <ul class="list-input settings-list">
--- a/cms/templates/js/xblock-string-field-editor.underscore
+++ b/cms/templates/js/xblock-string-field-editor.underscore
@@ -0,0 +1,3 @@
+<div class="xblock-string-field-editor">
+    <input type="text" value="<%= value %>" class="xblock-field-input page-header-title-edit is-hidden" data-metadata-name="<%= fieldName %>">
+</div>