[pLog-svn] r7030 - plog/branches/lifetype-1.2/templates/admin

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2010-09-21 19:14:39 -0400 (Tue, 21 Sep 2010)
New Revision: 7030

Modified:
   plog/branches/lifetype-1.2/templates/admin/editpost.template
   plog/branches/lifetype-1.2/templates/admin/header.template
   plog/branches/lifetype-1.2/templates/admin/newpost.template
Log:
the new tinymce needs to be loaded prior to protoype

Modified: plog/branches/lifetype-1.2/templates/admin/editpost.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/editpost.template	2010-09-21 23:14:01 UTC (rev 7029)
+++ plog/branches/lifetype-1.2/templates/admin/editpost.template	2010-09-21 23:14:39 UTC (rev 7030)
@@ -1,3 +1,5 @@
+{assign var=editor value=1}
+{assign var=htmlarea value=$blogsettings->getValue("htmlarea_enabled")}
 {include file="$admintemplatepath/header.template"}
 {include file="$admintemplatepath/navigation.template" showOpt=editPosts title=$locale->tr("editPost")}
 <link rel="stylesheet" type="text/css" media="all" href="js/jscalendar/calendar-win2k-cold-1.css" title="win2k-cold-1" />
@@ -5,14 +7,6 @@
 <script type="text/javascript" src="js/jscalendar/lang/calendar-en.js"></script>
 <script type="text/javascript" src="js/jscalendar/calendar-setup_stripped.js"></script>
 <script type="text/javascript" src="js/ui/plogui.js"></script>
-{assign var=htmlarea value=$blogsettings->getValue("htmlarea_enabled")}
- {if $htmlarea}
-  <script type="text/javascript" src="js/tinymce/tiny_mce_gzip.php"></script>
-  <script type="text/javascript" src="js/tinymce/tiny_mce-plog.js"></script>
- {else}
-  <script type="text/javascript" src="js/editor/lifetypeeditor.js"></script>
- {/if} 
-
  <script type="text/javascript">
   
   // some messages that we are going to need in the functions above 

Modified: plog/branches/lifetype-1.2/templates/admin/header.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/header.template	2010-09-21 23:14:01 UTC (rev 7029)
+++ plog/branches/lifetype-1.2/templates/admin/header.template	2010-09-21 23:14:39 UTC (rev 7030)
@@ -24,6 +24,14 @@
 	var plogAdminBaseUrl = "{$url->getBaseUrl(false)}/admin.php";
 	var plogBlogId = "{$blog->getId()}";
 </script>
+ {if $editor}
+   {if $htmlarea}
+     <script type="text/javascript" src="js/tinymce/tiny_mce_gzip.js"></script>
+     <script type="text/javascript" src="js/tinymce/tiny_mce-plog.js"></script>
+   {else}
+     <script type="text/javascript" src="js/editor/lifetypeeditor.js"></script>
+   {/if}
+ {/if}
 <script type="text/javascript" src="js/cookie/cookie.js"></script>
 <script type="text/javascript" src="js/prototype/prototype.js"></script>
 <!-- Yahoo UI Library -->

Modified: plog/branches/lifetype-1.2/templates/admin/newpost.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/newpost.template	2010-09-21 23:14:01 UTC (rev 7029)
+++ plog/branches/lifetype-1.2/templates/admin/newpost.template	2010-09-21 23:14:39 UTC (rev 7030)
@@ -1,18 +1,13 @@
+{assign var=editor value=1}
+{assign var=htmlarea value=$blogsettings->getValue("htmlarea_enabled")}
 {include file="$admintemplatepath/header.template"}
 {include file="$admintemplatepath/navigation.template" showOpt=newPost title=$locale->tr("newPost")}
-{assign var=htmlarea value=$blogsettings->getValue("htmlarea_enabled")}
  <script type="text/javascript" src="js/ui/plogui.js"></script>
  <link rel="stylesheet" type="text/css" media="all" href="js/jscalendar/calendar-win2k-cold-1.css" title="win2k-cold-1" />
  <script type="text/javascript" src="js/jscalendar/calendar_stripped.js"></script>
  <script type="text/javascript" src="js/jscalendar/lang/calendar-en.js"></script>
  <script type="text/javascript" src="js/jscalendar/calendar-setup_stripped.js"></script>
  <script type="text/javascript" src="js/ui/autosave.js"></script>
- {if $htmlarea}
-  <script type="text/javascript" src="js/tinymce/tiny_mce_gzip.php"></script>
-  <script type="text/javascript" src="js/tinymce/tiny_mce-plog.js"></script>
- {else}
-  <script type="text/javascript" src="js/editor/lifetypeeditor.js"></script>
- {/if}
  <script type="text/javascript">
   
   // some messages that we are going to need in the functions above