Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[chg] clean up html code and format

Browse source
This commit is contained in:
Knah Tsaeb 2015-07-17 11:28:43 +02:00
parent d02bf19916
commit b6d9d9b37a
16 changed files with 295 additions and 230 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
inc/styles/colums.css
View file

@ -377,6 +377,12 @@ a, .linkdescription a {
width: 2em;
}
.removeTag {
border-left: 1px solid #aaa;
color: #6767A7;
padding-left: .2em;
}
.tagfilter input.bigbutton, .searchform input.bigbutton, .addform input.bigbutton {
background: linear-gradient(#dedede,#ffffff);
background-color: #dedede;

8
inc/styles/myShaarli.css
View file

@ -652,6 +652,12 @@ a, .linkdescription a {
text-decoration: underline;
}
.removeTag {
border-left: 1px solid #aaa;
color: #6767A7;
padding-left: .2em;
}
.markdownHelp {
background-color: #FFFFFF;
padding: .3em;
@ -1090,7 +1096,7 @@ a:hover, .linkdescription a:hover, .linktitle a:hover, .linkWallabag a:hover, .l
}
}
@media handheld, only screen and (max-width: 480px), only screen and (max-device-width: 854px) {
@media handheld, only screen and (max-width: 480px) , only screen and (max-device-width: 854px) {
#pageheader a {
border-radius: 5px 5px 5px 5px;
margin: 3px;

2
tpl/addlink.html
View file

@ -7,7 +7,7 @@
<div id="pageheader">
{include="page.header"}
<div id="headerform">
<form method="GET" action="" name="addform" class="addform">
<form method="get" name="addform" class="addform">
<input type="text" name="post" autofocus>
<input type="submit" value="Add link" class="bigbutton">
</form>

2
tpl/changepassword.html
View file

@ -6,7 +6,7 @@
<body>
<div id="pageheader">
{include="page.header"}
<form method="POST" action="" name="changepasswordform" id="changepasswordform">
<form method="post" name="changepasswordform" id="changepasswordform">
<p>
<label for="oldpassword">Old password:</label>
<input type="password" name="oldpassword" id="oldpassword" autofocus/>

20
tpl/changetag.html
View file

@ -10,7 +10,7 @@
<body>
<div id="pageheader">
{include="page.header"}
<form method="POST" action="" name="changetag" id="editlinkform">
<form method="post" name="changetag" id="editlinkform">
<fieldset>
<legend>
Rename tag
@ -43,7 +43,15 @@
</p>
</fieldset>
</form>
</div>
{include="page.footer"}
{if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) && empty($GLOBALS['disablejquery'])"}
<script>
$(document).ready(function() {
$('.fromtag').autocomplete({
source : '{$source}?ws=singletag',
minLength : 1
});
function confirmDeleteTag() {
var agree = confirm("Are you sure you want to delete this tag from all links ?");
if (agree) {
@ -52,16 +60,6 @@
return false;
}
}
</script>
</div>
{include="page.footer"}
{if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) && empty($GLOBALS['disablejquery'])"}
<script language="JavaScript">
$(document).ready(function() {
$('.fromtag').autocomplete({
source : '{$source}?ws=singletag',
minLength : 1
});
});
</script>
{/if}

2
tpl/configure.html
View file

@ -7,7 +7,7 @@
<div id="pageheader">
{include="page.header"}
{$timezone_js}
<form method="POST" action="" name="configform" id="configform">
<form method="post" action="" name="configform" id="configform">
<ul class="tabs">
<li>
<input type="radio" checked name="tabs" id="tab1">

2
tpl/editlink.html
View file

@ -26,7 +26,7 @@
<input type="text" id="lf_title" name="lf_title" value="{$link.title|htmlspecialchars}">
</p>
<p>
<label for="lf_description">Description</label><a href="" id="help"><img src="../images/help_icon.png" alt="help icon"/></a>
<label for="lf_description">Description</label><a href="doc/markdown.php" id="help"><img src="../images/help_icon.png" alt="help icon"/></a>
<textarea id="lf_description" name="lf_description" rows="4" cols="25">{$link.description|htmlspecialchars}</textarea>
</p>
<p>

31
tpl/export.html
View file

@ -1,15 +1,28 @@
<!DOCTYPE html>
<html>
<head>{include="includes"}</head>
<body>
<div id="pageheader">
<head>
{include="includes"}
</head>
<body>
<div id="pageheader">
{include="page.header"}
<div id="toolsdiv">
<a href="?do=export&what=all"><b>Export all</b> <span>: Export all links</span></a><br><br>
<a href="?do=export&what=public"><b>Export public</b> <span>: Export public links only</a><br><br>
<a href="?do=export&what=private"><b>Export private</b> <span>: Export private links only</a><br><br style="clear:both;">
<ul>
<li>
<a href="?do=export&what=all">Export all <span>: Export all links</span></a>
</li>
<li>
<a href="?do=export&what=public">Export public <span>: Export public links only</span></a>
</li>
<li>
<a href="?do=export&what=private">Export private <span>: Export private links only</span></a>
</li>
</ul>
<div class="clearFix">
&nbsp;
</div>
</div>
{include="page.footer"}
</body>
</div>
</div>
{include="page.footer"}
</body>
</html>

34
tpl/import.html
View file

@ -1,21 +1,33 @@
<!DOCTYPE html>
<html>
<head>{include="includes"}</head>
<body onload="document.uploadform.filetoupload.focus();">
<div id="pageheader">
<head>
{include="includes"}
</head>
<body onload="document.uploadform.filetoupload.focus();">
<div id="pageheader">
{include="page.header"}
<div id="uploaddiv">
Import Netscape html bookmarks (as exported from Firefox/Chrome/Opera/delicious/diigo...) (Max: {$maxfilesize|htmlspecialchars} bytes).
<form method="POST" action="?do=upload" enctype="multipart/form-data" name="uploadform" id="uploadform">
<input type="hidden" name="token" value="{$token}">
<form method="post" action="?do=upload" enctype="multipart/form-data" name="uploadform" id="uploadform">
<p>
<input type="file" name="filetoupload" size="80">
</p>
<p>
<input type="checkbox" name="private" id="private">
<label for="private">&nbsp;Import all links as private</label>
</p>
<p>
<input type="checkbox" name="overwrite" id="overwrite">
<label for="overwrite">&nbsp;Overwrite existing links</label>
</p>
<p>
<input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize|htmlspecialchars}">
<input type="submit" name="import_file" value="Import" class="bigbutton"><br>
<input type="checkbox" name="private" id="private"><label for="private">&nbsp;Import all links as private</label><br>
<input type="checkbox" name="overwrite" id="overwrite"><label for="overwrite">&nbsp;Overwrite existing links</label>
<input type="hidden" name="token" value="{$token}">
<input type="submit" name="import_file" value="Import" class="bigbutton">
</p>
</form>
</div>
</div>
{include="page.footer"}
</body>
</div>
{include="page.footer"}
</body>
</html>

4
tpl/includes.html
View file

@ -10,4 +10,6 @@
<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 type="text/css" rel="stylesheet" href="inc/styles/{$theme}.css?version={$version|urlencode}#" />
{if condition="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version}#" />{/if}
{if condition="is_file('inc/user.css')"}
<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version}#" />
{/if}

144
tpl/linklist.html
View file

@ -7,55 +7,73 @@
<script src="inc/jquery-ui.min.js#"></script>
{/if}
</head>
<body>
<div id="pageheader">
<body>
<div id="pageheader">
{include="page.header"}
<div id="headerform">
<form method="GET" class="searchform" name="searchform">
<form method="get" class="searchform" name="searchform">
<input type="text" id="searchform_value" name="searchterm" value="" placeholder="Search text"/>
<input type="submit" value="Search" class="bigbutton"/>
</form>
<form method="GET" class="tagfilter" name="tagfilter">
<form method="get" class="tagfilter" name="tagfilter">
<input type="text" name="searchtags" id="tagfilter_value" value="{loop="search_crits"}{$value|htmlspecialchars} {/loop}" placeholder="Filter by tag"/>
<input type="submit" value="Filter by tag" class="bigbutton"/>
</form>
</div>
</div>
<div id="linklist">
</div>
<div id="linklist">
{include="linklist.paging"}
{if="count($links)==0"}
<div id="searchcriteria">Nothing found.</div>
<div id="searchcriteria">
Nothing found.
</div>
{else}
{if="$search_type=='fulltext'"}
<div id="searchcriteria">{$result_count} results for <i>{$search_crits}</i></div>
<div id="searchcriteria">
{$result_count} results for <i>{$search_crits}</i>
</div>
{/if}
{if="$search_type=='tags'"}
<div id="searchcriteria">{$result_count} results for tags <i>
{loop="search_crits"}
<span class="linktag" title="Remove tag"><a href="?removetag={$value|htmlspecialchars}">{$value|htmlspecialchars} <span style="border-left:1px solid #aaa; padding-left:5px; color:#6767A7;">x</span></a></span>
{/loop}</i></div>
<div id="searchcriteria">
{$result_count} results for tags <i> {loop="search_crits"} <span class="linktag" title="Remove tag"><a href="?removetag={$value|htmlspecialchars}">{$value|htmlspecialchars} <span class="removeTag">x</span></a></span> {/loop}</i>
</div>
{/if}
{/if}
<ul class="linkList">
{loop="links"}
<li{if="$value.class"} class="{$value.class}"{/if}>
<a name="{$value.linkdate|smallHash}" id="{$value.linkdate|smallHash}"></a>
<li {if="$value.class"} class="{$value.class}"{/if} >
<!--<a name="{$value.linkdate|smallHash}" id="{$value.linkdate|smallHash}"></a>-->
{if="$GLOBALS['config']['ENABLE_THUMBNAILS']"}
<div class="thumbnail">{$value.url|thumbnail}</div>
<div class="thumbnail">
{$value.url|thumbnail}
</div>
{/if}
<div class="linkcontainer {if="$GLOBALS['config']['ENABLE_THUMBNAILS']"}linkcontainerThumb{/if}">
{if="isLoggedIn()"}
<div class="linkeditbuttons">
<form method="GET" class="buttoneditform"><input type="hidden" name="edit_link" value="{$value.linkdate}"><input type="image" alt="Edit" src="images/edit_icon.png#" title="Edit" class="button_edit"></form><br>
<form method="POST" class="buttoneditform"><input type="hidden" name="lf_linkdate" value="{$value.linkdate}">
<input type="hidden" name="token" value="{$token}"><input type="hidden" name="delete_link"><input type="image" alt="Delete" src="images/delete_icon.png#" title="Delete" class="button_delete" onClick="return confirmDeleteLink();"></form>
<form method="get" class="buttoneditform">
<input type="hidden" name="edit_link" value="{$value.linkdate}">
<input type="image" alt="Edit" src="images/edit_icon.png#" title="Edit" class="button_edit">
</form>
<br>
<form method="post" class="buttoneditform">
<input type="hidden" name="lf_linkdate" value="{$value.linkdate}">
<input type="hidden" name="token" value="{$token}">
<input type="hidden" name="delete_link">
<input type="image" alt="Delete" src="images/delete_icon.png#" title="Delete" class="button_delete" onClick="return confirmDeleteLink();">
</form>
</div>
{/if}
<h3 class="linktitle">{function="returnFavicon($value.url)"}<a href="{$redirector}{$value.url|htmlspecialchars}">{$value.title|htmlspecialchars}</a></h3>
{if="$value.description"}<div class="linkdescription"{if condition="$search_type=='permalink'"}{/if}>{$value.description}</div>{/if}
{if condition="isset($value.via) && !empty($value.via)"}<div><a href="{$value.via}">Origine => {$value.via|getJustDomain}</a></div>{/if}
{if="$value.description"}
<div class="linkdescription" {if condition="$search_type=='permalink'"}{/if}>
{$value.description}
</div>
{/if}
{if condition="isset($value.via) && !empty($value.via)"}
<div>
<a href="{$value.via}">Origine => {$value.via|getJustDomain}</a>
</div>{/if}
{if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
<span class="linkdate linkBottom" title="Permalink"><a href="?{$value.linkdate|smallHash}">{$value.localdate|htmlspecialchars} - permalink</a> - </span>
{else}
@ -66,80 +84,76 @@ <h3 class="linktitle">{function="returnFavicon($value.url)"}<a href="{$redirecto
<span class="linkWallabag linkBottom"><a href="{$GLOBALS['config']['WALLABAG_URL']}/?plainurl={$value.url|htmlspecialchars}">Save to Wallabag</a> - </span>
{/if}
<span><a href="http://qrfree.kaywa.com/?l=1&amp;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#" width="13" height="13" title="QR-Code" alt="qrcode logo"></a></span> -
<span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span><br>
onclick="showQrCode(this); return false;" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}"><img src="images/qrcode.png#" title="QR-Code" alt="qrcode logo"></a></span> - <span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span>
<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}
</div>
{/if}
</div>
<span class="clearFix"></span>
<span class="clearFix">&nbsp;</span>
</li>
{/loop}
</ul>
{include="linklist.paging"}
</div>
</div>
{include="page.footer"}
<script>
$('#tagfilter_value').autocomplete({
<script>
$('#tagfilter_value').autocomplete({
source : '{$source}?ws=tags',
minLength : 1
});
// Remove any displayed QR-Code
function remove_qrcode()
{
// Remove any displayed QR-Code
function remove_qrcode() {
var elem = document.getElementById("permalinkQrcode");
if (elem) elem.parentNode.removeChild(elem);
if (elem)
elem.parentNode.removeChild(elem);
return false;
}
// Show the QR-Code of a permalink (when the QR-Code icon is clicked).
function showQrCode(caller,loading=false)
{
}
// Show the QR-Code of a permalink (when the QR-Code icon is clicked).
function showQrCode(caller,loading=false) {
// 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.
if ( typeof (qr) == 'undefined')// Load qr.js only if not present.
{
if (!loading) // If javascript lib is still loading, do not append script to body.
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";
document.body.appendChild(element);
}
setTimeout(function() { showQrCode(caller,true);}, 200); // Retry in 200 milliseconds.
setTimeout(function() {
showQrCode(caller, true);
}, 200);
// Retry in 200 milliseconds.
return false;
}
// Remove previous qrcode if present.
remove_qrcode();
// Build the div which contains the QR-Code:
var element = document.createElement('div');
element.id="permalinkQrcode";
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);' ); }
// Build the QR-Code:
var image = qr.image({size: 8,value: caller.dataset.permalink});
if (image)
{
element.appendChild(image);
element.innerHTML+= "<br>Click to close";
caller.parentNode.appendChild(element);
if (element.attachEvent) {
element.attachEvent('onclick', 'this.parentNode.removeChild(this);');
}// Damn IE
else {
element.setAttribute('onclick', 'this.parentNode.removeChild(this);');
}
else
{
element.innerHTML="Your browser does not seem to be HTML5 compatible.";
// Build the QR-Code:
var image = qr.image({
size : 8,
value : caller.dataset.permalink
});
if (image) {
element.appendChild(image);
element.innerHTML += "<br>Click to close";
caller.parentNode.appendChild(element);
} else {
element.innerHTML = "Your browser does not seem to be HTML5 compatible.";
}
return false;
}
</script>
</body>
}
</script>
</body>
</html>

1
tpl/loginform.html
View file

@ -6,7 +6,6 @@
<body>
<div id="pageheader">
{include="page.header"}
<div id="headerform">
{if="!ban_canLogin()"}
You have been banned from login after too many failed attempts. Try later.

22
tpl/page.footer.html
View file

@ -1,11 +1,23 @@
<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>.<br/>
Original theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>.<br/>
{if="$GLOBALS['config']['contactLink']"} For contact me <a href="{$GLOBALS['config']['contactLink']}">use this link</a>{/if}.
<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>.
<br/>
Original theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>.
<br/>
{if="$GLOBALS['config']['contactLink']"} For contact me <a href="{$GLOBALS['config']['contactLink']}">use this link</a>{/if}.
</div>
{if="$newversion"}
<div id="newversion">&#x25CF;<a href="{$GLOBALS['config']['UPDATECHECK_DOWNLOAD']}">{$newversion|htmlspecialchars}</a></div>
<div id="newversion">
&#x25CF;<a href="{$GLOBALS['config']['UPDATECHECK_DOWNLOAD']}">{$newversion|htmlspecialchars}</a>
</div>
{/if}
{if="isLoggedIn()"}
<script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script>
<script>
function confirmDeleteLink() {
var agree = confirm("Are you sure you want to delete this link ?");
if (agree)
return true;
else
return false;
}
</script>
{/if}

43
tpl/page.header.html
View file

@ -1,25 +1,24 @@
<div id="logo" title="Share your links !" onclick="document.location='?';"></div>
<div id="linkcount" class="nomobile">Shaare
{if="!empty($linkcount)"}{$linkcount}{/if} links</div>
<span id="shaarli_title"><a href="{$titleLink}">{$shaarlititle|htmlspecialchars}</a></span>
<div id="logo" title="Share your links !" onclick="document.location='?';"></div>
<div id="linkcount" class="nomobile">
Shaare
{if="!empty($linkcount)"}{$linkcount}{/if} links
</div>
<span id="shaarli_title"><a href="{$titleLink}">{$shaarlititle|htmlspecialchars}</a></span>
{if="!empty($_GET['source']) && $_GET['source']=='bookmarklet'"}
{ignore} When called as a popup from bookmarklet, do not display menu. {/ignore}
{ignore} When called as a popup from bookmarklet, do not display menu. {/ignore}
{else}
<a href="?" class="nomobile">Home</a>
{if="isLoggedIn()"}
<a href="?do=logout">Logout</a><a href="?do=tools">Tools</a><a href="?do=addlink"><b>Add link</b></a>
{elseif="$GLOBALS['config']['OPEN_SHAARLI']"}
<a href="?do=tools">Tools</a><a href="?do=addlink"><b>Add link</b></a>
{else}
<a href="?do=login">Login</a>
{/if}
<a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a>
<a href="{$feedurl}?do=atom{$searchcrits}" style="padding-left:10px;" class="nomobile">ATOM Feed</a>
<a href="?do=tagcloud">Tag cloud</a>
<a href="?do=picwall{$searchcrits}">Picture wall</a>
<a href="?do=daily">Daily</a>
<a href="?" class="nomobile">Home</a>
{if="isLoggedIn()"}
<a href="?do=logout">Logout</a><a href="?do=tools">Tools</a><a href="?do=addlink"><b>Add link</b></a>
{elseif="$GLOBALS['config']['OPEN_SHAARLI']"}
<a href="?do=tools">Tools</a><a href="?do=addlink"><b>Add link</b></a>
{else}
<a href="?do=login">Login</a>
{/if}
<div class="clear"></div>
<a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a>
<a href="{$feedurl}?do=atom{$searchcrits}" style="padding-left:10px;" class="nomobile">ATOM Feed</a>
<a href="?do=tagcloud">Tag cloud</a>
<a href="?do=picwall{$searchcrits}">Picture wall</a>
<a href="?do=daily">Daily</a>
{/if}
<div class="clear"></div>

12
tpl/page.html
View file

@ -1,9 +1,13 @@
<!DOCTYPE html>
<html>
<head>{include="includes"}</head>
<body>
<div id="pageheader">{include="page.header"}</div>
<head>
{include="includes"}
</head>
<body>
<div id="pageheader">
{include="page.header"}
</div>
You body goes here...
{include="page.footer"}
</body>
</body>
</html>

44
tpl/picwall.html
View file

@ -1,31 +1,31 @@
<!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>
<script src="inc/jquery.lazyload.min.js#"></script>
{/if}
</head>
<body>
<div id="pageheader">{include="page.header"}</div>
<center>
<div class="picwall_container">
<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>
{/if}
</head>
<body>
<div id="pageheader">
{include="page.header"}
</div>
<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>
</center>
{include="page.footer"}
{if="empty($GLOBALS['disablejquery'])"}
<script>
$(document).ready(function() {
</div>
{include="page.footer"}
{if="empty($GLOBALS['disablejquery'])"}
<script>
$(document).ready(function() {
$("img.lazyimage").show().lazyload();
});
</script>
{/if}
</body>
});
</script>
{/if}
</body>
</html>