From 756c47980d1eeb8f564347eb600bf47fb53beb18 Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Sat, 25 Jan 2014 20:49:33 +0100
Subject: [PATCH] Additional entry status "Published" added.

Also changed the overlong label text for scheduled entries. Both
need new or changed lang constants.
---
 templates/2k11/admin/entries.inc.tpl  | 5 ++++-
 templates/2k11/admin/overview.inc.tpl | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/templates/2k11/admin/entries.inc.tpl b/templates/2k11/admin/entries.inc.tpl
index fed4485e..280840af 100644
--- a/templates/2k11/admin/entries.inc.tpl
+++ b/templates/2k11/admin/entries.inc.tpl
@@ -162,7 +162,10 @@
                         {/if}
                         </span>
                     {if !$showFutureEntries && ($entry.timestamp >= $serverOffsetHour)}
-                        <span class="entry_status status_future">{$CONST.ENTRY_PUBLISHED_FUTURE}</span>
+                        <span class="entry_status status_future">Scheduled{* $CONST.ENTRY_PUBLISHED_FUTURE *}</span>{* i18n *}
+                    {/if}
+                    {if ($entry.timestamp < $serverOffsetHour) && !$entry.isdraft}
+                        <span class="entry_status status_published">Published</span> {* i18n *}
                     {/if}
                     {if $entry.ep_is_sticky}
                         <span class="entry_status status_sticky">{$CONST.STICKY_POSTINGS}</span>
diff --git a/templates/2k11/admin/overview.inc.tpl b/templates/2k11/admin/overview.inc.tpl
index 3cde088d..67b2a49b 100644
--- a/templates/2k11/admin/overview.inc.tpl
+++ b/templates/2k11/admin/overview.inc.tpl
@@ -58,7 +58,7 @@
                         <li><a class="button_link" href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]={$entry.id}" title="{$CONST.EDIT} #{$entry.id}"><span class="icon-edit"></span><span class="visuallyhidden"> {$CONST.EDIT}</span></a></li>
                     </ul>
                 {if !$showFutureEntries && ($entry.timestamp >= $serverOffsetHour) && $entry.isdraft == "false"}
-                    <span class="entry_status status_future">{$CONST.ENTRY_PUBLISHED_FUTURE}</span>
+                    <span class="entry_status status_future">Scheduled{* $CONST.ENTRY_PUBLISHED_FUTURE *}</span>{* i18n *} 
                 {/if}
                 {if $entry.ep_is_sticky}
                     <span class="entry_status status_sticky">{$CONST.STICKY_POSTINGS}</span>