From a4ec72dbd40067fb4631d0b2300bee5e49a8acb1 Mon Sep 17 00:00:00 2001
From: onli <onli89@googlemail.com>
Date: Sun, 7 Jul 2013 20:42:20 +0200
Subject: [PATCH] Dashboard: Also show drafts

---
 include/admin/overview.inc.php        | 25 ++++++++++++++++++++++---
 templates/2k11/admin/overview.inc.tpl |  5 ++++-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/include/admin/overview.inc.php b/include/admin/overview.inc.php
index d33cb869..1eb05ea0 100644
--- a/include/admin/overview.inc.php
+++ b/include/admin/overview.inc.php
@@ -23,15 +23,17 @@ $data['usedVersion'] = $serendipity['version'];
 $data['update'] = version_compare($data['usedVersion'], $data['curVersion'], '<');
 
 
-$data['comments'] = serendipity_db_query("SELECT c.*, e.title FROM {$serendipity['dbPrefix']}comments c
+$comments = serendipity_db_query("SELECT c.*, e.title FROM {$serendipity['dbPrefix']}comments c
                                     LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id)
                                     ORDER BY c.id DESC LIMIT 5");
-foreach ($data['comments'] as &$comment) {
+foreach ($comments as &$comment) {
     $entrylink = serendipity_archiveURL($comment['entry_id'], 'comments', 'serendipityHTTPPath', true) . '#c' . $comment['id'];
     $comment['entrylink'] = $entrylink;
 }
 
-$data['entries'] = serendipity_fetchEntries(
+$data['comments'] = $comments;
+
+$entries = serendipity_fetchEntries(
                      false,
                      false,
                      5,
@@ -41,6 +43,23 @@ $data['entries'] = serendipity_fetchEntries(
                      'e.timestamp >= ' . serendipity_serverOffsetHour()
                    );
 
+$entriesAmount = count($data['entries']);
+if ($entriesAmount < 5) {
+    // there is still space for drafts
+    $drafts = serendipity_fetchEntries(
+                     false,
+                     false,
+                     5- $entriesAmount,
+                     true,
+                     false,
+                     'timestamp DESC',
+                     'isdraft = "true" AND e.timestamp <=  ' . serendipity_serverOffsetHour() 
+                   );
+    $entries = array_merge($entries, $drafts);
+}
+
+$data['entries'] = $entries;
+
 $data['token'] = serendipity_setFormToken('url');
 
 echo serendipity_smarty_show('admin/overview.inc.tpl', $data);
diff --git a/templates/2k11/admin/overview.inc.tpl b/templates/2k11/admin/overview.inc.tpl
index 36c71446..5df78936 100644
--- a/templates/2k11/admin/overview.inc.tpl
+++ b/templates/2k11/admin/overview.inc.tpl
@@ -41,12 +41,15 @@
     {/if}
     {if is_array($entries)}
         <section id="dashboard_entries" class="equal_heights quick_list">
-            <h3>Future Entries</h3> {* i18n *}
+            <h3>{$CONST.ADMIN_ENTRIES}</h3> {* i18n *}
 
             <ol class="plainList">
             {foreach $entries as $entry}
                 <li>
                     <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]={$entry.id}" title="#{$entry.id}: {$entry.title|escape}">{$entry.title}</a>
+                    {if $entry.isdraft == "true"}
+                        <span class="entry_status status_draft">Draft</span>
+                    {/if}
                     <ul class="plainList actions">
                         <li>
                             <a class="button_link" href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=preview&amp;{$token}&amp;serendipity[id]={$entry.id}" title="{$CONST.PREVIEW} #{$entry.id}">