mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Dashboard: Also show drafts

Browse Source
This commit is contained in:
onli
2013-07-07 20:42:20 +02:00
parent 8f3b3fabaa
commit a4ec72dbd4
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/admin/overview.inc.php
View File

@ -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);

5
templates/2k11/admin/overview.inc.tpl
View File

@ -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}">