# HG changeset patch
# User verrierj
# Date 1314629663 -7200
# Node ID 6d3be9c30cdcf03fefc0e0189c4867e49fe7af8d
# Parent  cf6fb849fedd62b089d292924b2256d501e49d46
Corrected size of modal windows. Tested for firefox only

diff -r cf6fb849fedd -r 6d3be9c30cdc src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html	Thu Aug 25 17:35:05 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html	Mon Aug 29 16:54:23 2011 +0200
@@ -7,8 +7,8 @@
 	    <tbody class="projectscontentsbody">
 	{% for content in contents %}
 		<tr class="imageline {% cycle 'projectscontentsoddline' 'projectscontentsevenline'%}">
-		    <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}/img/page_add.png" title="{% trans 'create project' %}" alt="{% trans 'create project' %}" href="{% url ldt.ldt_utils.views.create_project content.iri_id %}" class="ldt_link_create"/></div></td>
-		    <td class="cellimg"><div class="cellimgdiv"><img  alt="{% trans 'preview media'%}" title="{% trans 'preview media'%}" src="{{LDT_MEDIA_PREFIX}}/img/control_play.png" href="{% url ldt.ldt_utils.views.index content.iri_id %}" class="ldt_link"/></div></td>
+		    <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}/img/page_add.png" title="{% trans 'create project' %}" alt="{% trans 'create project' %}" href="{% url ldt.ldt_utils.views.create_project content.iri_id %}" class="ldt_link_create_project"/></div></td>
+		    <td class="cellimg"><div class="cellimgdiv"><img  alt="{% trans 'preview media'%}" title="{% trans 'preview media'%}" src="{{LDT_MEDIA_PREFIX}}/img/control_play.png" href="{% url ldt.ldt_utils.views.index content.iri_id %}" class="ldt_link_open_ldt"/></div></td>
 		    <td class="contenttitle"><a class="contenttitlelink" href="{% url ldt.ldt_utils.views.write_content iri_id=content.iri_id %}">{{ content.title|default:"_" }}</a></td>
 		</tr>
 	{% endfor %}
diff -r cf6fb849fedd -r 6d3be9c30cdc src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html	Thu Aug 25 17:35:05 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html	Mon Aug 29 16:54:23 2011 +0200
@@ -13,7 +13,7 @@
         {% else %}
             <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/page_edit.png" href="{% url index_project project.ldt_id %}" class="ldt_link" alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/></div></td>
         {% endif %}
-        <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/page_copy.png" href="{% url ldt.ldt_utils.views.copy_project project.ldt_id %}" class="ldt_link_create" alt="{% trans 'copy project' %}" title="{% trans 'copy project' %}"/></div></td>
+        <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/page_copy.png" href="{% url ldt.ldt_utils.views.copy_project project.ldt_id %}" class="ldt_link_copy_project" alt="{% trans 'copy project' %}" title="{% trans 'copy project' %}"/></div></td>
         <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/plugin.png" href="{{WEB_URL}}{{json_url_id}}" id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/></div></td>
         <td class="cellimg">
         {% ifequal project.state 2 %}
diff -r cf6fb849fedd -r 6d3be9c30cdc src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html	Thu Aug 25 17:35:05 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html	Mon Aug 29 16:54:23 2011 +0200
@@ -8,7 +8,7 @@
 {% for project in projects %}
     <tr class="imageline {% cycle 'projectscontentsoddline' 'projectscontentsevenline'%}" >
         {% url ldt.ldt_utils.views.project_json_id project.ldt_id as json_url_id %}
-        <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/page_copy.png" href="{% url ldt.ldt_utils.views.copy_project project.ldt_id %}" class="ldt_link_create" alt="{% trans 'copy the project' %}" title="{% trans 'copy the project' %}"/></div></td>
+        <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/page_copy.png" href="{% url ldt.ldt_utils.views.copy_project project.ldt_id %}" class="ldt_link_copy_project" alt="{% trans 'copy the project' %}" title="{% trans 'copy the project' %}"/></div></td>
         <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/plugin.png" href="{{WEB_URL}}{{json_url_id}}" id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/></div></td>
         <td class="cellimg">
         <img src="{{ADMIN_MEDIA_PREFIX}}img/admin/icon-yes.gif" alt="{% trans 'Project published' %}" id="project_{{project.ldt_id}}" />
diff -r cf6fb849fedd -r 6d3be9c30cdc src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html	Thu Aug 25 17:35:05 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html	Mon Aug 29 16:54:23 2011 +0200
@@ -66,7 +66,7 @@
 	<div class="span-12 last" id="projectsdiv">
 		<div class="span-12 last titlediv" >
 			<div class="span-8 projectscontentstitle" >{% trans "Published projects" %}
-			&nbsp;<a class='ldt_link_create' href="{% url ldt.ldt_utils.views.create_ldt_view %}" ><img src="{{LDT_MEDIA_PREFIX}}img/page_add.png" alt="{% trans 'Create project' %}" title="{% trans 'Create project' %}" /></a></div>
+			&nbsp;<a class='ldt_link_create_project' href="{% url ldt.ldt_utils.views.create_ldt_view %}" ><img src="{{LDT_MEDIA_PREFIX}}img/page_add.png" alt="{% trans 'Create project' %}" title="{% trans 'Create project' %}" /></a></div>
 			<div class="span-4 last searchfielddiv" >
 			    <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" value="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="projecsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
 			</div>
diff -r cf6fb849fedd -r 6d3be9c30cdc src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html	Thu Aug 25 17:35:05 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html	Mon Aug 29 16:54:23 2011 +0200
@@ -63,7 +63,7 @@
 	<div class="span-12 last" id="projectsdiv">
 		<div class="span-12 last titlediv" >
 			<div class="span-8 projectscontentstitle" >{% trans "My projects" %}
-			<a class='ldt_link_create' href="{% url ldt.ldt_utils.views.create_ldt_view %}" ><img class='icon_title' src="{{LDT_MEDIA_PREFIX}}img/page_add_large.png" alt="{% trans 'Create project' %}" title="{% trans 'Create project' %}" /></a></div>
+			<a class='ldt_link_create_project' href="{% url ldt.ldt_utils.views.create_ldt_view %}" ><img class='icon_title' src="{{LDT_MEDIA_PREFIX}}img/page_add_large.png" alt="{% trans 'Create project' %}" title="{% trans 'Create project' %}" /></a></div>
 			<div class="span-4 last searchfielddiv" >
 			    <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" value="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="projecsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
 			</div>
diff -r cf6fb849fedd -r 6d3be9c30cdc src/ldt/ldt/static/ldt/css/nyroModal.css
--- a/src/ldt/ldt/static/ldt/css/nyroModal.css	Thu Aug 25 17:35:05 2011 +0200
+++ b/src/ldt/ldt/static/ldt/css/nyroModal.css	Mon Aug 29 16:54:23 2011 +0200
@@ -32,10 +32,10 @@
 	margin: 25px;
 	background: #fff;
 }
-.nyroModalCont iframe {
+/*.nyroModalCont iframe {
 	width: 600px;
 	height: 400px;
-}
+}*/
 .nyroModalError {
 	border: 4px solid red;
 	color: red;
diff -r cf6fb849fedd -r 6d3be9c30cdc src/ldt/ldt/static/ldt/js/projectscontents.js
--- a/src/ldt/ldt/static/ldt/js/projectscontents.js	Thu Aug 25 17:35:05 2011 +0200
+++ b/src/ldt/ldt/static/ldt/js/projectscontents.js	Mon Aug 29 16:54:23 2011 +0200
@@ -151,7 +151,6 @@
     );
 }
 
-
 function init_events_contents(base_node, embed_url, content_filter_url) {
     
     init_events_base(base_node, embed_url);
@@ -162,16 +161,16 @@
     $('.content_link_create').nyroModal({
         filters: ['iframe'],
         sizes: {
-            minW: 770,
-            minH: 550
+            minW: 730,
+            minH: 460
         },
         callbacks: {
             afterClose: function(nm) {
                 searchCallback($('#searchprojectsinput'), "#contentslistcontainer", content_filter_url);
             },
             afterShowCont: function(nm) {
-                nm.store.iframe.width(770);
-                nm.store.iframe.height(550);
+                nm.store.iframe.width(730);
+                nm.store.iframe.height(450);
                 nm.store.iframe.load(function() {
                     var form_status = $(this).contents().find("#content_form_status").val(); 
                     if(form_status === 'saved' || form_status === 'deleted' ) {
@@ -194,16 +193,16 @@
     $('.contenttitlelink').nyroModal({
         filters: ['iframe'],
         sizes: {
-            minW: 770,
-            minH: 550
+            minW: 730,
+            minH: 480
         },
         callbacks: {
             afterClose: function(nm) {
                 searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url,0);    
             },
             afterShowCont: function(nm) {
-                nm.store.iframe.width(770);
-                nm.store.iframe.height(550);
+                nm.store.iframe.width(730);
+                nm.store.iframe.height(470);
                 nm.store.iframe.load(function() {
                       var form_status = $(this).contents().find("#content_form_status").val(); 
                       if(form_status === 'saved' || form_status === 'deleted') {
@@ -216,25 +215,33 @@
     
 }
 
-function init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl) {
-
-    // These are the functions called when we display a project in an LDT modal window
-    $('.ldt_link',base_node).each(function(i){
+function init_modal_window (class_name, windowW, windowH, frameW, frameH, base_node) {
+    $(class_name,base_node).each(function(i){
         $(this).attr("target","_iri");
     });
-    $('.ldt_link',base_node).nyroModal({
+    
+    $(class_name,base_node).nyroModal({
         filters: ['iriIframe'],
         sizes: {
-            minW: '1025',
-            minH: '665'
+            minW: '' + windowW,
+            minH: '' + windowH
         },
         showCloseButton: true,
         closeOnEscape:false,
         closeOnClick:false,
         callbacks: {
             afterShowCont: function(nm) {
-                nm.store.iframe.width(1025);
-                nm.store.iframe.height(665);
+                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();
+                    }
+                        
+                });  
+                
+                nm.store.iframe.width(frameW);
+                nm.store.iframe.height(frameH);
             },
             close: function(nm) {
                 // We don't do anything here, we hack the callback directly from the close function.
@@ -245,62 +252,23 @@
             }
         }
     });
-
-
-    $('.ldt_link',base_node).each(function(i, e) {
-        nm = $(e).data('nmObj');
-        $(e).data('nmObj', $.extend(true, nm, {
-            close: testAndClose(nm.close)
-        }));
-    });    
-
-
-    $('.ldt_link_create',base_node).each(function(i){
-        $(this).attr("target","_iri");
-    });
-    $('.ldt_link_create',base_node).nyroModal({
-         
-        filters: ['iriIframe'],
-        sizes: {
-            minW: '600',
-            minH: '500'
-        },
-        showCloseButton:true,
-        closeOnEscape:false,
-        closeOnClick:false,
-        callbacks: {
-            afterShowCont: function(nm) {
-                nm.store.iframe.width(600);
-                nm.store.iframe.height(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();
-                    }
-                    var swfobject = $(this).contents().find("#ldtInitSwf"); 
-                    if (swfobject.length) {
-                        nm['sizes']['initW'] = 1025;
-                        nm['sizes']['initH'] = 665;
-                        nm.resize();
-                        nm.store.iframe.width(1025);
-                        nm.store.iframe.height(665);
-                    }
-                });
-            },
-            afterClose: function(nm) {
-                searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
-            }
-        }        
-    });
-    $('.ldt_link_create',base_node).each(function(i, e) {
+    
+    $(class_name,base_node).each(function(i, e) {
         nm = $(e).data('nmObj');
         $(e).data('nmObj', $.extend(true, nm, {
             close: testAndClose(nm.close)
         }));
     });
+}
 
-    
+function init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl) {
+
+    // These are the functions called when we display a project in an LDT modal window
+    init_modal_window ('.ldt_link_open_ldt', 1025, 660, 1015, 650, base_node);
+    init_modal_window ('.ldt_link_create_project', 500, 520, 500, 510, base_node);
+    init_modal_window ('.ldt_link_copy_project', 500, 150, 500, 150, base_node);
+
+     
     $('.publishedproject', base_node).click(function(e) {
         e.preventDefault();
         var target = $(e.target);
@@ -345,22 +313,24 @@
     $('.projecttitlelink').nyroModal({
         filters: ['iframe'],
         sizes: {
-            minH:680, 
-            minW:600
+            minW: '510',
+            minH: '560'
         },
         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') {
+
+                    nm.store.iframe.width(500);
+                    nm.store.iframe.height(550);
+                    
+                    var form_status = $(this).contents().find("#project_form_status").val(); 
+                    if(form_status === 'saved' || form_status === 'deleted') {
                           $.nmTop().close();
-                      }
+                    }
                   });
             }
         }