From 96bc4efe9ea9ed513d1ec06e0823847d5eebe82f Mon Sep 17 00:00:00 2001 From: Seb Sauvage Date: Wed, 25 Jan 2012 22:26:36 +0100 Subject: =?UTF-8?q?Version=200.0.36=20beta:=20-=20Corrected:=20Improper=20?= =?UTF-8?q?text=20color=20in=20install=20form.=20-=20Corrected:=20Error=20?= =?UTF-8?q?in=20QRCode=20url=20(missing=20'=3F')=20-=20Changed:=20Display?= =?UTF-8?q?=20adjustments=20in=20=E2=80=9CDaily=E2=80=9D=20page.=20-=20Add?= =?UTF-8?q?ed:=20Shaarli=20licence=20in=20COPYING?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- COPYING | 21 +++++++++++++++++++++ images/squiggle2.png | Bin 0 -> 898 bytes inc/shaarli.css | 10 ++++++++-- index.php | 12 +++++++----- tpl/daily.html | 14 +++++++------- tpl/linklist.html | 2 +- 6 files changed, 44 insertions(+), 15 deletions(-) create mode 100644 COPYING create mode 100644 images/squiggle2.png diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..d9731d27 --- /dev/null +++ b/COPYING @@ -0,0 +1,21 @@ +Shaarli is distributed under the zlib/libpng License: + +Copyright (c) 2011 Sébastien SAUVAGE (sebsauvage.net) + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from +the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would + be appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. diff --git a/images/squiggle2.png b/images/squiggle2.png new file mode 100644 index 00000000..23409ce3 Binary files /dev/null and b/images/squiggle2.png differ diff --git a/inc/shaarli.css b/inc/shaarli.css index b4c41822..a949666e 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css @@ -248,7 +248,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 a { color:black; text-decoration:none; } -#installform td { font-size: 10pt; 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; } #changetag { color:#ccc; padding:10px 5px 10px 5px; clear:left; } #configform td { color:#ccc; font-size: 10pt; padding:10px 5px 10px 5px; } @@ -370,7 +370,13 @@ div.dailyEntryThumbnail background:url(../images/50pc_transparent.png); padding:4px 0px 2px 0px; } -div.dailyEntryDescription { margin-top: 10px; text-align:justify; } +div.dailyEntryDescription +{ + margin-top: 10px; + margin-bottom: 30px; + text-align:justify; + overflow:auto; +} /* Common css screwdriver */ .clear{ diff --git a/index.php b/index.php index da2445de..9dd6483e 100644 --- a/index.php +++ b/index.php @@ -1,5 +1,5 @@ $link) { // Roughly estimate length of entry (by counting characters) - $length=strlen($link['title'])+strlen($link['description']); - if ($link['thumbnail']) $length +=100; // 1 thumbnails roughly take as much space as 100 words; - + // Title: 30 chars = 1 line. 1 line is 30 pixels height. + // Description: 836 characters gives roughly 342 pixel height. + // This is not perfect, but it's usually ok. + $length=strlen($link['title'])+(342*strlen($link['description']))/836; + if ($link['thumbnail']) $length +=100; // 1 thumbnails roughly takes 100 pixels height. // Then put in column which is the less filled: $smallest=min($fill); // find smallest value in array. $index=array_search($smallest,$fill); // find index of this smallest value. diff --git a/tpl/daily.html b/tpl/daily.html index e05acc86..9ee74739 100644 --- a/tpl/daily.html +++ b/tpl/daily.html @@ -14,41 +14,41 @@
{if="$linksToDisplay"} -
+
{loop="col1"}
+
permalink
{if="$value.tags"}
{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}
{/if}
{$value.title|htmlspecialchars}
{if="$value.thumbnail"}
{$value.thumbnail}
{/if}
{$value.formatedDescription}
-
permalink
{/loop}
-
+
{loop="col2"}
+
permalink
{if="$value.tags"}
{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}
{/if}
{$value.title|htmlspecialchars}
{if="$value.thumbnail"}
{$value.thumbnail}
{/if}
{$value.formatedDescription}
-
permalink
{/loop}
-
+
{loop="col3"}
+
permalink
{if="$value.tags"}
{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}
{/if}
{$value.title|htmlspecialchars}
{if="$value.thumbnail"}
{$value.thumbnail}
{/if}
{$value.formatedDescription}
-
permalink
{/loop} -
+
{else}
No articles on this day.
{/if} diff --git a/tpl/linklist.html b/tpl/linklist.html index a7dd61e9..dc5b5398 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html @@ -42,7 +42,7 @@ {else} permalink - {/if} -
- +
- {$value.url|htmlspecialchars}
{if="$value.tags"}
-- cgit v1.2.3