{"action":"created","comment":{"url":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/comments/23191948","id":23191948,"diff_hunk":"@@ -892,6 +892,222 @@ section.instructor-dashboard-content-2 {\n       }\n     }\n   }\n+\n+\n+  .email-lists-management {\n+\n+    .wrapper-email-select {\n+      background-color: $light-gray;\n+      padding: ($baseline/2);\n+    }\n+\n+    #single-email-selector {\n+      width: 50%;\n+      display: block;\n+      margin: ($baseline/4) 0;\n+      padding: ($baseline/4);\n+    }\n+\n+    .email-list-container {\n+      margin-bottom: ($baseline*1.5);\n+\n+      .email-list-widget {\n+\n+        .header {\n+          @include box-sizing(border-box);\n+          @include border-top-radius(3);\n+          position: relative;\n+          padding: ($baseline/2);\n+          background-color: #efefef;\n+          border: 1px solid $light-gray;\n+          display: none; // hiding to prefer dropdown as header\n+        }\n+\n+        .title {\n+          @include font-size(16);\n+        }\n+\n+        .label {\n+          @extend %t-copy-sub1;\n+          color: $lighter-base-font-color;\n+        }\n+\n+        .info {\n+          @include box-sizing(border-box);\n+          padding: ($baseline/2);\n+\n+          border: 1px solid $light-gray;\n+          color: $lighter-base-font-color;\n+          line-height: 1.3em;\n+          font-size: .85em;\n+        }\n+      }\n+    }\n+  }\n+\n+  .email-list {\n+    @include box-sizing(border-box);\n+    background-color: $light-gray;\n+    margin: ($baseline/4) 0;\n+    padding: ($baseline/4);\n+\n+    table {\n+      width: 100%;\n+    }\n+\n+    thead {\n+      background-color: #696969;\n+    }\n+\n+    tr {\n+      border-bottom: 1px solid $light-gray;\n+      text-transform: capitalize;\n+    }\n+\n+    .or {\n+      background-color: #778899;\n+    }\n+\n+    .and {\n+      background-color: #8FBC8F;\n+    }\n+\n+    .not {\n+      background-color: #DB7093;\n+    }\n+\n+    .problem_specific, .section_specific {\n+      display: none;\n+    }\n+\n+    .active {\n+      display: table-cell;\n+    }\n+\n+    .addingQuery {\n+      text-align: right;\n+    }\n+\n+    #addQuery {\n+      @include idashbutton($blue);\n+      font-size: 12px;\n+      position: relative;\n+      right: $baseline;\n+    }\n+\n+    #incompleteMessage {\n+      padding-right: 40px;\n+      color: #C71585;\n+    }\n+\n+    .remove {\n+      color: $white\n+    }\n+\n+    .remove, .deleteSaved {\n+      cursor: pointer;\n+      text-align: center;\n+      &:hover, &:focus {\n+        color: $alert-color;\n+      }\n+    }\n+\n+    .deleteSaved {\n+      color: $black\n+    }\n+\n+\n+    .loadQuery {\n+      color: $black;\n+      cursor: pointer;\n+      text-align: center;\n+\n+      &:hover, &:focus {\n+        color: $blue;\n+      }\n+    }\n+\n+    .tableCaption {\n+      text-align: left;\n+      padding: 10px;\n+      padding-left: 5px;\n+      padding-bottom: 10px;\n+      font-weight: bold;\n+    }\n+\n+    thead {\n+      color:white;\n+    }\n+\n+    td {\n+      @extend %t-copy-sub1;\n+      vertical-align: middle;\n+      word-wrap: break-word;\n+      padding: ($baseline/2) ($baseline/4);\n+      border-left: 1px solid $light-gray;\n+      border-right: 1px solid $light-gray;\n+    }\n+\n+    #estimated {\n+      color: #1E90FF;\n+      font-size: 20px;\n+      padding-bottom: 10px;\n+    }\n+\n+    .subsection {\n+      text-indent: 10px;\n+    }\n+\n+    .working {\n+      color: $black;\n+    }\n+\n+    .bottom-email {\n+      @include box-sizing(border-box);\n+      @include border-bottom-radius(3);\n+      position: relative;\n+      padding: ($baseline/2*2);\n+      margin-top: -1px;\n+      border: 1px solid $light-gray;\n+      background-color: #efefef;\n+      box-shadow: inset #bbb 0 1 1 0;","path":"lms/static/sass/course/instructor/_instructor_2.scss","position":182,"original_position":182,"commit_id":"ea94939cb1cf94b1e882fd85ff2b587f0432dc0c","original_commit_id":"ea94939cb1cf94b1e882fd85ff2b587f0432dc0c","user":{"login":"stvstnfrd","id":7300975,"avatar_url":"https://avatars.githubusercontent.com/u/7300975?v=3","gravatar_id":"","url":"https://api.github.com/users/stvstnfrd","html_url":"https://github.com/stvstnfrd","followers_url":"https://api.github.com/users/stvstnfrd/followers","following_url":"https://api.github.com/users/stvstnfrd/following{/other_user}","gists_url":"https://api.github.com/users/stvstnfrd/gists{/gist_id}","starred_url":"https://api.github.com/users/stvstnfrd/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/stvstnfrd/subscriptions","organizations_url":"https://api.github.com/users/stvstnfrd/orgs","repos_url":"https://api.github.com/users/stvstnfrd/repos","events_url":"https://api.github.com/users/stvstnfrd/events{/privacy}","received_events_url":"https://api.github.com/users/stvstnfrd/received_events","type":"User","site_admin":false},"body":"Sorry if there was a miscommunication about the use of units in CSS. The units (px, em, %) should be excluded if the value is 0. For any non-zero value, the unit _must_ be attached.","created_at":"2015-01-19T22:41:51Z","updated_at":"2015-01-19T22:41:51Z","html_url":"https://github.com/Stanford-Online/edx-platform/pull/169#discussion_r23191948","pull_request_url":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/169","_links":{"self":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/comments/23191948"},"html":{"href":"https://github.com/Stanford-Online/edx-platform/pull/169#discussion_r23191948"},"pull_request":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/169"}}},"pull_request":{"url":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/169","id":25466502,"html_url":"https://github.com/Stanford-Online/edx-platform/pull/169","diff_url":"https://github.com/Stanford-Online/edx-platform/pull/169.diff","patch_url":"https://github.com/Stanford-Online/edx-platform/pull/169.patch","issue_url":"https://api.github.com/repos/Stanford-Online/edx-platform/issues/169","number":169,"state":"open","locked":false,"title":"Caijim/emaillist","user":{"login":"caijim","id":461386,"avatar_url":"https://avatars.githubusercontent.com/u/461386?v=3","gravatar_id":"","url":"https://api.github.com/users/caijim","html_url":"https://github.com/caijim","followers_url":"https://api.github.com/users/caijim/followers","following_url":"https://api.github.com/users/caijim/following{/other_user}","gists_url":"https://api.github.com/users/caijim/gists{/gist_id}","starred_url":"https://api.github.com/users/caijim/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/caijim/subscriptions","organizations_url":"https://api.github.com/users/caijim/orgs","repos_url":"https://api.github.com/users/caijim/repos","events_url":"https://api.github.com/users/caijim/events{/privacy}","received_events_url":"https://api.github.com/users/caijim/received_events","type":"User","site_admin":false},"body":"Backend+Frontend code for Email List tool on instructor dashboard page (under membership tab)\r\n\r\nA few things:\r\n1) Javascript is not clean. Any pointers would be greatly and graciously appreciated\r\n2) In the urls file, I had to double up on some urls like the following just so I could call reverse(..) on them (see instructor_dashboard.py) so I could use the parameterized version in js. If I don't add the non-param'd version the page doesn't load. What is the way around this?\r\n\r\nurl(r'^get_single_query/(?P<inclusion>\\S{2,3})/(?P<queryType>(Section|Problem))/(?P<stateType>\\S+)/(?P<stateId>\\S+)$', 'instructor.views.api.get_single_query', name=\"get_single_query\"),\r\n(r'^get_single_query',\r\n  'instructor.views.api.get_single_query', name=\"get_single_query\")\r\n\r\n\r\nThanks, and sorry for the huge changelist\r\n\r\ntagging @jbau @stvstnfrd @kluo  for reviewing\r\n\r\nStyle changed applied and functionality has been tested. Still need to write unit tests and address some existing comments. Thanks so far!\r\n","created_at":"2014-12-04T01:18:20Z","updated_at":"2015-01-19T22:41:51Z","closed_at":null,"merged_at":null,"merge_commit_sha":"7dbc9d36ac33fbdfe53fda98502c3595ca283e85","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/169/commits","review_comments_url":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/169/comments","review_comment_url":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/comments/{number}","comments_url":"https://api.github.com/repos/Stanford-Online/edx-platform/issues/169/comments","statuses_url":"https://api.github.com/repos/Stanford-Online/edx-platform/statuses/ea94939cb1cf94b1e882fd85ff2b587f0432dc0c","head":{"label":"Stanford-Online:caijim/emaillist","ref":"caijim/emaillist","sha":"ea94939cb1cf94b1e882fd85ff2b587f0432dc0c","user":{"login":"Stanford-Online","id":2159497,"avatar_url":"https://avatars.githubusercontent.com/u/2159497?v=3","gravatar_id":"","url":"https://api.github.com/users/Stanford-Online","html_url":"https://github.com/Stanford-Online","followers_url":"https://api.github.com/users/Stanford-Online/followers","following_url":"https://api.github.com/users/Stanford-Online/following{/other_user}","gists_url":"https://api.github.com/users/Stanford-Online/gists{/gist_id}","starred_url":"https://api.github.com/users/Stanford-Online/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Stanford-Online/subscriptions","organizations_url":"https://api.github.com/users/Stanford-Online/orgs","repos_url":"https://api.github.com/users/Stanford-Online/repos","events_url":"https://api.github.com/users/Stanford-Online/events{/privacy}","received_events_url":"https://api.github.com/users/Stanford-Online/received_events","type":"Organization","site_admin":false},"repo":{"id":11616657,"name":"edx-platform","full_name":"Stanford-Online/edx-platform","owner":{"login":"Stanford-Online","id":2159497,"avatar_url":"https://avatars.githubusercontent.com/u/2159497?v=3","gravatar_id":"","url":"https://api.github.com/users/Stanford-Online","html_url":"https://github.com/Stanford-Online","followers_url":"https://api.github.com/users/Stanford-Online/followers","following_url":"https://api.github.com/users/Stanford-Online/following{/other_user}","gists_url":"https://api.github.com/users/Stanford-Online/gists{/gist_id}","starred_url":"https://api.github.com/users/Stanford-Online/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Stanford-Online/subscriptions","organizations_url":"https://api.github.com/users/Stanford-Online/orgs","repos_url":"https://api.github.com/users/Stanford-Online/repos","events_url":"https://api.github.com/users/Stanford-Online/events{/privacy}","received_events_url":"https://api.github.com/users/Stanford-Online/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Stanford-Online/edx-platform","description":"the edX learning management system (LMS) and course authoring tool, Studio","fork":true,"url":"https://api.github.com/repos/Stanford-Online/edx-platform","forks_url":"https://api.github.com/repos/Stanford-Online/edx-platform/forks","keys_url":"https://api.github.com/repos/Stanford-Online/edx-platform/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Stanford-Online/edx-platform/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Stanford-Online/edx-platform/teams","hooks_url":"https://api.github.com/repos/Stanford-Online/edx-platform/hooks","issue_events_url":"https://api.github.com/repos/Stanford-Online/edx-platform/issues/events{/number}","events_url":"https://api.github.com/repos/Stanford-Online/edx-platform/events","assignees_url":"https://api.github.com/repos/Stanford-Online/edx-platform/assignees{/user}","branches_url":"https://api.github.com/repos/Stanford-Online/edx-platform/branches{/branch}","tags_url":"https://api.github.com/repos/Stanford-Online/edx-platform/tags","blobs_url":"https://api.github.com/repos/Stanford-Online/edx-platform/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Stanford-Online/edx-platform/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Stanford-Online/edx-platform/git/refs{/sha}","trees_url":"https://api.github.com/repos/Stanford-Online/edx-platform/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Stanford-Online/edx-platform/statuses/{sha}","languages_url":"https://api.github.com/repos/Stanford-Online/edx-platform/languages","stargazers_url":"https://api.github.com/repos/Stanford-Online/edx-platform/stargazers","contributors_url":"https://api.github.com/repos/Stanford-Online/edx-platform/contributors","subscribers_url":"https://api.github.com/repos/Stanford-Online/edx-platform/subscribers","subscription_url":"https://api.github.com/repos/Stanford-Online/edx-platform/subscription","commits_url":"https://api.github.com/repos/Stanford-Online/edx-platform/commits{/sha}","git_commits_url":"https://api.github.com/repos/Stanford-Online/edx-platform/git/commits{/sha}","comments_url":"https://api.github.com/repos/Stanford-Online/edx-platform/comments{/number}","issue_comment_url":"https://api.github.com/repos/Stanford-Online/edx-platform/issues/comments/{number}","contents_url":"https://api.github.com/repos/Stanford-Online/edx-platform/contents/{+path}","compare_url":"https://api.github.com/repos/Stanford-Online/edx-platform/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Stanford-Online/edx-platform/merges","archive_url":"https://api.github.com/repos/Stanford-Online/edx-platform/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Stanford-Online/edx-platform/downloads","issues_url":"https://api.github.com/repos/Stanford-Online/edx-platform/issues{/number}","pulls_url":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls{/number}","milestones_url":"https://api.github.com/repos/Stanford-Online/edx-platform/milestones{/number}","notifications_url":"https://api.github.com/repos/Stanford-Online/edx-platform/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Stanford-Online/edx-platform/labels{/name}","releases_url":"https://api.github.com/repos/Stanford-Online/edx-platform/releases{/id}","created_at":"2013-07-23T19:05:46Z","updated_at":"2015-01-16T08:47:14Z","pushed_at":"2015-01-19T21:04:43Z","git_url":"git://github.com/Stanford-Online/edx-platform.git","ssh_url":"git@github.com:Stanford-Online/edx-platform.git","clone_url":"https://github.com/Stanford-Online/edx-platform.git","svn_url":"https://github.com/Stanford-Online/edx-platform","homepage":"http://code.edx.org/","size":366563,"stargazers_count":9,"watchers_count":9,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":2,"mirror_url":null,"open_issues_count":51,"forks":2,"open_issues":51,"watchers":9,"default_branch":"master"}},"base":{"label":"Stanford-Online:master","ref":"master","sha":"17888bb993e7d35b322a73362d1e8e05b95d1c93","user":{"login":"Stanford-Online","id":2159497,"avatar_url":"https://avatars.githubusercontent.com/u/2159497?v=3","gravatar_id":"","url":"https://api.github.com/users/Stanford-Online","html_url":"https://github.com/Stanford-Online","followers_url":"https://api.github.com/users/Stanford-Online/followers","following_url":"https://api.github.com/users/Stanford-Online/following{/other_user}","gists_url":"https://api.github.com/users/Stanford-Online/gists{/gist_id}","starred_url":"https://api.github.com/users/Stanford-Online/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Stanford-Online/subscriptions","organizations_url":"https://api.github.com/users/Stanford-Online/orgs","repos_url":"https://api.github.com/users/Stanford-Online/repos","events_url":"https://api.github.com/users/Stanford-Online/events{/privacy}","received_events_url":"https://api.github.com/users/Stanford-Online/received_events","type":"Organization","site_admin":false},"repo":{"id":11616657,"name":"edx-platform","full_name":"Stanford-Online/edx-platform","owner":{"login":"Stanford-Online","id":2159497,"avatar_url":"https://avatars.githubusercontent.com/u/2159497?v=3","gravatar_id":"","url":"https://api.github.com/users/Stanford-Online","html_url":"https://github.com/Stanford-Online","followers_url":"https://api.github.com/users/Stanford-Online/followers","following_url":"https://api.github.com/users/Stanford-Online/following{/other_user}","gists_url":"https://api.github.com/users/Stanford-Online/gists{/gist_id}","starred_url":"https://api.github.com/users/Stanford-Online/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Stanford-Online/subscriptions","organizations_url":"https://api.github.com/users/Stanford-Online/orgs","repos_url":"https://api.github.com/users/Stanford-Online/repos","events_url":"https://api.github.com/users/Stanford-Online/events{/privacy}","received_events_url":"https://api.github.com/users/Stanford-Online/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Stanford-Online/edx-platform","description":"the edX learning management system (LMS) and course authoring tool, Studio","fork":true,"url":"https://api.github.com/repos/Stanford-Online/edx-platform","forks_url":"https://api.github.com/repos/Stanford-Online/edx-platform/forks","keys_url":"https://api.github.com/repos/Stanford-Online/edx-platform/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Stanford-Online/edx-platform/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Stanford-Online/edx-platform/teams","hooks_url":"https://api.github.com/repos/Stanford-Online/edx-platform/hooks","issue_events_url":"https://api.github.com/repos/Stanford-Online/edx-platform/issues/events{/number}","events_url":"https://api.github.com/repos/Stanford-Online/edx-platform/events","assignees_url":"https://api.github.com/repos/Stanford-Online/edx-platform/assignees{/user}","branches_url":"https://api.github.com/repos/Stanford-Online/edx-platform/branches{/branch}","tags_url":"https://api.github.com/repos/Stanford-Online/edx-platform/tags","blobs_url":"https://api.github.com/repos/Stanford-Online/edx-platform/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Stanford-Online/edx-platform/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Stanford-Online/edx-platform/git/refs{/sha}","trees_url":"https://api.github.com/repos/Stanford-Online/edx-platform/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Stanford-Online/edx-platform/statuses/{sha}","languages_url":"https://api.github.com/repos/Stanford-Online/edx-platform/languages","stargazers_url":"https://api.github.com/repos/Stanford-Online/edx-platform/stargazers","contributors_url":"https://api.github.com/repos/Stanford-Online/edx-platform/contributors","subscribers_url":"https://api.github.com/repos/Stanford-Online/edx-platform/subscribers","subscription_url":"https://api.github.com/repos/Stanford-Online/edx-platform/subscription","commits_url":"https://api.github.com/repos/Stanford-Online/edx-platform/commits{/sha}","git_commits_url":"https://api.github.com/repos/Stanford-Online/edx-platform/git/commits{/sha}","comments_url":"https://api.github.com/repos/Stanford-Online/edx-platform/comments{/number}","issue_comment_url":"https://api.github.com/repos/Stanford-Online/edx-platform/issues/comments/{number}","contents_url":"https://api.github.com/repos/Stanford-Online/edx-platform/contents/{+path}","compare_url":"https://api.github.com/repos/Stanford-Online/edx-platform/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Stanford-Online/edx-platform/merges","archive_url":"https://api.github.com/repos/Stanford-Online/edx-platform/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Stanford-Online/edx-platform/downloads","issues_url":"https://api.github.com/repos/Stanford-Online/edx-platform/issues{/number}","pulls_url":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls{/number}","milestones_url":"https://api.github.com/repos/Stanford-Online/edx-platform/milestones{/number}","notifications_url":"https://api.github.com/repos/Stanford-Online/edx-platform/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Stanford-Online/edx-platform/labels{/name}","releases_url":"https://api.github.com/repos/Stanford-Online/edx-platform/releases{/id}","created_at":"2013-07-23T19:05:46Z","updated_at":"2015-01-16T08:47:14Z","pushed_at":"2015-01-19T21:04:43Z","git_url":"git://github.com/Stanford-Online/edx-platform.git","ssh_url":"git@github.com:Stanford-Online/edx-platform.git","clone_url":"https://github.com/Stanford-Online/edx-platform.git","svn_url":"https://github.com/Stanford-Online/edx-platform","homepage":"http://code.edx.org/","size":366563,"stargazers_count":9,"watchers_count":9,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":2,"mirror_url":null,"open_issues_count":51,"forks":2,"open_issues":51,"watchers":9,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/169"},"html":{"href":"https://github.com/Stanford-Online/edx-platform/pull/169"},"issue":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/issues/169"},"comments":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/issues/169/comments"},"review_comments":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/169/comments"},"review_comment":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/169/commits"},"statuses":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/statuses/ea94939cb1cf94b1e882fd85ff2b587f0432dc0c"}}}}