From 67b73242ea1d2789d284159ef39edf1c0f2e2c37 Mon Sep 17 00:00:00 2001
From: Arthur Barrett <abarrett@edx.org>
Date: Fri, 1 Mar 2013 15:11:42 -0500
Subject: [PATCH] added advanced component button with ability to specify
 components in course policy.

---
 cms/djangoapps/contentstore/views.py | 33 +++++++++++++++++++++-------
 cms/templates/unit.html              |  2 +-
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index b55dc13e58..4b925d53e0 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -66,7 +66,12 @@ from cms.djangoapps.models.settings.course_metadata import CourseMetadata
 log = logging.getLogger(__name__)
 
 
-COMPONENT_TYPES = ['customtag', 'discussion', 'html', 'problem', 'video']
+COMPONENT_TYPES = ['customtag', 'discussion', 'html', 'problem', 'video', 'advanced']
+
+# advanced/beta components that can be enabled for all courses or per-course in the policy file 
+ADVANCED_COMPONENT_TYPES = []
+ADVANCED_COMPONENT_CATEGORY = 'advanced'
+ADVANCED_COMPONENT_POLICY_KEY = 'enable_advanced_modules'
 
 # cdodge: these are categories which should not be parented, they are detached from the hierarchy
 DETACHED_CATEGORIES = ['about', 'static_tab', 'course_info']
@@ -281,15 +286,26 @@ def edit_unit(request, location):
 
     component_templates = defaultdict(list)
 
+    # check if there are any advanced modules specified in the course policy
+    advanced_component_types = list(ADVANCED_COMPONENT_TYPES)
+    course_metadata = CourseMetadata.fetch(course.location)
+    advanced_component_types.extend(course_metadata.get(ADVANCED_COMPONENT_POLICY_KEY, []))
+
     templates = modulestore().get_items(Location('i4x', 'edx', 'templates'))
     for template in templates:
-        if template.location.category in COMPONENT_TYPES:
-            component_templates[template.location.category].append((
-                template.display_name,
-                template.location.url(),
-                'markdown' in template.metadata,
-                'empty' in template.metadata
-            ))
+        component_template = ( 
+            template.display_name,
+            template.location.url(),
+            'markdown' in template.metadata,
+            'empty' in template.metadata
+        )
+        if template.location.category in COMPONENT_TYPES: 
+            component_templates[template.location.category].append(component_template)
+        elif template.location.category in advanced_component_types:
+            component_templates[ADVANCED_COMPONENT_CATEGORY].append(component_template)
+
+    # order of component types for display purposes
+    component_template_types = [type for type in COMPONENT_TYPES if type in component_templates.keys()]
 
     components = [
         component.location.url()
@@ -341,6 +357,7 @@ def edit_unit(request, location):
         'unit_location': location,
         'components': components,
         'component_templates': component_templates,
+        'component_template_types': component_template_types,
         'draft_preview_link': preview_lms_link,
         'published_preview_link': lms_link,
         'subsection': containing_subsection,
diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index c529f5863a..686aaa9ba1 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -53,7 +53,7 @@
               <div class="new-component">
                 <h5>Add New Component</h5>
                 <ul class="new-component-type">
-                  % for type in sorted(component_templates.keys()):
+                  % for type in component_template_types:
                   <li>
                     <a href="#" data-type="${type}">
                       <span class="large-template-icon large-${type}-icon"></span>