[fix] bad merge
This commit is contained in:
commit
9a3783ed20
14 changed files with 1780 additions and 1360 deletions
|
@ -55,13 +55,14 @@ myShaarli Features :
|
||||||
* Add link to archive.org (qwertygc https://github.com/nodiscc/Shaarli/commit/b113dc8e6bba052883297ab575dd36fd3073805e)
|
* Add link to archive.org (qwertygc https://github.com/nodiscc/Shaarli/commit/b113dc8e6bba052883297ab575dd36fd3073805e)
|
||||||
* myShaali can use Firefox social API (Marsup https://github.com/shaarli/Shaarli/commit/d33c5d4c3b9c70441391a08e8bcb2a8c639a4635)
|
* myShaali can use Firefox social API (Marsup https://github.com/shaarli/Shaarli/commit/d33c5d4c3b9c70441391a08e8bcb2a8c639a4635)
|
||||||
* myShaali can post original article to Wallabag (v1/v2)(nodiscc https://github.com/nodiscc/Shaarli/tree/new-plugin-system/tpl/plugins/wallabag)
|
* myShaali can post original article to Wallabag (v1/v2)(nodiscc https://github.com/nodiscc/Shaarli/tree/new-plugin-system/tpl/plugins/wallabag)
|
||||||
|
* myShaali implement OpenSearch (ArthurHoaro https://github.com/shaarli/Shaarli/issues/176)
|
||||||
* Few small fix
|
* Few small fix
|
||||||
* You can upgrade original Shaarli to myShaarli without lost your data
|
* You can upgrade original Shaarli to myShaarli without lost your data
|
||||||
* You can define url origin of update
|
* You can define url origin of update
|
||||||
* Change date/time format
|
* Change date/time format
|
||||||
|
|
||||||
More information on the project page:
|
More information on the project page:
|
||||||
https://forge.leslibres.org/projects/shaarli
|
https://forge.leslibres.org/Knah-Tsaeb/MyShaarli
|
||||||
|
|
||||||
|
|
||||||
Requires php 5.1
|
Requires php 5.1
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
1.1.2
|
1.1.4
|
||||||
|
|
|
@ -5,8 +5,9 @@
|
||||||
<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
|
<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
|
||||||
<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
|
<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
|
||||||
<!--<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />-->
|
<!--<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />-->
|
||||||
<link rel="icon" type="image/png" sizes="128x128" href="images/favicon_128.png#" />
|
<link rel="icon" type="image/png" sizes="128x128" href="images/favicon_128.png#" />
|
||||||
<link rel="icon" type="image/png" sizes="64x64" href="images/favicon_64.png#" />
|
<link rel="icon" type="image/png" sizes="64x64" href="images/favicon_64.png#" />
|
||||||
<link rel="icon" type="image/png" sizes="32x32" href="images/favicon_32.png#" />
|
<link rel="icon" type="image/png" sizes="32x32" href="images/favicon_32.png#" />
|
||||||
<link rel="icon" type="image/png" sizes="16x16" href="images/favicon_16.png#" />
|
<link rel="icon" type="image/png" sizes="16x16" href="images/favicon_16.png#" />
|
||||||
<link type="text/css" rel="stylesheet" href="myShaarli.css?version={$version|urlencode}" />
|
<link type="text/css" rel="stylesheet" href="myShaarli.css?version={$version|urlencode}" />
|
||||||
|
<link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle|htmlspecialchars}" />
|
||||||
|
|
|
@ -518,7 +518,7 @@ a, .linkdescription a {
|
||||||
}
|
}
|
||||||
|
|
||||||
#linklist li, #linklist li.private {
|
#linklist li, #linklist li.private {
|
||||||
background: #fff;
|
background-color: #fff;
|
||||||
border: 1px solid #cdcdcd;
|
border: 1px solid #cdcdcd;
|
||||||
border-radius: .3em;
|
border-radius: .3em;
|
||||||
clear: both;
|
clear: both;
|
||||||
|
@ -526,6 +526,13 @@ a, .linkdescription a {
|
||||||
padding: .3em;
|
padding: .3em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#linklist li.private {
|
||||||
|
background-image: url('../../images/private_16x16.png');
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-position: 10px center;
|
||||||
|
padding: .3em .3em .3em 32px;
|
||||||
|
}
|
||||||
|
|
||||||
#linklist li.publicLinkHightLight {
|
#linklist li.publicLinkHightLight {
|
||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
}
|
}
|
||||||
|
|
15
tpl/myShaarli/opensearch.html
Normal file
15
tpl/myShaarli/opensearch.html
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
|
||||||
|
<ShortName>myShaarli search - {$pagetitle}</ShortName>
|
||||||
|
<Description>myShaarli search - {$pagetitle}</Description>
|
||||||
|
<Url type="text/html" template="{$serverurl}?searchterm={searchTerms}" />
|
||||||
|
<Url type="application/atom+xml" template="{$serverurl}?do=atom&searchterm={searchTerms}" />
|
||||||
|
<Url type="application/rss+xml" template="{$serverurl}?do=rss&searchterm={searchTerms}" />
|
||||||
|
<InputEncoding>UTF-8</InputEncoding>
|
||||||
|
<Developer>Knah Tsaeb myShaarly - https://github.com/Knah-Tsaeb/myShaarli</Developer>
|
||||||
|
<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlz AAALEwAACxMBAJqcGAAAAAd0SU1FB98HEA4tDZmAhI0AAAAdaVRYdENvbW1lbnQAAAAAAENyZWF0 ZWQgd2l0aCBHSU1QZC5lBwAAAhJJREFUOMuVUz1oU1EYPcm90iTNnxCTtImtD6VdoghShzq0xPLy
|
||||||
|
DEpEcdAuoUgVC4JDHERx6ioU0UVQC3VyU4dAMKb+pNI6qBTaQqnSxpBgan6qTZq89z6HWIkhofEs l3s45/B99/suQxPcuOdnWeOXEedBPnjsRNfcQjxH+B8cuqC7c3OG0+05ToeH+d1mOlZPDF62tZv3 KwMOQb7e0c2t7QaOHylFMLh2RdLzSqper6m9HBk2C66e0kL/kK7NuZfh8+wW7J0cboFj6VMZ0Wel 6Lv78vGmFVh6lNMXr1rPfk8QZqIlzL4uIrEiY3VJRt9RI8xWJih606O1j5v5bY+2NsBmND1/+vBn
|
||||||
|
4cA+Pc6f2wOPx4BOZxsujXZgIwPEX21Oxx9nVms9/wS8ncyu5xaFqXJei5eRAkJj3RgbcSPyYgOn BhxYz6hf69+A1xMqK71ZXt66EjzjxuSTFIp5DySfgm9rMlTSZHacQmIxO6/+6r3W5RrV6fP92K32 Qi73YXz8fcLuEE6ufEjuvA+iKBIRkd/vp2AwSEREXq+3oVHbkNRW6UKhoBaLRQCA3W6HJEmmlgL+ LolGo2Ws2uWfk7UUUKlUqmO12WCxWAAARI1b541IWZYT6XTaHQgEwDkHESGZTCIWi+Va+kiSJN0K
|
||||||
|
hUK0jYmJCRJFcaphm81CfD7fg0qlEmSMcQDTjLGhcDgs1+t+Ay6pzgTLZnNuAAAAAElFTkSuQmCC
|
||||||
|
</Image>
|
||||||
|
</OpenSearchDescription>
|
|
@ -1,23 +1,21 @@
|
||||||
<div id="footer">
|
<div id="footer">
|
||||||
<a href="https://forge.leslibres.org/projects/shaarli/repository/show?rev=myShaarli">myShaarli are made by Knah Tsaeb</a> is based on <b><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli">Shaarli 0.0.41 beta</a></b> - The personal, minimalist, super-fast, no-database delicious clone. By <a href="http://sebsauvage.net" target="_blank">sebsauvage.net</a>.
|
<a href="https://forge.leslibres.org/Knah-Tsaeb/MyShaarli">myShaarli are made by Knah Tsaeb</a> is based on <b><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli">Shaarli 0.0.41 beta</a></b> - The personal, minimalist, super-fast, no-database
|
||||||
<br/>
|
delicious clone. By <a href="http://sebsauvage.net" target="_blank">sebsauvage.net</a>.
|
||||||
Original theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>.
|
<br/> Original theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>.
|
||||||
<br/>
|
<br/> {if="$GLOBALS['config']['contactLink']"} For contact me <a href="{$GLOBALS['config']['contactLink']}">use this link.</a>{/if}
|
||||||
{if="$GLOBALS['config']['contactLink']"} For contact me <a href="{$GLOBALS['config']['contactLink']}">use this link.</a>{/if}
|
|
||||||
</div>
|
</div>
|
||||||
{if="$newversion"}
|
{if="$newversion"}
|
||||||
<div id="newversion">
|
<div id="newversion">
|
||||||
●<a href="{$GLOBALS['config']['UPDATECHECK_DOWNLOAD']}">{$newversion|htmlspecialchars}</a>
|
●<a href="{$GLOBALS['config']['UPDATECHECK_DOWNLOAD']}">{$newversion|htmlspecialchars}</a>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if} {if="isLoggedIn()"}
|
||||||
{if="isLoggedIn()"}
|
|
||||||
<script>
|
<script>
|
||||||
function confirmDeleteLink() {
|
function confirmDeleteLink() {
|
||||||
var agree = confirm("Are you sure you want to delete this link ?");
|
var agree = confirm("Are you sure you want to delete this link ?");
|
||||||
if (agree)
|
if (agree)
|
||||||
return true;
|
return true;
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
|
@ -528,7 +528,7 @@ a, .linkdescription a {
|
||||||
|
|
||||||
#linklist li, #linklist li.private {
|
#linklist li, #linklist li.private {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
background: #fff;
|
background-color: #fff;
|
||||||
border: 1px solid #cdcdcd;
|
border: 1px solid #cdcdcd;
|
||||||
border-radius: .3em;
|
border-radius: .3em;
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
|
@ -538,6 +538,12 @@ a, .linkdescription a {
|
||||||
width: calc(25% - .6em);
|
width: calc(25% - .6em);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#linklist li.private {
|
||||||
|
background-image: url('../../images/private_16x16.png');
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-position: 10px 10px;
|
||||||
|
}
|
||||||
|
|
||||||
#linklist li.publicLinkHightLight {
|
#linklist li.publicLinkHightLight {
|
||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
}
|
}
|
||||||
|
@ -1286,4 +1292,4 @@ a:hover, .linkdescription a:hover, .linktitle a:hover, .linkWallabag a:hover, .l
|
||||||
position: relative;
|
position: relative;
|
||||||
width: calc(100% - 0.6em);
|
width: calc(100% - 0.6em);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,8 +5,9 @@
|
||||||
<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
|
<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
|
||||||
<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
|
<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
|
||||||
<!--<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />-->
|
<!--<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />-->
|
||||||
<link rel="icon" type="image/png" sizes="128x128" href="images/favicon_128.png#" />
|
<link rel="icon" type="image/png" sizes="128x128" href="images/favicon_128.png#" />
|
||||||
<link rel="icon" type="image/png" sizes="64x64" href="images/favicon_64.png#" />
|
<link rel="icon" type="image/png" sizes="64x64" href="images/favicon_64.png#" />
|
||||||
<link rel="icon" type="image/png" sizes="32x32" href="images/favicon_32.png#" />
|
<link rel="icon" type="image/png" sizes="32x32" href="images/favicon_32.png#" />
|
||||||
<link rel="icon" type="image/png" sizes="16x16" href="images/favicon_16.png#" />
|
<link rel="icon" type="image/png" sizes="16x16" href="images/favicon_16.png#" />
|
||||||
<link type="text/css" rel="stylesheet" href="columns.css?version={$version|urlencode}" />
|
<link type="text/css" rel="stylesheet" href="columns.css?version={$version|urlencode}" />
|
||||||
|
<link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle|htmlspecialchars}" />
|
||||||
|
|
15
tpl/myShaarli_Columns/opensearch.html
Normal file
15
tpl/myShaarli_Columns/opensearch.html
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
|
||||||
|
<ShortName>myShaarli search - {$pagetitle}</ShortName>
|
||||||
|
<Description>myShaarli search - {$pagetitle}</Description>
|
||||||
|
<Url type="text/html" template="{$serverurl}?searchterm={searchTerms}" />
|
||||||
|
<Url type="application/atom+xml" template="{$serverurl}?do=atom&searchterm={searchTerms}" />
|
||||||
|
<Url type="application/rss+xml" template="{$serverurl}?do=rss&searchterm={searchTerms}" />
|
||||||
|
<InputEncoding>UTF-8</InputEncoding>
|
||||||
|
<Developer>Knah Tsaeb myShaarly - https://github.com/Knah-Tsaeb/myShaarli</Developer>
|
||||||
|
<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlz AAALEwAACxMBAJqcGAAAAAd0SU1FB98HEA4tDZmAhI0AAAAdaVRYdENvbW1lbnQAAAAAAENyZWF0 ZWQgd2l0aCBHSU1QZC5lBwAAAhJJREFUOMuVUz1oU1EYPcm90iTNnxCTtImtD6VdoghShzq0xPLy
|
||||||
|
DEpEcdAuoUgVC4JDHERx6ioU0UVQC3VyU4dAMKb+pNI6qBTaQqnSxpBgan6qTZq89z6HWIkhofEs l3s45/B99/suQxPcuOdnWeOXEedBPnjsRNfcQjxH+B8cuqC7c3OG0+05ToeH+d1mOlZPDF62tZv3 KwMOQb7e0c2t7QaOHylFMLh2RdLzSqper6m9HBk2C66e0kL/kK7NuZfh8+wW7J0cboFj6VMZ0Wel 6Lv78vGmFVh6lNMXr1rPfk8QZqIlzL4uIrEiY3VJRt9RI8xWJih606O1j5v5bY+2NsBmND1/+vBn
|
||||||
|
4cA+Pc6f2wOPx4BOZxsujXZgIwPEX21Oxx9nVms9/wS8ncyu5xaFqXJei5eRAkJj3RgbcSPyYgOn BhxYz6hf69+A1xMqK71ZXt66EjzjxuSTFIp5DySfgm9rMlTSZHacQmIxO6/+6r3W5RrV6fP92K32 Qi73YXz8fcLuEE6ufEjuvA+iKBIRkd/vp2AwSEREXq+3oVHbkNRW6UKhoBaLRQCA3W6HJEmmlgL+ LolGo2Ws2uWfk7UUUKlUqmO12WCxWAAARI1b541IWZYT6XTaHQgEwDkHESGZTCIWi+Va+kiSJN0K
|
||||||
|
hUK0jYmJCRJFcaphm81CfD7fg0qlEmSMcQDTjLGhcDgs1+t+Ay6pzgTLZnNuAAAAAElFTkSuQmCC
|
||||||
|
</Image>
|
||||||
|
</OpenSearchDescription>
|
|
@ -1,23 +1,21 @@
|
||||||
<div id="footer">
|
<div id="footer">
|
||||||
<a href="https://forge.leslibres.org/projects/shaarli/repository/show?rev=myShaarli">myShaarli are made by Knah Tsaeb</a> is based on <b><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli">Shaarli 0.0.41 beta</a></b> - The personal, minimalist, super-fast, no-database delicious clone. By <a href="http://sebsauvage.net" target="_blank">sebsauvage.net</a>.
|
<a href="https://forge.leslibres.org/Knah-Tsaeb/MyShaarli">myShaarli are made by Knah Tsaeb</a> is based on <b><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli">Shaarli 0.0.41 beta</a></b> - The personal, minimalist, super-fast, no-database
|
||||||
<br/>
|
delicious clone. By <a href="http://sebsauvage.net" target="_blank">sebsauvage.net</a>.
|
||||||
Original theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>.
|
<br/> Original theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>.
|
||||||
<br/>
|
<br/> {if="$GLOBALS['config']['contactLink']"} For contact me <a href="{$GLOBALS['config']['contactLink']}">use this link.</a>{/if}
|
||||||
{if="$GLOBALS['config']['contactLink']"} For contact me <a href="{$GLOBALS['config']['contactLink']}">use this link.</a>{/if}
|
|
||||||
</div>
|
</div>
|
||||||
{if="$newversion"}
|
{if="$newversion"}
|
||||||
<div id="newversion">
|
<div id="newversion">
|
||||||
●<a href="{$GLOBALS['config']['UPDATECHECK_DOWNLOAD']}">{$newversion|htmlspecialchars}</a>
|
●<a href="{$GLOBALS['config']['UPDATECHECK_DOWNLOAD']}">{$newversion|htmlspecialchars}</a>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if} {if="isLoggedIn()"}
|
||||||
{if="isLoggedIn()"}
|
|
||||||
<script>
|
<script>
|
||||||
function confirmDeleteLink() {
|
function confirmDeleteLink() {
|
||||||
var agree = confirm("Are you sure you want to delete this link ?");
|
var agree = confirm("Are you sure you want to delete this link ?");
|
||||||
if (agree)
|
if (agree)
|
||||||
return true;
|
return true;
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
|
@ -5,8 +5,9 @@
|
||||||
<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
|
<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
|
||||||
<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
|
<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
|
||||||
<!--<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />-->
|
<!--<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />-->
|
||||||
<link rel="icon" type="image/png" sizes="128x128" href="images/favicon_128.png#" />
|
<link rel="icon" type="image/png" sizes="128x128" href="images/favicon_128.png#" />
|
||||||
<link rel="icon" type="image/png" sizes="64x64" href="images/favicon_64.png#" />
|
<link rel="icon" type="image/png" sizes="64x64" href="images/favicon_64.png#" />
|
||||||
<link rel="icon" type="image/png" sizes="32x32" href="images/favicon_32.png#" />
|
<link rel="icon" type="image/png" sizes="32x32" href="images/favicon_32.png#" />
|
||||||
<link rel="icon" type="image/png" sizes="16x16" href="images/favicon_16.png#" />
|
<link rel="icon" type="image/png" sizes="16x16" href="images/favicon_16.png#" />
|
||||||
<link type="text/css" rel="stylesheet" href="shaarli.css?version={$version|urlencode}" />
|
<link type="text/css" rel="stylesheet" href="shaarli.css?version={$version|urlencode}" />
|
||||||
|
<link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle|htmlspecialchars}" />
|
||||||
|
|
15
tpl/original/opensearch.html
Normal file
15
tpl/original/opensearch.html
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
|
||||||
|
<ShortName>myShaarli search - {$pagetitle}</ShortName>
|
||||||
|
<Description>myShaarli search - {$pagetitle}</Description>
|
||||||
|
<Url type="text/html" template="{$serverurl}?searchterm={searchTerms}" />
|
||||||
|
<Url type="application/atom+xml" template="{$serverurl}?do=atom&searchterm={searchTerms}" />
|
||||||
|
<Url type="application/rss+xml" template="{$serverurl}?do=rss&searchterm={searchTerms}" />
|
||||||
|
<InputEncoding>UTF-8</InputEncoding>
|
||||||
|
<Developer>Knah Tsaeb myShaarly - https://github.com/Knah-Tsaeb/myShaarli</Developer>
|
||||||
|
<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlz AAALEwAACxMBAJqcGAAAAAd0SU1FB98HEA4tDZmAhI0AAAAdaVRYdENvbW1lbnQAAAAAAENyZWF0 ZWQgd2l0aCBHSU1QZC5lBwAAAhJJREFUOMuVUz1oU1EYPcm90iTNnxCTtImtD6VdoghShzq0xPLy
|
||||||
|
DEpEcdAuoUgVC4JDHERx6ioU0UVQC3VyU4dAMKb+pNI6qBTaQqnSxpBgan6qTZq89z6HWIkhofEs l3s45/B99/suQxPcuOdnWeOXEedBPnjsRNfcQjxH+B8cuqC7c3OG0+05ToeH+d1mOlZPDF62tZv3 KwMOQb7e0c2t7QaOHylFMLh2RdLzSqper6m9HBk2C66e0kL/kK7NuZfh8+wW7J0cboFj6VMZ0Wel 6Lv78vGmFVh6lNMXr1rPfk8QZqIlzL4uIrEiY3VJRt9RI8xWJih606O1j5v5bY+2NsBmND1/+vBn
|
||||||
|
4cA+Pc6f2wOPx4BOZxsujXZgIwPEX21Oxx9nVms9/wS8ncyu5xaFqXJei5eRAkJj3RgbcSPyYgOn BhxYz6hf69+A1xMqK71ZXt66EjzjxuSTFIp5DySfgm9rMlTSZHacQmIxO6/+6r3W5RrV6fP92K32 Qi73YXz8fcLuEE6ufEjuvA+iKBIRkd/vp2AwSEREXq+3oVHbkNRW6UKhoBaLRQCA3W6HJEmmlgL+ LolGo2Ws2uWfk7UUUKlUqmO12WCxWAAARI1b541IWZYT6XTaHQgEwDkHESGZTCIWi+Va+kiSJN0K
|
||||||
|
hUK0jYmJCRJFcaphm81CfD7fg0qlEmSMcQDTjLGhcDgs1+t+Ay6pzgTLZnNuAAAAAElFTkSuQmCC
|
||||||
|
</Image>
|
||||||
|
</OpenSearchDescription>
|
|
@ -1,23 +1,21 @@
|
||||||
<div id="footer">
|
<div id="footer">
|
||||||
<a href="https://forge.leslibres.org/projects/shaarli/repository/show?rev=myShaarli">myShaarli are made by Knah Tsaeb</a> is based on <b><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli">Shaarli 0.0.41 beta</a></b> - The personal, minimalist, super-fast, no-database delicious clone. By <a href="http://sebsauvage.net" target="_blank">sebsauvage.net</a>.
|
<a href="https://forge.leslibres.org/Knah-Tsaeb/MyShaarli">myShaarli are made by Knah Tsaeb</a> is based on <b><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli">Shaarli 0.0.41 beta</a></b> - The personal, minimalist, super-fast, no-database
|
||||||
<br/>
|
delicious clone. By <a href="http://sebsauvage.net" target="_blank">sebsauvage.net</a>.
|
||||||
Original theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>.
|
<br/> Original theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>.
|
||||||
<br/>
|
<br/> {if="$GLOBALS['config']['contactLink']"} For contact me <a href="{$GLOBALS['config']['contactLink']}">use this link</a>{/if}.
|
||||||
{if="$GLOBALS['config']['contactLink']"} For contact me <a href="{$GLOBALS['config']['contactLink']}">use this link</a>{/if}.
|
|
||||||
</div>
|
</div>
|
||||||
{if="$newversion"}
|
{if="$newversion"}
|
||||||
<div id="newversion">
|
<div id="newversion">
|
||||||
●<a href="{$GLOBALS['config']['UPDATECHECK_DOWNLOAD']}">{$newversion|htmlspecialchars}</a>
|
●<a href="{$GLOBALS['config']['UPDATECHECK_DOWNLOAD']}">{$newversion|htmlspecialchars}</a>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if} {if="isLoggedIn()"}
|
||||||
{if="isLoggedIn()"}
|
|
||||||
<script>
|
<script>
|
||||||
function confirmDeleteLink() {
|
function confirmDeleteLink() {
|
||||||
var agree = confirm("Are you sure you want to delete this link ?");
|
var agree = confirm("Are you sure you want to delete this link ?");
|
||||||
if (agree)
|
if (agree)
|
||||||
return true;
|
return true;
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
Loading…
Reference in a new issue