diff -r a5f517ac1c03 -r 57a2650a7f87 web/static/ldt/js/projectscontents.js
--- a/web/static/ldt/js/projectscontents.js	Fri Feb 04 18:41:55 2011 +0100
+++ b/web/static/ldt/js/projectscontents.js	Fri Feb 11 13:31:26 2011 +0100
@@ -13,33 +13,26 @@
 	}
 };
 
+
 function init_events_base(base_node, embed_url) {
-
+	
+	$('.ldt_link',base_node).each(function(i){
+		$(this).attr("target","_iri");
+	});
 	$('.ldt_link',base_node).nyroModal({
-       	type: 'iframe',
-       	forceType: 'iframe',
-       	windowResize: false,
-   		height:662, 
-   		width:1022,
-   		bgColor: 'rgb(239, 239, 239)',
-   		padding: 5,
-   		titleFromIframe: false,
-        beforeHideContent: function(elts, settings, callback){
-	        try {
-	             var res = $('#ldtInitSwf',$('#nyroModalIframe').contents());
-	             if(res.length > 0)
-	             {
-	             	   res.get(0).forceSave();
-	             }
-	        }
-	        catch(err)
-	        {
-	         // do nothing
-	        }                   
-	        callback();
-   		}
-
-      	});
+		filters: ['iriIFrame'],
+		sizes: {
+			minW: '1022',
+			minH: '662'
+		},
+		showCloseButton: true,
+		callbacks: {
+			afterShowCont: function(nm) {
+				nm.store.iframe.height(662);
+				nm.store.iframe.width(1022);
+			}
+		}
+      });
     	
 
 	$('.ldt_link_embed',base_node).click(function(e) {
@@ -48,20 +41,23 @@
 		var json_url = link.attr("href");
 		var player_id = link.attr("id");
 		var ldt_id = player_id.substring(15);
-		/*$.nyroModalSettings({
-		 	ajax: { data: ({ json_url:json_url, player_id:player_id }) }
-		  	});*/
-		   $.nyroModalManual({
-		       type: 'iframe',
-		       forceType: 'iframe',
-		       titleFromIframe: false,
-		       height:662, 
-               width:750,
-               bgColor: 'rgb(239, 239, 239)',
-               padding: 5,
-		       url: embed_url+'?json_url='+escape(json_url)+'&player_id='+escape(player_id)+'&ldt_id='+escape(ldt_id)
-		   });
-		   return false;
+		$('<a />', {
+			href: embed_url+'?json_url='+escape(json_url)+'&player_id='+escape(player_id)+'&ldt_id='+escape(ldt_id),
+			target: "_blank"
+		}).nyroModal({
+			filters: ['iframe'],
+			sizes: {
+				minW: '750',
+				minH: '662'
+			},
+			callbacks: {
+				afterShowCont: function(nm) {
+					nm.store.iframe.height(662);
+					nm.store.iframe.width(750);
+				}
+		    }
+		    }).trigger('nyroModal');
+		return false;
 	});
 
 
@@ -140,96 +136,97 @@
 
 	init_events_base(base_node, embed_url);
 	
-	$('.content_link_create').nyroModal({
-	    type: 'iframe',
-	    forceType: 'iframe',
-	    height:500, 
-	    width:765,
-	    bgColor: 'rgb(239, 239, 239)',
-	    padding: 5,
-	    titleFromIframe: false,
-	    endRemove: function(elts, settings) {
-	    	searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url)
-		},
-	  	endShowContent: function(elts, settings) {
-		  	$('#nyroModalIframe', elts.content).load(function() {
-			  	var form_status = $(this).contents().find("#content_form_status").val(); 
-			  	if(form_status == 'saved' || form_status == 'deleted' ) {
-			  		$.nyroModalRemove();
-			  	}
-		  	});
-		}
+	$('.content_link_create').each(function(i){
+		$(this).attr("target","_blank");
 	});
-	
-	$('.contenttitlelink').nyroModal({
-	    type: 'iframe',
-	    forceType: 'iframe',
-	    height:500, 
-	    width:765,
-	    bgColor: 'rgb(239, 239, 239)',
-	    padding: 5,
-	    titleFromIframe: false,
-	    endRemove: function(elts, settings) {
-	    	searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url,0);
+	$('.content_link_create').nyroModal({
+		filters: ['iframe'],
+		sizes: {
+			minW: 770,
+			minH: 500
 		},
-	  	endShowContent: function(elts, settings) {
-		  	$('#nyroModalIframe', elts.content).load(function() {
-			  	var form_status = $(this).contents().find("#content_form_status").val(); 
-			  	if(form_status == 'saved' || form_status == 'deleted') {
-			  		$.nyroModalRemove();
-			  	}
-		  	});
+		callbacks: {
+			afterClose: function(nm) {
+				searchCallback($('#searchprojectsinput'), "#contentslistcontainer", content_filter_url);
+			},
+			afterShowCont: function(nm) {
+				nm.store.iframe.width(770);
+				nm.store.iframe.height(500);
+				nm.store.iframe.load(function() {
+				  	var form_status = $(this).contents().find("#content_form_status").val(); 
+				  	if(form_status == 'saved' || form_status == 'deleted' ) {
+				  		$.nmTop().close();
+				  	}
+			  	});
+			}			
 		}
 	});
 
-
+	$('.contenttitlelink').each(function(i){
+		$(this).attr("target","_blank");
+	});
+	$('.contenttitlelink').nyroModal({
+		filters: ['iframe'],
+		sizes: {
+			minW: 770,
+			minH: 500
+		},
+		callbacks: {
+			afterClose: function(nm) {
+				searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url,0);	
+			},
+			afterShowCont: function(nm) {
+				nm.store.iframe.width(770);
+				nm.store.iframe.height(500);
+				nm.store.iframe.load(function() {
+				  	var form_status = $(this).contents().find("#content_form_status").val(); 
+				  	if(form_status == 'saved' || form_status == 'deleted') {
+				  		$.nmTop().close();
+				  	}
+			  	});
+			}
+		}
+	});
 }
 
 function init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl) {
 
+	$('.ldt_link_create',base_node).each(function(i){
+		$(this).attr("target","_iri");
+	});
  	$('.ldt_link_create',base_node).nyroModal({
-        type: 'iframe',
-        forceType: 'iframe',
-        windowResize: false,
-        height:680, 
-        width:500,
-        bgColor: 'rgb(239, 239, 239)',
-        padding: 5,
-        titleFromIframe: false,
-	    endRemove: function(elts, settings) {
- 			searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
+ 		
+ 		filters: ['iriIframe'],
+		sizes: {
+			minW: '600',
+			minH: '500'
 		},
-        beforeHideContent: function(elts, settings, callback){
-             try {
-	              var res = $('#ldtInitSwf',$('#nyroModalIframe').contents());
-	              if(res.length > 0)
-	              {
-	              	   res.get(0).forceSave();
-	              }
-             }
-             catch(err)
-             {
-              // do nothing
-             }                   
-             callback();
-        	},
-        endShowContent: function(elts, settings){
-    		var iframe = $('#nyroModalIframe', elts.content);
-			iframe.load(function(){
-			  	var form_status = $(this).contents().find("#project_form_status").val(); 
-			  	if(form_status == 'saved' || form_status == 'deleted' ) {
-			  		$.nyroModalRemove();
-			  	}
-				var swfobject = $(this).contents().find("#ldtInitSwf"); 
-				if (swfobject.length) {
-					$.nyroModalSettings({
-						height: swfobject.height() + 31,
-						width: swfobject.width() + 21
-					});
-				}
-			});
-        	}
-    	});
+		callbacks: {
+			afterShowCont: function(nm) {
+				nm.store.iframe.width(600);
+				nm.store.iframe.height(500);
+				var iframe = nm.store.iframe;
+				iframe.load(function(){
+					var form_status = $(this).contents().find("#project_form_status").val(); 
+					if(form_status == 'saved' || form_status == 'deleted' ) {
+						$.nmTop().close();
+					}
+					var swfobject = $(this).contents().find("#ldtInitSwf"); 
+					if (swfobject.length) {
+						nm['sizes']['initW'] = swfobject.width() + 21;
+						nm['sizes']['initH'] = swfobject.height() + 31;
+						nm.resize();
+						nm.store.iframe.height(swfobject.height() + 31);
+						nm.store.iframe.width(swfobject.width() + 21);
+					}
+				});
+			},
+			afterClose: function(nm) {
+				searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
+			}	
+	    }
+		
+    });
 
 	
 	$('.publishedproject', base_node).click(function(e) {
@@ -266,24 +263,30 @@
 		});
 	});
 
+	$('.projecttitlelink').each(function(i){
+		$(this).attr("target","_blank");
+	});
 	$('.projecttitlelink').nyroModal({
-	    type: 'iframe',
-	    forceType: 'iframe',
-        height:680, 
-        width:500,
-	    bgColor: 'rgb(239, 239, 239)',
-	    padding: 5,
-	    titleFromIframe: false,
-	    endRemove: function(elts, settings) {
-			searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
+		filters: ['iframe'],
+		sizes: {
+			minH:680, 
+			minW:500
 		},
-	  	endShowContent: function(elts, settings) {
-		  	$('#nyroModalIframe', elts.content).load(function() {
-			  	var form_status = $(this).contents().find("#project_form_status").val(); 
-			  	if(form_status == 'saved' || form_status == 'deleted') {
-			  		$.nyroModalRemove();
-			  	}
-		  	});
+		callbacks: {
+			afterClose: function(nm) {
+				searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
+			},
+			afterShowCont: function(nm) {
+				nm.store.iframe.height(680);
+				nm.store.iframe.width(600);
+				var iframe = nm.store.iframe;
+				iframe.load(function(){
+				  	var form_status = $(this).contents().find("#project_form_status").val(); 
+				  	if(form_status == 'saved' || form_status == 'deleted') {
+				  		$.nmTop().close();
+				  	}
+			  	});
+			}
 		}
 	});