Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
0d8a4797
Commit
0d8a4797
authored
May 20, 2014
by
lduarte1991
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
extend changes of url/raw issue to video annotions
parent
4f981d99
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
12 deletions
+13
-12
lms/templates/videoannotation.html
+13
-12
No files found.
lms/templates/videoannotation.html
View file @
0d8a4797
<
%!
from
django
.
utils
.
translation
import
ugettext
as
_
%
>
<
%
namespace
name=
'static'
file=
'/static_content.html'
/>
<
%
static:css
group=
'style-vendor-tinymce-content'
/>
<
%
static:css
group=
'style-vendor-tinymce-skin'
/>
<script
type=
"text/javascript"
src=
"${static.url('js/vendor/tinymce/js/tinymce/tinymce.full.min.js')}"
/>
<
script
type
=
"text/javascript"
src
=
"${static.url('js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js')}"
/>
${static.css(group='style-vendor-tinymce-content', raw=True)}
${static.css(group='style-vendor-tinymce-skin', raw=True)}
<script
type=
"text/javascript"
src=
"${static.url('js/vendor/tinymce/js/tinymce/tinymce.full.min.js', raw=True)}"
/>
<
script
type
=
"text/javascript"
src
=
"${static.url('js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js', raw=True)}"
/>
<
div
class
=
"annotatable-wrapper"
>
<
div
class
=
"annotatable-header"
>
...
...
@@ -35,7 +36,7 @@
<
/div
>
<
/div
>
<
/div
>
<
script
>
function
onClickHideInstructions
(){
...
...
@@ -70,16 +71,16 @@
optionsAnnotator
:
{
permissions
:{
user
:
{
id
:
"${user.email}"
,
id
:
"${user.email}"
,
name
:
"${user.username}"
},
userString
:
function
(
user
)
{
if
(
user
&&
user
.
name
)
if
(
user
&&
user
.
name
)
return
user
.
name
;
return
user
;
},
userId
:
function
(
user
)
{
if
(
user
&&
user
.
id
)
if
(
user
&&
user
.
id
)
return
user
.
id
;
return
user
;
},
...
...
@@ -103,7 +104,7 @@
}
for
(
_i
=
0
,
_len
=
tokens
.
length
;
_i
<
_len
;
_i
++
)
{
token
=
tokens
[
_i
];
if
(
this
.
userId
(
user
)
===
token
)
{
return
true
;
...
...
@@ -168,7 +169,7 @@
var
imgURLRoot
=
"${settings.STATIC_URL}"
+
"js/vendor/ova/catch/img/"
;
tinymce
.
baseURL
=
"${settings.STATIC_URL}"
+
"js/vendor/tinymce/js/tinymce"
;
//remove old instances
if
(
Annotator
.
_instances
.
length
!==
0
)
{
$
(
'#videoHolder'
).
annotator
(
"destroy"
);
...
...
@@ -176,9 +177,9 @@
delete
ova
;
//Load the plugin Video/Text Annotation
var
ova
=
new
OpenVideoAnnotation
.
Annotator
(
$
(
'#videoHolder'
),
options
);
ova
.
annotator
.
addPlugin
(
'Tags'
);
//Catch
var
annotator
=
ova
.
annotator
,
catchOptions
=
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment