Make separate links for lms_preview and lms as needed

cms/djangoapps/contentstore/utils.py

 from django.conf import settings
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
-from xmodule.modulestore.draft import DRAFT
 from xmodule.modulestore.exceptions import ItemNotFoundError
 
 
@@ -35,13 +34,14 @@ def get_course_location_for_item(location):
     return location
 
 
-def get_lms_link_for_item(location):
+def get_lms_link_for_item(location, preview=False):
     location = Location(location)
     if settings.LMS_BASE is not None:
-        lms_link = "{lms_base}/courses/{course_id}/jump_to/{location}".format(
+        lms_link = "//{preview}{lms_base}/courses/{course_id}/jump_to/{location}".format(
+            preview='preview.' if preview else '',
             lms_base=settings.LMS_BASE,
             # TODO: These will need to be changed to point to the particular instance of this problem in the particular course
-            course_id = modulestore().get_containing_courses(location)[0].id,
+            course_id=modulestore().get_containing_courses(location)[0].id,
             location=location,
         )
     else:

cms/djangoapps/contentstore/views.py

@@ -188,6 +188,7 @@ def edit_subsection(request, location):
             break
 
     lms_link = get_lms_link_for_item(location)
+    preview_link = get_lms_link_for_item(location, preview=True)
 
     # make sure that location references a 'sequential', otherwise return BadRequest
     if item.location.category != 'sequential':
@@ -214,7 +215,8 @@ def edit_subsection(request, location):
                                'context_course': course,
                                'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty'),
                                'lms_link': lms_link,
-                               'parent_item' : parent,
+                               'preview_link': preview_link,
+                               'parent_item': parent,
                                'policy_metadata' : policy_metadata
                                })
 
@@ -240,8 +242,8 @@ def edit_unit(request, location):
             course.location.course == item.location.course):
             break
 
-    # The non-draft location
-    lms_link = get_lms_link_for_item(item.location._replace(revision=None))
+    lms_link = get_lms_link_for_item(item.location)
+    preview_lms_link = get_lms_link_for_item(item.location, preview=True)
 
     component_templates = defaultdict(list)
 
@@ -282,7 +284,7 @@ def edit_unit(request, location):
         'unit_location': location,
         'components': components,
         'component_templates': component_templates,
-        'draft_preview_link': lms_link,
+        'draft_preview_link': preview_lms_link,
         'published_preview_link': lms_link,
         'subsection': containing_subsection,
         'section': containing_section,

cms/envs/dev.py

@@ -53,7 +53,7 @@ DATABASES = {
     }
 }
 
-LMS_BASE = "http://localhost:8000"
+LMS_BASE = "localhost:8000"
 
 REPOS = {
     'edx4edx': {

cms/static/sass/_unit.scss

@@ -310,7 +310,7 @@
     }
   }
 
-  .preview-button {
+  .preview-button, .view-button {
     @include white-button;
     margin-bottom: 10px;
   }
@@ -325,7 +325,8 @@
 
   .save-button,
   .preview-button,
-  .publish-button {
+  .publish-button,
+  .view-button {
     font-size: 11px;
     margin-top: 10px;
     padding: 6px 15px 8px;
@@ -427,17 +428,15 @@
 }
 
 .edit-state-draft {
-  .visibility {
+  .visibility,
+  .edit-draft-message,
+  .view-button {
     display: none;
   }
 
   .published-alert {
     display: block;
   }
-
-  .edit-draft-message {
-    display: none;
-  }
 }
 
 .edit-state-public {
@@ -446,7 +445,8 @@
   .component-actions,
   .new-component-item,
   #published-alert,
-  .publish-draft-message {
+  .publish-draft-message,
+  .preview-button {
     display: none;
   }
 
@@ -463,7 +463,8 @@
   #delete-draft,
   #publish-draft,
   #published-alert,
-  #create-draft, {
+  #create-draft,
+  .view-button {
     display: none;
   }
 }

cms/templates/edit_subsection.html

@@ -89,7 +89,8 @@
     </div>
     <div class="row unit-actions">
       <a href="#" class="save-button save-subsection" data-id="${subsection.location}">Save</a>
-	  <a href="${lms_link}" target="_blank" class="preview-button">Preview</a>
+      <a href="${preview_link}" target="_blank" class="preview-button">Preview Drafts</a>
+      <a href="${lms_link}" target="_blank" class="preview-button">View Live</a>
     </div>
       </div>
     </div>

cms/templates/unit.html

@@ -91,6 +91,7 @@
               <a id="save-draft" href="#" class="save-button">Save Draft</a>
               <a id="delete-draft" href="#" class="save-button">Delete Draft</a>
               <a href="${draft_preview_link}" target="_blank" class="preview-button">Preview</a>
+              <a href="${published_preview_link}" target="_blank" class="view-button">View Live</a>
             </div>
           </div>
         </div>

cms/templates/widgets/header.html

@@ -13,7 +13,7 @@
         <li><a href="${reverse('static_pages', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, coursename=ctx_loc.name))}" id='pages-tab'>Pages</a></li>
         <li><a href="${reverse('asset_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" id='assets-tab'>Assets</a></li>
         <li><a href="${reverse('manage_users', kwargs=dict(location=ctx_loc))}" id='users-tab'>Users</a></li>
-        <li><a href="${reverse('import_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" id='import-tab' class="wip-box">Import</a></li>
+        <li><a href="${reverse('import_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" id='import-tab'>Import</a></li>
       </ul>
       % endif
     </div>