bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #674 from fermionic/20130503-basic-video-support

Browse source 
basic video playback support using VideoJS
This commit is contained in:
fermionic 2013-05-11 08:33:36 -07:00
commit 3a13aba62e
33 changed files with 5632 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
view/theme/decaf-mobile/style.css
View file

@ -2192,6 +2192,15 @@ input#profile-jot-email {
width: 587px;
}
.video-top-wrapper {
display: inline-block;
vertical-align: top;
margin-top: 15px;
margin-right: 15px;
margin-left: 15px;
margin-bottom: 15px;
}
#profile-jot-desc {
/*float: left;*/
width: 100%;

0
view/theme/decaf-mobile/templates/videos_end.tpl Normal file
View file

0
view/theme/decaf-mobile/templates/videos_head.tpl Normal file
View file

9
view/theme/duepuntozero/style.css
View file

@ -2137,6 +2137,15 @@ aside input[type='text'] {
margin-bottom: 15px;
}
.video-top-wrapper {
display: inline-block;
vertical-align: top;
margin-top: 15px;
margin-right: 15px;
margin-left: 15px;
margin-bottom: 15px;
}
#profile-jot-desc {
/*float: left;*/
width: 480px;

3
view/theme/frost-mobile/js/main.js
View file

@ -389,6 +389,9 @@
}
/* autocomplete @nicknames */
$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");
// setup videos, since VideoJS won't take care of any loaded via AJAX
if(typeof _V_ != 'undefined') _V_.autoSetup();
});
}

2
view/theme/frost-mobile/js/main.min.js vendored
View file

File diff suppressed because one or more lines are too long

9
view/theme/frost-mobile/style.css
View file

@ -2162,6 +2162,15 @@ input#profile-jot-email {
width: 587px;
}
.video-top-wrapper {
display: inline-block;
vertical-align: top;
margin-top: 15px;
margin-right: 15px;
margin-left: 15px;
margin-bottom: 15px;
}
#profile-jot-desc {
/*float: left;*/
width: 100%;

5
view/theme/frost-mobile/templates/videos_end.tpl Normal file
View file

@ -0,0 +1,5 @@
<script src="library/video-js/video.min.js"></script>
<script>
_V_.options.flash.swf = "https://f.shmuz.in/library/video-js/video-js.swf"
</script>

2
view/theme/frost-mobile/templates/videos_head.tpl Normal file
View file

@ -0,0 +1,2 @@
<link href="library/video-js/video-js.min.css" rel="stylesheet">

2
view/theme/frost/js/main.js
View file

@ -405,6 +405,8 @@
collapseHeight();
// setup videos, since VideoJS won't take care of any loaded via AJAX
if(typeof _V_ != 'undefined') _V_.autoSetup();
});
}

2
view/theme/frost/js/main.min.js vendored
View file

File diff suppressed because one or more lines are too long

9
view/theme/frost/style.css
View file

@ -2519,6 +2519,15 @@ aside input[type='text'] {
margin-bottom: 15px;
}
.video-top-wrapper {
display: inline-block;
vertical-align: top;
margin-top: 15px;
margin-right: 15px;
margin-left: 15px;
margin-bottom: 15px;
}
#profile-jot-desc {
/*float: left;*/
/*width: 480px;*/

5
view/theme/frost/templates/videos_end.tpl Normal file
View file

@ -0,0 +1,5 @@
<script src="library/video-js/video.min.js"></script>
<script>
_V_.options.flash.swf = "https://f.shmuz.in/library/video-js/video-js.swf"
</script>

2
view/theme/frost/templates/videos_head.tpl Normal file
View file

@ -0,0 +1,2 @@
<link href="library/video-js/video-js.min.css" rel="stylesheet">