Added new instructor modal.

ECOM-6391

course_discovery/apps/publisher/migrations/0030_create_switch_add_instructor_feature.py

+from django.db import migrations
+
+
+def create_switch(apps, schema_editor):
+    """Create the publisher_add_instructor_feature switch if it does not already exist."""
+    Switch = apps.get_model('waffle', 'Switch')
+    Switch.objects.get_or_create(name='publisher_add_instructor_feature', defaults={'active': False})
+
+
+def delete_switch(apps, schema_editor):
+    """Delete the publisher_add_instructor_feature switch."""
+    Switch = apps.get_model('waffle', 'Switch')
+    Switch.objects.filter(name='publisher_add_instructor_feature').delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('publisher', '0029_auto_20170119_0934'),
+        ('waffle', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RunPython(create_switch, delete_switch),
+    ]

course_discovery/apps/publisher/views.py

@@ -192,7 +192,8 @@ class CreateCourseView(mixins.LoginRequiredMixin, mixins.PublisherUserRequiredMi
             'course_form': self.course_form,
             'run_form': self.run_form,
             'seat_form': self.seat_form,
-            'publisher_hide_features_for_pilot': waffle.switch_is_active('publisher_hide_features_for_pilot')
+            'publisher_hide_features_for_pilot': waffle.switch_is_active('publisher_hide_features_for_pilot'),
+            'publisher_add_instructor_feature': waffle.switch_is_active('publisher_add_instructor_feature'),
         }
 
     def get(self, request, *args, **kwargs):

course_discovery/conf/locale/en/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-20 11:48+0500\n"
+"POT-Creation-Date: 2017-01-20 12:41+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -784,6 +784,7 @@ msgid "Save"
 msgstr ""
 
 #: templates/metadata/admin/course_run.html
+#: templates/publisher/_add_instructor_popup.html
 #: templates/publisher/course_form.html
 msgid "Cancel"
 msgstr ""
@@ -796,6 +797,60 @@ msgstr ""
 msgid "Save Course Run"
 msgstr ""
 
+#: templates/publisher/_add_instructor_popup.html
+msgid "New Instructor"
+msgstr ""
+
+#: templates/publisher/_add_instructor_popup.html
+msgid "Name"
+msgstr ""
+
+#: templates/publisher/_add_instructor_popup.html
+#: templates/publisher/add_course_form.html
+#: templates/publisher/add_courserun_form.html
+msgid "required"
+msgstr ""
+
+#: templates/publisher/_add_instructor_popup.html
+msgid "Family Name"
+msgstr ""
+
+#: templates/publisher/_add_instructor_popup.html
+#: templates/publisher/course_run_detail/_all.html
+#: templates/publisher/course_run_detail/_drupal.html
+#: templates/publisher/course_run_detail/_salesforce.html
+msgid "Title"
+msgstr ""
+
+#: templates/publisher/_add_instructor_popup.html
+#: templates/publisher/course_run_detail/_all.html
+#: templates/publisher/course_run_detail/_studio.html
+#: templates/publisher/dashboard/_preview_ready.html
+#: templates/publisher/dashboard/_published.html
+#: templates/publisher/dashboard/_studio_requests.html
+msgid "Organization"
+msgstr ""
+
+#: templates/publisher/_add_instructor_popup.html
+msgid "Bio"
+msgstr ""
+
+#: templates/publisher/_add_instructor_popup.html
+msgid "Social Links"
+msgstr ""
+
+#: templates/publisher/_add_instructor_popup.html
+msgid "optional - one per line"
+msgstr ""
+
+#: templates/publisher/_add_instructor_popup.html
+msgid "Major Works"
+msgstr ""
+
+#: templates/publisher/_add_instructor_popup.html
+msgid "Add Staff Member"
+msgstr ""
+
 #: templates/publisher/_footer.html
 msgid "Terms of Service"
 msgstr ""
@@ -1062,11 +1117,6 @@ msgid ""
 msgstr ""
 
 #: templates/publisher/add_course_form.html
-#: templates/publisher/add_courserun_form.html
-msgid "required"
-msgstr ""
-
-#: templates/publisher/add_course_form.html
 msgid "BRIEF DESCRIPTION"
 msgstr ""
 
@@ -1149,6 +1199,14 @@ msgid "Limited to the primary instructors a learner will encounter in videos"
 msgstr ""
 
 #: templates/publisher/add_course_form.html
+msgid "Add New"
+msgstr ""
+
+#: templates/publisher/add_course_form.html
+msgid "Instructor"
+msgstr ""
+
+#: templates/publisher/add_course_form.html
 msgid "SUBJECT FIELD"
 msgstr ""
 
@@ -1482,26 +1540,12 @@ msgstr ""
 #: templates/publisher/course_run_detail/_all.html
 #: templates/publisher/course_run_detail/_drupal.html
 #: templates/publisher/course_run_detail/_salesforce.html
-msgid "Title"
-msgstr ""
-
-#: templates/publisher/course_run_detail/_all.html
-#: templates/publisher/course_run_detail/_drupal.html
-#: templates/publisher/course_run_detail/_salesforce.html
 #: templates/publisher/course_run_detail/_studio.html
 msgid "Number"
 msgstr ""
 
 #: templates/publisher/course_run_detail/_all.html
 #: templates/publisher/course_run_detail/_studio.html
-#: templates/publisher/dashboard/_preview_ready.html
-#: templates/publisher/dashboard/_published.html
-#: templates/publisher/dashboard/_studio_requests.html
-msgid "Organization"
-msgstr ""
-
-#: templates/publisher/course_run_detail/_all.html
-#: templates/publisher/course_run_detail/_studio.html
 msgid "Pacing Type"
 msgstr ""
 

course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-20 11:48+0500\n"
+"POT-Creation-Date: 2017-01-20 12:41+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

course_discovery/conf/locale/eo/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-20 11:48+0500\n"
+"POT-Creation-Date: 2017-01-20 12:41+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -931,6 +931,7 @@ msgid "Save"
 msgstr "Sävé Ⱡ'σяєм ι#"
 
 #: templates/metadata/admin/course_run.html
+#: templates/publisher/_add_instructor_popup.html
 #: templates/publisher/course_form.html
 msgid "Cancel"
 msgstr "Çänçél Ⱡ'σяєм ιρѕυ#"
@@ -943,6 +944,60 @@ msgstr "Bäçk tö Prögräm Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
 msgid "Save Course Run"
 msgstr "Sävé Çöürsé Rün Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
 
+#: templates/publisher/_add_instructor_popup.html
+msgid "New Instructor"
+msgstr "Néw Ìnstrüçtör Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
+
+#: templates/publisher/_add_instructor_popup.html
+msgid "Name"
+msgstr "Nämé Ⱡ'σяєм ι#"
+
+#: templates/publisher/_add_instructor_popup.html
+#: templates/publisher/add_course_form.html
+#: templates/publisher/add_courserun_form.html
+msgid "required"
+msgstr "réqüïréd Ⱡ'σяєм ιρѕυм ∂#"
+
+#: templates/publisher/_add_instructor_popup.html
+msgid "Family Name"
+msgstr "Fämïlý Nämé Ⱡ'σяєм ιρѕυм ∂σłσя #"
+
+#: templates/publisher/_add_instructor_popup.html
+#: templates/publisher/course_run_detail/_all.html
+#: templates/publisher/course_run_detail/_drupal.html
+#: templates/publisher/course_run_detail/_salesforce.html
+msgid "Title"
+msgstr "Tïtlé Ⱡ'σяєм ιρѕ#"
+
+#: templates/publisher/_add_instructor_popup.html
+#: templates/publisher/course_run_detail/_all.html
+#: templates/publisher/course_run_detail/_studio.html
+#: templates/publisher/dashboard/_preview_ready.html
+#: templates/publisher/dashboard/_published.html
+#: templates/publisher/dashboard/_studio_requests.html
+msgid "Organization"
+msgstr "Örgänïzätïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
+
+#: templates/publisher/_add_instructor_popup.html
+msgid "Bio"
+msgstr "Bïö Ⱡ'σяєм#"
+
+#: templates/publisher/_add_instructor_popup.html
+msgid "Social Links"
+msgstr "Söçïäl Lïnks Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
+
+#: templates/publisher/_add_instructor_popup.html
+msgid "optional - one per line"
+msgstr "öptïönäl - öné pér lïné Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σ#"
+
+#: templates/publisher/_add_instructor_popup.html
+msgid "Major Works"
+msgstr "Mäjör Wörks Ⱡ'σяєм ιρѕυм ∂σłσя #"
+
+#: templates/publisher/_add_instructor_popup.html
+msgid "Add Staff Member"
+msgstr "Àdd Stäff Mémßér Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
+
 #: templates/publisher/_footer.html
 msgid "Terms of Service"
 msgstr "Térms öf Sérvïçé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
@@ -1275,11 +1330,6 @@ msgstr ""
 "döllärs (mïnïmüm öf $49) Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
 
 #: templates/publisher/add_course_form.html
-#: templates/publisher/add_courserun_form.html
-msgid "required"
-msgstr "réqüïréd Ⱡ'σяєм ιρѕυм ∂#"
-
-#: templates/publisher/add_course_form.html
 msgid "BRIEF DESCRIPTION"
 msgstr "BRÌÉF DÉSÇRÌPTÌÖN Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмє#"
 
@@ -1390,6 +1440,14 @@ msgstr ""
 " ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя #"
 
 #: templates/publisher/add_course_form.html
+msgid "Add New"
+msgstr "Àdd Néw Ⱡ'σяєм ιρѕυм #"
+
+#: templates/publisher/add_course_form.html
+msgid "Instructor"
+msgstr "Ìnstrüçtör Ⱡ'σяєм ιρѕυм ∂σłσ#"
+
+#: templates/publisher/add_course_form.html
 msgid "SUBJECT FIELD"
 msgstr "SÛBJÉÇT FÌÉLD Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#"
 
@@ -1813,26 +1871,12 @@ msgstr "Stätüs Ⱡ'σяєм ιρѕυ#"
 #: templates/publisher/course_run_detail/_all.html
 #: templates/publisher/course_run_detail/_drupal.html
 #: templates/publisher/course_run_detail/_salesforce.html
-msgid "Title"
-msgstr "Tïtlé Ⱡ'σяєм ιρѕ#"
-
-#: templates/publisher/course_run_detail/_all.html
-#: templates/publisher/course_run_detail/_drupal.html
-#: templates/publisher/course_run_detail/_salesforce.html
 #: templates/publisher/course_run_detail/_studio.html
 msgid "Number"
 msgstr "Nümßér Ⱡ'σяєм ιρѕυ#"
 
 #: templates/publisher/course_run_detail/_all.html
 #: templates/publisher/course_run_detail/_studio.html
-#: templates/publisher/dashboard/_preview_ready.html
-#: templates/publisher/dashboard/_published.html
-#: templates/publisher/dashboard/_studio_requests.html
-msgid "Organization"
-msgstr "Örgänïzätïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
-
-#: templates/publisher/course_run_detail/_all.html
-#: templates/publisher/course_run_detail/_studio.html
 msgid "Pacing Type"
 msgstr "Päçïng Týpé Ⱡ'σяєм ιρѕυм ∂σłσя #"
 

course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-20 11:48+0500\n"
+"POT-Creation-Date: 2017-01-20 12:41+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

course_discovery/static/js/publisher/publisher.js

@@ -35,6 +35,19 @@ $(document).ready(function(){
     $('#id_is_xseries').click( function(e){
         $('#xseries_name_group').toggle(this.checked);
     });
+    $('#add-new-instructor').click(function(e){
+        $('#addInstructorModal').show();
+        $('body').addClass('stopScroll');
+    });
+    $(document).click(function(e){
+        var modal = $('#addInstructorModal');
+        if (event.target == modal[0]) {
+            closeModal(e, modal);
+        }
+    });
+    $('.closeModal').click(function (e) {
+        closeModal(e, $('#addInstructorModal'));
+    });
 });
 
 $(document).on('change', '#id_organization', function (e) {
@@ -63,3 +76,21 @@ function loadAdminUsers(org_id) {
         }
     });
 }
+
+function loadSelectedImage(input) {
+    if (input.files && input.files[0]) {
+        var reader = new FileReader();
+
+        reader.onload = function (e) {
+            $('.select-image').attr('src', e.target.result);
+        };
+
+        reader.readAsDataURL(input.files[0]);
+    }
+}
+
+function closeModal(event, modal) {
+    event.preventDefault();
+    modal.hide();
+    $('body').removeClass('stopScroll');
+}

course_discovery/static/sass/publisher/course_form.scss

@@ -42,3 +42,81 @@
   padding-bottom: 2px;
   padding-top: 2px;
 }
+
+#add-new-instructor {
+    @include padding(20px, 10px, 20px, 10px);
+    background: white;
+    border: 2px dashed gray;
+}
+
+.modal {
+    @include left(0);
+    display: none;
+    position: fixed;
+    z-index: 1;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    background-color: rgb(0, 0, 0);
+    background-color: rgba(0, 0, 0, 0.4);
+
+    .modal-content {
+        @include padding(20px, 20px, 20px, 20px);
+        background-color: #fefefe;
+        margin: 5% auto;
+        border: 20px solid rgba(215, 215, 215, 1);
+        width: 50%;
+        min-width: 380px;
+
+        .staff-image-icon {
+            cursor: pointer;
+            position: relative;
+            width: 150px;
+            height: 150px;
+            display: block;
+            margin: auto;
+        }
+
+        img.select-image {
+            border: 1px dashed gray;
+            border-radius: 50%;
+            width: 150px;
+            height: 150px;
+        }
+
+        #staffImageSelect {
+            @include left(0);
+            cursor: pointer;
+            outline: none;
+            position: absolute;
+            top: 0;
+            width: 150px;
+            height: 150px;
+            overflow: hidden;
+            opacity: 0;
+            z-index: 1000;
+        }
+
+        input, textarea, select, .read-only-field {
+            margin-bottom: 20px;
+            display: block;
+        }
+
+        .field-label {
+            font-weight: bold;
+        }
+
+        .new-instructor-heading {
+            font-weight: 700;
+        }
+
+        .actions {
+            @include text-align(right);
+        }
+    }
+}
+
+.stopScroll{
+    overflow: hidden;
+}

course_discovery/static/sass/publisher/publisher.scss

@@ -427,6 +427,10 @@ select {
   font-size: 12px;
 }
 
+.optional {
+  font-weight: normal;
+}
+
 .checkbox-inline {
   ul {
     @include margin-left(0);
@@ -778,6 +782,7 @@ select {
 
 .btn-save {
     background-color: #169BD5;
+    border-color: #169BD5;
     border-radius: 5px;
     padding: 10px;
 }

course_discovery/templates/publisher/_add_instructor_popup.html

+{% load i18n %}
+
+<div id="addInstructorModal" class="modal">
+    <div class="modal-content">
+        <h2 class="hd-2 emphasized new-instructor-heading">{% trans "New Instructor" %}</h2>
+        <form class="form">
+            <fieldset class="form-group">
+                <div class="staff-image-icon">
+                    <img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" class="select-image" />
+                    <input name="staff-image" id="staffImageSelect" type="file" accept="image/*" onchange="loadSelectedImage(this);">
+                </div>
+                <label class="field-label" for="given-name">{% trans "Name" %}:
+                    <span class="required">* {% trans "required" %}</span>
+                </label>
+                <input class="field-input input-text" type="text" id="given-name" name="given-name" />
+
+                <label class="field-label" for="family-name">{% trans "Family Name" %}:
+                    <span class="required">* {% trans "required" %}</span>
+                </label>
+                <input class="field-input input-text" type="text" id="family-name" name="family-name" />
+
+                <label class="field-label" for="title">{% trans "Title" %}:
+                    <span class="required">* {% trans "required" %}</span>
+                </label>
+                <input class="field-input input-text" type="text" id="title" name="title" />
+
+                <label class="field-label">{% trans "Organization" %}:
+                    <span class="required">* {% trans "required" %}</span>
+                </label>
+                {% if course_form.organization.field.queryset.all.count > 1 %}
+                    {{ course_form.organization }}
+                {% else %}
+                    {% with course_form.organization.field.queryset|first as organization %}
+                        <span class="read-only-field">{{ organization.name }}</span>
+                        <input id="id_organization" name="organization" type="hidden" value="{{ organization.id }}">
+                    {% endwith %}
+                {% endif %}
+
+                <label class="field-label" for="bio">{% trans "Bio" %}:
+                    <span class="required">* {% trans "required" %}</span>
+                </label>
+                <textarea class="field-textarea input-textarea textarea-medium textarea-block" id="bio" name="bio"></textarea>
+
+                <label class="field-label" for="socialLinks">{% trans "Social Links" %}:
+                    <span class="optional">({% trans "optional - one per line" %} )</span>
+                </label>
+                <textarea class="field-textarea input-textarea textarea-medium textarea-block" id="socialLinks" name="social-links"></textarea>
+
+                <label class="field-label" for="majorWorks">{% trans "Major Works" %}:
+                    <span class="optional">({% trans "optional - one per line" %} )</span>
+                </label>
+                <textarea class="field-textarea input-textarea textarea-medium textarea-block" id="majorWorks" name="major-works"></textarea>
+            </fieldset>
+            <div class="actions">
+                <a class="btn-cancel closeModal" href="#">{% trans "Cancel" %}</a>
+                <button class="btn-brand btn-base btn-save" type="button">{% trans "Add Staff Member" %}</button>
+            </div>
+        </form>
+    </div>
+</div>

course_discovery/templates/publisher/add_course_form.html

@@ -323,6 +323,9 @@
                     </div>
                     <div class="col col-6">
                         {{ run_form.staff }}
+                        {% if publisher_add_instructor_feature %}
+                            <button type="button" id="add-new-instructor">{% trans "Add New" %}<br>{% trans "Instructor" %}</button>
+                        {% endif %}
                     </div>
                 </div>
 
@@ -513,6 +516,9 @@
 </form>
 </div>
 </div>
+{% if publisher_add_instructor_feature %}
+    {% include "publisher/_add_instructor_popup.html" %}
+{% endif %}
 {% endblock %}
 
 {% block extra_js %}