Minor bugfixes

cms/djangoapps/contentstore/views.py

@@ -366,7 +366,6 @@ 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,

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 component_template_types:
+                  % for type in sorted(component_templates.keys()):
                   <li>
                     <a href="#" data-type="${type}">
                       <span class="large-template-icon large-${type}-icon"></span>