From 75d45f811fcaafa515fc71d15badee6c56794e8d Mon Sep 17 00:00:00 2001 From: Matthias Mees Date: Fri, 31 May 2013 18:10:16 +0200 Subject: [PATCH] Replaces inline onclick handler for .status_timestamp. Also moved reference to serendipity_editor.js before the closing body element. This way, jQuery's $(document).ready() equals $(window).load(), so we don't have to use that any longer. --- templates/2k11/admin/entries.inc.tpl | 2 +- templates/2k11/admin/index.tpl | 6 ++--- .../2k11/admin/serendipity_editor.js.tpl | 27 ++++++++++--------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/templates/2k11/admin/entries.inc.tpl b/templates/2k11/admin/entries.inc.tpl index 0469510f..32d4ab89 100644 --- a/templates/2k11/admin/entries.inc.tpl +++ b/templates/2k11/admin/entries.inc.tpl @@ -129,7 +129,7 @@
- {$entry.timestamp|@formatTime:"{$CONST.DATE_FORMAT_SHORT}"}{if $entry.timestamp <= ($entry.last_modified - 1800)} {$CONST.LAST_UPDATED}{/if} + {$entry.timestamp|@formatTime:"{$CONST.DATE_FORMAT_SHORT}"}{if $entry.timestamp <= ($entry.last_modified - 1800)} {$CONST.LAST_UPDATED}{/if} {$CONST.POSTED_BY} {$entry.author|escape} diff --git a/templates/2k11/admin/index.tpl b/templates/2k11/admin/index.tpl index b301c27c..5c5ad8ab 100644 --- a/templates/2k11/admin/index.tpl +++ b/templates/2k11/admin/index.tpl @@ -10,10 +10,7 @@ -{if $admin_vars.admin_installed} -{serendipity_hookPlugin hook="backend_header" hookAll="true"} -{/if} - +{if $admin_vars.admin_installed}{serendipity_hookPlugin hook="backend_header" hookAll="true"}{/if} {if NOT $admin_vars.no_banner} @@ -182,5 +179,6 @@

{$admin_vars.version_info}

{/if} + diff --git a/templates/2k11/admin/serendipity_editor.js.tpl b/templates/2k11/admin/serendipity_editor.js.tpl index fc226b3e..f1be658b 100644 --- a/templates/2k11/admin/serendipity_editor.js.tpl +++ b/templates/2k11/admin/serendipity_editor.js.tpl @@ -666,18 +666,21 @@ function highlightComment(id, checkvalue) { footer: '#meta' }); - // Wait until content including images is loaded - $(window).load(function() { - // Fire WYSIWYG editor(s) - spawn(); + // Fire WYSIWYG editor(s) + spawn(); - // Equal Heights - var $eqHeights = $('body').has('.equal_heights'); - - if($eqHeights.size() > 0) { - $('.equal_heights').syncHeight({ - updateOnResize: true - }); - } + // Click events + $('.status_timestamp > a').click(function(e) { + alert($(this).attr('title')); + e.preventDefault(); }); + + // Equal Heights + var $eqHeights = $('body').has('.equal_heights'); + + if($eqHeights.size() > 0) { + $('.equal_heights').syncHeight({ + updateOnResize: true + }); + } })(jQuery);