[php-blog-cvs] serendipity/templates/default entries.tpl,1.1.2.19,1.1.2.20 plugin_calendar.tpl,1.1.2.1,1.1.2.2

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25986/templates/default

Modified Files:
      Tag: branch-smarty
	entries.tpl plugin_calendar.tpl 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -d -r1.1.2.19 -r1.1.2.20
--- entries.tpl	11 Nov 2004 12:45:20 -0000	1.1.2.19
+++ entries.tpl	12 Nov 2004 15:43:33 -0000	1.1.2.20
@@ -4,7 +4,7 @@
     {foreach from=$entries item="dategroup"}
     <div class="serendipity_Entry_Date">
         {if $dategroup.is_sticky}
-        <h3 class="serendipity_date">STICKY POSTINGS</h3>
+        <h3 class="serendipity_date">{$CONST.STICKY_POSTINGS}</h3>
         {else}
         <h3 class="serendipity_date">{$dategroup.date|@formatTime:DATE_FORMAT_ENTRY}</h3>
         {/if}
@@ -58,7 +58,7 @@
                     {/if}
                 {/if}
 
-                {if $entry.is_entry_owner}
+                {if $entry.is_entry_owner and not $is_preview}
                         | <a href="{$serendipityBaseURL}serendipity_entries.php?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]={$entry.id}">{$CONST.EDIT_ENTRY}</a>
                 {/if}
 
@@ -98,7 +98,7 @@
             <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_APPROVED|@sprintf:$CONST.COMMENT_APPROVED}</div><br />
         {/if}
 
-        {if $is_single_entry and not $use_popups}
+        {if $is_single_entry and not $use_popups and not $is_preview}
             <div class="serendipity_comments">
                 <br />
                 <a id="trackbacks"></a>
@@ -111,7 +111,7 @@
             </div>
         {/if}
 
-        {if $is_single_entry}
+        {if $is_single_entry and not $is_preview}
             <div class="serendipity_comments">
                 <br />
                 <a id="comments"></a>

Index: plugin_calendar.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/plugin_calendar.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- plugin_calendar.tpl	25 Sep 2004 23:29:20 -0000	1.1.2.1
+++ plugin_calendar.tpl	12 Nov 2004 15:43:33 -0000	1.1.2.2
@@ -1,24 +1,28 @@
-<table width="100%" cellspacing="0" cellpadding="0" class="serendipity_calendar">
+<table style="width: 100%" cellspacing="0" cellpadding="0" class="serendipity_calendar">
     <tr>
-        <td class="serendipity_calendarHeader" align="left">
+        <td class="serendipity_calendarHeader">
 {if $plugin_calendar_head.minScroll le $plugin_calendar_head.month_date}
-            <a title="Back" href="{$plugin_calendar_head.uri_previous}"><img alt="{$const.BACK}" src="{serendipity_getFile file="img/back.png"}" border="0"></a>
+            <a title="{$CONST.BACK}" href="{$plugin_calendar_head.uri_previous}"><img alt="{$CONST.BACK}" src="{serendipity_getFile file="img/back.png"}" style="border: 0px" /></a>
 {/if}
         </td>
-        <td colspan="5" class="serendipity_calendarHeader" align="center" valign="bottom">
-            <b><nobr><a href="{$plugin_calendar_head.uri_month}">{$plugin_calendar_head.month_date|formatTime:"%B '%y"}</a></nobr></b>
+
+        <td colspan="5" class="serendipity_calendarHeader" style="text-align: center; vertical-align: bottom">
+            <b><a style="white-space: nowrap" href="{$plugin_calendar_head.uri_month}">{$plugin_calendar_head.month_date|formatTime:"%B '%y":false}</a></b>
         </td>
-        <td class="serendipity_calendarHeader" align="right">
+
+        <td class="serendipity_calendarHeader" style="text-align: right">
 {if $plugin_calendar_head.maxScroll ge $plugin_calendar_head.month_date}
-            <a title="Forward" href="{$plugin_calendar_head.uri_next}"><img alt="{$const.FORWARD}" src="{serendipity_getFile file="img/forward.png"}" border="0"></a>
+            <a title="{$CONST.FORWARD}" href="{$plugin_calendar_head.uri_next}"><img alt="{$CONST.FORWARD}" src="{serendipity_getFile file="img/forward.png"}" style="border: 0px" /></a>
 {/if}
         </td>
     </tr>
+
     <tr>
     {foreach from=$plugin_calendar_dow item="dow"}
-        <td scope="col" abbr="{$dow.date|@formatTime:"%A"}" title="{$dow.date|@formatTime:"%A"}" class="serendipity_weekDayName" align="center">{$dow.date|@formatTime:"%a"|@truncate:2:""}</td>
+        <td scope="col" abbr="{$dow.date|@formatTime:"%A":false}" title="{$dow.date|@formatTime:"%A":false}" class="serendipity_weekDayName" align="center">{$dow.date|@formatTime:"%a":false|@truncate:2:""}</td>
     {/foreach}
     </tr>
+
     {foreach from=$plugin_calendar_weeks item="week"}
         <tr class="serendipity_calendar">
         {foreach from=$week.days item="day"}