[pLog-svn] r7080 - in plugins/branches/lifetype-1.2/templateeditor: . templates

jondaley at devel.lifetype.net jondaley at devel.lifetype.net
Fri Oct 22 14:16:57 EDT 2010


Author: jondaley
Date: 2010-10-22 14:16:57 -0400 (Fri, 22 Oct 2010)
New Revision: 7080

Modified:
   plugins/branches/lifetype-1.2/templateeditor/plugintemplateeditor.class.php
   plugins/branches/lifetype-1.2/templateeditor/templates/blogtemplatesetslist.template
   plugins/branches/lifetype-1.2/templateeditor/templates/blogtemplateslist.template
   plugins/branches/lifetype-1.2/templateeditor/templates/blogtemplatesubfolderlist.template
   plugins/branches/lifetype-1.2/templateeditor/templates/sitetemplatesetslist.template
   plugins/branches/lifetype-1.2/templateeditor/templates/sitetemplateslist.template
   plugins/branches/lifetype-1.2/templateeditor/templates/sitetemplatesubfolderlist.template
Log:
fixes popup blocker issue for internet explorer 8.  #1639

Modified: plugins/branches/lifetype-1.2/templateeditor/plugintemplateeditor.class.php
===================================================================
--- plugins/branches/lifetype-1.2/templateeditor/plugintemplateeditor.class.php	2010-10-22 18:05:21 UTC (rev 7079)
+++ plugins/branches/lifetype-1.2/templateeditor/plugintemplateeditor.class.php	2010-10-22 18:16:57 UTC (rev 7080)
@@ -15,7 +15,7 @@
 			$this->id      = "templateeditor";
 			$this->author  = "Mark Wu";
 			$this->desc    = "This plugin offers an online template editor for LifeType";
-            $this->version = "20081204";
+            $this->version = "20101022";
 
             $config =& Config::getConfig();
             $this->pluginEnabled = $config->getValue( "plugin_templateeditor_enabled" );

Modified: plugins/branches/lifetype-1.2/templateeditor/templates/blogtemplatesetslist.template
===================================================================
--- plugins/branches/lifetype-1.2/templateeditor/templates/blogtemplatesetslist.template	2010-10-22 18:05:21 UTC (rev 7079)
+++ plugins/branches/lifetype-1.2/templateeditor/templates/blogtemplatesetslist.template	2010-10-22 18:16:57 UTC (rev 7080)
@@ -10,9 +10,9 @@
         originUrl = url.getAttribute('href');
         newUrl = encodeURI(originUrl + '&newTemplateId=' + copyToName);
         url.setAttribute('href', newUrl);
-    } else {
-        url.setAttribute('href', '?op=blogTemplateSetsList');
+        return true;
     }
+    return false;
 }
 </SCRIPT>
 {/literal}
@@ -47,7 +47,7 @@
      <div class="list_action_button">
       <img src="imgs/admin/icon_empty-16.png" />
       <img src="imgs/admin/icon_empty-16.png" />
-      <a href="?op=blogCopyTemplateSet&amp;type=1&amp;templateId={$sitetemplate->getName()}" id="{$sitetemplate->getName()}" onClick="copyTemplateSetTo(this.id)" >
+      <a href="?op=blogCopyTemplateSet&amp;type=1&amp;templateId={$sitetemplate->getName()}" id="{$sitetemplate->getName()}" onClick="return copyTemplateSetTo(this.id)" >
         <img src="imgs/admin/icon_copy-16.png" alt="{$locale->tr("copy")}" />
       </a>
       <img src="imgs/admin/icon_empty-16.png" />
@@ -109,4 +109,4 @@
  </form>
  
 {include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footer.template"}

Modified: plugins/branches/lifetype-1.2/templateeditor/templates/blogtemplateslist.template
===================================================================
--- plugins/branches/lifetype-1.2/templateeditor/templates/blogtemplateslist.template	2010-10-22 18:05:21 UTC (rev 7079)
+++ plugins/branches/lifetype-1.2/templateeditor/templates/blogtemplateslist.template	2010-10-22 18:16:57 UTC (rev 7080)
@@ -10,9 +10,9 @@
         originUrl = url.getAttribute('href');
         newUrl = encodeURI(originUrl + '&newFileId=' + copyToName);
         url.setAttribute('href', newUrl);
-    } else {
-        url.setAttribute('href', '?op=blogTemplatesList&templateId=' + templateId);
+        return true;
     }
+    return false;
 }
 
 function openImagePreviewWindow( destUrl )
@@ -155,7 +155,7 @@
        <img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" />
       </a>
       {if $file.isEditable}
-       <a href="?op=blogCopyTemplateFile&amp;templateId={$currentTemplate}&amp;fileId={$file.name}" id="{$file.name}" onClick="copyTemplateFileTo(this.id, '{$currentTemplate}')" >
+       <a href="?op=blogCopyTemplateFile&amp;templateId={$currentTemplate}&amp;fileId={$file.name}" id="{$file.name}" onClick="return copyTemplateFileTo(this.id, '{$currentTemplate}')" >
         <img src="imgs/admin/icon_copy-16.png" alt="{$locale->tr("copy")}" />
        </a>
       {else}
@@ -181,4 +181,4 @@
 </form>
  
 {include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footer.template"}

Modified: plugins/branches/lifetype-1.2/templateeditor/templates/blogtemplatesubfolderlist.template
===================================================================
--- plugins/branches/lifetype-1.2/templateeditor/templates/blogtemplatesubfolderlist.template	2010-10-22 18:05:21 UTC (rev 7079)
+++ plugins/branches/lifetype-1.2/templateeditor/templates/blogtemplatesubfolderlist.template	2010-10-22 18:16:57 UTC (rev 7080)
@@ -10,9 +10,9 @@
         originUrl = url.getAttribute('href');
         newUrl = encodeURI(originUrl + '&newFileId=' + copyToName);
         url.setAttribute('href', newUrl);
-    } else {
-        url.setAttribute('href', '?op=blogTemplatesList&templateId=' + templateId + '&subFolderId=' + subFolderId);
+        return true;
     }
+    return false;
 }
 
 function openImagePreviewWindow( destUrl )
@@ -137,7 +137,7 @@
        <img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" />
       </a>
       {if $file.isEditable}
-       <a href="?op=blogCopyTemplateFile&amp;templateId={$currentTemplate}&amp;subFolderId={$currentSubFolder}&amp;fileId={$file.name}" id="{$file.name}" onClick="copyTemplateFileTo(this.id, '{$currentTemplate}', '{$currentSubFolder}')" >
+       <a href="?op=blogCopyTemplateFile&amp;templateId={$currentTemplate}&amp;subFolderId={$currentSubFolder}&amp;fileId={$file.name}" id="{$file.name}" onClick="return copyTemplateFileTo(this.id, '{$currentTemplate}', '{$currentSubFolder}')" >
         <img src="imgs/admin/icon_copy-16.png" alt="{$locale->tr("copy")}" />
        </a>
       {else}

Modified: plugins/branches/lifetype-1.2/templateeditor/templates/sitetemplatesetslist.template
===================================================================
--- plugins/branches/lifetype-1.2/templateeditor/templates/sitetemplatesetslist.template	2010-10-22 18:05:21 UTC (rev 7079)
+++ plugins/branches/lifetype-1.2/templateeditor/templates/sitetemplatesetslist.template	2010-10-22 18:16:57 UTC (rev 7080)
@@ -10,9 +10,9 @@
         originUrl = url.getAttribute('href');
         newUrl = encodeURI(originUrl + '&newTemplateId=' + copyToName);
         url.setAttribute('href', newUrl);
-    } else {
-        url.setAttribute('href', '?op=siteTemplateSetsList');
+        return true;
     }
+    return false;
 }
 </SCRIPT>
 {/literal}
@@ -49,7 +49,7 @@
        <a href="?op=siteDeleteTemplateSet&amp;templateId={$sitetemplate->getName()}">
          <img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" />
        </a>
-       <a href="?op=siteCopyTemplateSet&amp;templateId={$sitetemplate->getName()}" id="{$sitetemplate->getName()}" onClick="copyTemplateSetTo(this.id)" >
+       <a href="?op=siteCopyTemplateSet&amp;templateId={$sitetemplate->getName()}" id="{$sitetemplate->getName()}" onClick="return copyTemplateSetTo(this.id)" >
          <img src="imgs/admin/icon_copy-16.png" alt="{$locale->tr("copy")}" />
        </a>
       {else}
@@ -78,4 +78,4 @@
  </form>
  
 {include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footer.template"}

Modified: plugins/branches/lifetype-1.2/templateeditor/templates/sitetemplateslist.template
===================================================================
--- plugins/branches/lifetype-1.2/templateeditor/templates/sitetemplateslist.template	2010-10-22 18:05:21 UTC (rev 7079)
+++ plugins/branches/lifetype-1.2/templateeditor/templates/sitetemplateslist.template	2010-10-22 18:16:57 UTC (rev 7080)
@@ -10,9 +10,9 @@
         originUrl = url.getAttribute('href');
         newUrl = encodeURI(originUrl + '&newFileId=' + copyToName);
         url.setAttribute('href', newUrl);
-    } else {
-        url.setAttribute('href', '?op=siteTemplatesList&templateId=' + templateId);
+        return true;
     }
+    return false;
 }
 
 function openImagePreviewWindow( destUrl )
@@ -155,7 +155,7 @@
        <img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" />
       </a>
       {if $file.isEditable}
-       <a href="?op=siteCopyTemplateFile&amp;templateId={$currentTemplate}&amp;fileId={$file.name}" id="{$file.name}" onClick="copyTemplateFileTo(this.id, '{$currentTemplate}')" >
+       <a href="?op=siteCopyTemplateFile&amp;templateId={$currentTemplate}&amp;fileId={$file.name}" id="{$file.name}" onClick="return copyTemplateFileTo(this.id, '{$currentTemplate}')" >
         <img src="imgs/admin/icon_copy-16.png" alt="{$locale->tr("copy")}" />
        </a>
       {else}
@@ -181,4 +181,4 @@
 </form>
  
 {include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footer.template"}

Modified: plugins/branches/lifetype-1.2/templateeditor/templates/sitetemplatesubfolderlist.template
===================================================================
--- plugins/branches/lifetype-1.2/templateeditor/templates/sitetemplatesubfolderlist.template	2010-10-22 18:05:21 UTC (rev 7079)
+++ plugins/branches/lifetype-1.2/templateeditor/templates/sitetemplatesubfolderlist.template	2010-10-22 18:16:57 UTC (rev 7080)
@@ -10,9 +10,9 @@
         originUrl = url.getAttribute('href');
         newUrl = encodeURI(originUrl + '&newFileId=' + copyToName);
         url.setAttribute('href', newUrl);
-    } else {
-        url.setAttribute('href', '?op=siteTemplatesList&templateId=' + templateId + '&subFolderId=' + subFolderId);
-    }
+        return true;
+    } 
+    return false;
 }
 
 function openImagePreviewWindow( destUrl )
@@ -137,7 +137,7 @@
        <img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" />
       </a>
       {if $file.isEditable}
-       <a href="?op=siteCopyTemplateFile&amp;templateId={$currentTemplate}&amp;subFolderId={$currentSubFolder}&amp;fileId={$file.name}" id="{$file.name}" onClick="copyTemplateFileTo(this.id, '{$currentTemplate}', '{$currentSubFolder}')" >
+       <a href="?op=siteCopyTemplateFile&amp;templateId={$currentTemplate}&amp;subFolderId={$currentSubFolder}&amp;fileId={$file.name}" id="{$file.name}" onClick="return copyTemplateFileTo(this.id, '{$currentTemplate}', '{$currentSubFolder}')" >
         <img src="imgs/admin/icon_copy-16.png" alt="{$locale->tr("copy")}" />
        </a>
       {else}
@@ -164,4 +164,4 @@
 </form>
  
 {include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footer.template"}



More information about the pLog-svn mailing list