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

Merge remote-tracking branch 'master/master' into myShaarli

Browse source
This commit is contained in:
Knah Tsaeb 2013-03-29 15:48:58 +01:00
parent b28f3129ef 9550bfe181
commit 4c02d06d57
5 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
inc/shaarli.css
View file

@ -69,9 +69,9 @@ h1 { font-size:20pt; font-weight:bold; font-style:italic; margin-bottom:20px; }
/* Small tab on the left of each link with edit/delete buttons. */ /* Small tab on the left of each link with edit/delete buttons. */
.button_edit, .button_delete { border-radius:0; box-shadow:none; border-style:none; border-width:0; padding:0; background:none; } .button_edit, .button_delete { border-radius:0; box-shadow:none; border-style:none; border-width:0; padding:0; background:none; }
.linkeditbuttons { .linkeditbuttons {
position:absolute; position:absolute;
left:-1px; left:-1px;
padding:4px 2px 2px 2px; padding:4px 2px 2px 2px;
background-color:#f0f0f0; background-color:#f0f0f0;
@ -111,7 +111,7 @@ cursor:pointer;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
width:auto; width:auto;
padding:0 10px 5px 10px; padding:0 10px 5px 10px;
margin: auto; margin: auto;
} }
#pageheader a #pageheader a
@ -132,6 +132,8 @@ cursor:pointer;
text-decoration:none; text-decoration:none;
} }
.shareYourLink {float:right; font-style:italic; color:#bbb; text-align:right; padding:0 5 0 0;}
#toolsdiv a{ #toolsdiv a{
clear:both; clear:both;
} }
@ -206,7 +208,7 @@ cursor:pointer;
#paging_older { margin-right:15px; } #paging_older { margin-right:15px; }
#paging_newer { margin-left:15px; } #paging_newer { margin-left:15px; }
#headerform { color:#ffffff; padding:5px 5px 5px 5px; clear: both;} #headerform { color:#ffffff; padding:5px 5px 5px 5px; clear: both; width:100%; white-space:nowrap;}
#toolsdiv { color:#ffffff; padding:5px 5px 5px 5px; clear:left; } #toolsdiv { color:#ffffff; padding:5px 5px 5px 5px; clear:left; }
#uploaddiv { color:#ffffff; padding:5px 5px 5px 5px; clear:left; } #uploaddiv { color:#ffffff; padding:5px 5px 5px 5px; clear:left; }
#editlinkform { height:100%;color:#ffffff; padding:5px 5px 5px 15px; width:80%; clear:left; } #editlinkform { height:100%;color:#ffffff; padding:5px 5px 5px 15px; width:80%; clear:left; }
@ -271,7 +273,8 @@ font-size:9pt;
#footer a:hover{ color:#000000;} #footer a:hover{ color:#000000;}
#newversion { background-color: #FFFFA0; color:#000; position:absolute; top:0;right:0; padding:2 7 2 7; font-size:9pt;} #newversion { background-color: #FFFFA0; color:#000; position:absolute; top:0;right:0; padding:2 7 2 7; font-size:9pt;}
#cloudtag { padding-left:10%; padding-right:10%; } #cloudtag { padding-left:10%; padding-right:10%; }
#cloudtag a { color:black; text-decoration:none; } #cloudtag a { font-weight:bold; color:black; text-decoration:none }
#cloudtag span { color:#99f; font-size:9pt; padding-left:5px; padding-right:2px;}
#installform td { font-size: 10pt; color:black; padding:10px 5px 10px 5px; clear:left; } #installform td { font-size: 10pt; color:black; padding:10px 5px 10px 5px; clear:left; }
#changepasswordform { color:#ccc; padding:10px 5px 10px 5px; clear:left; } #changepasswordform { color:#ccc; padding:10px 5px 10px 5px; clear:left; }
#changetag { color:#ccc; padding:10px 5px 10px 5px; clear:left; } #changetag { color:#ccc; padding:10px 5px 10px 5px; clear:left; }
@ -305,7 +308,7 @@ font-size:9pt;
background-color: transparent; background-color: transparent;
background-color: rgba(0, 0, 0, 0.4); /* FF3+, Saf3+, Opera 10.10+, Chrome, IE9 */ background-color: rgba(0, 0, 0, 0.4); /* FF3+, Saf3+, Opera 10.10+, Chrome, IE9 */
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#66000000,endColorstr=#66000000); /* IE6–IE9 */ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#66000000,endColorstr=#66000000); /* IE6–IE9 */
text-shadow:2px 2px 1px #000000; text-shadow:2px 2px 1px #000000;
} }
/* Minimal customisation for jQuery widgets */ /* Minimal customisation for jQuery widgets */
@ -336,7 +339,7 @@ box-shadow:2px 2px 20px 2px #333333;
div.daily div.daily
{ {
font-family: Georgia, 'DejaVu Serif', Norasi, serif; font-family: Georgia, 'DejaVu Serif', Norasi, serif;
background-color: #E6D6BE; background-color: #E6D6BE;
/* Background paper texture by BashCorpo: /* Background paper texture by BashCorpo:
http://www.bashcorpo.dk/textures.php http://www.bashcorpo.dk/textures.php
@ -355,7 +358,7 @@ div.daily
#daily_col3 { float:left;position:relative; width:33%;} #daily_col3 { float:left;position:relative; width:33%;}
div.dailyAbout div.dailyAbout
{ {
float:left; float:left;
border: 1px solid black; border: 1px solid black;
font-size: 8pt; font-size: 8pt;
@ -363,21 +366,21 @@ div.dailyAbout
left:10px; left:10px;
top: 15px; top: 15px;
padding: 5px 5px 5px 5px; padding: 5px 5px 5px 5px;
text-align:center; text-align:center;
} }
div.dailyAbout a { color: #890500; } div.dailyAbout a { color: #890500; }
div.dailyTitle div.dailyTitle
{ {
font-weight: bold; font-weight: bold;
font-size: 44pt; font-size: 44pt;
text-align:center; text-align:center;
padding:10px 20px 0px 20px; padding:10px 20px 0px 20px;
} }
div.dailyDate div.dailyDate
{ {
font-size: 12pt; font-size: 12pt;
font-weight:bold; font-weight:bold;
text-align:center; text-align:center;
padding:0px 20px 30px 20px; padding:0px 20px 30px 20px;
} }
@ -391,19 +394,19 @@ div.dailyEntry
div.dailyEntry a { text-decoration:none; color: #890500; } div.dailyEntry a { text-decoration:none; color: #890500; }
div.dailyEntryTags { font-size:7.75pt; } div.dailyEntryTags { font-size:7.75pt; }
div.dailyEntryTitle { font-size:18pt; font-weight:bold;} div.dailyEntryTitle { font-size:18pt; font-weight:bold;}
div.dailyEntryThumbnail div.dailyEntryThumbnail
{ {
width:100%; width:100%;
text-align:center; text-align:center;
background-color:rgb(128,128,128); background-color:rgb(128,128,128);
background:url(../images/50pc_transparent.png); background:url(../images/50pc_transparent.png);
padding:4px 0px 2px 0px; padding:4px 0px 2px 0px;
} }
div.dailyEntryDescription div.dailyEntryDescription
{ {
margin-top: 10px; margin-top: 10px;
margin-bottom: 30px; margin-bottom: 30px;
text-align:justify; text-align:justify;
overflow:auto; overflow:auto;
} }
@ -413,7 +416,7 @@ div.dailyEntryDescription
} }
/* For lazy images loading in picture wall. /* For lazy images loading in picture wall.
using http://www.appelsiini.net/projects/lazyload using http://www.appelsiini.net/projects/lazyload
*/ */
.lazyimage { display:none; } .lazyimage { display:none; }
@ -462,7 +465,7 @@ div.dailyDate { font-size: 11pt;padding:0px; display:block; }
div.dailyEntryTitle { font-size:16pt; font-weight:bold;} div.dailyEntryTitle { font-size:16pt; font-weight:bold;}
div.dailyEntryDescription { font-size:10pt; } div.dailyEntryDescription { font-size:10pt; }
} }
/* Highlight search results */ /* Highlight search results */
.highlight { background-color: #FFFF33; } .highlight { background-color: #FFFF33; }

2
tpl/linklist.html
View file

@ -4,7 +4,7 @@
<body> <body>
<div id="pageheader"> <div id="pageheader">
{include="page.header"} {include="page.header"}
<div id="headerform" style="width:100%; white-space:nowrap;"> <div id="headerform">
<form method="GET" class="searchform" name="searchform" style="display:inline;"><input type="text" id="searchform_value" name="searchterm" style="width:30%" value=""> <input type="submit" value="Search" class="bigbutton"></form> <form method="GET" class="searchform" name="searchform" style="display:inline;"><input type="text" id="searchform_value" name="searchterm" style="width:30%" value=""> <input type="submit" value="Search" class="bigbutton"></form>
<form method="GET" class="tagfilter" name="tagfilter" style="display:inline;margin-left:24px;"><input type="text" name="searchtags" id="tagfilter_value" style="width:10%" value=""> <input type="submit" value="Filter by tag" class="bigbutton"></form> <form method="GET" class="tagfilter" name="tagfilter" style="display:inline;margin-left:24px;"><input type="text" name="searchtags" id="tagfilter_value" style="width:10%" value=""> <input type="submit" value="Filter by tag" class="bigbutton"></form>
</div> </div>

2
tpl/loginform.html
View file

@ -13,7 +13,7 @@
Login: <input type="text" name="login" tabindex="1">&nbsp;&nbsp;&nbsp; Login: <input type="text" name="login" tabindex="1">&nbsp;&nbsp;&nbsp;
Password : <input type="password" name="password" tabindex="2"> Password : <input type="password" name="password" tabindex="2">
<input type="submit" value="Login" class="bigbutton" tabindex="4"><br> <input type="submit" value="Login" class="bigbutton" tabindex="4"><br>
<input style="margin:10 0 0 40;" type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3"><label for="longlastingsession">&nbsp;Stay signed in (Do not check on public computers)</label> <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3"><label for="longlastingsession">&nbsp;Stay signed in (Do not check on public computers)</label>
<input type="hidden" name="token" value="{$token}"> <input type="hidden" name="token" value="{$token}">
{if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">{/if} {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">{/if}
</form> </form>

6
tpl/page.header.html
View file

@ -1,9 +1,9 @@
<div id="logo" title="Share your links !" onclick="document.location='?';"></div> <div id="logo" title="Share your links !" onclick="document.location='?';"></div>
<div style="float:right; font-style:italic; color:#bbb; text-align:right; padding:0 5 0 0;" class="nomobile">Shaare your links...<br> <div class="nomobile shareYourLink">Shaare your links...<br>
{if="!empty($linkcount)"}{$linkcount} links{/if}</div> {if="!empty($linkcount)"}{$linkcount} links{/if}</div>
<span id="shaarli_title"><a href="?">{$shaarlititle|htmlspecialchars}</a></span> <span id="shaarli_title"><a href="?">{$shaarlititle|htmlspecialchars}</a></span>
{if="!empty($_GET['source']) && $_GET['source']=='bookmarklet'"} {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} {else}
@ -16,7 +16,7 @@
<a href="?do=login">Login</a> <a href="?do=login">Login</a>
{/if} {/if}
<a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a> <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="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a>
<a href="?do=tagcloud">Tag cloud</a> <a href="?do=tagcloud">Tag cloud</a>
<a href="?do=picwall{$searchcrits}">Picture wall</a> <a href="?do=picwall{$searchcrits}">Picture wall</a>
<a href="?do=daily">Daily</a> <a href="?do=daily">Daily</a>

2
tpl/tagcloud.html
View file

@ -6,7 +6,7 @@
<center> <center>
<div id="cloudtag"> <div id="cloudtag">
{loop="tags"} {loop="tags"}
<span style="color:#99f; font-size:9pt; padding-left:5px; padding-right:2px;">{$value.count}</span><a href="?searchtags={$key|htmlspecialchars}" style="font-size:{$value.size}pt; font-weight:bold; color:black; text-decoration:none">{$key|htmlspecialchars}</a> <span>{$value.count}</span><a href="?searchtags={$key|htmlspecialchars}" style="font-size:{$value.size}pt;">{$key|htmlspecialchars}</a>
{/loop} {/loop}
</div> </div>
</center> </center>