]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge pull request #882 from ArthurHoaro/feature/edit-timestamp
authorArthurHoaro <arthur@hoa.ro>
Wed, 31 May 2017 15:54:46 +0000 (17:54 +0200)
committerGitHub <noreply@github.com>
Wed, 31 May 2017 15:54:46 +0000 (17:54 +0200)
Add creation date when editing a link

1  2 
index.php
tpl/default/css/shaarli.css

diff --combined index.php
index 823eb8dea7834100f40a3525770ecdce29b2f20f,cb0afbd0901a9efae11958dc7040f05172c40042..2ff2505a5e7b27355d71b64d6b88478d2f87e7e2
+++ b/index.php
@@@ -1256,7 -1256,13 +1256,7 @@@ function renderPage($conf, $pluginManag
          // Remove duplicates.
          $tags = implode(' ', array_unique(explode(' ', $tags)));
  
 -        $url = trim($_POST['lf_url']);
 -        if (! startsWith($url, 'http:') && ! startsWith($url, 'https:')
 -            && ! startsWith($url, 'ftp:') && ! startsWith($url, 'magnet:')
 -            && ! startsWith($url, '?') && ! startsWith($url, 'javascript:')
 -        ) {
 -            $url = 'http://' . $url;
 -        }
 +        $url = whitelist_protocols(trim($_POST['lf_url']), $conf->get('security.allowed_protocols'));
  
          $link = array(
              'id' => $id,
                  'url' => $url,
                  'description' => $description,
                  'tags' => $tags,
-                 'private' => $private
+                 'private' => $private,
              );
          } else {
              $link['linkdate'] = $link['created']->format(LinkDB::LINK_DATE_FORMAT);
index 3391fa0539ee7b49a5df06f303dce3cbc9b0681b,8b86bce21de628dec6f1784c24a5fe5dda0a4ab4..39bbd0a3d5048fd1821bc7997ac0314fcbade002
@@@ -539,8 -539,8 +539,8 @@@ body, .pure-g [class*="pure-u"] 
      color: #1b926c;
  }
  
 -.linklist-item-title .linklist-link:visited {
 -    color: #1b926c;
 +.linklist-item-title a:visited .linklist-link {
 +    color: #555555;
  }
  
  .linklist-item-title a:hover, .linklist-item-title .linklist-link:hover{
@@@ -992,6 -992,14 +992,14 @@@ form[name="linkform"].page-form 
      color: #3f3f3f;
  }
  
+ /**
+  * EDIT LINK
+  */
+ #editlinkform .created-date {
+     color: #767676;
+     margin-bottom: 10px;
+ }
  /**
   * LOGIN
   */