From a62ab679a43a6734c121b6986d31b6ba150bb783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Cebri=C3=A1n=20Robles?= Date: Fri, 20 Dec 2013 21:46:13 -0500 Subject: [PATCH 1/6] Annotation tools --- .../contentstore/views/component.py | 2 + cms/templates/base.html | 37 + cms/urls.py | 2 + .../student/firebase_token_generator.py | 50 + common/djangoapps/student/views.py | 17 + common/lib/xmodule/setup.py | 2 + .../xmodule/modulestore/inheritance.py | 1 + .../xmodule/xmodule/textannotation_module.py | 106 + .../xmodule/xmodule/videoannotation_module.py | 155 + lms/djangoapps/notes/api.py | 7 + lms/djangoapps/notes/urls.py | 3 +- lms/djangoapps/notes/views.py | 14 +- lms/djangoapps/staticbook/views.py | 8 + lms/envs/common.py | 19 +- lms/static/coffee/src/notes.coffee | 78 +- lms/static/js/vendor/ova/annotator-full.js | 3384 +++++++++ lms/static/js/vendor/ova/catch/css/main.css | 516 ++ .../js/vendor/ova/catch/img/closeIcon.png | Bin 0 -> 1114 bytes .../vendor/ova/catch/img/expandableIcon.png | Bin 0 -> 1279 bytes .../ova/catch/img/expandableIcon_Arrow.png | Bin 0 -> 3002 bytes lms/static/js/vendor/ova/catch/img/fish.jpg | Bin 0 -> 11572 bytes .../vendor/ova/catch/img/geolocation_icon.png | Bin 0 -> 740 bytes .../js/vendor/ova/catch/img/groups_icon.png | Bin 0 -> 747 bytes .../js/vendor/ova/catch/img/privacy_icon.png | Bin 0 -> 635 bytes .../js/vendor/ova/catch/img/shareControls.png | Bin 0 -> 9691 bytes .../js/vendor/ova/catch/img/share_icon.png | Bin 0 -> 655 bytes lms/static/js/vendor/ova/catch/js/catch.js | 1108 +++ .../vendor/ova/catch/js/handlebars-1.1.2.js | 2595 +++++++ .../js/vendor/ova/flagging-annotator.js | 104 + lms/static/js/vendor/ova/ova.js | 2649 +++++++ lms/static/js/vendor/ova/rangeslider.js | 1059 +++ lms/static/js/vendor/ova/reply-annotator.js | 80 + .../js/vendor/ova/richText-annotator.js | 123 + lms/static/js/vendor/ova/share-annotator.js | 474 ++ .../skins/lightgray/content.inline.min.css | 1 + .../ova/skins/lightgray/content.min.css | 1 + .../skins/lightgray/fonts/icomoon-small.eot | Bin 0 -> 8344 bytes .../skins/lightgray/fonts/icomoon-small.svg | 175 + .../skins/lightgray/fonts/icomoon-small.ttf | Bin 0 -> 8160 bytes .../skins/lightgray/fonts/icomoon-small.woff | Bin 0 -> 8336 bytes .../ova/skins/lightgray/fonts/icomoon.eot | Bin 0 -> 8268 bytes .../ova/skins/lightgray/fonts/icomoon.svg | 153 + .../ova/skins/lightgray/fonts/icomoon.ttf | Bin 0 -> 8104 bytes .../ova/skins/lightgray/fonts/icomoon.woff | Bin 0 -> 8400 bytes .../vendor/ova/skins/lightgray/img/anchor.gif | Bin 0 -> 53 bytes .../vendor/ova/skins/lightgray/img/loader.gif | Bin 0 -> 2608 bytes .../vendor/ova/skins/lightgray/img/object.gif | Bin 0 -> 152 bytes .../vendor/ova/skins/lightgray/img/trans.gif | Bin 0 -> 43 bytes .../vendor/ova/skins/lightgray/img/wline.gif | Bin 0 -> 46 bytes .../ova/skins/lightgray/skin.ie7.min.css | 1 + .../vendor/ova/skins/lightgray/skin.min.css | 1 + lms/static/js/vendor/ova/tags-annotator.js | 1100 +++ lms/static/js/vendor/ova/tinymce.min.js | 9 + lms/static/js/vendor/ova/video.dev.js | 6461 +++++++++++++++++ lms/static/js/vendor/ova/vjs.youtube.js | 373 + lms/templates/courseware/courseware.html | 2 +- lms/templates/main.html | 33 + lms/templates/notes.html | 153 +- lms/templates/static_htmlbook.html | 3 +- lms/templates/textannotation.html | 198 + lms/templates/videoannotation.html | 225 + lms/urls.py | 1 + scripts/create-dev-env.sh | 8 +- 63 files changed, 21445 insertions(+), 46 deletions(-) create mode 100644 common/djangoapps/student/firebase_token_generator.py create mode 100644 common/lib/xmodule/xmodule/textannotation_module.py create mode 100644 common/lib/xmodule/xmodule/videoannotation_module.py create mode 100644 lms/static/js/vendor/ova/annotator-full.js create mode 100644 lms/static/js/vendor/ova/catch/css/main.css create mode 100644 lms/static/js/vendor/ova/catch/img/closeIcon.png create mode 100644 lms/static/js/vendor/ova/catch/img/expandableIcon.png create mode 100644 lms/static/js/vendor/ova/catch/img/expandableIcon_Arrow.png create mode 100644 lms/static/js/vendor/ova/catch/img/fish.jpg create mode 100644 lms/static/js/vendor/ova/catch/img/geolocation_icon.png create mode 100644 lms/static/js/vendor/ova/catch/img/groups_icon.png create mode 100644 lms/static/js/vendor/ova/catch/img/privacy_icon.png create mode 100644 lms/static/js/vendor/ova/catch/img/shareControls.png create mode 100644 lms/static/js/vendor/ova/catch/img/share_icon.png create mode 100644 lms/static/js/vendor/ova/catch/js/catch.js create mode 100644 lms/static/js/vendor/ova/catch/js/handlebars-1.1.2.js create mode 100644 lms/static/js/vendor/ova/flagging-annotator.js create mode 100644 lms/static/js/vendor/ova/ova.js create mode 100644 lms/static/js/vendor/ova/rangeslider.js create mode 100644 lms/static/js/vendor/ova/reply-annotator.js create mode 100644 lms/static/js/vendor/ova/richText-annotator.js create mode 100644 lms/static/js/vendor/ova/share-annotator.js create mode 100644 lms/static/js/vendor/ova/skins/lightgray/content.inline.min.css create mode 100644 lms/static/js/vendor/ova/skins/lightgray/content.min.css create mode 100644 lms/static/js/vendor/ova/skins/lightgray/fonts/icomoon-small.eot create mode 100644 lms/static/js/vendor/ova/skins/lightgray/fonts/icomoon-small.svg create mode 100644 lms/static/js/vendor/ova/skins/lightgray/fonts/icomoon-small.ttf create mode 100644 lms/static/js/vendor/ova/skins/lightgray/fonts/icomoon-small.woff create mode 100644 lms/static/js/vendor/ova/skins/lightgray/fonts/icomoon.eot create mode 100644 lms/static/js/vendor/ova/skins/lightgray/fonts/icomoon.svg create mode 100644 lms/static/js/vendor/ova/skins/lightgray/fonts/icomoon.ttf create mode 100644 lms/static/js/vendor/ova/skins/lightgray/fonts/icomoon.woff create mode 100644 lms/static/js/vendor/ova/skins/lightgray/img/anchor.gif create mode 100644 lms/static/js/vendor/ova/skins/lightgray/img/loader.gif create mode 100644 lms/static/js/vendor/ova/skins/lightgray/img/object.gif create mode 100644 lms/static/js/vendor/ova/skins/lightgray/img/trans.gif create mode 100644 lms/static/js/vendor/ova/skins/lightgray/img/wline.gif create mode 100644 lms/static/js/vendor/ova/skins/lightgray/skin.ie7.min.css create mode 100644 lms/static/js/vendor/ova/skins/lightgray/skin.min.css create mode 100644 lms/static/js/vendor/ova/tags-annotator.js create mode 100644 lms/static/js/vendor/ova/tinymce.min.js create mode 100644 lms/static/js/vendor/ova/video.dev.js create mode 100644 lms/static/js/vendor/ova/vjs.youtube.js create mode 100644 lms/templates/textannotation.html create mode 100644 lms/templates/videoannotation.html diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py index deda47f5fa24..3acc50649e83 100644 --- a/cms/djangoapps/contentstore/views/component.py +++ b/cms/djangoapps/contentstore/views/component.py @@ -42,6 +42,8 @@ OPEN_ENDED_COMPONENT_TYPES = ["combinedopenended", "peergrading"] NOTE_COMPONENT_TYPES = ['notes'] ADVANCED_COMPONENT_TYPES = [ + 'textannotation', + 'videoannotation', 'annotatable', 'word_cloud', 'graphical_slider_tool', diff --git a/cms/templates/base.html b/cms/templates/base.html index 4f5c824c7ba5..e652827d410e 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -221,6 +221,43 @@ }; + + + ## ova + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ## js templates + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lms/templates/notes.html b/lms/templates/notes.html index a5fd914c71a4..dbeea4f9e106 100644 --- a/lms/templates/notes.html +++ b/lms/templates/notes.html @@ -59,24 +59,141 @@
-

${_("My Notes")}

- % for note in notes: -
-
${note.quote|h}
-
${note.text.replace("\n", "
") | n,h}
-
    - % if note.tags: -
  • ${_("Tags: {tags}").format(tags=note.tags) | h}
    • - % endif -
  • ${_('Author: {username}').format(username=note.user.username)}
    • -
  • ${_('Created: {datetime}').format(datetime=note.created.strftime('%m/%d/%Y %H:%m'))}
    • -
  • ${_('Source: {link}').format(link='{url}'.format(url=note.uri))}
    • -
-
- % endfor - % if notes is UNDEFINED or len(notes) == 0: -

${_('You do not have any notes.')}

- % endif +

My Notes

+
+
+
You do not have any notes.
+
+
diff --git a/lms/templates/static_htmlbook.html b/lms/templates/static_htmlbook.html index 56e53ceffcdb..5d4348c0b9b0 100644 --- a/lms/templates/static_htmlbook.html +++ b/lms/templates/static_htmlbook.html @@ -146,7 +146,8 @@
- + +
diff --git a/lms/templates/textannotation.html b/lms/templates/textannotation.html new file mode 100644 index 000000000000..200335c329b7 --- /dev/null +++ b/lms/templates/textannotation.html @@ -0,0 +1,198 @@ +
+
+ % if display_name is not UNDEFINED and display_name is not None: +
${display_name}
+ % endif +
+ % if instructions_html is not UNDEFINED and instructions_html is not None: +
+
+ Instructions + Collapse Instructions +
+
+ ${instructions_html} +
+
+ % endif +
+
+ Guided Discussion + +
+
+
${content_html}
+
Source: ${source}
+
+
You do not have any notes.
+
+
+
+
+ + + diff --git a/lms/templates/videoannotation.html b/lms/templates/videoannotation.html new file mode 100644 index 000000000000..9710ef510816 --- /dev/null +++ b/lms/templates/videoannotation.html @@ -0,0 +1,225 @@ +
+
+ % if display_name is not UNDEFINED and display_name is not None: +
${display_name}
+ % endif +
+ % if instructions_html is not UNDEFINED and instructions_html is not None: +
+
+ Instructions + Collapse Instructions +
+
+ ${instructions_html} +
+
+ % endif +
+
+ Guided Discussion + +
+
+
+ +
+
+
You do not have any notes.
+
+
+
+
+ + + + diff --git a/lms/urls.py b/lms/urls.py index ca154c21c541..214a5534866b 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -15,6 +15,7 @@ url(r'^update_certificate$', 'certificates.views.update_certificate'), url(r'^$', 'branding.views.index', name="root"), # Main marketing page, or redirect to courseware url(r'^dashboard$', 'student.views.dashboard', name="dashboard"), + url(r'^token$', 'student.views.token', name="token"), url(r'^login$', 'student.views.signin_user', name="signin_user"), url(r'^register$', 'student.views.register_user', name="register_user"), diff --git a/scripts/create-dev-env.sh b/scripts/create-dev-env.sh index 73ae93ab2d6c..8a7e1d986cb8 100755 --- a/scripts/create-dev-env.sh +++ b/scripts/create-dev-env.sh @@ -329,7 +329,7 @@ clone_repos # Sanity check to make sure the repo layout hasn't changed if [[ -d $BASE/edx-platform/scripts ]]; then output "Installing system-level dependencies" - bash $BASE/edx-platform/scripts/install-system-req.sh + #bash $BASE/edx-platform/scripts/install-system-req.sh else error "It appears that our directory structure has changed and somebody failed to update this script. raise an issue on Github and someone should fix it." @@ -364,7 +364,7 @@ if ! hash bundle 2>/dev/null; then output "Installing gem bundler" gem install bundler fi -rbenv rehash +#rbenv rehash output "Installing ruby packages" bundle install --gemfile $BASE/edx-platform/Gemfile @@ -482,7 +482,7 @@ pip install -r $BASE/edx-platform/requirements/edx/pre.txt output "Installing edX requirements" # Install prereqs cd $BASE/edx-platform -rake install_prereqs +bundle exec rake install_prereqs # Final dependecy output "Finishing Touches" @@ -490,7 +490,7 @@ cd $BASE pip install argcomplete cd $BASE/edx-platform bundle install -rake install_prereqs +bundle exec rake install_prereqs mkdir -p "$BASE/log" mkdir -p "$BASE/db" From 997b08dbce11e23577fb837d07ba344ae74e6ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Cebri=C3=A1n?= Date: Fri, 3 Jan 2014 13:23:33 +0100 Subject: [PATCH 2/6] some fixes --- common/lib/xmodule/xmodule/textannotation_module.py | 3 ++- common/lib/xmodule/xmodule/videoannotation_module.py | 3 ++- lms/envs/common.py | 11 ----------- lms/templates/notes.html | 2 +- lms/templates/textannotation.html | 4 ---- lms/templates/videoannotation.html | 3 --- scripts/create-dev-env.sh | 8 ++++---- 7 files changed, 9 insertions(+), 25 deletions(-) diff --git a/common/lib/xmodule/xmodule/textannotation_module.py b/common/lib/xmodule/xmodule/textannotation_module.py index 1629c43400e4..0af0e6c113f6 100644 --- a/common/lib/xmodule/xmodule/textannotation_module.py +++ b/common/lib/xmodule/xmodule/textannotation_module.py @@ -51,7 +51,8 @@ class AnnotatableFields(object): class TextAnnotationModule(AnnotatableFields, XModule): js = {'coffee': [], - 'js': []} + 'js': [] + } # js_module_name = "TextAnnotation" css = {'scss': [resource_string(__name__, 'css/annotatable/display.scss')]} icon_class = 'textannotation' diff --git a/common/lib/xmodule/xmodule/videoannotation_module.py b/common/lib/xmodule/xmodule/videoannotation_module.py index 7c047d82a27f..bbfbf137753d 100644 --- a/common/lib/xmodule/xmodule/videoannotation_module.py +++ b/common/lib/xmodule/xmodule/videoannotation_module.py @@ -39,7 +39,8 @@ class VideoAnnotationModule(AnnotatableFields, XModule): resource_string(__name__, 'js/src/collapsible.coffee'), resource_string(__name__, 'js/src/html/display.coffee'), resource_string(__name__, 'js/src/annotatable/display.coffee')], - 'js': []} + 'js': [] + } # js_module_name = "VideoAnnotation" css = {'scss': [resource_string(__name__, 'css/annotatable/display.scss')]} icon_class = 'videoannotation' diff --git a/lms/envs/common.py b/lms/envs/common.py index 69e12f219877..f968387b0058 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -667,16 +667,6 @@ 'js/vendor/jquery.qtip.min.js', 'js/vendor/swfobject/swfobject.js', 'js/vendor/jquery.ba-bbq.min.js', - #'js/vendor/annotator.min.js', - #'js/vendor/annotator.store.min.js', - #'js/vendor/annotator.tags.min.js', - #'js/vendor/ova/vjs.youtube.js', - #'js/vendor/ova/rangeslider.min.js', - #'js/vendor/ova/share-annotator.min.js', - #'js/vendor/ova/geolocation-annotator.min.js', - #'js/vendor/ova/richText-annotator.min.js', - #'js/vendor/ova/tinymce.min.js', - #'js/vendor/ova/ova.min.js', ] discussion_js = sorted(rooted_glob(COMMON_ROOT / 'static', 'coffee/src/discussion/**/*.js')) @@ -719,7 +709,6 @@ 'js/vendor/CodeMirror/codemirror.css', 'css/vendor/jquery.treeview.css', 'css/vendor/ui-lightness/jquery-ui-1.8.22.custom.css', - #'css/vendor/annotator.min.css', ], 'output_filename': 'css/lms-style-course-vendor.css', }, diff --git a/lms/templates/notes.html b/lms/templates/notes.html index dbeea4f9e106..ccc73e73ffbc 100644 --- a/lms/templates/notes.html +++ b/lms/templates/notes.html @@ -62,7 +62,7 @@

My Notes

-
You do not have any notes.
+
${_('You do not have any notes.')}
- - - ## ova - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + ## js templates - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/lms/templates/notes.html b/lms/templates/notes.html index ccc73e73ffbc..4ecbbd53488b 100644 --- a/lms/templates/notes.html +++ b/lms/templates/notes.html @@ -169,8 +169,7 @@

My Notes

}, }; - var imgURLRoot = window.location.protocol; - imgURLRoot +="//" + uri.replace(imgURLRoot+"//","").split('/')[0] + "/static/js/vendor/ova/catch/img/"; + var imgURLRoot = "${settings.STATIC_URL}" + "js/vendor/ova/catch/img/"; //remove old instances if (Annotator._instances.length !== 0) { diff --git a/lms/templates/textannotation.html b/lms/templates/textannotation.html index 5b2362908aea..cdb4e21c9de8 100644 --- a/lms/templates/textannotation.html +++ b/lms/templates/textannotation.html @@ -137,7 +137,7 @@ create: '/create', read: '/read/:id', update: '/update/:id', - destroy: '/destroy/:id', + destroy: '/delete/:id', search: '/search' }, diff --git a/setup.py b/setup.py new file mode 100644 index 000000000000..361884babf8c --- /dev/null +++ b/setup.py @@ -0,0 +1,12 @@ +from setuptools import setup + +setup( + name="calc", + version="0.2", + packages=["calc"], + install_requires=[ + "pyparsing==1.5.6", + "numpy", + "scipy" + ], +) From c93f855a35362cda9cdd95afcb46b410a5d1718a Mon Sep 17 00:00:00 2001 From: danielcebrian Date: Thu, 9 Jan 2014 15:32:13 +0100 Subject: [PATCH 4/6] Delete a --- common/static/css/vendor/ova/a | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 common/static/css/vendor/ova/a diff --git a/common/static/css/vendor/ova/a b/common/static/css/vendor/ova/a deleted file mode 100644 index a1dc2c277ae7..000000000000 --- a/common/static/css/vendor/ova/a +++ /dev/null @@ -1,5 +0,0 @@ -/*! -Video.js Default Styles (http://videojs.com) -Version 4.1.0 -Create your own skin at http://designer.videojs.com -*/.vjs-default-skin{color:#ccc}@font-face{font-family:VideoJS;src:url(font/vjs.eot);src:url(font/vjs.eot?#iefix) format('embedded-opentype'),url(font/vjs.woff) format('woff'),url(font/vjs.ttf) format('truetype');font-weight:400;font-style:normal}.vjs-default-skin .vjs-slider{outline:0;position:relative;cursor:pointer;padding:0;background-color:#333;background-color:rgba(51,51,51,.9)}.vjs-default-skin .vjs-slider:focus{-webkit-box-shadow:0 0 2em #fff;-moz-box-shadow:0 0 2em #fff;box-shadow:0 0 2em #fff}.vjs-default-skin .vjs-slider-handle{position:absolute;left:0;top:0}.vjs-default-skin .vjs-slider-handle:before{content:"\e009";font-family:VideoJS;font-size:1em;line-height:1;text-align:center;text-shadow:0 0 1em #fff;position:absolute;top:0;left:0;-webkit-transform:rotate(-45deg);-moz-transform:rotate(-45deg);-ms-transform:rotate(-45deg);-o-transform:rotate(-45deg);transform:rotate(-45deg)}.vjs-default-skin .vjs-control-bar{display:none;position:absolute;bottom:0;left:0;right:0;height:3em;background-color:#07141e;background-color:rgba(7,20,30,.7)}.vjs-default-skin .vjs-control{outline:0;position:relative;float:left;text-align:center;margin:0;padding:0;height:3em;width:4em}.vjs-default-skin .vjs-control:before{font-family:VideoJS;font-size:1.5em;line-height:2;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;text-shadow:1px 1px 1px rgba(0,0,0,.5)}.vjs-default-skin .vjs-control:focus:before,.vjs-default-skin .vjs-control:hover:before{text-shadow:0 0 1em #fff}.vjs-default-skin .vjs-control:focus{}.vjs-default-skin .vjs-control-text{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.vjs-default-skin .vjs-play-control{width:5em;cursor:pointer}.vjs-default-skin .vjs-play-control:before{content:"\e001"}.vjs-default-skin.vjs-playing .vjs-play-control:before{content:"\e002"}.vjs-default-skin .vjs-mute-control,.vjs-default-skin .vjs-volume-menu-button{cursor:pointer;float:right}.vjs-default-skin .vjs-mute-control:before,.vjs-default-skin .vjs-volume-menu-button:before{content:"\e006"}.vjs-default-skin .vjs-mute-control.vjs-vol-0:before,.vjs-default-skin .vjs-volume-menu-button.vjs-vol-0:before{content:"\e003"}.vjs-default-skin .vjs-mute-control.vjs-vol-1:before,.vjs-default-skin .vjs-volume-menu-button.vjs-vol-1:before{content:"\e004"}.vjs-default-skin .vjs-mute-control.vjs-vol-2:before,.vjs-default-skin .vjs-volume-menu-button.vjs-vol-2:before{content:"\e005"}.vjs-default-skin .vjs-volume-control{width:5em;float:right}.vjs-default-skin .vjs-volume-bar{width:5em;height:.6em;margin:1.1em auto 0}.vjs-default-skin .vjs-volume-menu-button .vjs-menu-content{height:2.9em}.vjs-default-skin .vjs-volume-level{position:absolute;top:0;left:0;height:.5em;background:#66a8cc url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAP0lEQVQIHWWMAQoAIAgDR/QJ/Ub//04+w7ZICBwcOg5FZi5iBB82AGzixEglJrd4TVK5XUJpskSTEvpdFzX9AB2pGziSQcvAAAAAAElFTkSuQmCC) -50% 0 repeat}.vjs-default-skin .vjs-volume-bar .vjs-volume-handle{width:.5em;height:.5em}.vjs-default-skin .vjs-volume-handle:before{font-size:.9em;top:-.2em;left:-.2em;width:1em;height:1em}.vjs-default-skin .vjs-volume-menu-button .vjs-menu .vjs-menu-content{width:6em;left:-4em}.vjs-default-skin .vjs-progress-control{position:absolute;left:0;right:0;width:auto;font-size:.3em;height:1em;top:-1em;-webkit-transition:all .4s;-moz-transition:all .4s;-o-transition:all .4s;transition:all .4s}.vjs-default-skin:hover .vjs-progress-control{font-size:.9em;-webkit-transition:all .2s;-moz-transition:all .2s;-o-transition:all .2s;transition:all .2s}.vjs-default-skin .vjs-progress-holder{height:100%}.vjs-default-skin .vjs-progress-holder .vjs-play-progress,.vjs-default-skin .vjs-progress-holder .vjs-load-progress{position:absolute;display:block;height:100%;margin:0;padding:0;left:0;top:0}.vjs-default-skin .vjs-play-progress{background:#66a8cc url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAP0lEQVQIHWWMAQoAIAgDR/QJ/Ub//04+w7ZICBwcOg5FZi5iBB82AGzixEglJrd4TVK5XUJpskSTEvpdFzX9AB2pGziSQcvAAAAAAElFTkSuQmCC) -50% 0 repeat}.vjs-default-skin .vjs-load-progress{background:#646464;background:rgba(255,255,255,.4)}.vjs-default-skin .vjs-seek-handle{width:1.5em;height:100%}.vjs-default-skin .vjs-seek-handle:before{padding-top:.1em}.vjs-default-skin .vjs-time-controls{font-size:1em;line-height:3em}.vjs-default-skin .vjs-current-time{float:left}.vjs-default-skin .vjs-duration{float:left}.vjs-default-skin .vjs-remaining-time{display:none;float:left}.vjs-time-divider{float:left;line-height:3em}.vjs-default-skin .vjs-fullscreen-control{width:3.8em;cursor:pointer;float:right}.vjs-default-skin .vjs-fullscreen-control:before{content:"\e000"}.vjs-default-skin.vjs-fullscreen .vjs-fullscreen-control:before{content:"\e00b"}.vjs-default-skin .vjs-big-play-button{left:.5em;top:.5em;font-size:3em;display:block;z-index:2;position:absolute;width:4em;height:2.6em;text-align:center;vertical-align:middle;cursor:pointer;opacity:1;background-color:#07141e;background-color:rgba(7,20,30,.7);border:.1em solid #3b4249;-webkit-border-radius:.8em;-moz-border-radius:.8em;border-radius:.8em;-webkit-box-shadow:0 0 1em rgba(255,255,255,.25);-moz-box-shadow:0 0 1em rgba(255,255,255,.25);box-shadow:0 0 1em rgba(255,255,255,.25);-webkit-transition:all .4s;-moz-transition:all .4s;-o-transition:all .4s;transition:all .4s}.vjs-default-skin:hover .vjs-big-play-button,.vjs-default-skin .vjs-big-play-button:focus{outline:0;border-color:#fff;background-color:#505050;background-color:rgba(50,50,50,.75);-webkit-box-shadow:0 0 3em #fff;-moz-box-shadow:0 0 3em #fff;box-shadow:0 0 3em #fff;-webkit-transition:all 0s;-moz-transition:all 0s;-o-transition:all 0s;transition:all 0s}.vjs-default-skin .vjs-big-play-button:before{content:"\e001";font-family:VideoJS;line-height:2.6em;text-shadow:.05em .05em .1em #000;text-align:center;position:absolute;left:0;width:100%;height:100%}.vjs-loading-spinner{display:none;position:absolute;top:50%;left:50%;font-size:5em;line-height:1;width:1em;height:1em;margin-left:-.5em;margin-top:-.5em;opacity:.75;-webkit-animation:spin 1.5s infinite linear;-moz-animation:spin 1.5s infinite linear;-o-animation:spin 1.5s infinite linear;animation:spin 1.5s infinite linear}.vjs-default-skin .vjs-loading-spinner:before{content:"\e00a";font-family:VideoJS;position:absolute;width:1em;height:1em;text-align:center;text-shadow:0 0 .1em #000}.vjs-default-skin .vjs-loading-spinner:after{content:"\e00a";font-family:VideoJS;position:absolute;width:1em;height:1em;text-align:center;-webkit-background-clip:text;-webkit-text-fill-color:transparent}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}.vjs-default-skin .vjs-menu-button{float:right;cursor:pointer}.vjs-default-skin .vjs-menu{display:none;position:absolute;bottom:0;left:0;width:0;height:0;margin-bottom:3em;border-left:2em solid transparent;border-right:2em solid transparent;border-top:1.55em solid #000;border-top-color:rgba(7,40,50,.5)}.vjs-default-skin .vjs-menu-button .vjs-menu .vjs-menu-content{display:block;padding:0;margin:0;position:absolute;width:10em;bottom:1.5em;max-height:15em;overflow:auto;left:-5em;background-color:#07141e;background-color:rgba(7,20,30,.7);-webkit-box-shadow:-.2em -.2em .3em rgba(255,255,255,.2);-moz-box-shadow:-.2em -.2em .3em rgba(255,255,255,.2);box-shadow:-.2em -.2em .3em rgba(255,255,255,.2)}.vjs-default-skin .vjs-menu-button:hover .vjs-menu{display:block}.vjs-default-skin .vjs-menu-button ul li{list-style:none;margin:0;padding:.3em 0;line-height:1.4em;font-size:1.2em;text-align:center;text-transform:lowercase}.vjs-default-skin .vjs-menu-button ul li.vjs-selected{background-color:#000}.vjs-default-skin .vjs-menu-button ul li:focus,.vjs-default-skin .vjs-menu-button ul li:hover,.vjs-default-skin .vjs-menu-button ul li.vjs-selected:focus,.vjs-default-skin .vjs-menu-button ul li.vjs-selected:hover{outline:0;color:#111;background-color:#fff;background-color:rgba(255,255,255,.75);-webkit-box-shadow:0 0 1em #fff;-moz-box-shadow:0 0 1em #fff;box-shadow:0 0 1em #fff}.vjs-default-skin .vjs-menu-button ul li.vjs-menu-title{text-align:center;text-transform:uppercase;font-size:1em;line-height:2em;padding:0;margin:0 0 .3em;font-weight:700;cursor:default}.vjs-default-skin .vjs-subtitles-button:before{content:"\e00c"}.vjs-default-skin .vjs-captions-button:before{content:"\e008"}.vjs-default-skin .vjs-captions-button:focus .vjs-control-content:before,.vjs-default-skin .vjs-captions-button:hover .vjs-control-content:before{-webkit-box-shadow:0 0 1em #fff;-moz-box-shadow:0 0 1em #fff;box-shadow:0 0 1em #fff}.video-js{background-color:#000;position:relative;padding:0;font-size:10px;vertical-align:middle;font-weight:400;font-style:normal;font-family:Arial,sans-serif;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.video-js .vjs-tech{position:absolute;top:0;left:0;width:100%;height:100%}.video-js:-moz-full-screen{position:absolute}body.vjs-full-window{padding:0;margin:0;height:100%;overflow-y:auto}.video-js.vjs-fullscreen{position:fixed;overflow:hidden;z-index:1000;left:0;top:0;bottom:0;right:0;width:100%!important;height:100%!important;_position:absolute}.video-js:-webkit-full-screen{width:100%!important;height:100%!important}.vjs-poster{background-repeat:no-repeat;background-position:50% 50%;background-size:contain;cursor:pointer;height:100%;margin:0;padding:0;position:relative;width:100%}.vjs-poster img{display:block;margin:0 auto;max-height:100%;padding:0;width:100%}.video-js .vjs-text-track-display{text-align:center;position:absolute;bottom:4em;left:1em;right:1em}.video-js .vjs-text-track{display:none;font-size:1.4em;text-align:center;margin-bottom:.1em;background-color:#000;background-color:rgba(0,0,0,.5)}.video-js .vjs-subtitles{color:#fff}.video-js .vjs-captions{color:#fc6}.vjs-tt-cue{display:block}.vjs-fade-in{display:block!important;visibility:visible;opacity:1;-webkit-transition:visibility .1s,opacity .1s;-moz-transition:visibility .1s,opacity .1s;-o-transition:visibility .1s,opacity .1s;transition:visibility .1s,opacity .1s}.vjs-fade-out{display:block!important;visibility:hidden;opacity:0;-webkit-transition:visibility 1.5s,opacity 1.5s;-moz-transition:visibility 1.5s,opacity 1.5s;-o-transition:visibility 1.5s,opacity 1.5s;transition:visibility 1.5s,opacity 1.5s;-webkit-transition-delay:2s;-moz-transition-delay:2s;-o-transition-delay:2s;transition-delay:2s}.vjs-default-skin .vjs-hidden{display:none}.vjs-lock-showing{display:block!important;opacity:1;visibility:visible} \ No newline at end of file From f9efce1726596fd3b80ed81a5b90e346025dbbbb Mon Sep 17 00:00:00 2001 From: daniel cebrian Date: Thu, 9 Jan 2014 18:48:14 +0100 Subject: [PATCH 5/6] release annotation tool --- .rbenv | 1 - lms/static/coffee/src/notes.coffee | 2 +- lms/templates/notes.html | 2 +- lms/templates/videoannotation.html | 2 +- setup.py | 12 ------------ 5 files changed, 3 insertions(+), 16 deletions(-) delete mode 160000 .rbenv delete mode 100644 setup.py diff --git a/.rbenv b/.rbenv deleted file mode 160000 index 14bc162ca606..000000000000 --- a/.rbenv +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 14bc162ca606e0c61da8d82e1b99b0946d7be13f diff --git a/lms/static/coffee/src/notes.coffee b/lms/static/coffee/src/notes.coffee index 8034db8e59d3..df58d62c8afa 100644 --- a/lms/static/coffee/src/notes.coffee +++ b/lms/static/coffee/src/notes.coffee @@ -56,7 +56,7 @@ class StudentNotes create: '/create', read: '/read/:id', update: '/update/:id', - destroy: '/destroy/:id', + destroy: '/delete/:id', search: '/search' loadFromSearch: diff --git a/lms/templates/notes.html b/lms/templates/notes.html index 4ecbbd53488b..b7181928568f 100644 --- a/lms/templates/notes.html +++ b/lms/templates/notes.html @@ -143,7 +143,7 @@

My Notes

create: '/create', read: '/read/:id', update: '/update/:id', - destroy: '/destroy/:id', + destroy: '/delete/:id', search: '/search' }, diff --git a/lms/templates/videoannotation.html b/lms/templates/videoannotation.html index dd81dd8e5d0f..7ef54a5a958c 100644 --- a/lms/templates/videoannotation.html +++ b/lms/templates/videoannotation.html @@ -140,7 +140,7 @@ create: '/create', read: '/read/:id', update: '/update/:id', - destroy: '/destroy/:id', + destroy: '/delete/:id', search: '/search' }, diff --git a/setup.py b/setup.py deleted file mode 100644 index 361884babf8c..000000000000 --- a/setup.py +++ /dev/null @@ -1,12 +0,0 @@ -from setuptools import setup - -setup( - name="calc", - version="0.2", - packages=["calc"], - install_requires=[ - "pyparsing==1.5.6", - "numpy", - "scipy" - ], -) From dde3d695a72ed1e0485816e95cd711c2b1e14b70 Mon Sep 17 00:00:00 2001 From: daniel cebrian Date: Thu, 9 Jan 2014 22:40:38 +0100 Subject: [PATCH 6/6] removed some comments --- Gemfile.lock | 6 ++-- .../xmodule/xmodule/textannotation_module.py | 3 -- .../xmodule/xmodule/videoannotation_module.py | 1 - lms/templates/textannotation.html | 11 +----- lms/templates/videoannotation.html | 35 +------------------ 5 files changed, 5 insertions(+), 51 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 75602a864248..f3d7ec5691c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,15 +6,15 @@ GEM sass (>= 3.2.0) thor colorize (0.5.8) - ffi (1.9.0) + ffi (1.9.3) launchy (2.1.2) addressable (~> 2.3) neat (1.4.0) bourbon (>= 2.1) sass (>= 3.2) rake (10.0.4) - rb-fsevent (0.9.3) - rb-inotify (0.9.2) + rb-fsevent (0.9.4) + rb-inotify (0.9.3) ffi (>= 0.5.0) sass (3.2.12) sys-proctable (0.9.3) diff --git a/common/lib/xmodule/xmodule/textannotation_module.py b/common/lib/xmodule/xmodule/textannotation_module.py index 0af0e6c113f6..da2d947952dd 100644 --- a/common/lib/xmodule/xmodule/textannotation_module.py +++ b/common/lib/xmodule/xmodule/textannotation_module.py @@ -53,7 +53,6 @@ class TextAnnotationModule(AnnotatableFields, XModule): js = {'coffee': [], 'js': [] } -# js_module_name = "TextAnnotation" css = {'scss': [resource_string(__name__, 'css/annotatable/display.scss')]} icon_class = 'textannotation' @@ -64,8 +63,6 @@ def __init__(self, *args, **kwargs): self.instructions = self._extract_instructions(xmltree) self.content = etree.tostring(xmltree, encoding='unicode') - #settings.LMS_BASE - #self.location.org self.element_id = self.location.name self.highlight_colors = ['yellow', 'orange', 'purple', 'blue', 'green'] diff --git a/common/lib/xmodule/xmodule/videoannotation_module.py b/common/lib/xmodule/xmodule/videoannotation_module.py index 53942564824c..95ca6319b185 100644 --- a/common/lib/xmodule/xmodule/videoannotation_module.py +++ b/common/lib/xmodule/xmodule/videoannotation_module.py @@ -41,7 +41,6 @@ class VideoAnnotationModule(AnnotatableFields, XModule): resource_string(__name__, 'js/src/annotatable/display.coffee')], 'js': [] } -# js_module_name = "VideoAnnotation" css = {'scss': [resource_string(__name__, 'css/annotatable/display.scss')]} icon_class = 'videoannotation' diff --git a/lms/templates/textannotation.html b/lms/templates/textannotation.html index cdb4e21c9de8..f46ad5baf95d 100644 --- a/lms/templates/textannotation.html +++ b/lms/templates/textannotation.html @@ -16,11 +16,7 @@ % endif
-
- Guided Discussion - -
-
+
${content_html}
Source: ${source}
@@ -85,11 +81,6 @@ }, showViewPermissionsCheckbox: true, showEditPermissionsCheckbox: false, - /*groups: { - world: 'group:__world__', - authenticated: 'group:__authenticated__', - consumer: 'group:__consumer__' - },*/ userAuthorize: function(action, annotation, user) { var token, tokens, _i, _len; if (annotation.permissions) { diff --git a/lms/templates/videoannotation.html b/lms/templates/videoannotation.html index 7ef54a5a958c..9afa73238562 100644 --- a/lms/templates/videoannotation.html +++ b/lms/templates/videoannotation.html @@ -16,11 +16,7 @@
% endif
-
- Guided Discussion - -
-
+