]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
projects / github / shaarli / Shaarli.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 852613d 8e0ad1d)
Merge pull request #99 from pikzen/license-version
authornodiscc <nodiscc@gmail.com>
Mon, 26 Jan 2015 12:41:06 +0000 (13:41 +0100)
committernodiscc <nodiscc@gmail.com>
Mon, 26 Jan 2015 12:41:06 +0000 (13:41 +0100)
Versioned JS files & centralized licenses

1  2 
tpl/editlink.html patch | diff1 | diff2 | blob | history
tpl/linklist.html patch | diff1 | diff2 | blob | history
tpl/picwall.html patch | diff1 | diff2 | blob | history

diff --combined tpl/editlink.html
index 047e7f0dc09613c9f69b67aca1f691e70f991436,885feed77075b8a5be986f91761439413de7588c..ecab443d4903ae2b31c6db90c7ad14af98cfe2cf
--- 1/tpl/editlink.html
--- 2/tpl/editlink.html
+++ b/tpl/editlink.html
@@@ -1,7 -1,7 +1,7 @@@
  <!DOCTYPE html>
  <html>
  <head>{include="includes"}
- {if="empty($GLOBALS['disablejquery'])"}<script src="inc/jquery.min.js#"></script><script src="inc/jquery-ui.min.js#"></script>{/if}
+ {if="empty($GLOBALS['disablejquery'])"}<script src="inc/jquery-1.11.2.min.js#"></script><script src="inc/jquery-ui-1.11.2.min.js#"></script>{/if}
  </head>
  <body
  {if="$link.title==''"}onload="document.linkform.lf_title.focus();"
@@@ -33,7 -33,7 +33,7 @@@
  </div>
  {include="page.footer"}
  {if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) && empty($GLOBALS['disablejquery'])"}
 -<script language="JavaScript">
 +<script>
  $(document).ready(function()
  {
      $('#lf_tags').autocomplete({source:'{$source}?ws=tags',minLength:1});
diff --combined tpl/linklist.html
index 16fc842d048a87d48c7821af77399a49f034dd6f,58d5867ed159fe92802fefc9bc46e2b90125d8c3..c8dfd12292e15aee31f851e08a36078ec0bfb5bb
--- 1/tpl/linklist.html
--- 2/tpl/linklist.html
+++ b/tpl/linklist.html
@@@ -30,7 -30,7 +30,7 @@@
      <ul>
          {loop="links"}
          <li{if="$value.class"} class="{$value.class}"{/if}>
 -            <a name="{$value.linkdate|smallHash}" id="{$value.linkdate|smallHash}"></a>
 +            <a id="{$value.linkdate|smallHash}"></a>
              <div class="thumbnail">{$value.url|thumbnail}</div>
              <div class="linkcontainer">
                  {if="isLoggedIn()"}
@@@ -51,10 -51,9 +51,10 @@@
                  {if="$GLOBALS['config']['ARCHIVE_ORG']"}
                  <span class="linkarchive"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">archive</a> - </span>
                  {/if}
 -                <div class="linkqrcode"><a href="http://qrfree.kaywa.com/?l=1&s=8&d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}"
 -                    onclick="showQrCode(this); return false;" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}"><img src="images/qrcode.png#" title="QR-Code"></a></div> -
 -                <a href={$value.url|htmlspecialchars}><span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span></a><br>
 +                <div class="linkqrcode"><a href="http://qrfree.kaywa.com/?l=1&amp;s=8&amp;d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}"
 +                    onclick="return showQrCode(this);" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}">
 +                  <img src="images/qrcode.png#" alt="QR-Code" title="{$value.localdate|htmlspecialchars}"></a></div> -
 +                <a href="{$value.url|htmlspecialchars}"><span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span></a><br>
                  {if="$value.tags"}
                      <div class="linktaglist">
                      {loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value|htmlspecialchars}</a></span> {/loop}
@@@ -71,7 -70,7 +71,7 @@@
  
      {include="page.footer"}
  
 -<script language="JavaScript">
 +<script>
  // Remove any displayed QR-Code
  function remove_qrcode()
  {
@@@ -80,24 -79,16 +80,24 @@@
      return false;
  }
  
 +function isCanvasSupported(){
 +    var elem = document.createElement('canvas');
 +    return !!(elem.getContext && elem.getContext('2d'));
 +}
 +
  // Show the QR-Code of a permalink (when the QR-Code icon is clicked).
 -function showQrCode(caller,loading=false)
 +function showQrCode(caller,loading)
  {
 +    if( !isCanvasSupported() ) return true;
 +
      // Dynamic javascript lib loading: We only load qr.js if the QR code icon is clicked:
      if (typeof(qr)=='undefined') // Load qr.js only if not present.
      {
 +        loading = typeof loading !== 'undefined' ? loading : false;
          if (!loading)  // If javascript lib is still loading, do not append script to body.
          {
              var element = document.createElement("script");
-             element.src = "inc/qr.min.js";
+             element.src = "inc/qr-1.1.3.min.js";
              document.body.appendChild(element);
          }
          setTimeout(function() { showQrCode(caller,true);}, 200); // Retry in 200 milliseconds.
@@@ -110,12 -101,12 +110,12 @@@
      // Build the div which contains the QR-Code:
      var element = document.createElement('div');
      element.id="permalinkQrcode";
 -      // Make QR-Code div commit sepuku when clicked:
 -    if ( element.attachEvent ){ element.attachEvent('onclick', 'this.parentNode.removeChild(this);' ); } // Damn IE
 -    else { element.setAttribute('onclick', 'this.parentNode.removeChild(this);' ); }
 +
 +    // Make QR-Code div commit sepuku when clicked:
 +    element.addEventListener('click', remove_qrcode ); // Works on every canvas supported browser
  
      // Build the QR-Code:
 -    var image = qr.image({size: 8,value: caller.dataset.permalink});
 +    var image = qr.image({size: 8,value: caller.getAttribute('data-permalink')});
      if (image)
      {
          element.appendChild(image);
diff --combined tpl/picwall.html
index bfaabf7e4d6d5d937acc52acb46cb88d65535394,bf299fbf44f697dcd0902ff1c82373ab5ae4966d..d3cabb2db151a9d885694ece6407b4bd0c3b517d
--- 1/tpl/picwall.html
--- 2/tpl/picwall.html
+++ b/tpl/picwall.html
@@@ -2,22 -2,22 +2,22 @@@
  <html>
  <head>{include="includes"}
  {if="empty($GLOBALS['disablejquery'])"}       
- <script src="inc/jquery.min.js#"></script>
- <script src="inc/jquery-ui.min.js#"></script>
- <script src="inc/jquery.lazyload.min.js#"></script>
+ <script src="inc/jquery-1.11.2.min.js#"></script>
+ <script src="inc/jquery-ui-1.11.2.min.js#"></script>
+ <script src="inc/jquery.lazyload-1.9.3.min.js#"></script>
  {/if}
  </head>
  <body>
  <div id="pageheader">{include="page.header"}</div>
 -<center>
 -<div class="picwall_container">
 -    {loop="linksToDisplay"}
 -    <div class="picwall_pictureframe">
 -          {$value.thumbnail}<a href="{$value.permalink}"><span class="info">{$value.title|htmlspecialchars}</span></a>
 -    </div>
 -    {/loop}
 +<div class="center">
 +        <div id="picwall_container">
 +            {loop="linksToDisplay"}
 +            <div class="picwall_pictureframe">
 +                  {$value.thumbnail}<a href="{$value.permalink}"><span class="info">{$value.title|htmlspecialchars}</span></a>
 +            </div>
 +            {/loop}
 +        </div>
  </div>
 -</center>
  {include="page.footer"}
  
  {if="empty($GLOBALS['disablejquery'])"} 
The personal, minimalist, super-fast, database free, bookmarking service - community repo