From: ArthurHoaro Date: Wed, 31 May 2017 15:54:46 +0000 (+0200) Subject: Merge pull request #882 from ArthurHoaro/feature/edit-timestamp X-Git-Tag: v0.9.1~1^2~23 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=5c6fac0bfc9583e6e372643facf6ddc50a6a1b1d;hp=ac94db1e36c77d52c316b5fa4e8e36b9d1e38b9e;p=github%2Fshaarli%2FShaarli.git Merge pull request #882 from ArthurHoaro/feature/edit-timestamp Add creation date when editing a link --- diff --git a/index.php b/index.php index 823eb8de..2ff2505a 100644 --- a/index.php +++ b/index.php @@ -1425,7 +1425,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) 'url' => $url, 'description' => $description, 'tags' => $tags, - 'private' => $private + 'private' => $private, ); } else { $link['linkdate'] = $link['created']->format(LinkDB::LINK_DATE_FORMAT); diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index 3391fa05..39bbd0a3 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -992,6 +992,14 @@ form[name="linkform"].page-form { color: #3f3f3f; } +/** + * EDIT LINK + */ +#editlinkform .created-date { + color: #767676; + margin-bottom: 10px; +} + /** * LOGIN */ diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index 354499a4..d03fd72f 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html @@ -8,11 +8,15 @@
-

{'Shaare'|t}

+

+ {if="!$link_is_new"}{'Edit'|t}{/if} + {'Shaare'|t} +

{if="isset($link.id)"} {/if} + {if="!$link_is_new"}
{'Created:'|t} {$link.created|format_date}
{/if}
@@ -55,7 +59,8 @@
- + {if="!$link_is_new"}