Static corrections in ldt/media
authorwakimd
Fri, 15 Oct 2010 13:42:04 +0200
changeset 96 a8eeb7253e58
parent 95 9bae869b2146
child 99 0fb4b009c6eb
Static corrections in ldt/media
web/ldt/media/css/embed_popup.css
web/ldt/media/css/ldtform.css
web/ldt/media/css/workspace.css
web/ldt/media/img/ajax-loader-220x19.gif
web/ldt/media/js/embed_popup.js
web/ldt/media/js/projectscontents.js
web/ldt/media/swf/ldt/LignesDeTempsFlex.swf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/ldt/media/css/embed_popup.css	Fri Oct 15 13:42:04 2010 +0200
@@ -0,0 +1,33 @@
+pre {
+white-space: pre-wrap; /* css-3 */
+white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
+white-space: -pre-wrap; /* Opera 4-6 */
+white-space: -o-pre-wrap; /* Opera 7 */
+word-wrap: break-word; /* Internet Explorer 5.5+ */
+}
+
+input
+{
+	background: #ededed;
+}
+
+input[type="button"] {
+	background-color: #656565;
+	color: white;
+	width: auto;
+	font-weight: bold;
+	padding: 5px 10px;
+}
+
+#button_row input {
+	margin: 10px; 
+}
+
+#display_select {
+	float: left;
+}
+
+#copy_div {
+	float: right;
+}
+
--- a/web/ldt/media/css/ldtform.css	Fri Oct 15 12:38:52 2010 +0200
+++ b/web/ldt/media/css/ldtform.css	Fri Oct 15 13:42:04 2010 +0200
@@ -47,10 +47,27 @@
 #submitcontent {
 	border-top: 1px solid black;
 	padding-top : 10px;
+}
+
+#submitcontent-buttons {
 	text-align: right;
 }
 
-#add_content input[type="submit"], #add_contribution input[type="submit"] {
+#submitcontent-loader {
+	text-align: left;
+}
+
+.submitcontent-loader-content {
+	display: none;
+}
+
+
+#submitcontent-loader-msg {
+	padding-left: 6px;
+}
+
+
+#submitcontent-buttons input[type="submit"], #submitcontent-buttons button  {
 	background-color: #656565;
 	color: white;
 	width:auto;
@@ -114,3 +131,9 @@
 	border: 1px solid #DDD;
 }
 
+.error_message {
+	padding: 3em 2em;
+	font-size: larger;
+	font-weight: bold;   
+}
+
--- a/web/ldt/media/css/workspace.css	Fri Oct 15 12:38:52 2010 +0200
+++ b/web/ldt/media/css/workspace.css	Fri Oct 15 13:42:04 2010 +0200
@@ -109,6 +109,12 @@
 	color: #4F5155;
 }
 
+.projecttitlelink,.projecttitlelink:link,.projecttitlelink:hover,.projecttitlelink:visited {
+	text-decoration: none;
+	color: #4F5155;
+}
+
+
 .projecttitle {
 	width: 367px;
 	padding: 4px 10px 4px 5px;	
Binary file web/ldt/media/img/ajax-loader-220x19.gif has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/ldt/media/js/embed_popup.js	Fri Oct 15 13:42:04 2010 +0200
@@ -0,0 +1,49 @@
+var display_state = "player";
+
+function toggle_display() {
+	$j.each(["player","seo_body","seo_meta","links"], function(i,display_str) {
+
+		var div_selector = "#"+display_str+"_code";
+		if(display_str == display_state) {
+			$j(div_selector).show();
+		}
+		else {
+			$j(div_selector).hide();
+		}
+	});
+}
+
+$j(document).ready(function(){
+	
+	toggle_display();
+	
+	$j('.ldt_json_link').click(function(e) {
+    	e.preventDefault();
+ 		link = $j(e.target);
+ 		$j("#res_link_{{player_id}}").load(link.attr("href"));
+ 		$j("#res_link_{{player_id}}").show();
+ 		return false;
+    });
+
+    $j('#player_button').click(function(e) {
+    	display_state = "player";
+    	toggle_display();
+    });
+    $j('#seo_body_button').click(function(e) {
+    	display_state = "seo_body";
+    	toggle_display();
+    });
+    $j('#seo_meta_button').click(function(e) {
+    	display_state = "seo_meta";
+    	toggle_display();
+    });
+    $j('#links_button').click(function(e) {
+    	display_state = "links";
+    	toggle_display();
+    });
+
+   $j("#copy_button").click(function(e) {
+ 	   alert($j("#"+display_state+"_code").html());
+   });	 	    
+    
+});
--- a/web/ldt/media/js/projectscontents.js	Fri Oct 15 12:38:52 2010 +0200
+++ b/web/ldt/media/js/projectscontents.js	Fri Oct 15 13:42:04 2010 +0200
@@ -23,51 +23,31 @@
    		width:1022,
    		bgColor: 'rgb(239, 239, 239)',
    		padding: 5,
-   		titleFromIframe: false
+   		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();
+   		},
+
       	});
     	
- 	$('.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,
-        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 swfobject = $(this).contents().find("#ldtInitSwf"); 
-    				if (swfobject.length) {
-    					$.nyroModalSettings({
-    						height: swfobject.height() + 31,
-    						width: swfobject.width() + 21
-    					});
-    				}
-    			});
-        	}
-    	});
 
 	$('.ldt_link_embed',base_node).click(function(e) {
 		e.preventDefault();
 		var link = $(e.target);
 		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 }) }
 		  	});*/
@@ -79,7 +59,7 @@
                width:750,
                bgColor: 'rgb(239, 239, 239)',
                padding: 5,
-		       url: embed_url+'?json_url='+escape(json_url)+'&player_id='+escape(player_id),
+		       url: embed_url+'?json_url='+escape(json_url)+'&player_id='+escape(player_id)+'&ldt_id='+escape(ldt_id),
 		   });
 		   return false;
 	});
@@ -129,25 +109,30 @@
 	if(target.attr('timer')) {
 		clearTimeout(target.attr('timer'));
 	}
-	
-	target.attr('timer',setTimeout(function() {
-		target.next(".searchajaxloader").show();
-		target.nextAll(".searchclear").hide();
-		var realVal = target.realVal();
-		if(realVal.length == 0) {
-			realVal = "_";
-		}
-		url = url.replace('__FILTER__',escape(realVal));
-		$(container_selector).load(url, null, function() {
-			target.next(".searchajaxloader").hide();
-			if(target.realVal().length > 0) {
-				target.nextAll(".searchclear").show();
-			}
-			init_events($(container_selector));
-			target.removeAttr('timer');
-		});
-	},
-	300));
+
+	target.attr(
+		'timer',
+		setTimeout(function() {
+			target.next(".searchajaxloader").show();
+			target.nextAll(".searchclear").hide();
+			var filterVal = "_" + escape(target.realVal());
+			url = url.replace('__FILTER__',filterVal);
+			$.ajax({
+				url: url,
+				cache: false,
+				success: function(data, status, request) {
+					$(container_selector).html(data);
+					target.next(".searchajaxloader").hide();
+					if(target.realVal().length > 0) {
+						target.nextAll(".searchclear").show();
+					}
+					init_events($(container_selector));
+					target.removeAttr('timer');
+				}
+			});	
+		},
+		300)
+	);
 };
 
 
@@ -169,7 +154,7 @@
 	  	endShowContent: function(elts, settings) {
 		  	$('#nyroModalIframe', elts.content).load(function() {
 			  	var form_status = $(this).contents().find("#content_form_status").val(); 
-			  	if(form_status == 'saved') {
+			  	if(form_status == 'saved' || form_status == 'deleted' ) {
 			  		$.nyroModalRemove();
 			  	}
 		  	});
@@ -185,12 +170,12 @@
 	    padding: 5,
 	    titleFromIframe: false,
 	    endRemove: function(elts, settings) {
-	    	searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url)
+	    	searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url,0);
 		},
 	  	endShowContent: function(elts, settings) {
 		  	$('#nyroModalIframe', elts.content).load(function() {
 			  	var form_status = $(this).contents().find("#content_form_status").val(); 
-			  	if(form_status == 'saved') {
+			  	if(form_status == 'saved' || form_status == 'deleted') {
 			  		$.nyroModalRemove();
 			  	}
 		  	});
@@ -201,7 +186,52 @@
 }
 
 function init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl) {
-		
+
+ 	$('.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);
+		},
+        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
+					});
+				}
+			});
+        	}
+    	});
+
+	
 	$('.publishedproject', base_node).click(function(e) {
 		e.preventDefault();
 		var target = $(e.target);
@@ -236,6 +266,27 @@
 		});
 	});
 
+	$('.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);
+		},
+	  	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();
+			  	}
+		  	});
+		}
+	});
+	
 }
 
 function init_events_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl) {
Binary file web/ldt/media/swf/ldt/LignesDeTempsFlex.swf has changed