--- a/src/hdalab/templates/renkan_edit.html Thu Mar 31 14:13:00 2016 +0200
+++ b/src/hdalab/templates/renkan_edit.html Tue Apr 05 18:34:37 2016 +0200
@@ -12,14 +12,14 @@
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/lib/bjqs.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/login.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/renkan_video.css' %}" />
- <link rel="stylesheet" type="text/css" href="{% static 'hdalab/lib/video-js-5.8.6/video-js.css' %}" />
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/lib/video-js/video-js.css' %}" />
{% endblock %}
{% block js_import %}
{{block.super}}
<!-- video-js IE8 support -->
- <script src="{% static 'hdalab/lib/video-js-5.8.6/ie8/videojs-ie8.min.js' %}"></script>
- <script src="{% static 'hdalab/lib/video-js-5.8.6/video.min.js' %}"></script>
+ <script src="{% static 'hdalab/lib/video-js/ie8/videojs-ie8.min.js' %}"></script>
+ <script src="{% static 'hdalab/lib/video-js/video.min.js' %}"></script>
<script src="{% static 'hdalab/lib/bjqs-1.3.min.js' %}"></script>
<script src="{% static 'renkanmanager/lib/jquery-ui/jquery-ui.js' %}"></script>
<script src="{% static 'renkanmanager/lib/jquery-mousewheel/jquery.mousewheel.js' %}"></script>
@@ -112,7 +112,7 @@
_rkn = _renkan;
};
-
+
// Closure to fix require.js import mismatch
//(function($){
$(function() {
@@ -194,20 +194,20 @@
help_dialog.dialog("open");
}
});
-
-
-
+
+
+
$(".img-close").click(function(){
help_dialog.dialog("close");
});
}
});
-
+
//video dialog init
var video_dialog = $("#video-container").dialog({
autoOpen: false,
- height: 680,
- width: 820,
+ height: 530,
+ width: 870,
resizable: false,
draggable: false,
create: function (event, ui) {
@@ -219,11 +219,15 @@
video_dialog.dialog("open");
}
});
-
+
$(".video-close").click(function(){
video_dialog.dialog("close");
});
- }
+ },
+ close: function (event, ui) {
+ var player = videojs('renkan_video');
+ player.pause();
+ }
});
});