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

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source
This commit is contained in:
Matthias Mees 2012-12-05 13:58:48 +01:00
commit 44885ea0f0
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/admin/entries.inc.php
View File

@ -160,7 +160,10 @@ function serendipity_drawList() {
$data['serverOffsetHour'] = serendipity_serverOffsetHour();
$data['showFutureEntries'] = $serendipity['showFutureEntries'];
} // entries end
} else {
$data['no_entries'] = true;
} // if entries end
} // End function serendipity_drawList()
if (!empty($serendipity['GET']['editSubmit'])) {

5
include/admin/tpl/entries.inc.tpl
View File

@ -126,7 +126,7 @@
<span class="status_draft">{$CONST.DRAFT}</span>
{/if}
<span class="status_timestamp">
{$entry.timestamp|@formatTime:"{$CONST.DATE_FORMAT_SHORT}"}{if $entry.timestamp <= ($entry.last_modified - (60*30))} <a class="icon_link" href="#" title="{$CONST.LAST_UPDATED}: {$entry.last_modified|@formatTime:"{$CONST.DATE_FORMAT_SHORT}"}" onclick="alert(this.title)"><span class="icon-info-circle"></span><span class="visuallyhidden"> {$CONST.LAST_UPDATED}</span></a>{/if}
{$entry.timestamp|@formatTime:"{$CONST.DATE_FORMAT_SHORT}"}{if $entry.timestamp <= ($entry.last_modified - 1800)} <a class="icon_link" href="#" title="{$CONST.LAST_UPDATED}: {$entry.last_modified|@formatTime:"{$CONST.DATE_FORMAT_SHORT}"}" onclick="alert(this.title)"><span class="icon-info-circle"></span><span class="visuallyhidden"> {$CONST.LAST_UPDATED}</span></a>{/if}
</span>
</div>
@ -175,8 +175,7 @@
<input name="serendipity[editSubmit]" type="submit" value="{$CONST.GO}">
</form>
{/if}
{* BUG: This seems to be triggered if only one entry is present and said entry should be deleted? Ian: Is it gone now? YL: Nope, still triggered. *}
{if ( ( (!$switched_output && empty($entries)) || (!$drawList && empty($entries)) ) && ( $get.adminAction != 'new' && $get.adminAction != 'edit' ) && !$is_iframepreview )}
{if $no_entries}
<span class="msg_notice"><span class="icon-info-circle"></span> {$CONST.NO_ENTRIES_TO_PRINT}</span>
{/if}

2
include/admin/tplold/entries.inc.tpl
View File

@ -193,7 +193,7 @@
</div><!-- // div.serendipity_admin_list drawList end -->
{/if}{* $drawList end *}
{if ( ( (!$switched_output && empty($entries)) || (!$drawList && empty($entries)) ) && ( $get.adminAction != 'new' && $get.adminAction != 'edit' ) && !$is_iframepreview )}
{if $no_entries}
<div class="serendipity_admin_list">