GitHub PullRequestReviewCommentEvent at 2014-08-14 01:35:00
Repository: edx-platform
Actor: lduarte1991
Payload: {"action":"created","comment":{"url":"https://api.github.com/repos/edx/edx-platform/pulls/comments/16217490","id":16217490,"diff_hunk":"@@ -339,6 +339,18 @@\n             'css/vendor/jquery.qtip.min.css',\n             'js/vendor/markitup/skins/simple/style.css',\n             'js/vendor/markitup/sets/wiki/style.css',\n+            'css/vendor/ova/annotator.css',\n+            'css/vendor/ova/edx-annotator.css',\n+            'css/vendor/ova/video-js.min.css',\n+            'css/vendor/ova/rangeslider.css',\n+            'css/vendor/ova/share-annotator.css',\n+            'css/vendor/ova/richText-annotator.css',\n+            'css/vendor/ova/tags-annotator.css',\n+            'css/vendor/ova/flagging-annotator.css',\n+            'css/vendor/ova/diacritic-annotator.css',\n+            'css/vendor/ova/grouping-annotator.css',\n+            'css/vendor/ova/ova.css',\n+            'js/vendor/ova/catch/css/main.css'","path":"cms/envs/common.py","position":15,"original_position":15,"commit_id":"2b9b5fb6513f4329411a5bace15ddeda49d2fc46","original_commit_id":"2b9b5fb6513f4329411a5bace15ddeda49d2fc46","user":{"login":"lduarte1991","id":6320787,"avatar_url":"https://avatars.githubusercontent.com/u/6320787?v=2","gravatar_id":"bc37d92e816ed0434fbc44dcbdb2fc41","url":"https://api.github.com/users/lduarte1991","html_url":"https://github.com/lduarte1991","followers_url":"https://api.github.com/users/lduarte1991/followers","following_url":"https://api.github.com/users/lduarte1991/following{/other_user}","gists_url":"https://api.github.com/users/lduarte1991/gists{/gist_id}","starred_url":"https://api.github.com/users/lduarte1991/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lduarte1991/subscriptions","organizations_url":"https://api.github.com/users/lduarte1991/orgs","repos_url":"https://api.github.com/users/lduarte1991/repos","events_url":"https://api.github.com/users/lduarte1991/events{/privacy}","received_events_url":"https://api.github.com/users/lduarte1991/received_events","type":"User","site_admin":false},"body":"Actually the reason i brought it up was because I think that i can make the CSS be loaded on a per component basis. So instead of adding it to cms/templates/base.html, I can add it to the individual templates/textannotation.html and the similar ones for video and image. I'll show you when i rebase and you can decide whether you want me to not do that. ","created_at":"2014-08-14T01:35:00Z","updated_at":"2014-08-14T01:35:00Z","html_url":"https://github.com/edx/edx-platform/pull/4823#discussion_r16217490","pull_request_url":"https://api.github.com/repos/edx/edx-platform/pulls/4823","_links":{"self":{"href":"https://api.github.com/repos/edx/edx-platform/pulls/comments/16217490"},"html":{"href":"https://github.com/edx/edx-platform/pull/4823#discussion_r16217490"},"pull_request":{"href":"https://api.github.com/repos/edx/edx-platform/pulls/4823"}}},"pull_request":{"url":"https://api.github.com/repos/edx/edx-platform/pulls/4823","id":19755185,"html_url":"https://github.com/edx/edx-platform/pull/4823","diff_url":"https://github.com/edx/edx-platform/pull/4823.diff","patch_url":"https://github.com/edx/edx-platform/pull/4823.patch","issue_url":"https://api.github.com/repos/edx/edx-platform/issues/4823","number":4823,"state":"open","locked":false,"title":"Annotation Tools: Adding Annotator to CMS","user":{"login":"lduarte1991","id":6320787,"avatar_url":"https://avatars.githubusercontent.com/u/6320787?v=2","gravatar_id":"bc37d92e816ed0434fbc44dcbdb2fc41","url":"https://api.github.com/users/lduarte1991","html_url":"https://github.com/lduarte1991","followers_url":"https://api.github.com/users/lduarte1991/followers","following_url":"https://api.github.com/users/lduarte1991/following{/other_user}","gists_url":"https://api.github.com/users/lduarte1991/gists{/gist_id}","starred_url":"https://api.github.com/users/lduarte1991/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lduarte1991/subscriptions","organizations_url":"https://api.github.com/users/lduarte1991/orgs","repos_url":"https://api.github.com/users/lduarte1991/repos","events_url":"https://api.github.com/users/lduarte1991/events{/privacy}","received_events_url":"https://api.github.com/users/lduarte1991/received_events","type":"User","site_admin":false},"body":"**Background:** The newest update to Studio exposed a bug and made it a codebreaker. The bug consisted of Annotator not being loaded into the CMS. This PR adds the appropriate items to requirejs to be loaded in the CMS.\r\n\r\n**Studio Update:** I added the appropriate CSS files to the pipeline. I added the files to requirejs in base.html. I made sure that tinymce is loaded via the STATIC_URL variable since it's different between CMS and LMS. Finally I added an if condition. If Annotator is not already loaded (i.e. undefined), it means that it is being called upon by Studio in which case it will run the require on the appropriate configuration script (i.e. ova.js or osda.js) and load all the dependencies. Unless I misunderstood how requirejs works, this should stop it from being loaded on every page, but rather only on the pages that load \"ova\" and \"osda.\" \r\n\r\n**LMS Update:** None.\r\n\r\n**Testing:** Here's the [tarball](https://www.dropbox.com/s/r684ber7z4ddqtc/2014_T4.DPRfFs.tar.gz). Now in Studio if you go into any of the units you should be able to see the component instead of just \"Loading...\" and Annotator should exist which means you should be able to view the video, read the text, and view the image from Studio now. ","created_at":"2014-08-13T21:41:00Z","updated_at":"2014-08-14T01:35:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":"38c684c7e0993f50f7a1b4980c62feabae584f96","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/edx/edx-platform/pulls/4823/commits","review_comments_url":"https://api.github.com/repos/edx/edx-platform/pulls/4823/comments","review_comment_url":"https://api.github.com/repos/edx/edx-platform/pulls/comments/{number}","comments_url":"https://api.github.com/repos/edx/edx-platform/issues/4823/comments","statuses_url":"https://api.github.com/repos/edx/edx-platform/statuses/2b9b5fb6513f4329411a5bace15ddeda49d2fc46","head":{"label":"lduarte1991:lduarte-harvardx-pr19","ref":"lduarte-harvardx-pr19","sha":"2b9b5fb6513f4329411a5bace15ddeda49d2fc46","user":{"login":"lduarte1991","id":6320787,"avatar_url":"https://avatars.githubusercontent.com/u/6320787?v=2","gravatar_id":"bc37d92e816ed0434fbc44dcbdb2fc41","url":"https://api.github.com/users/lduarte1991","html_url":"https://github.com/lduarte1991","followers_url":"https://api.github.com/users/lduarte1991/followers","following_url":"https://api.github.com/users/lduarte1991/following{/other_user}","gists_url":"https://api.github.com/users/lduarte1991/gists{/gist_id}","starred_url":"https://api.github.com/users/lduarte1991/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lduarte1991/subscriptions","organizations_url":"https://api.github.com/users/lduarte1991/orgs","repos_url":"https://api.github.com/users/lduarte1991/repos","events_url":"https://api.github.com/users/lduarte1991/events{/privacy}","received_events_url":"https://api.github.com/users/lduarte1991/received_events","type":"User","site_admin":false},"repo":{"id":19076508,"name":"edx-platform","full_name":"lduarte1991/edx-platform","owner":{"login":"lduarte1991","id":6320787,"avatar_url":"https://avatars.githubusercontent.com/u/6320787?v=2","gravatar_id":"bc37d92e816ed0434fbc44dcbdb2fc41","url":"https://api.github.com/users/lduarte1991","html_url":"https://github.com/lduarte1991","followers_url":"https://api.github.com/users/lduarte1991/followers","following_url":"https://api.github.com/users/lduarte1991/following{/other_user}","gists_url":"https://api.github.com/users/lduarte1991/gists{/gist_id}","starred_url":"https://api.github.com/users/lduarte1991/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lduarte1991/subscriptions","organizations_url":"https://api.github.com/users/lduarte1991/orgs","repos_url":"https://api.github.com/users/lduarte1991/repos","events_url":"https://api.github.com/users/lduarte1991/events{/privacy}","received_events_url":"https://api.github.com/users/lduarte1991/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/lduarte1991/edx-platform","description":"the edX learning management system (LMS) and course authoring tool, Studio","fork":true,"url":"https://api.github.com/repos/lduarte1991/edx-platform","forks_url":"https://api.github.com/repos/lduarte1991/edx-platform/forks","keys_url":"https://api.github.com/repos/lduarte1991/edx-platform/keys{/key_id}","collaborators_url":"https://api.github.com/repos/lduarte1991/edx-platform/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/lduarte1991/edx-platform/teams","hooks_url":"https://api.github.com/repos/lduarte1991/edx-platform/hooks","issue_events_url":"https://api.github.com/repos/lduarte1991/edx-platform/issues/events{/number}","events_url":"https://api.github.com/repos/lduarte1991/edx-platform/events","assignees_url":"https://api.github.com/repos/lduarte1991/edx-platform/assignees{/user}","branches_url":"https://api.github.com/repos/lduarte1991/edx-platform/branches{/branch}","tags_url":"https://api.github.com/repos/lduarte1991/edx-platform/tags","blobs_url":"https://api.github.com/repos/lduarte1991/edx-platform/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/lduarte1991/edx-platform/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/lduarte1991/edx-platform/git/refs{/sha}","trees_url":"https://api.github.com/repos/lduarte1991/edx-platform/git/trees{/sha}","statuses_url":"https://api.github.com/repos/lduarte1991/edx-platform/statuses/{sha}","languages_url":"https://api.github.com/repos/lduarte1991/edx-platform/languages","stargazers_url":"https://api.github.com/repos/lduarte1991/edx-platform/stargazers","contributors_url":"https://api.github.com/repos/lduarte1991/edx-platform/contributors","subscribers_url":"https://api.github.com/repos/lduarte1991/edx-platform/subscribers","subscription_url":"https://api.github.com/repos/lduarte1991/edx-platform/subscription","commits_url":"https://api.github.com/repos/lduarte1991/edx-platform/commits{/sha}","git_commits_url":"https://api.github.com/repos/lduarte1991/edx-platform/git/commits{/sha}","comments_url":"https://api.github.com/repos/lduarte1991/edx-platform/comments{/number}","issue_comment_url":"https://api.github.com/repos/lduarte1991/edx-platform/issues/comments/{number}","contents_url":"https://api.github.com/repos/lduarte1991/edx-platform/contents/{+path}","compare_url":"https://api.github.com/repos/lduarte1991/edx-platform/compare/{base}...{head}","merges_url":"https://api.github.com/repos/lduarte1991/edx-platform/merges","archive_url":"https://api.github.com/repos/lduarte1991/edx-platform/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/lduarte1991/edx-platform/downloads","issues_url":"https://api.github.com/repos/lduarte1991/edx-platform/issues{/number}","pulls_url":"https://api.github.com/repos/lduarte1991/edx-platform/pulls{/number}","milestones_url":"https://api.github.com/repos/lduarte1991/edx-platform/milestones{/number}","notifications_url":"https://api.github.com/repos/lduarte1991/edx-platform/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/lduarte1991/edx-platform/labels{/name}","releases_url":"https://api.github.com/repos/lduarte1991/edx-platform/releases{/id}","created_at":"2014-04-23T16:14:10Z","updated_at":"2014-07-08T17:04:22Z","pushed_at":"2014-08-13T21:33:43Z","git_url":"git://github.com/lduarte1991/edx-platform.git","ssh_url":"git@github.com:lduarte1991/edx-platform.git","clone_url":"https://github.com/lduarte1991/edx-platform.git","svn_url":"https://github.com/lduarte1991/edx-platform","homepage":"http://code.edx.org/","size":328241,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":true,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"edx:master","ref":"master","sha":"c389a445ae0a4ba4434e3b19ae26ee4dc2443700","user":{"login":"edx","id":3179841,"avatar_url":"https://avatars.githubusercontent.com/u/3179841?v=2","gravatar_id":"e1f6c6dc8772c47c0261cd5df2ed2814","url":"https://api.github.com/users/edx","html_url":"https://github.com/edx","followers_url":"https://api.github.com/users/edx/followers","following_url":"https://api.github.com/users/edx/following{/other_user}","gists_url":"https://api.github.com/users/edx/gists{/gist_id}","starred_url":"https://api.github.com/users/edx/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/edx/subscriptions","organizations_url":"https://api.github.com/users/edx/orgs","repos_url":"https://api.github.com/users/edx/repos","events_url":"https://api.github.com/users/edx/events{/privacy}","received_events_url":"https://api.github.com/users/edx/received_events","type":"Organization","site_admin":false},"repo":{"id":10391073,"name":"edx-platform","full_name":"edx/edx-platform","owner":{"login":"edx","id":3179841,"avatar_url":"https://avatars.githubusercontent.com/u/3179841?v=2","gravatar_id":"e1f6c6dc8772c47c0261cd5df2ed2814","url":"https://api.github.com/users/edx","html_url":"https://github.com/edx","followers_url":"https://api.github.com/users/edx/followers","following_url":"https://api.github.com/users/edx/following{/other_user}","gists_url":"https://api.github.com/users/edx/gists{/gist_id}","starred_url":"https://api.github.com/users/edx/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/edx/subscriptions","organizations_url":"https://api.github.com/users/edx/orgs","repos_url":"https://api.github.com/users/edx/repos","events_url":"https://api.github.com/users/edx/events{/privacy}","received_events_url":"https://api.github.com/users/edx/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/edx/edx-platform","description":"Open edX, the edX platform that powers http://edx.org","fork":false,"url":"https://api.github.com/repos/edx/edx-platform","forks_url":"https://api.github.com/repos/edx/edx-platform/forks","keys_url":"https://api.github.com/repos/edx/edx-platform/keys{/key_id}","collaborators_url":"https://api.github.com/repos/edx/edx-platform/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/edx/edx-platform/teams","hooks_url":"https://api.github.com/repos/edx/edx-platform/hooks","issue_events_url":"https://api.github.com/repos/edx/edx-platform/issues/events{/number}","events_url":"https://api.github.com/repos/edx/edx-platform/events","assignees_url":"https://api.github.com/repos/edx/edx-platform/assignees{/user}","branches_url":"https://api.github.com/repos/edx/edx-platform/branches{/branch}","tags_url":"https://api.github.com/repos/edx/edx-platform/tags","blobs_url":"https://api.github.com/repos/edx/edx-platform/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/edx/edx-platform/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/edx/edx-platform/git/refs{/sha}","trees_url":"https://api.github.com/repos/edx/edx-platform/git/trees{/sha}","statuses_url":"https://api.github.com/repos/edx/edx-platform/statuses/{sha}","languages_url":"https://api.github.com/repos/edx/edx-platform/languages","stargazers_url":"https://api.github.com/repos/edx/edx-platform/stargazers","contributors_url":"https://api.github.com/repos/edx/edx-platform/contributors","subscribers_url":"https://api.github.com/repos/edx/edx-platform/subscribers","subscription_url":"https://api.github.com/repos/edx/edx-platform/subscription","commits_url":"https://api.github.com/repos/edx/edx-platform/commits{/sha}","git_commits_url":"https://api.github.com/repos/edx/edx-platform/git/commits{/sha}","comments_url":"https://api.github.com/repos/edx/edx-platform/comments{/number}","issue_comment_url":"https://api.github.com/repos/edx/edx-platform/issues/comments/{number}","contents_url":"https://api.github.com/repos/edx/edx-platform/contents/{+path}","compare_url":"https://api.github.com/repos/edx/edx-platform/compare/{base}...{head}","merges_url":"https://api.github.com/repos/edx/edx-platform/merges","archive_url":"https://api.github.com/repos/edx/edx-platform/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/edx/edx-platform/downloads","issues_url":"https://api.github.com/repos/edx/edx-platform/issues{/number}","pulls_url":"https://api.github.com/repos/edx/edx-platform/pulls{/number}","milestones_url":"https://api.github.com/repos/edx/edx-platform/milestones{/number}","notifications_url":"https://api.github.com/repos/edx/edx-platform/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/edx/edx-platform/labels{/name}","releases_url":"https://api.github.com/repos/edx/edx-platform/releases{/id}","created_at":"2013-05-30T20:20:38Z","updated_at":"2014-08-13T18:24:56Z","pushed_at":"2014-08-14T00:39:17Z","git_url":"git://github.com/edx/edx-platform.git","ssh_url":"git@github.com:edx/edx-platform.git","clone_url":"https://github.com/edx/edx-platform.git","svn_url":"https://github.com/edx/edx-platform","homepage":"http://openedx.org/","size":1546042,"stargazers_count":1364,"watchers_count":1364,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"forks_count":760,"mirror_url":null,"open_issues_count":107,"forks":760,"open_issues":107,"watchers":1364,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/edx/edx-platform/pulls/4823"},"html":{"href":"https://github.com/edx/edx-platform/pull/4823"},"issue":{"href":"https://api.github.com/repos/edx/edx-platform/issues/4823"},"comments":{"href":"https://api.github.com/repos/edx/edx-platform/issues/4823/comments"},"review_comments":{"href":"https://api.github.com/repos/edx/edx-platform/pulls/4823/comments"},"review_comment":{"href":"https://api.github.com/repos/edx/edx-platform/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/edx/edx-platform/pulls/4823/commits"},"statuses":{"href":"https://api.github.com/repos/edx/edx-platform/statuses/2b9b5fb6513f4329411a5bace15ddeda49d2fc46"}}}}