From: Michael Dale Date: Tue, 18 Aug 2009 09:07:58 +0000 (+0000) Subject: * initial import "kaltura skin" (yaron.s) X-Git-Tag: 1.31.0-rc.0~40248 X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=6138f4f68dca268df5f07b2d4c71da514d2b14e0;p=lhc%2Fweb%2Fwiklou.git * initial import "kaltura skin" (yaron.s) * basic hook into js system for new k-class names * menu items remain to be filled in. --- diff --git a/js2/mwEmbed/example_usage/Player_Simple_Video_Tag.html b/js2/mwEmbed/example_usage/Player_Simple_Video_Tag.html index 92c4cf7628..418fc0fd20 100644 --- a/js2/mwEmbed/example_usage/Player_Simple_Video_Tag.html +++ b/js2/mwEmbed/example_usage/Player_Simple_Video_Tag.html @@ -13,10 +13,13 @@ once you include: mv_embed.js on any remote page you can then use the video tag
- +
Sample Embed
Simple video Embed: - 
<video poster="http://metavid.org/w/index.php?action=ajax&rs=mv_frame_server&stream_id=71&t=1:23:16&size=400x300" 
+	     	
<video style="width:400px;height:288px" poster="http://metavid.org/w/index.php?action=ajax&rs=mv_frame_server&stream_id=71&t=1:23:16&size=400x300" 
 src="http://metavidstorage01.ucsc.edu/media/house_proceeding_07-18-06_00.ogg?t=1:23:16/1:23:44"></video>
diff --git a/js2/mwEmbed/jquery/jquery.ui-1.7.1/themes/base/jquery-ui-1.7.1.custom.css b/js2/mwEmbed/jquery/jquery.ui-1.7.1/themes/base/jquery-ui-1.7.1.custom.css new file mode 100644 index 0000000000..118def2207 --- /dev/null +++ b/js2/mwEmbed/jquery/jquery.ui-1.7.1/themes/base/jquery-ui-1.7.1.custom.css @@ -0,0 +1,287 @@ + +/* +* jQuery UI CSS Framework +* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) +* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses. +* To view and modify this theme, visit http://jqueryui.com/themeroller/ +*/ + +/*** Begin CORE ***/ + +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { display: none; } +.ui-helper-hidden-accessible { position: absolute; left: -99999999px; } +.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } +.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } +.ui-helper-clearfix { display: inline-block; } +/* required comment for clearfix to work in Opera \*/ +* html .ui-helper-clearfix { height:1%; } +.ui-helper-clearfix { display:block; } +/* end clearfix */ +.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }*/ + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { cursor: default !important; } + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { display: block; text-indents: -99999px; overflow: hidden; background-repeat: no-repeat; } + + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } + +/*** End Core ***/ + + +/*** Begin THEME ***/ + +/* Component containers +----------------------------------*/ +.ui-widget { font-family: Arial,sans-serif/*{ffDefault}*/; font-size: 11px/*{fsDefault}*/; } +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Arial,sans-serif/*{ffDefault}*/; font-size: 11px; } +.ui-widget-content { border: none/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png) 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*//*{bgContentRepeat}*/; color: #A9A9A9/*{fcContent}*/; } +.ui-widget-content a { color: #A9A9A9/*{fcContent}*/; } +.ui-widget-header { border: none/*{borderColorHeader}*/; background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*//*{bgHeaderRepeat}*/; color: #565656/*{fcHeader}*/; font-weight: bold; } +.ui-widget-header a { color: #000/*{fcHeader}*/; } + + + +/* Interaction states +----------------------------------*/ +.ui-state-default, .ui-widget-content .ui-state-default { border: none/*{borderColorDefault}*/; background: none/*{bgColorDefault}*/ /*{bgDefaultXPos}*/ /*{bgDefaultYPos}*/ /*{bgDefaultRepeat}*//*{bgDefaultRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #333/*{fcDefault}*/; outline: none; } +.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #000/*{fcDefault}*/; text-decoration: none; outline: none; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: none/*{borderColorHover}*/; background: none/*{bgColorHover}*/ none /*{bgHoverXPos}*/ /*{bgHoverYPos}*/ /*{bgHoverRepeat}*//*{bgHoverRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #222/*{fcHover}*/; outline: none; } +.ui-state-hover a, .ui-state-hover a:hover { color: #000/*{fcHover}*/; text-decoration: none; outline: none; } +.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #ccc/*{borderColorActive}*/; background: none/*{bgColorActive}*/ /*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*//*{bgActiveRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; outline: none; } +.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121/*{fcActive}*/; outline: none; text-decoration: none; } + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*//*{bgHighlightRepeat}*/; color: #363636/*{fcHighlight}*/; } +.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #363636/*{fcHighlight}*/; } +.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url(images/ui-bg_glass_95_fef1ec_1x400.png) 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*//*{bgErrorRepeat}*/; color: #cd0a0a/*{fcError}*/; } +.ui-state-error a, .ui-widget-content .ui-state-error a { color: #cd0a0a/*{fcError}*/; } +.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a/*{fcError}*/; } +.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } +.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; } +.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; } +.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; } +.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsHeader}*/; } +.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png)/*{iconsDefault}*/; } +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsHover}*/; } +.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsActive}*/; } +.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; } +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; } + +/* positioning */ +.ui-icon-carat-1-n { background-position: 0 0; } +.ui-icon-carat-1-ne { background-position: -16px 0; } +.ui-icon-carat-1-e { background-position: -32px 0; } +.ui-icon-carat-1-se { background-position: -48px 0; } +.ui-icon-carat-1-s { background-position: -64px 0; } +.ui-icon-carat-1-sw { background-position: -80px 0; } +.ui-icon-carat-1-w { background-position: -96px 0; } +.ui-icon-carat-1-nw { background-position: -112px 0; } +.ui-icon-carat-2-n-s { background-position: -128px 0; } +.ui-icon-carat-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -64px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -64px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-off { background-position: -96px -144px; } +.ui-icon-radio-on { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-tl { -moz-border-radius-topleft: 5px/*{cornerRadius}*/; -webkit-border-top-left-radius: 5px/*{cornerRadius}*/; } +.ui-corner-tr { -moz-border-radius-topright: 5px/*{cornerRadius}*/; -webkit-border-top-right-radius: 5px/*{cornerRadius}*/; } +.ui-corner-bl { -moz-border-radius-bottomleft: 5px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 5px/*{cornerRadius}*/; } +.ui-corner-br { -moz-border-radius-bottomright: 5px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 5px/*{cornerRadius}*/; } +.ui-corner-top { -moz-border-radius-topleft: 5px/*{cornerRadius}*/; -webkit-border-top-left-radius: 5px/*{cornerRadius}*/; -moz-border-radius-topright: 5px/*{cornerRadius}*/; -webkit-border-top-right-radius: 5px/*{cornerRadius}*/; } +.ui-corner-bottom { -moz-border-radius-bottomleft: 5px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 5px/*{cornerRadius}*/; -moz-border-radius-bottomright: 5px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 5px/*{cornerRadius}*/; } +.ui-corner-right { -moz-border-radius-topright: 5px/*{cornerRadius}*/; -webkit-border-top-right-radius: 5px/*{cornerRadius}*/; -moz-border-radius-bottomright: 5px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 5px/*{cornerRadius}*/; } +.ui-corner-left { -moz-border-radius-topleft: 5px/*{cornerRadius}*/; -webkit-border-top-left-radius: 5px/*{cornerRadius}*/; -moz-border-radius-bottomleft: 5px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 5px/*{cornerRadius}*/; } +.ui-corner-all { -moz-border-radius: 5px/*{cornerRadius}*/; -webkit-border-radius: 5px/*{cornerRadius}*/; } + +/* Overlays */ +.ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*//*{bgOverlayRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityOverlay}*/; } +.ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*//*{bgShadowRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; -moz-border-radius: 8px/*{cornerRadiusShadow}*/; -webkit-border-radius: 8px/*{cornerRadiusShadow}*/; } + + + diff --git a/js2/mwEmbed/libEmbedVideo/embedVideo.js b/js2/mwEmbed/libEmbedVideo/embedVideo.js index ef23f2eb7b..f525efb5c3 100644 --- a/js2/mwEmbed/libEmbedVideo/embedVideo.js +++ b/js2/mwEmbed/libEmbedVideo/embedVideo.js @@ -30,10 +30,22 @@ loadGM({ "download_segment" : "Download Selection:", "download_full" : "Download Full Video File:", "download_right_click": "To download right click and select save target as", - "download_clip" : "Download the Clip", + "download_clip" : "Download Video", "download_text" : "Download Text (cmml xml):", + "download" : "Download", + + "share" : "Share", + "credits" : "Credits", "clip_linkback" : "Clip Source Page", + "chose_player" : "Choose Video Player", + + "share_this_video" : "Share This Video", + "video_credits" : "Video Credits", + + "menu_btn" : "MENU", + "close_btn" : "CLOSE", + "mv_ogg-player-vlc-mozilla" : "VLC Plugin", "mv_ogg-player-videoElement" : "Native Ogg Video Support", @@ -48,7 +60,9 @@ loadGM({ "mv_generic_missing_plugin" : "You browser does not appear to support playback type: $1
visit the Playback Methods page to download a player
", "mv_for_best_experience": "For a better video playback experience we recommend:
Firefox 3.5", - "mv_do_not_warn_again": "Dissmiss for now." + "mv_do_not_warn_again": "Dissmiss for now.", + + "players": "Players", }); @@ -279,29 +293,22 @@ var ctrlBuilder = { 'options':true, 'borders':true }, - getControls:function( embedObj ){ - js_log('f:controlsBuilder:: opt:' + this.options); + getControls:function( embedObj ){ + js_log('f:controlsBuilder:: opt:'); this.id = (embedObj.pc)?embedObj.pc.pp.id:embedObj.id; this.available_width = embedObj.playerPixelWidth(); //make pointer to the embedObj - this.embedObj =embedObj; + this.embedObj = embedObj; var _this = this; for(var i in embedObj.supports){ _this.supports[i] = embedObj.supports[i]; }; - //special case vars: - if( ( embedObj.roe || - (embedObj.media_element.timedTextSources && - embedObj.media_element.timedTextSources() ) - ) && embedObj.show_meta_link ) - this.supports['closed_captions']=true; + //check for close_captions tracks: + if( ( embedObj.roe || embedObj.timedTextSources() ) + && embedObj.show_meta_link ) + this.supports['closed_captions']=true; - - //append options to body (if not already there) - if($j('#mv_vid_options_'+ctrlBuilder.id).length==0) - $j('body').append( this.components['mv_embedded_options'].o() ); - var o=''; for( var i in this.components ){ if( this.supports[i] ){ @@ -316,30 +323,32 @@ var ctrlBuilder = { } } } + //add the options menu + o+=this.components['mv_embedded_options'].o( embedObj ); return o; }, /* * addControlHooks * to be run once controls are attached to the dom */ - addControlHooks:function(embedObj){ + addControlHooks:function( embedObj ){ //add in drag/seek hooks: if(!embedObj.base_seeker_slider_offset && $j('#mv_seeker_slider_'+embedObj.id).get(0)) embedObj.base_seeker_slider_offset = $j('#mv_seeker_slider_'+embedObj.id).get(0).offsetLeft; //js_log('looking for: #mv_seeker_slider_'+embedObj.id + "\n " + // 'start sec: '+embedObj.start_time_sec + ' base offset: '+embedObj.base_seeker_slider_offset); + + var $tp=$j('#' + embedObj.id); + + //@todo: which object is being play()'d (or whatever) ? + //We select the element to attach the event to this way: + //$tp.find('.ui-icon-play').parent().click(function(){alert(0)}); or we can give the button itself a class - probably better. - //add play hook: - $j('#mv_play_pause_button_' + embedObj.id).unbind().btnBind().click(function(){ + //add play hook for play-btn and large_play_button + $tp.find('.play-btn,.play-btn-large').unbind().btnBind().click(function(){ $j('#' + embedObj.id).get(0).play(); }) - - //big_play_link_ play binding: - $j('#big_play_link_' + embedObj.id).unbind().click(function(){ - $j('#' + embedObj.id).get(0).play(); - }); - //add recomend firefox if non-native playback: if( embedObj.doNativeWarningCheck() ){ $j('#dc_'+ embedObj.id).hover( @@ -353,7 +362,7 @@ var ctrlBuilder = { ''); $j('#ffwarn_'+embedObj.id).click(function(){ if( $j(this).is(':checked') ){ - //set up a cookie for 7 days: + //set up a cookie for 5 days: $j.cookie('dismissNativeWarn', true, { expires: 5 }); //set the current instance _global['dismissNativeWarn'] = true; @@ -380,7 +389,6 @@ var ctrlBuilder = { $j('#big_play_link_' + embedObj.id).pngFix(); } - //captions binding: $j('#timed_text_' + embedObj.id).unbind().btnBind().click(function(){ $j('#' + embedObj.id).get(0).showTextInterface(); @@ -397,7 +405,8 @@ var ctrlBuilder = { }); js_log(" should add slider binding: " + $j('#mv_play_head_'+embedObj.id).length) ; - $j('#mv_play_head_'+embedObj.id).slider({ +// $j('#mv_play_head_'+embedObj.id).slider({ + $tp.find( '.j-scrubber' ).slider({ range: "min", value: 0, min: 0, @@ -435,89 +444,140 @@ var ctrlBuilder = { js_log('do jump to: '+embedObj.jump_time + ' perc:' +perc + ' sts:' + embedObj.seek_time_sec); embedObj.doSeek(perc); } - } + } + }); + //@todo: identify problem with volume button jumping... + $tp.find('.k-volume-slider').slider({ + range: "min", + value: 80, + min: 0, + max: 100, + slide: function(event, ui) { + embedObj.updateVolumen(ui.value/100); + }, + change: function(event, ui){ + var level = ui.value/100; + if (level==0) { + $tp.find('.k-volume span').addClass('ui-icon-volume-off'); + }else{ + $tp.find('.k-volume span').removeClass('ui-icon-volume-off'); + } + //only run the onChange event if done by a user slide: + if(embedObj.userSlide){ + embedObj.userSlide=false; + embedObj.seeking=true; +// var perc = ui.value/100; + embedObj.updateVolumen(level); + } + } }); //up the z-index of the default status indicator: - $j('#mv_play_head_'+embedObj.id + ' .ui-slider-handle').css('z-index', 4); - $j('#mv_play_head_'+embedObj.id + ' .ui-slider-range').addClass('ui-corner-all').css('z-index', 2); +// $j('#mv_play_head_'+embedObj.id + ' .ui-slider-handle').css('z-index', 4); +// $j('#mv_play_head_'+embedObj.id + ' .ui-slider-range').addClass('ui-corner-all').css('z-index', 2); //extended class list for jQuery ui themeing (we can probably refactor this with custom buffering highliter) - $j('#mv_play_head_'+embedObj.id).append( ctrlBuilder.getMvBufferHtml() ); - + $j('#' + embedObj.id + ' .j-scrubber').prepend( ctrlBuilder.getMvBufferHtml() ); + + + //options menu + $tp.find('.k-menu').hide(); + $tp.find('.k-options').click(function(){ + var $ktxt = $j(this).find('.ui-icon-k-menu'); + var $kmenu = $tp.find('.k-menu'); + if( $kmenu.is(':visible') ){ + $kmenu.fadeOut("fast",function(){ + $ktxt.html ( gM('menu_btn') ); + }); + $tp.find('.play-btn-large').fadeIn('fast'); + }else{ + $kmenu.fadeIn("fast", function(){ + $ktxt.html ( gM('close_btn') ); + }); + $tp.find('.play-btn-large').fadeOut('fast'); + } + }); + + //videoOptions: - $j('#mv_vid_options_'+ctrlBuilder.id+' .vo_selection').click(function(){ + $tp.find('.k-player-btn').click(function(){ embedObj.selectPlaybackMethod(); - $j('#mv_vid_options_'+ctrlBuilder.id).hide(); - return false; + return false; }); - $j('#mv_vid_options_'+ctrlBuilder.id+' .vo_download').click(function(){ + + $tp.find('.k-download-btn').click(function(){ embedObj.showVideoDownload(); - $j('#mv_vid_options_'+ctrlBuilder.id).hide(); - return false; - }) - $j('#mv_vid_options_'+ctrlBuilder.id+' .vo_showcode').click(function(){ + return false; + }); + + $tp.find('.k-share-btn').click(function(){ embedObj.showEmbedCode(); - $j('#mv_vid_options_'+ctrlBuilder.id).hide(); - return false; - }); - + return false; + }); + $tp.find('.k-credits-btn').click(function(){ + //@@todo show credits menu screen; + return false; + }); + //volume binding: + $tp.find('.k-volume').unbind().btnBind().click(function(){ + $tp.toggleMute(); + }); + var hoverOverDelay=false; - $j('#volume_control_'+embedObj.id).unbind().btnBind().click(function(){ + /*$j('#volume_control_'+embedObj.id).unbind().btnBind().click(function(){ $j('#' +embedObj.id).get(0).toggleMute(); - }).hover( - function(){ + }); + .hover( + function(){ $j('#vol_container_' + embedObj.id).addClass('vol_container_top'); //set to "below" if playing and embedType != native - if(embedObj && embedObj.isPlaying && embedObj.isPlaying() && !embedObj.supports['overlays']){ + if(embedObj && embedObj.isPlaying() && !embedObj.supports['overlays']){ $j('#vol_container_' + embedObj.id).removeClass('vol_container_top').addClass('vol_container_below'); } - + $j('#vol_container_' + embedObj.id).fadeIn('fast'); hoverOverDelay = true; }, - function(){ - hoverOverDelay= false; + function(){ + hoverOverDelay= false; setTimeout(function doHideVolume(){ if(!hoverOverDelay){ $j('#vol_container_' + embedObj.id).fadeOut('fast'); } - }, 500); + }, 500); } ); //Volumen Slider $j('#volume_bar_'+embedObj.id).slider({ - orientation: "vertical", + orientation: "vertical", range: "min", value: 80, min: 0, - max: 100, - slide: function(event, ui) { - var perc = ui.value/100; + max: 100, + slide: function(event, ui) { + var perc = ui.value/100; //js_log('update volume:' + perc); - embedObj.updateVolumen(perc); + embedObj.updateVolumen(perc); }, change:function(event, ui){ - var perc = ui.value/100; + var perc = ui.value/100; if (perc==0) { - $j('#volume_control_'+embedObj.id + ' span').removeClass('ui-icon-volume-on').addClass('ui-icon-volume-off'); - }else{ + $j('#volume_control_'+embedObj.id + ' span').removeClass('ui-icon-volume-on').addClass('ui-icon-volume-off'); + }else{ $j('#volume_control_'+embedObj.id + ' span').removeClass('ui-icon-volume-off').addClass('ui-icon-volume-on'); } - //only run the onChange event if done by a user slide: + //only run the onChange event if done by a user slide: if(embedObj.userSlide){ embedObj.userSlide=false; - embedObj.seeking=true; - var perc = ui.value/100; - embedObj.updateVolumen(perc); + embedObj.seeking=true; + var perc = ui.value/100; + embedObj.updateVolumen(perc); } - } - }); + } + });*/ - }, + }, getMvBufferHtml:function(){ - return '
'; + return '
'; }, components:{ 'borders':{ @@ -528,76 +588,95 @@ var ctrlBuilder = { }, 'mv_embedded_options':{ 'w':0, - 'o':function(){ - var o= '
'+ - '
'+ - '
'+ - '
'+ - '
Video Options
'+ - '
'+ - '
'+ - '

Stream Selection

'+ - '

Download

'+ - '

Share or Embed

'; - - //link to the stream page if we are not already there: - if( ctrlBuilder.embedObj.roe && typeof mv_stream_interface == 'undefined' ) - o+='

Source Page

'; - - o+='
'+ - '
' + - '
' + - '
'; + 'o':function( embedObj ){ + var o= '' + + '
' + + '' + + '
' + + '
' + + '

' + gM('chose_player')+'

' + + '
' + + '
' + + '

' + gM('download_clip')+'

' + + '
' + + '
' + + '

' + gM('share_this_video') + '

' + + '
' + + '
' + + '

' + gM('video_credits') + '

' + + '
' + + '
' + + '
'; return o; } }, - 'fullscreen':{ - 'w':20, + 'pause':{ + 'w':147, //28 147 'o':function(){ - return '' + return '' } }, - 'options':{ - 'w':26, + 'play_head':{ // scrubber + 'w':0, //special case (takes up remaining space) 'o':function(){ - return ''; + return '
' } }, - 'pause':{ - 'w':24, + 'time_display':{ + 'w':36, 'o':function(){ - return ''; + return '
' + seconds2npt ( ctrlBuilder.embedObj.getDuration() ) + '
'; } }, - 'closed_captions':{ - 'w':23, + 'volume_control':{ + 'w':47, 'o':function(){ - return '
' - } + return '' + + '
'; + + //vertical volume control: + /* return ''; + */ + } }, - 'volume_control':{ - 'w':23, + 'closed_captions':{ + 'w':24, 'o':function(){ - return ''; + return '
' + + '
'; } }, - 'time_display':{ - 'w':90, + 'fullscreen':{ + 'w':24, 'o':function(){ - return '
' + ctrlBuilder.embedObj.getTimeReq() + '
'; + return '' } }, - 'play_head':{ - 'w':0, //special case (takes up remaining space) + 'options':{ + 'w':50, 'o':function(){ - return '
'; + return '' } - } + } } } @@ -1117,7 +1196,7 @@ embedVideo.prototype = { }, playerPixelWidth : function() { - var player = $j('#mv_embedded_player_'+this.id).get(0); + var player = $j('#dc_'+this.id).get(0); if(typeof player!='undefined' && player['offsetWidth']) return player.offsetWidth; else @@ -1125,7 +1204,7 @@ embedVideo.prototype = { }, playerPixelHeight : function() { - var player = $j('#mv_embedded_player_'+this.id).get(0); + var player = $j('#dc_'+this.id).get(0); if(typeof player!='undefined' && player['offsetHeight']) return player.offsetHeight; else @@ -1343,6 +1422,11 @@ embedVideo.prototype = { //return the duration return this.duration; }, + timedTextSources:function(){ + if(!this.media_element.timedTextSources) + return false; + return this.media_element.timedTextSources() + }, /* * wrapEmebedContainer * wraps the embed code into a container to better support playlist function @@ -1400,7 +1484,7 @@ embedVideo.prototype = { // if(!this.selected_player){ // return this.getPluginMissingHTML(); //Set "loading" here - $j('#mv_embedded_player_'+_this.id).html(''+ + $j('#dc_'+_this.id).html(''+ '
' + gM('loading_plugin') + '
' @@ -1411,7 +1495,7 @@ embedVideo.prototype = { js_log('performing embed for ' + _this.id); var embed_code = _this.getEmbedHTML(); //js_log('shopuld embed:' + embed_code); - $j('#mv_embedded_player_'+_this.id).html(embed_code); + $j('#dc_'+_this.id).html(embed_code); }); }, onClipDone:function(){ @@ -1632,7 +1716,7 @@ embedVideo.prototype = { var _this = this; js_log('f:doThumbnailHTML'+ this.thumbnail_disp); this.closeDisplayedHTML(); - $j( '#mv_embedded_player_' + this.id ).html( this.getThumbnailHTML() ); + $j( '#dc_' + this.id ).html( this.getThumbnailHTML() ); this.paused = true; this.thumbnail_disp = true; }, @@ -1652,26 +1736,23 @@ embedVideo.prototype = { return ctrlBuilder.getControls( this ); }, getHTML : function (){ - //@@todo check if we have sources avaliable - js_log('embedVideo:getHTML : ' + this.id + ' resource type: ' + this.type); - var _this = this; - var html_code = ''; - html_code = '
'; - html_code += '
' + - this.getThumbnailHTML() + - '
'; - //js_log("mvEmbed:controls "+ typeof this.controls); - if( this.controls ) - { + js_log('f:getHTML : ' + this.id ); + var _this = this; + var html_code = ''; + + //get the thumbnail: + html_code = this.getThumbnailHTML(); + + if(this.controls){ js_log("f:getHTML:AddControls"); - html_code +='
'; + html_code +='
'; html_code += this.getControlsHTML(); html_code +='
'; //block out some space by encapulating the top level div $j(this).wrap('
'); - } - html_code += '
'; //videoPlayer div close + + (parseInt(this.height) + ctrlBuilder.height )+'px" id="k-player_' + this.id + '" class="k-player">
'); + } + //js_log('should set: '+this.id); $j(this).html( html_code ); //add hooks once Controls are in DOM @@ -1821,15 +1902,16 @@ embedVideo.prototype = { this.thumbnail = this.media_element.getThumbnailURL(); //put it all in the div container dc_id - thumb_html+= '
'+ - ''; + ''; - if(this.play_button == true && this.controls == true) + if( this.play_button == true && this.controls == true ) thumb_html+=this.getPlayButton(); - thumb_html+='
'; + thumb_html+='
'; return thumb_html; }, getEmbeddingHTML:function() @@ -1870,10 +1952,9 @@ embedVideo.prototype = { }, getPlayButton:function(id){ if(!id)id=this.id; - return ''; }, doLinkBack:function(){ @@ -2028,7 +2109,8 @@ embedVideo.prototype = { var this_id = (this.pc!=null)?this.pc.pp.id:this.id; var _this=this; - var out= '
'; +// var out= '
'; + var out= ''; var _this=this; //js_log('selected src'+ _this.media_element.selected_source.url); $j.each( this.media_element.getPlayableSources(), function(source_id, source){ @@ -2051,35 +2133,40 @@ embedVideo.prototype = { if (default_player) { - out += ''; - if( ! is_selected ) - out+=''; - out += source.getTitle()+ (is_selected?'':'') + ' '; +// out += ''; + out+='
' + + '

Choose Video Player

' + + '
    '; +// if( ! is_selected ) +// out+=''; +// out += source.getTitle()+ (is_selected?'':'') + ' '; //output the player select code: - var supporting_players = embedTypes.players.getMIMETypePlayers( source.getMIMEType() ); - out+='
      '; + var supporting_players = embedTypes.players.getMIMETypePlayers( source.getMIMEType() ); +// out+='
      '; }else out+= source.getTitle() + ' - no player available'; }); - out+='
'; +// out+='
'; this.displayHTML(out); //set up the click bindings: @@ -2120,29 +2207,34 @@ embedVideo.prototype = { } }, getShowVideoDownload:function(){ - var out='
' + - ''+gM('download_segment')+'
'; - out+='
'+ - gM('download_right_click') + '

'; - var dl_list=''; - var dl_txt_list=''; +// var out='
' + +// ''+gM('download_segment')+'
'; +// out+='
'+ +// gM('download_right_click') + '

'; + var out='
' + + '

Download Video

' + + '
    '; +// var dl_list=''; +// var dl_txt_list=''; $j.each(this.media_element.getSources(), function(index, source){ - var dl_line = '
  • ' + ' ' - + source.getTitle()+' '+ '
    • '+"\n"; - if( source.getURI().indexOf('?t=')!==-1){ - out+=dl_line; - }else if( this.getMIMEType()=="text/cmml" || this.getMIMEType()=="text/x-srt" ){ - dl_txt_list+=dl_line; - }else{ - dl_list+=dl_line; +// var dl_line = '
  • ' + ' ' +// + source.getTitle()+' '+ '
    • '+"\n"; + var dl_line = '
  • ' + ' ' + source.getTitle() + '
    • \n'; + if(source.getURI().indexOf('?t=')!==-1) { + out+=dl_line; + } + else if(this.getMIMEType()=="text/cmml" || this.getMIMEType()=="text/x-srt") { + dl_txt_list+=dl_line; + } + else { + dl_list+=dl_line; } }); - - if(dl_list!='') - out+=gM('download_full') + '
    ' + dl_list + '
    '; - if(dl_txt_list!='') - out+=gM('download_text')+'
    ' + dl_txt_list +'
    '; - out+='
'; +// if(dl_list!='') +// out+=gM('download_full') + '
' + dl_list + '
'; +// if(dl_txt_list!='') +// out+=gM('download_text')+'
' + dl_txt_list +'
'; + out+='
'; return out; }, /* @@ -2172,11 +2264,11 @@ embedVideo.prototype = { this.paused=false; //make sure we are not "paused" this.seeking=false; } - - $j("#mv_play_pause_button_" + this_id + ' span').removeClass('ui-icon-play').addClass('ui-icon-pause'); - $j("#mv_play_pause_button_" + this_id).unbind().btnBind().click(function(){ + + $j('#'+ this_id + ' .play-btn .ui-icon').removeClass('ui-icon-play').addClass('ui-icon-pause'); + $j('#'+ this_id + ' .play-btn').unbind().btnBind().click(function(){ $j('#' + this_id ).get(0).pause(); - }).attr('title', gM('pause_clip')); + }).attr('title', gM('pause_clip')); }, load:function(){ @@ -2188,7 +2280,7 @@ embedVideo.prototype = { }, /* * base embed pause - * there is no general way to pause the video + * there is no general way to pause the video * must be overwritten by embed object to support this functionality. */ pause: function(){ @@ -2197,8 +2289,8 @@ embedVideo.prototype = { //(playing) do pause this.paused = true; //update the ctrl "paused state" - $j("#mv_play_pause_button_" + this_id + ' span').removeClass('ui-icon-pause').addClass('ui-icon-play'); - $j("#mv_play_pause_button_" + this_id).unbind().btnBind().click(function(){ + $j('#'+ this_id + ' .play-btn .ui-icon').removeClass('ui-icon-pause').addClass('ui-icon-play'); + $j('#'+ this_id + ' .play-btn').unbind().btnBind().click(function(){ $j('#'+this_id).get(0).play(); }).attr('title', gM('play_clip')); }, @@ -2234,7 +2326,7 @@ embedVideo.prototype = { } //make sure the big playbutton is has click action: - $j('#big_play_link_' + _this.id).unbind('click').click(function(){ + $j('#'+ _this.id +' .play-btn-large').unbind('click').btnBind().click(function(){ $j('#' +_this.id).get(0).play(); }); @@ -2248,8 +2340,8 @@ embedVideo.prototype = { var this_id = (this.pc!=null)?this.pc.pp.id:this.id; if(this.muted){ this.muted=false; - $j('#volume_control_'+this_id + ' span').removeClass('ui-icon-volume-off').addClass('ui-icon-volume-on'); - $j('#volume_bar_'+this_id).slider('value', 100); + $j( '#volume_control_' + this_id + ' span').removeClass('ui-icon-volume-off').addClass('ui-icon-volume-on'); + $j( '#volume_bar_' + this_id).slider('value', 100); this.updateVolumen(1); }else{ this.muted=true; @@ -2265,7 +2357,7 @@ embedVideo.prototype = { fullscreen:function(){ js_log('fullscreen not supported with current playback type'); }, - /* returns bool true if playing or paused, false if stooped + /* returns bool true if playing or paused, false if stopped */ isPlaying : function(){ if(this.thumbnail_disp){ @@ -2338,12 +2430,11 @@ embedVideo.prototype = { this.monitorTimerId = 0; } }, - updateBufferStatus: function(){ - + updateBufferStatus: function(){ //build the buffer targeet based for playlist vs clip var buffer_select = (this.pc) ? - '#cl_status_' + this.id + ' .mv_buffer': - '#mv_play_head_' + this.id + ' .mv_buffer'; + '#cl_status_' + this.id + ' .ui-slider-buffer': + '#' + this.id + ' .ui-slider-buffer'; //update the buffer progress bar (if available ) if( this.bufferedPercent != 0 ){ @@ -2387,19 +2478,17 @@ embedVideo.prototype = { //do head request if on the same domain return this.media_element.selected_source.URLTimeEncoding; }, - setSliderValue: function(perc, hide_progress){ + setSliderValue: function(perc, hide_progress){ if(this.controls){ var this_id = (this.pc)?this.pc.pp.id:this.id; - var val = parseInt( perc*1000 ); - $j('#mv_play_head_'+this_id).slider('value', val); - - //js_log("embed video set: " + '#mv_play_head_'+this_id + ' to ' + val); + var val = parseInt( perc*1000 ); + $j('#'+this.id + ' .j-scrubber').slider('value', val); } //js_log('set#mv_seeker_slider_'+this_id + ' perc in: ' + perc + ' * ' + $j('#mv_seeker_'+this_id).width() + ' = set to: '+ val + ' - '+ Math.round(this.mv_seeker_width*perc) ); //js_log('op:' + offset_perc + ' *('+perc+' * ' + $j('#slider_'+id).width() + ')'); }, highlightPlaySection:function(options){ - js_log('highlightPlaySection'); + js_log('highlightPlaySection'); var this_id = (this.pc)?this.pc.pp.id:this.id; var dur = this.getDuration(); var hide_progress = true; @@ -2450,7 +2539,8 @@ embedVideo.prototype = { setStatus:function(value){ var id = (this.pc)?this.pc.pp.id:this.id; //update status: - $j('#mv_time_'+id).html(value); + //$j('#mv_time_'+id).html(value); + $j('#'+this.id + ' .k-timer').html(value); } } diff --git a/js2/mwEmbed/libEmbedVideo/nativeEmbed.js b/js2/mwEmbed/libEmbedVideo/nativeEmbed.js index c547dd88a6..f437e4964a 100644 --- a/js2/mwEmbed/libEmbedVideo/nativeEmbed.js +++ b/js2/mwEmbed/libEmbedVideo/nativeEmbed.js @@ -46,7 +46,7 @@ var nativeEmbed = { }, //@@todo : loading progress postEmbedJS:function(){ - var _this = this; + var _this = this; js_log("f:native:postEmbedJS:"); this.getVID(); var doActualPlay= function(){ diff --git a/js2/mwEmbed/mv_embed.js b/js2/mwEmbed/mv_embed.js index f010d8a660..f1e246c10f 100644 --- a/js2/mwEmbed/mv_embed.js +++ b/js2/mwEmbed/mv_embed.js @@ -28,7 +28,7 @@ var MV_EMBED_VERSION = '1.0r19'; * @@ more config valuse on the way ;) */ var defaultMwConfig = { - 'skin_name': 'mvpcf', + 'skin_name': 'kskin', 'video_size':'400x300' } @@ -64,7 +64,7 @@ var jQueryUiVN = 'jquery.ui-1.7.1'; //setup the skin path: -var mv_jquery_skin_path = mv_embed_path + 'jquery/' + jQueryUiVN + '/themes/redmond/'; +var mv_jquery_skin_path = mv_embed_path + 'jquery/' + jQueryUiVN + '/themes/base/'; var mv_skin_img_path = mv_embed_path + 'skins/' + mwConfig['skin_name'] + '/images/'; var mv_default_thumb_url = mv_skin_img_path + 'vid_default_thumb.jpg'; @@ -1252,7 +1252,7 @@ function loadExternalJs( url, callback ){ // else{ var e = document.createElement("script"); e.setAttribute('src', url); - e.setAttribute('type',"text/javascript"); + e.setAttribute('type', "text/javascript"); /*if(callback) e.onload = callback; */ diff --git a/js2/mwEmbed/skins/kskin/images/Thumbs.db b/js2/mwEmbed/skins/kskin/images/Thumbs.db new file mode 100644 index 0000000000..bc201c2af6 Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/Thumbs.db differ diff --git a/js2/mwEmbed/skins/kskin/images/kaltura_open_source_video_platform.gif b/js2/mwEmbed/skins/kskin/images/kaltura_open_source_video_platform.gif new file mode 100644 index 0000000000..cf05af2544 Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/kaltura_open_source_video_platform.gif differ diff --git a/js2/mwEmbed/skins/kskin/images/kaltura_open_source_video_platform.png b/js2/mwEmbed/skins/kskin/images/kaltura_open_source_video_platform.png new file mode 100644 index 0000000000..9d438b5bc8 Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/kaltura_open_source_video_platform.png differ diff --git a/js2/mwEmbed/skins/kskin/images/ksprite.png b/js2/mwEmbed/skins/kskin/images/ksprite.png new file mode 100644 index 0000000000..ed5ec0840e Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/ksprite.png differ diff --git a/js2/mwEmbed/skins/kskin/images/ui-bg_flat_0_aaaaaa_40x100.png b/js2/mwEmbed/skins/kskin/images/ui-bg_flat_0_aaaaaa_40x100.png new file mode 100644 index 0000000000..5b5dab2ab7 Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/ui-bg_flat_0_aaaaaa_40x100.png differ diff --git a/js2/mwEmbed/skins/kskin/images/ui-bg_flat_75_ffffff_40x100.png b/js2/mwEmbed/skins/kskin/images/ui-bg_flat_75_ffffff_40x100.png new file mode 100644 index 0000000000..ac8b229af9 Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/ui-bg_flat_75_ffffff_40x100.png differ diff --git a/js2/mwEmbed/skins/kskin/images/ui-bg_glass_55_fbf9ee_1x400.png b/js2/mwEmbed/skins/kskin/images/ui-bg_glass_55_fbf9ee_1x400.png new file mode 100644 index 0000000000..ad3d6346e0 Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/ui-bg_glass_55_fbf9ee_1x400.png differ diff --git a/js2/mwEmbed/skins/kskin/images/ui-bg_glass_65_ffffff_1x400.png b/js2/mwEmbed/skins/kskin/images/ui-bg_glass_65_ffffff_1x400.png new file mode 100644 index 0000000000..42ccba269b Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/ui-bg_glass_65_ffffff_1x400.png differ diff --git a/js2/mwEmbed/skins/kskin/images/ui-bg_glass_75_dadada_1x400.png b/js2/mwEmbed/skins/kskin/images/ui-bg_glass_75_dadada_1x400.png new file mode 100644 index 0000000000..5a46b47cb1 Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/ui-bg_glass_75_dadada_1x400.png differ diff --git a/js2/mwEmbed/skins/kskin/images/ui-bg_glass_75_e6e6e6_1x400.png b/js2/mwEmbed/skins/kskin/images/ui-bg_glass_75_e6e6e6_1x400.png new file mode 100644 index 0000000000..86c2baa655 Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/ui-bg_glass_75_e6e6e6_1x400.png differ diff --git a/js2/mwEmbed/skins/kskin/images/ui-bg_glass_95_fef1ec_1x400.png b/js2/mwEmbed/skins/kskin/images/ui-bg_glass_95_fef1ec_1x400.png new file mode 100644 index 0000000000..4443fdc1a1 Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/ui-bg_glass_95_fef1ec_1x400.png differ diff --git a/js2/mwEmbed/skins/kskin/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/js2/mwEmbed/skins/kskin/images/ui-bg_highlight-soft_75_cccccc_1x100.png new file mode 100644 index 0000000000..7c9fa6c6ed Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/ui-bg_highlight-soft_75_cccccc_1x100.png differ diff --git a/js2/mwEmbed/skins/kskin/images/ui-icons_222222_256x240.png b/js2/mwEmbed/skins/kskin/images/ui-icons_222222_256x240.png new file mode 100644 index 0000000000..ee039dc096 Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/ui-icons_222222_256x240.png differ diff --git a/js2/mwEmbed/skins/kskin/images/ui-icons_2e83ff_256x240.png b/js2/mwEmbed/skins/kskin/images/ui-icons_2e83ff_256x240.png new file mode 100644 index 0000000000..45e8928e52 Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/ui-icons_2e83ff_256x240.png differ diff --git a/js2/mwEmbed/skins/kskin/images/ui-icons_454545_256x240.png b/js2/mwEmbed/skins/kskin/images/ui-icons_454545_256x240.png new file mode 100644 index 0000000000..7ec70d11bf Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/ui-icons_454545_256x240.png differ diff --git a/js2/mwEmbed/skins/kskin/images/ui-icons_888888_256x240.png b/js2/mwEmbed/skins/kskin/images/ui-icons_888888_256x240.png new file mode 100644 index 0000000000..5ba708c391 Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/ui-icons_888888_256x240.png differ diff --git a/js2/mwEmbed/skins/kskin/images/ui-icons_cd0a0a_256x240.png b/js2/mwEmbed/skins/kskin/images/ui-icons_cd0a0a_256x240.png new file mode 100644 index 0000000000..7930a55809 Binary files /dev/null and b/js2/mwEmbed/skins/kskin/images/ui-icons_cd0a0a_256x240.png differ diff --git a/js2/mwEmbed/skins/kskin/styles.css b/js2/mwEmbed/skins/kskin/styles.css new file mode 100644 index 0000000000..cd5649b177 --- /dev/null +++ b/js2/mwEmbed/skins/kskin/styles.css @@ -0,0 +1,110 @@ + +/* player styles */ +.k-player { width:400px; height:340px; position:relative;} /* inline via jq */ +.k-player * { padding:0; margin:0;} /* inline via jq */ + .k-edit-bar { } + .k-edit-bar a { width:33px; padding: 1px 0 0; display:block; text-align:center; font-weight:bold; color:#888; text-decoration:none; background:#F2F2F2;} + + .k-video { width:400px; height:300px; background:#000; margin-bottom:1px;} /* h & w inline via jq */ + .k-control-bar { height:21px; padding: 2px 0 0 6px; margin-top:1px; background: url(images/ksprite.png) repeat-x 0 -81px; font: normal 11px arial,sans-serif; color:#555;} + .k-control-bar button, .k-control-bar div.ui-slider, .k-control-bar div.k-timer { float:left;} + .k-timer { margin-top:2px;} + .k-volume-slider { width:26px;} + .k-control-bar .k-options { width:50px; height:22px; margin-top:-2px; border: solid 1px #aaa; border-top:none; float:right; font: bold 11px arial,sans-serif; color:#555;} + span.ui-icon.ui-icon-k-menu { width:auto; padding-left:2px; background:none; outline:none; cursor:default;} +.k-menu { background:#181818; position:absolute; top:0; left:0; display:none,filter:alpha(opacity=90); opacity: 0.9;} /* h, w, top inline via jq top:15px*/ + ul.k-menu-bar { height:128px; padding: 0 0 5px;position:absolute; bottom:5px;right:0px; list-style: none outside none; background: url(images/ksprite.png) -99px -104px no-repeat;} /* eventually: mtop inline via jq */ + .k-menu-bar li a { display:block; width:49px; height:32px; margin-left:1px; text-indent:99999px; background: url(images/ksprite.png) -51px -110px no-repeat; overflow:hidden;} + .k-menu-bar li a:hover { background-position: -1px -110px;} + .k-menu-bar li.k-download-btn a { background-position: -51px -141px;} + .k-menu-bar li.k-download-btn a:hover { background-position: -1px -141px;} + .k-menu-bar li.k-share-btn a { background-position: -51px -172px;} + .k-menu-bar li.k-share-btn a:hover { background-position: -1px -172px;} + .k-menu-bar li.k-credits-btn a { background-position: -51px -203px;} + .k-menu-bar li.k-credits-btn a:hover { background-position: -1px -203px;} + +.k-menu-screens { width:320px; padding: 13px 10px 15px 15px; float:left;} /* w & h inline via jq */ + .k-menu-screens h2 { padding: 0 0 5px 1px; clear:both; font-size:12px; color:#666;} + .k-menu-screens p { margin: 6px 0;} + .k-menu-screens a { ;} + .k-menu-screens a img { border:none;} + .k-menu-screens ul { padding:0; margin: 6px 0 0; list-style: none outside none;} + +.k-edit-screen { width:370px; height:223px; padding-top:77px; text-align:center; background:#181818; color:#fff;} + .k-edit-screen div { } + .k-edit-screen a { color:#7BB8FC;} + .k-edit-screen a img { border:none;} + +/* end player */ + +.k-slide-window { overflow:hidden;} +.k-screen.k-credits ul { float:left;} +.k-screen.k-credits li { height:39px; padding: 11px 11px 11px 11px; margin-bottom:12px; display:block; background:#333;} + .k-screen.k-credits li a { padding:0; background:none;} + .k-screen.k-credits li img { float:left; background:blue;} + .k-screen.k-credits li div { height:39px; padding-left:11px; floats:left; overflow:hidden;} + + a.k-prev-credit, a.k-next-credit { width:65px; height:28px; margin: -13px auto -6px; display:block; background: url(images/ksprite.png) 0px -320px no-repeat;} + a.k-next-credit { margin: 0 0 1px; position:absolute; bottom:0; background-position: -0px -290px;} + a:hover.k-prev-credit { background-position: 0px -238px;} + a:hover.k-next-credit { background-position: 0px -260px;} + + .k-logo { margin:8px 0 0 1px; display:block;} + + .k_field_wrap { border: solid 1px #444; margin-bottom:7px;} + .k-screen.k-share button { width:70px; padding:2px 5px 3px; border:1px solid #000; float:right; background: #D4D4D4 url(images/ksprite.png) no-repeat -32px 0; color:#000; float:right;} + .k-menu textarea { width:100%; height:15px; border: solid 2px #000; border-bottom:none; border-right:none; background:transparent; color:#ccc; overflow:hidden;} + + .k-screen.k-share div.ui-state-highlight { width:90px; padding:2px 5px; border-color:#554926; float:left; background:none; color:#FFE96E;} + .k-screen.k-share div.ui-state-highlight a { color:#FFE96E; font-weight:bold;} + .k-screen.k-share div.ui-state-highlight a:hover { } + +.k-menu-screens li { height:14px; margin-bottom:6px;} +.k-menu-screens li a { padding-left:22px; background:url(images/ksprite.png) no-repeat -85px -274px; text-decoration:none;} +.k-menu-screens li a.active, .k-menu-screens li a:hover.active { background-position: -85px -247px;} +.k-menu-screens li a:hover { background-position: -85px -260px;} + +.k-options.ui-state-hover { color:blue;} + +.k-players { display:none} +.k-credits { display:nones} + +.ui-state-default .ui-icon, .ui-state-hover .ui-icon { background: url(images/ksprite.png) no-repeat 0 -48px;} +.ui-state-default .ui-icon-play { background:url(images/ksprite.png) no-repeat 0 0;} +.ui-state-hover .ui-icon-play { background-position: -16px 0;} + +.ui-state-default .ui-icon-pause { background:url(images/ksprite.png) no-repeat 0 -17px;} +.ui-state-hover .ui-icon-pause { background-position: -16px -17px;} + + + .ui-state-default .ui-icon-arrow-4-diag { background-position: 0 -32px;} /* fullscreen */ + .ui-state-hover .ui-icon-arrow-4-diag { background-position: -16px -32px;} + .ui-state-default .ui-icon-volume-on, .ui-state-hover .ui-icon-volume-off, { margin-left:-6px; background-position: -16px -48px;} + .ui-state-hover .ui-icon-volume-on, .ui-state-default .ui-icon-volume-off { margin-left:-6px; background-position: 0 -48px;} + + .k-control-bar .ui-slider { height:8px; border: solid 1px #eee; margin: 4px 10px 0 7px; position:relative; background:url(images/ksprite.png) repeat-x 0 -350px;} + .k-control-bar .ui-slider-handle { width:8px; height:8px; border: solid 1px #888; margin: -1px 0 0 -5px; display:block; position:relative; background: url(images/ksprite.png) no-repeat -67px -341px; position:absolute;} + .k-control-bar .ui-slider-range { height:8px; position:absolute; background: url(images/ksprite.png) repeat-x 0 -368px; -moz-border-radius:5px; -webkit-border-radius:5px;} + .k-control-bar .ui-slider-buffer { height:8px; position:absolute; background: url(images/ksprite.png) repeat-x 0 -359px; -moz-border-radius:5px; -webkit-border-radius:5px;} + + .k-control-bar .ui-slider.k-volume-slider { height:15px; margin: 2px 3px 0 -4px; /* ie = m: 3 3 0 -2 */ border:none; background-position: -66px -323px; -moz-border-radius:0px; -webkit-border-radius:0px;} + .k-control-bar .k-volume-slider a.ui-slider-handle { width:8px; height:18px; margin: -3px 5px 0 -1px; border:none; display:block; position:absolute; background:none;} + .k-control-bar .k-volume-slider a:hover.ui-slider-handle { border: solid 1px #999;} + .k-control-bar .k-volume-slider .ui-slider-range { height:17px; position:absolute; background: url(images/ksprite.png) repeat-x -66px -306px; -moz-border-radius:0; -webkit-border-radius:0;} + + .play-btn-large { width:120px; height:55px; background: url(images/ksprite.png) no-repeat 28px -433px; position:absolute; cursor:pointer;} /*.ui-state-default */ + .play-btn-large.ui-state-hover { background: url(images/ksprite.png) no-repeat 28px -377px; } + + .k-volume.ui-state-hover { margin-left:6px; } + + /* move to ie css */ + .k-volume-slider span, span.ui-icon-play, span.ui-icon-volume-on, button.k-fullscreen { *margin-top:-1px;} + span.ui-icon-volume-on { *margin-left:0 !important;} + .ui-state-hover.k-volume { *margin-left:0 !important;} + span.ui-icon-k-menu { *margin-top:3px;} + .k-control-bar .ui-slider.k-volume-slider { *margin-left:-2px;} + /* end css */ + + /* debug only ! */ + .k-menu-screens { display:none;} + /* end debug */