diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-05-31 17:54:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-31 17:54:46 +0200 |
commit | 5c6fac0bfc9583e6e372643facf6ddc50a6a1b1d (patch) | |
tree | ada96efe0356782f3a338a7af37b6cffaf2b2ad5 | |
parent | ac94db1e36c77d52c316b5fa4e8e36b9d1e38b9e (diff) | |
parent | 807cade64c571929dc19afe3d44787c5abe84f57 (diff) | |
download | Shaarli-5c6fac0bfc9583e6e372643facf6ddc50a6a1b1d.tar.gz Shaarli-5c6fac0bfc9583e6e372643facf6ddc50a6a1b1d.tar.zst Shaarli-5c6fac0bfc9583e6e372643facf6ddc50a6a1b1d.zip |
Merge pull request #882 from ArthurHoaro/feature/edit-timestamp
Add creation date when editing a link
-rw-r--r-- | index.php | 2 | ||||
-rw-r--r-- | tpl/default/css/shaarli.css | 8 | ||||
-rw-r--r-- | tpl/default/editlink.html | 9 |
3 files changed, 16 insertions, 3 deletions
@@ -1425,7 +1425,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) | |||
1425 | 'url' => $url, | 1425 | 'url' => $url, |
1426 | 'description' => $description, | 1426 | 'description' => $description, |
1427 | 'tags' => $tags, | 1427 | 'tags' => $tags, |
1428 | 'private' => $private | 1428 | 'private' => $private, |
1429 | ); | 1429 | ); |
1430 | } else { | 1430 | } else { |
1431 | $link['linkdate'] = $link['created']->format(LinkDB::LINK_DATE_FORMAT); | 1431 | $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 | |||
@@ -993,6 +993,14 @@ form[name="linkform"].page-form { | |||
993 | } | 993 | } |
994 | 994 | ||
995 | /** | 995 | /** |
996 | * EDIT LINK | ||
997 | */ | ||
998 | #editlinkform .created-date { | ||
999 | color: #767676; | ||
1000 | margin-bottom: 10px; | ||
1001 | } | ||
1002 | |||
1003 | /** | ||
996 | * LOGIN | 1004 | * LOGIN |
997 | */ | 1005 | */ |
998 | #login-form .remember-me { | 1006 | #login-form .remember-me { |
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 @@ | |||
8 | <div id="editlinkform" class="pure-g"> | 8 | <div id="editlinkform" class="pure-g"> |
9 | <div class="pure-u-lg-1-5 pure-u-1-24"></div> | 9 | <div class="pure-u-lg-1-5 pure-u-1-24"></div> |
10 | <form method="post" name="linkform" class="page-form pure-u-lg-3-5 pure-u-22-24 page-form page-form-light"> | 10 | <form method="post" name="linkform" class="page-form pure-u-lg-3-5 pure-u-22-24 page-form page-form-light"> |
11 | <h2 class="window-title">{'Shaare'|t}</h2> | 11 | <h2 class="window-title"> |
12 | {if="!$link_is_new"}{'Edit'|t}{/if} | ||
13 | {'Shaare'|t} | ||
14 | </h2> | ||
12 | <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> | 15 | <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> |
13 | {if="isset($link.id)"} | 16 | {if="isset($link.id)"} |
14 | <input type="hidden" name="lf_id" value="{$link.id}"> | 17 | <input type="hidden" name="lf_id" value="{$link.id}"> |
15 | {/if} | 18 | {/if} |
19 | {if="!$link_is_new"}<div class="created-date">{'Created:'|t} {$link.created|format_date}</div>{/if} | ||
16 | <div> | 20 | <div> |
17 | <label for="lf_url">{'URL'|t}</label> | 21 | <label for="lf_url">{'URL'|t}</label> |
18 | </div> | 22 | </div> |
@@ -55,7 +59,8 @@ | |||
55 | 59 | ||
56 | 60 | ||
57 | <div class="submit-buttons center"> | 61 | <div class="submit-buttons center"> |
58 | <input type="submit" value="{'Save'|t}" name="save_edit" class="" id="button-save-edit"> | 62 | <input type="submit" name="save_edit" class="" id="button-save-edit" |
63 | value="{if="$link_is_new"}{'Save'|t}{else}{'Apply Changes'|t}{/if}"> | ||
59 | {if="!$link_is_new"} | 64 | {if="!$link_is_new"} |
60 | <a href="?delete_link&lf_linkdate={$link.id}&token={$token}" | 65 | <a href="?delete_link&lf_linkdate={$link.id}&token={$token}" |
61 | title="" name="delete_link" class="button button-red confirm-delete"> | 66 | title="" name="delete_link" class="button button-red confirm-delete"> |