[pLog-svn] r4408 - in plog/trunk: js/tinymce/themes/advanced/css templates/LifeType

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2006-12-19 04:02:10 +0000 (Tue, 19 Dec 2006)
New Revision: 4408

Modified:
   plog/trunk/js/tinymce/themes/advanced/css/editor_content.css
   plog/trunk/templates/LifeType/footermain.template
Log:
merged 4100:HEAD from lifetype-1.1.1 branch

Modified: plog/trunk/js/tinymce/themes/advanced/css/editor_content.css
===================================================================
--- plog/trunk/js/tinymce/themes/advanced/css/editor_content.css	2006-12-19 03:09:48 UTC (rev 4407)
+++ plog/trunk/js/tinymce/themes/advanced/css/editor_content.css	2006-12-19 04:02:10 UTC (rev 4408)
@@ -3,7 +3,7 @@
 
 body, td, pre {
 	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
+	font-size: 10px;
 }
 
 body {

Modified: plog/trunk/templates/LifeType/footermain.template
===================================================================
--- plog/trunk/templates/LifeType/footermain.template	2006-12-19 03:09:48 UTC (rev 4407)
+++ plog/trunk/templates/LifeType/footermain.template	2006-12-19 04:02:10 UTC (rev 4408)
@@ -1,46 +1,46 @@
-  <tr>
-		<td colspan="3" width="750" height="20"></td>
-	</tr>
-
-	<tr>
-	 <td width="750" height="1" bgcolor="#E5E5E5" colspan="3"><img src="images/spacer.gif" alt="" style="border:0px;width:1px;height:1px"/></td>
-  </tr> 
-
-	<tr>
-	 <td  height="55" width="100%"></td>
-	 <td  height="55" align="center">
-    {include file="$blogtemplate/paypal.template"}			 
-    </td>
-	<td  height="55" width="100%"></td>
-  </tr>	
-
-
-	<tr>
-		<td  width="238" align="left">&copy; 2005 <a href="http://www.lifetype.net">LifeType</a>. 
-		All rights reserved.
-    </td>
- 		<td width="272" align="center"> 
-    		<a href="http://www.lifetype.org/">International</a> | 
-    		<a href="http://www.lifetype.de/">Germany</a> | 
-    		<a href="http://www.lifetype.org.tw/">Taiwan</a>
-   	</td>
-		<td width="240" align="right"> 
-		    {if $locale->getLocaleCode() == "de_DE"}
-		    {** Oscar: I believe that the "impressum" is only needed in Germany, right? - Michael: yes, right **}
-     		<a href="http://www.spreadshirt.de/shop.php?sid=36983" target="blank">Shop</a> |
-    		<a href="http://www.lifetype.de/blog/index.php?blogId=35">Spenden</a> | 
-    		<a href="http://www.lifetype.de/blog/index.php?blogId=35">Impressum</a> | 
-    		{/if}
-    		<a href="{$url->templatePage("sitemap")}">Sitemap</a> |    		
-    		<a href="{$url->templatePage("aboutus")}#contact" class="black">{$locale->tr("Contact")}</a>
-    		{if $locale->getLocaleCode() == "en_UK"}
-    		| <a href="http://www.ferca.com">Hosting by Ferca</a>
-    		{/if}
-    		
-    	</td>
-		<td width="100%"></td>
-		</tr>
-		
-</table>
-	</body>
-</html>
\ No newline at end of file
+<tr>
+<td colspan="3" width="750" height="20"></td>
+</tr>
+
+<tr>
+<td width="750" height="1" bgcolor="#E5E5E5" colspan="3"><img src="images/spacer.gif" alt="" style="border:0px;width:1px;height:1px"/></td>
+</tr>
+
+<tr>
+<!--  <td  height="55" width="100%"></td> -->
+        <td  height="55" align="center" colspan="3">
+{include file="$blogtemplate/paypal.template"}
+</td>
+<!--<td  height="55" width="100%"></td>
 -->
+</tr>
+
+
+<tr>
+<td  width="238" align="left">&copy; 2005 <a href="http://www.lifetype.net">LifeType</a>.
+All rights reserved.
+</td>
+<td width="272" align="center">
+<a href="http://www.lifetype.org/">International</a> |
+<a href="http://www.lifetype.de/">Germany</a> |
+<a href="http://www.lifetype.org.tw/">Taiwan</a>
+</td>
+<td width="240" align="right">
+{if $locale->getLocaleCode() == "de_DE"}
+{** Oscar: I believe that the "impressum" is only needed in Germany, right? - Michael: yes, right **}
+<a href="http://www.spreadshirt.de/shop.php?sid=36983" target="blank">Shop</a> |
+<a href="http://www.lifetype.de/blog/index.php?blogId=35">Spenden</a> |
+<a href="http://www.lifetype.de/blog/index.php?blogId=35">Impressum</a> |
+{/if}
+<a href="{$url->templatePage("sitemap")}">Sitemap</a> |
+<a href="{$url->templatePage("aboutus")}#contact" class="black">{$locale->tr("Contact")}</a>
+{if $locale->getLocaleCode() == "en_UK"}
+| <a href="http://www.ferca.com">Hosting by Ferca</a>
+{/if}
+
+</td>
+<td width="100%"></td>
+</tr>
+
+</table>
+</body>
+</html>