begin refactoring code

cms/static/js/views/components/add_xblock.js

@@ -19,13 +19,8 @@ define(['jquery', 'underscore', 'gettext', 'js/views/baseview', 'common/js/compo
                 BaseView.prototype.initialize.call(this, options);
                 that = this;
                 this.template = this.loadTemplate('add-xblock-component');
-                this.nudgeTemplate = this.loadTemplate('add-xblock-component-nudge');
                 this.model.set({number_children: $('.level-element').length});
                 this.model.set({overrideNudge: false});
-                // this.model.on('change:number_children', function(model){
-                //     console.log('number of children changed!');
-                //     console.log(model.get('number_children'));
-                // }, this.model);
                 this.model.on('change:number_children', this.render, this);
                 this.model.on('change:overrideNudge', this.render, this);
             },
@@ -34,18 +29,17 @@ define(['jquery', 'underscore', 'gettext', 'js/views/baseview', 'common/js/compo
                 this.model.set({overrideNudge: true});
             },
 
-            renderNudge: function() {
-                this.$el.html(this.nudgeTemplate());
-            },
-
-            renderNormal: function() {
-                var that = this;
+            render: function() {
+                var that = this,
+                    numberChildren = this.model.get('number_children'),
+                    overrideNudge = this.model.get('overrideNudge');
                 this.$el.html(this.template({
-                    numberChildren: that.model.get('number_children'),
+                    numberChildren: numberChildren,
                     isVertical: that.model.isVertical(),
                     parentId: that.model.get('ancestor_info').ancestors[0].get('id'),
                     defaultNewName: that.model.get('display_name'),
-                    overrideNudge: that.model.get('overrideNudge')
+                    overrideNudge: overrideNudge,
+                    showComponentButtons: (numberChildren < 4 || overrideNudge)
                 }));
                 this.collection.each(
                     function(componentModel) {
@@ -60,15 +54,6 @@ define(['jquery', 'underscore', 'gettext', 'js/views/baseview', 'common/js/compo
                 );
             },
 
-            render: function() {
-                this.renderNormal();
-                // if (this.model.get('number_children') > 3) {
-                //     this.renderNudge();
-                // } else {
-                //     this.renderNormal();
-                // }
-            },
-
             showComponentTemplates: function(event) {
                 var type;
                 event.preventDefault();
@@ -109,8 +94,6 @@ define(['jquery', 'underscore', 'gettext', 'js/views/baseview', 'common/js/compo
 
             addNewUnit: function(event) {
                 var $target = $(event.currentTarget);
-                console.log($target);
-                    // category = $target.data('category');
                 event.preventDefault();
                 XBlockViewUtils.addXBlock($target).done(function(locator) {
                     ViewUtils.redirect('/container/' + locator + '?action=new')

cms/templates/js/add-xblock-component.underscore

 <div class="new-component">
     <h5><%= gettext("Add New Component") %></h5>
-    <p>Learner engagement is generally higher when units have fewer components. <a href="https://partners.edx.org/" target="_blank">Read more.</a></p>
-    <% if (numberChildren < 4 || overrideNudge) { %>
+    <p><%= gettext("Learning engagement is optimized when units have 2-4 components.") %> <a href="https://partners.edx.org/" target="_blank"><%= gettext("Read more.") %></a></p>
+    <% if (showComponentButtons) { %>
     <ul class="new-component-type">
 
     </ul>
-    <% } if (numberChildren >= 4) { %>
-    <p>This unit already contains <%= numberChildren %> components. Sylvia demands that start a new unit.</p>
+    <% } if (numberChildren > 3) { %>
+    <p>This unit already contains <%= numberChildren %> components. Sylvia demands that you start a new unit.</p>
 
     <% } %>
 
@@ -25,7 +25,7 @@
         </button>
     <% } %>
 
-    <% if (numberChildren > 3 && !overrideNudge) { %>
+    <% if (!showComponentButtons) { %>
         <button class="override-button">Thwart Sylvia</button>
     <% } %>