Revision: 48470
Author: dale
Date: 2009-03-16 23:39:43 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
add media wizard updates for archive.org
Modified Paths:
--------------
trunk/extensions/MetavidWiki/skins/add_media_wizard.js
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/remoteSearchDriver.js
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/searchLibs/metavidSearch.js
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/searchLibs/solrArchiveSearch.js
trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/styles.css
Modified: trunk/extensions/MetavidWiki/skins/add_media_wizard.js
===================================================================
--- trunk/extensions/MetavidWiki/skins/add_media_wizard.js 2009-03-16
23:39:03 UTC (rev 48469)
+++ trunk/extensions/MetavidWiki/skins/add_media_wizard.js 2009-03-16
23:39:43 UTC (rev 48470)
@@ -100,7 +100,7 @@
imE = document.getElementById('mv-add_media');
if(imE){
addHandler( imE, 'click', function() {
- mv_do_load_wiz();
+ mv_do_load_wiz();
});
}
//load mv_embed and do text search interface:
Modified:
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/remoteSearchDriver.js
===================================================================
---
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/remoteSearchDriver.js
2009-03-16 23:39:03 UTC (rev 48469)
+++
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/remoteSearchDriver.js
2009-03-16 23:39:43 UTC (rev 48470)
@@ -109,7 +109,7 @@
'wiki_commons':{
'enabled':1,
'checked':1,
- 'd' :1,
+ 'd' :0,
'title' :'Wikipedia Commons',
'desc' : 'Wikimedia Commons is a media file repository
making available public domain '+
'and freely-licensed educational media
content (images, sound and video clips) to all.',
@@ -131,7 +131,7 @@
'archive_org':{
'enabled':1,
'checked':1,
- 'd' :0,
+ 'd' :1,
'title' : 'Archive.org',
'desc' : 'The Internet Archive, a digital library of
cultural artifacts',
'homepage':'http://archive.org',
@@ -534,6 +534,8 @@
if(typeof cp['sObj'] != 'undefined'){
$j.each(cp.sObj.resultsObj, function(rInx,
rItem){
var disp = ( cp.d ) ? '' :
'display:none;';
+
+
if( _this.result_display_mode == 'box'
){
o+='<div id="mv_result_' + rInx
+ '" class="mv_clip_box_result" style="' + disp + 'width:' +
_this.thumb_width + 'px;height:'+ (_this.thumb_width-20)
+'px;position:relative;">';
@@ -554,14 +556,20 @@
'"
href="' + rItem.link + '"><img src="' + stylepath +
'/common/images/magnify-clip.png"></a>';
//add license icons if
present
- if( rItem.license ){
- o+=
_this.getlicenseImgSet( rItem.license );
- }
+ if( rItem.license )
+ o+=
_this.getlicenseImgSet( rItem.license );
o+='</div>';
}else if(_this.result_display_mode ==
'list'){
o+='<div id="mv_result_' + rInx
+ '" class="mv_clip_list_result" style="' + disp + 'width:90%">';
o+='<img
title="'+rItem.title+'" class="rsd_res_item" id="res_' + rInx +'"
style="float:left;width:' +
-
_this.thumb_width + 'px; padding:5px;" src="' + rItem.poster + '">';
+
_this.thumb_width + 'px; padding:5px;" src="' +
+
cp.sObj.getImageTransform( rItem, {'width':_this.thumb_width } )
+ +
'">';
+
+ //add license icons if
present
+ if( rItem.license )
+ o+=
_this.getlicenseImgSet( rItem.license );
+
o+= rItem.desc ;
o+='<div style="clear:both"
/>';
o+='</div>';
@@ -576,21 +584,30 @@
this.addResultBindings();
},
addResultBindings:function(){
- var _this = this;
+ var _this = this;
$j('.mv_clip_'+_this.result_display_mode+'_result').hover(function(){
$j(this).addClass('mv_clip_'+_this.result_display_mode+'_result_over');
+ //also set the animated image if avaliable
+ var res_id =
$j(this).children('.rsd_res_item').attr('id');
+ var rObj = _this.getResourceFromId( res_id );
+ if( rObj.poster_ani )
+ $j('#' + res_id ).attr('src', rObj.poster_ani);
+
},function(){
-
$j(this).removeClass('mv_clip_'+_this.result_display_mode+'_result_over');
+
$j(this).removeClass('mv_clip_'+_this.result_display_mode+'_result_over');
+ var res_id =
$j(this).children('.rsd_res_item').attr('id');
+ var rObj = _this.getResourceFromId( res_id );
+ //restore the original (non animated)
+ $j('#' + res_id ).attr('src', rObj.poster);
});
//resource click action: (bring up the resource editor)
- $j('.rsd_res_item').click(function(){
- //get the resource obj:
- var rObj = _this.getResourceFromId( this.id );
+ $j('.rsd_res_item').click(function(){
+ var rObj = _this.getResourceFromId( $j(this).attr("id")
);
_this.resourceEdit( rObj, this );
});
},
resourceEdit:function( rObj, rsdElement){
- js_log('f:resourceEdit');
+ js_log('f:resourceEdit:' + rObj.title);
var _this = this;
//remove any existing resource edit interface:
$j('#rsd_resource_edit').remove();
@@ -700,7 +717,7 @@
}).error(function () {
js_log("Error with: " + imObj.url);
}).attr('src', imObj.url);
- });
+ });
},
//loads the media editor:
doMediaEdit:function( rObj , mediaType){
Modified:
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/searchLibs/metavidSearch.js
===================================================================
---
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/searchLibs/metavidSearch.js
2009-03-16 23:39:03 UTC (rev 48469)
+++
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/searchLibs/metavidSearch.js
2009-03-16 23:39:43 UTC (rev 48470)
@@ -70,7 +70,8 @@
},
getEmbedHTML:function( rObj , options ){
var id_attr = (options['id'])?' id = "' + options['id'] +'" ':
'';
- var style_attr = (options['max_width'])?'
style="width:'+options['max_width']+'px;"':'';
+ var style_attr = (options['max_width'])?'
style="width:'+options['max_width']+'px;"':'';
+ //@@maybe check type here ?
if(options['only_poster']){
return '<img ' + id_attr + ' src="' + rObj['poster']+'"
' + style_attr + '>';
}else{
Modified:
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/searchLibs/solrArchiveSearch.js
===================================================================
---
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/searchLibs/solrArchiveSearch.js
2009-03-16 23:39:03 UTC (rev 48469)
+++
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/searchLibs/solrArchiveSearch.js
2009-03-16 23:39:43 UTC (rev 48470)
@@ -57,14 +57,19 @@
'link'
:'http://www.archive.org/details/' + resource.identifier,
'title' :resource.title
};
-
rObj['poster']='http://www.archive.org/download/'+resource.identifier+'/format=thumbnail';
+
rObj['poster']='http://www.archive.org/download/' +
resource.identifier+'/format=thumbnail';
+
rObj['poster_ani']='http://www.archive.org/download/' +
resource.identifier+'/format=Animated+Gif';
+
rObj['thumbwidth']=160;
rObj['thumbheight']=110;
- rObj['src']='http://www.archive.org/download/'+
+resource.identifier+'/format=Ogg+video';
- rObj['mime']='application/ogg';
+ rObj['src']='http://www.archive.org/download/'
+ resource.identifier+'/format=Ogg+video';
+ rObj['mime']='application/ogg';
rObj['pSobj']=_this;
- this.resultsObj[resource_id] =rObj;
+ //set the licence:
+
+ this.resultsObj[ resource_id ] =rObj;
+
//likely a audio clip if no poster and type
application/ogg
//@@todo we should return audio/ogg for the
mime type or some other way to specify its "audio"
@@ -76,6 +81,10 @@
}
},
getEmbedHTML: function( rObj , options) {
- //alert('archive.org support not yet ready');
+ js_log('getEmbedHTML:: ' + rObj.poster );
+ var id_attr = (options['id'])?' id = "' + options['id'] +'" ':
'';
+ if(rObj.mime == 'application/ogg' || rObj.mime == 'audio/ogg'
|| rObj.mime=='video/ogg'){
+ return '<video ' + id_attr + ' src="' + rObj.src + '"
poster="' + rObj.poster + '" type="video/ogg"></video>';
+ }
},
}
\ No newline at end of file
Modified: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/styles.css
===================================================================
--- trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/styles.css
2009-03-16 23:39:03 UTC (rev 48469)
+++ trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/styles.css
2009-03-16 23:39:43 UTC (rev 48470)
@@ -581,6 +581,7 @@
padding:10px;
border: thin solid #BBB;
clear:both;
+ position:relative;
}
.mv_clip_list_result_over{
padding:10px;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
