From 009ce9358168cc06c76fc2f4162829e552e633a3 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 14 Jan 2017 15:51:30 +0100 Subject: Move default template to vintage folder --- .gitignore | 1 + tpl/default/404.html | 17 - tpl/default/addlink.html | 16 - tpl/default/changepassword.html | 15 - tpl/default/changetag.html | 34 - tpl/default/configure.html | 121 -- tpl/default/css/reset.css | 6 - tpl/default/css/shaarli.css | 1208 -------------------- tpl/default/daily.html | 101 -- tpl/default/dailyrss.html | 16 - tpl/default/editlink.html | 63 - tpl/default/export.bookmarks.html | 10 - tpl/default/export.html | 28 - tpl/default/feed.atom.html | 42 - tpl/default/feed.rss.html | 39 - tpl/default/images/50pc_transparent.png | Bin 599 -> 0 bytes .../images/Paper_texture_v5_by_bashcorpo_w1000.jpg | Bin 127449 -> 0 bytes tpl/default/images/calendar.png | Bin 650 -> 0 bytes tpl/default/images/floral_left.png | Bin 1284 -> 0 bytes tpl/default/images/floral_right.png | Bin 1309 -> 0 bytes tpl/default/images/private.png | Bin 813 -> 0 bytes tpl/default/images/squiggle.png | Bin 720 -> 0 bytes tpl/default/images/squiggle_closing.png | Bin 1244 -> 0 bytes tpl/default/images/tag_blue.png | Bin 714 -> 0 bytes tpl/default/import.html | 33 - tpl/default/includes.html | 15 - tpl/default/install.html | 35 - tpl/default/linklist.html | 151 --- tpl/default/linklist.paging.html | 32 - tpl/default/loginform.html | 38 - tpl/default/opensearch.html | 45 - tpl/default/page.footer.html | 31 - tpl/default/page.header.html | 59 - tpl/default/page.html | 9 - tpl/default/picwall.html | 44 - tpl/default/pluginsadmin.html | 134 --- tpl/default/readme.txt | 42 - tpl/default/tagcloud.html | 31 - tpl/default/tools.html | 98 -- tpl/vintage/404.html | 17 + tpl/vintage/addlink.html | 16 + tpl/vintage/changepassword.html | 15 + tpl/vintage/changetag.html | 34 + tpl/vintage/configure.html | 121 ++ tpl/vintage/css/reset.css | 6 + tpl/vintage/css/shaarli.css | 1208 ++++++++++++++++++++ tpl/vintage/daily.html | 101 ++ tpl/vintage/dailyrss.html | 16 + tpl/vintage/editlink.html | 63 + tpl/vintage/export.bookmarks.html | 10 + tpl/vintage/export.html | 28 + tpl/vintage/feed.atom.html | 42 + tpl/vintage/feed.rss.html | 39 + tpl/vintage/images/50pc_transparent.png | Bin 0 -> 599 bytes .../images/Paper_texture_v5_by_bashcorpo_w1000.jpg | Bin 0 -> 127449 bytes tpl/vintage/images/calendar.png | Bin 0 -> 650 bytes tpl/vintage/images/floral_left.png | Bin 0 -> 1284 bytes tpl/vintage/images/floral_right.png | Bin 0 -> 1309 bytes tpl/vintage/images/private.png | Bin 0 -> 813 bytes tpl/vintage/images/squiggle.png | Bin 0 -> 720 bytes tpl/vintage/images/squiggle_closing.png | Bin 0 -> 1244 bytes tpl/vintage/images/tag_blue.png | Bin 0 -> 714 bytes tpl/vintage/import.html | 33 + tpl/vintage/includes.html | 15 + tpl/vintage/install.html | 35 + tpl/vintage/linklist.html | 151 +++ tpl/vintage/linklist.paging.html | 32 + tpl/vintage/loginform.html | 38 + tpl/vintage/opensearch.html | 45 + tpl/vintage/page.footer.html | 31 + tpl/vintage/page.header.html | 59 + tpl/vintage/page.html | 9 + tpl/vintage/picwall.html | 44 + tpl/vintage/pluginsadmin.html | 134 +++ tpl/vintage/readme.txt | 42 + tpl/vintage/tagcloud.html | 31 + tpl/vintage/tools.html | 98 ++ 77 files changed, 2514 insertions(+), 2513 deletions(-) delete mode 100644 tpl/default/404.html delete mode 100644 tpl/default/addlink.html delete mode 100644 tpl/default/changepassword.html delete mode 100644 tpl/default/changetag.html delete mode 100644 tpl/default/configure.html delete mode 100644 tpl/default/css/reset.css delete mode 100644 tpl/default/css/shaarli.css delete mode 100644 tpl/default/daily.html delete mode 100644 tpl/default/dailyrss.html delete mode 100644 tpl/default/editlink.html delete mode 100644 tpl/default/export.bookmarks.html delete mode 100644 tpl/default/export.html delete mode 100644 tpl/default/feed.atom.html delete mode 100644 tpl/default/feed.rss.html delete mode 100644 tpl/default/images/50pc_transparent.png delete mode 100644 tpl/default/images/Paper_texture_v5_by_bashcorpo_w1000.jpg delete mode 100644 tpl/default/images/calendar.png delete mode 100644 tpl/default/images/floral_left.png delete mode 100644 tpl/default/images/floral_right.png delete mode 100644 tpl/default/images/private.png delete mode 100644 tpl/default/images/squiggle.png delete mode 100644 tpl/default/images/squiggle_closing.png delete mode 100644 tpl/default/images/tag_blue.png delete mode 100644 tpl/default/import.html delete mode 100644 tpl/default/includes.html delete mode 100644 tpl/default/install.html delete mode 100644 tpl/default/linklist.html delete mode 100644 tpl/default/linklist.paging.html delete mode 100644 tpl/default/loginform.html delete mode 100644 tpl/default/opensearch.html delete mode 100644 tpl/default/page.footer.html delete mode 100644 tpl/default/page.header.html delete mode 100644 tpl/default/page.html delete mode 100644 tpl/default/picwall.html delete mode 100644 tpl/default/pluginsadmin.html delete mode 100644 tpl/default/readme.txt delete mode 100644 tpl/default/tagcloud.html delete mode 100644 tpl/default/tools.html create mode 100644 tpl/vintage/404.html create mode 100644 tpl/vintage/addlink.html create mode 100644 tpl/vintage/changepassword.html create mode 100644 tpl/vintage/changetag.html create mode 100644 tpl/vintage/configure.html create mode 100644 tpl/vintage/css/reset.css create mode 100644 tpl/vintage/css/shaarli.css create mode 100644 tpl/vintage/daily.html create mode 100644 tpl/vintage/dailyrss.html create mode 100644 tpl/vintage/editlink.html create mode 100644 tpl/vintage/export.bookmarks.html create mode 100644 tpl/vintage/export.html create mode 100644 tpl/vintage/feed.atom.html create mode 100644 tpl/vintage/feed.rss.html create mode 100644 tpl/vintage/images/50pc_transparent.png create mode 100644 tpl/vintage/images/Paper_texture_v5_by_bashcorpo_w1000.jpg create mode 100644 tpl/vintage/images/calendar.png create mode 100644 tpl/vintage/images/floral_left.png create mode 100644 tpl/vintage/images/floral_right.png create mode 100644 tpl/vintage/images/private.png create mode 100644 tpl/vintage/images/squiggle.png create mode 100644 tpl/vintage/images/squiggle_closing.png create mode 100644 tpl/vintage/images/tag_blue.png create mode 100644 tpl/vintage/import.html create mode 100644 tpl/vintage/includes.html create mode 100644 tpl/vintage/install.html create mode 100644 tpl/vintage/linklist.html create mode 100644 tpl/vintage/linklist.paging.html create mode 100644 tpl/vintage/loginform.html create mode 100644 tpl/vintage/opensearch.html create mode 100644 tpl/vintage/page.footer.html create mode 100644 tpl/vintage/page.header.html create mode 100644 tpl/vintage/page.html create mode 100644 tpl/vintage/picwall.html create mode 100644 tpl/vintage/pluginsadmin.html create mode 100644 tpl/vintage/readme.txt create mode 100644 tpl/vintage/tagcloud.html create mode 100644 tpl/vintage/tools.html diff --git a/.gitignore b/.gitignore index 19f3dc83..e64c8a4b 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ plugins/*/config.php # 3rd party themes tpl/* !tpl/default +!tpl/vintage diff --git a/tpl/default/404.html b/tpl/default/404.html deleted file mode 100644 index 53e98e2e..00000000 --- a/tpl/default/404.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - {include="includes"} - - - -
-

404 Not found Oh crap!

-

{$error_message}

-

Would you mind clicking here?

-
-{include="page.footer"} - - diff --git a/tpl/default/addlink.html b/tpl/default/addlink.html deleted file mode 100644 index da50f45e..00000000 --- a/tpl/default/addlink.html +++ /dev/null @@ -1,16 +0,0 @@ - - -{include="includes"} - - -{include="page.footer"} - - diff --git a/tpl/default/changepassword.html b/tpl/default/changepassword.html deleted file mode 100644 index c40daf9d..00000000 --- a/tpl/default/changepassword.html +++ /dev/null @@ -1,15 +0,0 @@ - - -{include="includes"} - - -{include="page.footer"} - - \ No newline at end of file diff --git a/tpl/default/changetag.html b/tpl/default/changetag.html deleted file mode 100644 index a0df3328..00000000 --- a/tpl/default/changetag.html +++ /dev/null @@ -1,34 +0,0 @@ - - -{include="includes"} - - - - - - - -{include="page.footer"} - - diff --git a/tpl/default/configure.html b/tpl/default/configure.html deleted file mode 100644 index 5820e6e4..00000000 --- a/tpl/default/configure.html +++ /dev/null @@ -1,121 +0,0 @@ - - -{include="includes"} - - -{include="page.footer"} - - diff --git a/tpl/default/css/reset.css b/tpl/default/css/reset.css deleted file mode 100644 index e29699e2..00000000 --- a/tpl/default/css/reset.css +++ /dev/null @@ -1,6 +0,0 @@ -/* CSS Reset from Yahoo to cope with browsers CSS inconsistencies. */ -/* - Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.com/yui/license.html - version: 2.8.2r1 - */ -html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;} \ No newline at end of file diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css deleted file mode 100644 index 7ca567e7..00000000 --- a/tpl/default/css/shaarli.css +++ /dev/null @@ -1,1208 +0,0 @@ -/* Cascading Stylesheet for Shaarli - https://github.com/shaarli/Shaarli */ - -body { - font-family: "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif; - font-size: 10pt; - background-color: #ffffff; - word-wrap: break-word; -} - -input, textarea { - background-color: #dedede; - background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dedede), to(#ffffff)); - background: -webkit-linear-gradient(#dedede, #ffffff); - background: -moz-linear-gradient(#dedede, #ffffff); - background: -ms-linear-gradient(#dedede, #ffffff); - background: -o-linear-gradient(#dedede, #ffffff); - background: linear-gradient(#dedede, #ffffff); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); - padding: 5px; - border-radius: 3px 3px 3px 3px; - border: none; - color: #000; -} - -a { - text-decoration: none; -} - -h1 { - font-size: 20pt; - font-weight: bold; - font-style: italic; - margin-bottom: 20px; -} - -em { - font-style: italic; -} - -strong { - font-weight: bold; -} - -/* Buttons */ -.bigbutton, #pageheader a.bigbutton { - background-color: #c0c0c0; - background: -moz-linear-gradient(#c0c0c0, #ffffff) repeat scroll 0 0 transparent; - background: -webkit-gradient(linear, 0 0, 0 bottom, from(#c0c0c0), to(#ffffff)); - background: -webkit-linear-gradient(#c0c0c0, #ffffff); - background: -ms-linear-gradient(#c0c0c0, #ffffff); - background: -o-linear-gradient(#c0c0c0, #ffffff); - background: linear-gradient(#c0c0c0, #ffffff); - border-radius: 3px 3px 3px 3px; - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.5); - cursor: pointer; - height: 24px; - padding: 0 5px; - margin: 0 5px 0 0; - color: #606060; - border-style: outset; - border-width: 1px; - display: inline-block; -} - -a.bigbutton, #pageheader a.bigbutton { - height: 22px; - line-height: 22px; -} - -.smallbutton { - background-color: #c0c0c0; - background: -moz-linear-gradient(#c0c0c0, #ffffff) repeat scroll 0 0 transparent; - background: -webkit-gradient(linear, 0 0, 0 bottom, from(#c0c0c0), to(#ffffff)); - background: -webkit-linear-gradient(#c0c0c0, #ffffff); - background: -ms-linear-gradient(#c0c0c0, #ffffff); - background: -o-linear-gradient(#c0c0c0, #ffffff); - background: linear-gradient(#c0c0c0, #ffffff); - border-radius: 3px 3px 3px 3px; - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.5); - cursor: pointer; - height: 20px; - margin-left: 5px; - padding: 0 5px; - color: #606060; - border-style: outset; - border-width: 1px; -} - -/* 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; -} - -.linkeditbuttons { - position: absolute; - left: 2px; - padding: 4px 2px 2px 2px; - - -webkit-border-radius: 0px 6px 6px 0px; - -moz-border-radius: 0px 6px 6px 0px; - -o-border-radius: 0px 6px 6px 0px; - -ms-border-radius: 0px 6px 6px 0px; - border-radius: 0px 6px 6px 0px; -} - -#pageheader #logo { - background-image: url('../../../images/logo.png'); - background-repeat: no-repeat; - float: left; - margin: 0 10px 0 10px; - width: 105px; - height: 55px; - cursor: pointer; -} - -#pageheader #menu { - width: 100%; -} - -#pageheader #menu ul { - margin: auto; - padding: 7px 0px 0px 0px; - float: none; -} - -#pageheader #menu ul li { - list-style: none; - display: inline; - position: relative; - box-sizing: border-box; -} - -#pageheader a { - background-color: #333333; - background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#000000)); - background: -webkit-linear-gradient(#333333, #000000); - background: -moz-linear-gradient(#333333, #000000); - background: -ms-linear-gradient(#333333, #000000); - background: -o-linear-gradient(#333333, #000000); - background: linear-gradient(#333333, #000000); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); - padding: 5px; - border-radius: 3px 3px 3px 3px; - margin: 10px 3px 3px 3px; - color: #A2DD42; - text-decoration: none; - line-height: 2.5; - white-space: nowrap; -} - -#pageheader #linkcount { - float: right; - font-style: italic; - color: #bbb; - text-align: right; - padding-right: 5px; - margin: 3px 3px 0px 0px; -} - -#pageheader { - background-color: #333333; - background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#111111)); - background: -webkit-linear-gradient(#333333, #111111); - background: -moz-linear-gradient(#333333, #111111); - background: -ms-linear-gradient(#333333, #111111); - background: -o-linear-gradient(#333333, #111111); - background: linear-gradient(#333333, #111111); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); - width: auto; - padding: 0 10px 5px 10px; - margin: auto; -} - -#pageheader .search { - width: 100%; - white-space: nowrap; -} - -#toolsdiv a { - clear: both; -} - -#toolsdiv #bookmark { - clear: none; -} - -#toolsdiv a span { - color: #ffffff; -} - -.linksperpage, .tagfilter, .searchform, .addform { - background-color: #dedede; - background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dedede), to(#ffffff)); - background: -webkit-linear-gradient(#dedede, #ffffff); - background: -moz-linear-gradient(#dedede, #ffffff); - background: -ms-linear-gradient(#dedede, #ffffff); - background: -o-linear-gradient(#dedede, #ffffff); - background: linear-gradient(#dedede, #ffffff); - display: inline; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); - padding: 5px; - border: none; - border-radius: 3px 3px 3px 3px; - margin: 10px 3px 3px 3px; - color: #cecece; -} - -.linksperpage { - box-shadow: 0 0 0 rgba(0, 0, 0, 0.5); - padding: 3px; -} - -.linksperpage input, .tagfilter input, .searchform input, .addform input { - border: none; - color: #606060; - background: none; - box-shadow: none; - padding: 5px; -} - -.linksperpage input { - padding: 0; -} - -.searchform #searchform_value { - width: 30%; -} - -.tagfilter { - margin-left:24px; -} - -.tagfilter div.awesomplete { - width: 15%; -} - -.tagfilter #tagfilter_value { - display: inline; -} - -.tagfilter li { - color: black; -} - -.tagfilter input.bigbutton, .searchform input.bigbutton, .addform input.bigbutton { - background-color: #dedede; - background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dedede), to(#ffffff)); - background: -webkit-linear-gradient(#dedede, #ffffff); - background: -moz-linear-gradient(#dedede, #ffffff); - background: -ms-linear-gradient(#dedede, #ffffff); - background: -o-linear-gradient(#dedede, #ffffff); - background: linear-gradient(#dedede, #ffffff); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); - padding: 0 5px 0 5px; - margin: 5px 0 5px 0; - height: 20px; - border-radius: 3px 3px 3px 3px; - cursor: pointer; -} - -#shaarli_title { - font-weight: bold; - font-style: italic; - margin-top: 0; -} - -#shaarli_title a { - color: #fff !important; -} - -#pageheader a:visited { - color: #98C943; - text-decoration: none; -} - -#pageheader a:hover { - color: #FFFFC9; - text-decoration: none; -} - -#pageheader a:active { - color: #bbb; - text-decoration: none; -} - -#searchcriteria { - padding: 4px 0px 5px 5px; - font-weight: bold; -} - -.paging { - padding: 5px; - background-color: #777; - color: #ccc; - text-align: center; - clear: both; -} - -.paging a:link { - color: #ccc; - text-decoration: none; -} - -.paging a:visited { - color: #ccc; -} - -.paging a:hover { - color: #FFFFC9; -} - -.paging a:active { - color: #fff; -} - -.paging_privatelinks { - float: left; -} - -.paging_linksperpage { - float: right; - padding-right: 5px; - margin: 0px 10px 2px 0px; -} - -.paging_linksperpage form.linksperpage { - display: inline; -} - -.paging_linksperpage form.linksperpage input { - height: 15px; -} - -.paging_current { - display: inline; - color: #fff; - padding: 0 20 0 20; -} - -.paging_older { - margin-right: 15px; -} - -.paging_newer { - margin-left: 15px; -} - -#headerform { - color: #ffffff; - padding: 5px 5px 5px 5px; - clear: both; -} - -#headerform input.linkurl { - width: 50%; - font-size: inherit; -} - -#headerform label { - cursor: pointer; - margin-right: 10px; -} - -#headerform label[for=longlastingsession] { - display: block; - width: 100%; - margin-top: 5px; -} - -#toolsdiv { - color: #ffffff; - padding: 5px 5px 5px 5px; - clear: left; -} - -#uploaddiv { - color: #ffffff; - padding: 5px 5px 5px 5px; - clear: left; -} - -#editlinkform { - height: 100%; - padding: 5px 5px 5px 15px; - width: 80%; - clear: left; -} - -#editlinkform label { - cursor: pointer; - color: #ffffff; -} - -#editlinkform textarea, #editlinkform .lf_input { - width: 100%; -} - -#linklist li { - padding: 4px 10px 15px 20px; - border-top: 1px solid #bbb; - clear: both; - background-color: #F2F2F2; - background: -webkit-gradient(linear, 0 0, 0 bottom, from(#F2F2F2), to(#ffffff)); - background: -webkit-linear-gradient(#F2F2F2, #ffffff); - background: -moz-linear-gradient(#F2F2F2, #ffffff); - background: -ms-linear-gradient(#F2F2F2, #ffffff); - background: -o-linear-gradient(#F2F2F2, #ffffff); - background: linear-gradient(#F2F2F2, #ffffff); -} - -/* -#linklist li.publicLinkHightLight:hover, #linklist li:hover { - background: #E9FFCE; -} -*/ - -.linkdate { - font-size:8pt; - color:#888; -} - -.linkdate a { - color:#E28E3F; -} - -#linklist li.private { - background: url('../images/private.png') no-repeat 4px center; - padding-left: 30px; -} - -#linklist li { - padding-left: 30px; -} - -.private .linktitle a { - color: #969696; -} - -.linktitle { - font-size: 14pt; - font-weight: bold; -} - -.linktitle a { - text-decoration: none; - color: #80AD48; -} - -.linktitle a:hover { - color: #F57900; -} - -.linkdate { - font-size: 8pt; - color: #888; -} - -.linkdate a { - background-image: url('../images/calendar.png'); - padding: 2px 0 3px 20px; - background-repeat: no-repeat; - text-decoration: none; - color: #E28E3F; -} - -.linkdate a:hover { - color: #F57900 } - -.linkurl { - font-size: 8pt; - color: #4BAA74; -} - -.linkdescription { - color: #000; - margin-top: 0; - margin-bottom: 12px; - font-weight: normal; - overflow: auto; -} - -.linkdescription a { - text-decoration: none; - color: #3465A4; -} - -.linkdescription a:hover { - color: #F57900; -} - -.linktaglist { - padding-top: 10px; - line-height: 200%; -} - -.linktag { - font-size: 9pt; - background-color: #F2F2F2; - background: -webkit-gradient(linear, 0 0, 0 bottom, from(#F2F2F2), to(#ffffff)); - background: -webkit-linear-gradient(#F2F2F2, #ffffff); - background: -moz-linear-gradient(#F2F2F2, #ffffff); - background: -ms-linear-gradient(#F2F2F2, #ffffff); - background: -o-linear-gradient(#F2F2F2, #ffffff); - background: linear-gradient(#F2F2F2, #ffffff); - box-shadow: 0 0 2px rgba(0, 0, 0, 0.5); - padding: 3px 5px 3px 20px; - height: 20px; - border-radius: 3px; - cursor: pointer; - background-image: url('../images/tag_blue.png'); - background-repeat: no-repeat; - background-position: 3px center; - background-color: #ffffff; -} - -.linktag:hover { - border-color: #555573; - color: #000; -} - -.linktag a { - color: #777; - text-decoration: none; -} - -.linktag .remove { - border-left: 1px solid #aaa; - padding-left: 5px; - color:#6767A7; -} - -.linkshort { - font-size: 8pt; - color: #888; -} - -.linkshort a { - text-decoration: none; - color: #393964; -} - -.linkshort a:hover { - text-decoration: underline; -} - -.buttoneditform { - display: inline; -} - -#footer { - font-size: 8pt; - text-align: center; - color: #888; - clear: both; - max-width: 30em; - margin: 15px auto 15px auto; -} - -#footer a { - color: #486D08; -} - -#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 #version_id { - text-decoration: blink; -} - -#cloudtag { - padding-left: 10%; - padding-right: 10%; -} - -#cloudtag .count { - color: #99f; - font-size: 9pt; - padding-left: 5px; - padding-right: 2px; -} - -#cloudtag a { - color: black; - text-decoration: none; -} - -#install { - margin: 0 20px; -} - -#installform { - border: 1px solid black; - padding: 10px; -} - -#installform table { - border: none; -} - -#installform td { - font-size: 10pt; - color: black; - padding: 10px 5px 10px 5px; - clear: left; -} - -#installform input.bigbutton { - float: right; -} - -#changepasswordform { - color: #ccc; - padding: 10px 5px 10px 5px; - clear: left; -} - -#changetag { - color: #ccc; - padding: 10px 5px 10px 5px; - clear: left; -} - -#changetag #totag { - margin-left: 40px; -} - -#changetag div { - float:left; -} - -#changetag label { - padding: 5px; -} - -#changetag li { - color: #000; -} -#configform td { - color: #ccc; - font-size: 10pt; - padding: 10px 5px 10px 5px; -} - -#configform { - color: #ccc; - padding: 10px 5px 10px 5px; - clear: left; -} - -.thumbnail { - float: right; - margin: 0px 10px 0px 10px; -} - -.thumbnail img { - border-radius: 3px; - box-shadow: 0.5px 0.5px 0.5px 1px #dde4e6; -} - -/* If you want thumbnails on the left: -.thumbnail { - float: left; - margin-right: 10px; -} -.linkcontainer { - position: static; - margin-left: 130px; -} -*/ - -/* --- Picture wall CSS --- */ -#picwall_container { - color: #fff; - background-color: #000; - clear: both; -} - -.picwall_pictureframe { - background-color: #000; - z-index: 5; - position: relative; - display: table-cell; - vertical-align: middle; - width: 90px; - height: 90px; - overflow: hidden; - text-align: center; - float: left; -} - -.b-lazy { - -webkit-transition: opacity 500ms ease-in-out; - -moz-transition: opacity 500ms ease-in-out; - -o-transition: opacity 500ms ease-in-out; - transition: opacity 500ms ease-in-out; - opacity: 0; -} -.b-lazy.b-loaded { - opacity: 1; -} - -.picwall_pictureframe img { - max-width: 100%; - height: auto; - color: transparent; -} /* Adapt the width of the image */ - -.picwall_pictureframe a { - text-decoration: none; -} - -/* CSS to show title when hovering an image - no javascript required. */ -.picwall_pictureframe span.info { - display: none; -} - -.picwall_pictureframe:hover span.info { - display: block; - position: absolute; - top: 0; - left: 0; - width: 90px; - font-weight: bold; - font-size: 8pt; - color: #fff; - text-align: left; - background-color: transparent; - 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 */ - text-shadow: 2px 2px 1px #000000; -} - -#linklist li.publicLinkHightLight { - background: #ffffff; -} - -div.daily { - font-family: Georgia, 'DejaVu Serif', Norasi, serif; - background-color: #E6D6BE; - /* Background paper texture by BashCorpo: - http://www.bashcorpo.dk/textures.php - http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998 */ - background-image: url("../images/Paper_texture_v5_by_bashcorpo_w1000.jpg"); - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; - background-size: cover; - position: relative; - border-bottom: 2px solid black; -} - -#daily_col1 { - float: left; - position: relative; - width: 33%; - padding-left: 1%; -} - -#daily_col2 { - float: left; - position: relative; - width: 33%; -} - -#daily_col3 { - float: left; - position: relative; - width: 33%; -} - -div.dailyAbout { - float: left; - border: 1px solid black; - font-size: 8pt; - position: absolute; - left: 10px; - top: 15px; - padding: 5px 5px 5px 5px; - text-align: center; -} - -div.dailyAbout a { - color: #890500; -} - -div.dailyAbout img { - position: relative; - top: 3px; - margin-right: 4px; - width: 14px; - height: 14px; -} - -div.dailyEntryPermalink { - float: right; -} - -div.dailyTitle { - font-weight: bold; - font-size: 44pt; - text-align: center; - padding: 10px 20px 0px 20px; -} - -div.dailyDate { - font-size: 12pt; - font-weight: bold; - text-align: center; - padding: 0px 20px 30px 20px; -} - -/* Individual entries in "Daily": */ -div.dailyEntry { - margin: 5px 10px 2px 5px; - font-size: 11pt; - border-top: 1px solid #555; -} - -div.dailyEntry a { - text-decoration: none; - color: #890500; -} - -div.dailyEntryTags { - font-size: 7.75pt; -} - -div.dailyEntryTitle { - font-size: 18pt; - font-weight: bold; -} - -div.dailyEntryLinkdate { - font-size: 8pt; -} - -div.dailyEntryThumbnail { - width: 100%; - text-align: center; - background-color: rgb(128, 128, 128); - background: url(../images/50pc_transparent.png); - padding: 4px 0px 2px 0px; -} - -div.dailyEntryDescription { - margin-top: 10px; - margin-bottom: 30px; - text-align: justify; - overflow: auto; -} - -div.dailyNoEntry { - text-align: center; - padding: 40px 0px 90px 0px; -} - -.daily #closing { - clear: both; - text-align: center; - padding-bottom: 20px; -} - -/* Common CSS screwdriver */ -.clear { - clear: both; -} - -.right { - text-align: right; -} - -.white { - color: white; -} - -/* For lazy images loading in picture wall. - Using http://www.appelsiini.net/projects/lazyload -*/ -.lazyimage { - display: none; -} - -#configuration_table td { - border: none; - padding: 10px; - vertical-align: top; -} - -@media print { - html { - border: none; - background: #fff !important; - color: #000 !important; - } - - body { - font-size: 12pt; - width: auto !important; - margin: auto !important; - } - - /* Minimum numer of lines to display when splitting a paragraph - over two pages */ - p { - orphans: 3; - widows: 3; - } - - a { - color: #000 !important; - text-decoration: none !important; - } - - #pageheader, .paging, #linklist li form, #footer { - display: none; - } - - #linklist li { - padding: 2 0 10 0; - border-top: 2px solid #000; - clear: both; - } - - #linklist li.private { - background-color: none; - border-left: 0; - } - - .linkdate { - line-height: 2; - } - - .linkurl { - color: #000; - } - - .linkdescription { - font-size: 10pt; - } - - .linktag { - border: 1px solid black; - font-style: italic; - font-size: 8pt; - } -} - -@media handheld, only screen and (max-width: 480px), only screen and (max-device-width: 854px) { - /* A few fixes for mobile devices (far from perfect). */ - - .tagfilter div.awesomplete { - width: 70%; - } - - .nomobile { - display: none; - } - - #logo { - display: none; - } - - #pageheader #menu ul { - text-align: center; - } - - #pageheader #menu a { - padding: 5px; - border-radius: 3px 3px 3px 3px; - margin: 3px; - } - - #headerform label { - width: 100%; - display: block; - height: auto; - line-height: 25px; - padding-bottom: 10px; - } - - #headerform label input[type=text], - #headerform label input[type=password]{ - float: right; - width: 70%; - } - - .searchform, .tagfilter { - display: block !important; - margin: 0px 3px 7px 0px !important; - padding: 0px !important; - width: 97% !important; - } - - .searchform input, .tagfilter input { - margin: 0px !important; - padding: 0px !important; - display: inline !important; - } - - .tagfilter input.bigbutton, .searchform input.bigbutton, .addform input.bigbutton, a.bigbutton { - width: 30%; - font-size: smaller; - } - - #searchform_value { - width: 70% !important; - } - - #tagfilter_value { - width: 70% !important; - } - - div.qrcode { - position: relative; - float: left; - top: -10px; - left: 0px; - } - - .paging_privatelinks { - float: none; - } - - .paging_linksperpage { - float: none; - margin-bottom: 10px; - font-size: smaller; - } - - #paging_older, #paging_newer, .paging_linksperpage a { - border: 1px solid black; - padding: 3px 5px 3px 5px; - background-color: #666; - color: #fff; - border-radius: 3px 3px 3px 3px; - } - - .thumbnail { - float: none; - height: auto; - margin: 0px; - text-align: center; - } - - #cloudtag { - padding: 0px; - } - - div.dailyAbout { - float: none; - position: relative; - width: 100%; - clear: both; - padding: 0px; - top: 0px; - left: 0px; - } - - #daily_col1, #daily_col2, #daily_col3 { - float: none; - width: 100%; - padding: 0px; - } - - div.dailyTitle { - font-size: 18pt; - margin-top: 5px; - padding: 0px; - } - - div.dailyDate { - font-size: 11pt; - padding: 0px; - display: block; - } - - div.dailyEntryTitle { - font-size: 16pt; - font-weight: bold; - } - - div.dailyEntryDescription { - font-size: 10pt; - } -} - -#toolsdiv a.button-description { - clear: none; -} - -/* Highlight search results */ -.highlight { - background-color: #FFFF33; -} - -.center { - text-align: center; -} - -ul.errors { - color: red; - float: left; -} - -#pluginsadmin { - width: 80%; - padding: 20px 0 0 20px; -} - -#pluginsadmin section { - padding: 20px 0; -} - -#pluginsadmin .plugin_parameters { - margin: 10px 0; -} - -#pluginsadmin h1 { - font-style: normal; -} - -#pluginsadmin h2 { - font-size: 1.4em; - font-weight: bold; -} - -#pluginsadmin table { - width: 100%; -} - -#pluginsadmin table, #pluginsadmin th, #pluginsadmin td { - border-width: 1px 0; - border-style: solid; - border-color: #c0c0c0; -} - -#pluginsadmin table th { - font-weight: bold; - padding: 10px 0; -} - -#pluginsadmin table td { - padding: 5px 0; -} - -#pluginsadmin input[type=submit] { - margin: 10px 0; -} - -#pluginsadmin label { - cursor: pointer; -} - -#pluginsadmin .plugin_parameter { - padding: 10px 0; - border-width: 1px 0; - border-style: solid; - border-color: #c0c0c0; -} - -#pluginsadmin .float_label { - float: left; - width: 40%; -} - -#pluginsadmin a { - color: #486D08; -} - -#pluginsadmin a.arrow { - color: black; -} - -/* 404 page */ -.error-container { - - margin: 50px; - margin-top: 20px; -} - -.error-container h1 { - text-decoration: none; - font-style: normal; - color: #80AD48; -} - -.linklist-plugin-icon { - width: 13px; - height: 13px; -} diff --git a/tpl/default/daily.html b/tpl/default/daily.html deleted file mode 100644 index e86e90b1..00000000 --- a/tpl/default/daily.html +++ /dev/null @@ -1,101 +0,0 @@ - - -{include="includes"} - - -
-
- {loop="$plugin_start_zone"} - {$value} - {/loop} -
- -
- All links of one day
in a single page.
- {if="$previousday"} <Previous day{else}<Previous day{/if} - - - {if="$nextday"}Next day>{else}Next day>{/if} -
- - {loop="$daily_about_plugin"} - {$value} - {/loop} - -
- rss_feedDaily RSS Feed -
- -
- floral_left - The Daily Shaarli - floral_right -
- -
- ——————————— - {function="strftime('%A %d, %B %Y', $day)"} - ——————————— -
- -
- - {if="$linksToDisplay"} - {loop="$cols"} - {if="isset($value[0])"} -
- {loop="$value"} - {$link=$value} -
-
- - permalink - -
- {if="!$hide_timestamps || isLoggedIn()"} -
- {function="strftime('%c', $link.timestamp)"} -
- {/if} - {if="$link.tags"} -
- {loop="$link.taglist"} - {$value} - - {/loop} -
- {/if} -
- {$link.title} -
- {if="$link.thumbnail"} -
{$link.thumbnail}
- {/if} -
{$link.formatedDescription}
- -
- {loop="$link.link_plugin"} - {$value} - {/loop} -
-
- {/loop} -
- {/if} - {/loop} - {else} -
No articles on this day.
- {/if} - -
- -
- {loop="$plugin_end_zone"} - {$value} - {/loop} -
-
-
-
-{include="page.footer"} - - diff --git a/tpl/default/dailyrss.html b/tpl/default/dailyrss.html deleted file mode 100644 index ddbd6c5e..00000000 --- a/tpl/default/dailyrss.html +++ /dev/null @@ -1,16 +0,0 @@ - - {$title} - {function="strftime('%A %e %B %Y', $daydate)"} - {$absurl} - {$absurl} - {$rssdate} - {$value.title} - {if="!$hide_timestamps"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags}{/if}
- {$value.url}
- {if="$value.thumbnail"}{$value.thumbnail}{/if}
- {if="$value.description"}{$value.formatedDescription}{/if} -

- {/loop} - ]]> - diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html deleted file mode 100644 index f855dfb1..00000000 --- a/tpl/default/editlink.html +++ /dev/null @@ -1,63 +0,0 @@ - - -{include="includes"} - - - - -{if="$source !== 'firefoxsocialapi'"} -{include="page.footer"} -{/if} - - - - - diff --git a/tpl/default/export.bookmarks.html b/tpl/default/export.bookmarks.html deleted file mode 100644 index 127a5c20..00000000 --- a/tpl/default/export.bookmarks.html +++ /dev/null @@ -1,10 +0,0 @@ - - -{ignore}The RainTPL loop is formatted to avoid generating extra newlines{/ignore} -{$pagetitle} -

Shaarli export of {$selection} bookmarks on {$date}

-

{loop="$links"} -

{$value.title}{if="$value.description"}{$eol}
{$value.description}{/if}{/loop} -

diff --git a/tpl/default/export.html b/tpl/default/export.html deleted file mode 100644 index 67c3d05f..00000000 --- a/tpl/default/export.html +++ /dev/null @@ -1,28 +0,0 @@ - - -{include="includes"} - -

- {include="page.footer"} - - diff --git a/tpl/default/feed.atom.html b/tpl/default/feed.atom.html deleted file mode 100644 index 49798e85..00000000 --- a/tpl/default/feed.atom.html +++ /dev/null @@ -1,42 +0,0 @@ - - - {$pagetitle} - Shaared links - {if="$show_dates"} - {$last_update} - {/if} - - - {loop="$feed_plugins_header"} - {$value} - {/loop} - - {$index_url} - {$index_url} - - {$index_url} - Shaarli - {loop="$links"} - - {$value.title} - {if="$usepermalinks"} - - {else} - - {/if} - {$value.guid} - {if="$show_dates"} - {$value.pub_iso_date} - {$value.up_iso_date} - {/if} - - {loop="$value.taglist"} - - {/loop} - {loop="$value.feed_plugins"} - {$value} - {/loop} - - {/loop} - diff --git a/tpl/default/feed.rss.html b/tpl/default/feed.rss.html deleted file mode 100644 index ee3fef88..00000000 --- a/tpl/default/feed.rss.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - {$pagetitle} - {$index_url} - Shaared links - {$language} - {$index_url} - Shaarli - - - diff --git a/tpl/default/images/50pc_transparent.png b/tpl/default/images/50pc_transparent.png deleted file mode 100644 index 8d8f99de..00000000 Binary files a/tpl/default/images/50pc_transparent.png and /dev/null differ diff --git a/tpl/default/images/Paper_texture_v5_by_bashcorpo_w1000.jpg b/tpl/default/images/Paper_texture_v5_by_bashcorpo_w1000.jpg deleted file mode 100644 index dd8e67ac..00000000 Binary files a/tpl/default/images/Paper_texture_v5_by_bashcorpo_w1000.jpg and /dev/null differ diff --git a/tpl/default/images/calendar.png b/tpl/default/images/calendar.png deleted file mode 100644 index 81c74519..00000000 Binary files a/tpl/default/images/calendar.png and /dev/null differ diff --git a/tpl/default/images/floral_left.png b/tpl/default/images/floral_left.png deleted file mode 100644 index f09a861d..00000000 Binary files a/tpl/default/images/floral_left.png and /dev/null differ diff --git a/tpl/default/images/floral_right.png b/tpl/default/images/floral_right.png deleted file mode 100644 index 0dfb6112..00000000 Binary files a/tpl/default/images/floral_right.png and /dev/null differ diff --git a/tpl/default/images/private.png b/tpl/default/images/private.png deleted file mode 100644 index 8919d658..00000000 Binary files a/tpl/default/images/private.png and /dev/null differ diff --git a/tpl/default/images/squiggle.png b/tpl/default/images/squiggle.png deleted file mode 100644 index c795f0a3..00000000 Binary files a/tpl/default/images/squiggle.png and /dev/null differ diff --git a/tpl/default/images/squiggle_closing.png b/tpl/default/images/squiggle_closing.png deleted file mode 100644 index 3f9d02b1..00000000 Binary files a/tpl/default/images/squiggle_closing.png and /dev/null differ diff --git a/tpl/default/images/tag_blue.png b/tpl/default/images/tag_blue.png deleted file mode 100644 index 7ec902fc..00000000 Binary files a/tpl/default/images/tag_blue.png and /dev/null differ diff --git a/tpl/default/import.html b/tpl/default/import.html deleted file mode 100644 index 071e1160..00000000 --- a/tpl/default/import.html +++ /dev/null @@ -1,33 +0,0 @@ - - -{include="includes"} - - -{include="page.footer"} - - diff --git a/tpl/default/includes.html b/tpl/default/includes.html deleted file mode 100644 index 17b78b17..00000000 --- a/tpl/default/includes.html +++ /dev/null @@ -1,15 +0,0 @@ -{$pagetitle} - - - - - - - - - -{if="is_file('data/user.css')"}{/if} -{loop="$plugins_includes.css_files"} - -{/loop} - diff --git a/tpl/default/install.html b/tpl/default/install.html deleted file mode 100644 index 42874dcd..00000000 --- a/tpl/default/install.html +++ /dev/null @@ -1,35 +0,0 @@ - - -{include="includes"}{$timezone_js} - -
-

Shaarli

- It looks like it's the first time you run Shaarli. Please configure it:
-
- - - - {$timezone_html} - - - - - - - - -
Login:
Password:
Page title:
Update: -
- API: - - - -
-
-
-{include="page.footer"} - - diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html deleted file mode 100644 index 5accc92f..00000000 --- a/tpl/default/linklist.html +++ /dev/null @@ -1,151 +0,0 @@ - - - - - {include="includes"} - - - - - - - {include="page.footer"} - - - - - - diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html deleted file mode 100644 index 86019c01..00000000 --- a/tpl/default/linklist.paging.html +++ /dev/null @@ -1,32 +0,0 @@ -
-{if="isLoggedIn()"} -
- - {if="$privateonly"} - Click to see all links - {else} - Click to see only private links - {/if} - - - -
-{/if} - {loop="$action_plugin"} -
- - {$value.html} - -
- {/loop} -
- Links per page: 20 50 100 -
-
- {if="$previous_page_url"} ◄Older {/if} -
page {$page_current} / {$page_max}
- {if="$next_page_url"} Newer► {/if} -
diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html deleted file mode 100644 index 84176385..00000000 --- a/tpl/default/loginform.html +++ /dev/null @@ -1,38 +0,0 @@ - - -{include="includes"} - - - -{include="page.footer"} - - diff --git a/tpl/default/opensearch.html b/tpl/default/opensearch.html deleted file mode 100644 index 3fcc30b7..00000000 --- a/tpl/default/opensearch.html +++ /dev/null @@ -1,45 +0,0 @@ - - - Shaarli search - {$pagetitle} - Shaarli search - {$pagetitle} - - - - UTF-8 - Shaarli Community - https://github.com/shaarli/Shaarli/ - data:image/x-icon;base64,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 - - diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html deleted file mode 100644 index 006d1d68..00000000 --- a/tpl/default/page.footer.html +++ /dev/null @@ -1,31 +0,0 @@ - - -{loop="$plugins_footer.endofpage"} - {$value} -{/loop} - -{if="$newVersion"} -
- ● Shaarli {$newVersion} is - available. -
-{/if} -{if="$versionError"} -
- Error: {$versionError} -
-{/if} -{if="isLoggedIn()"} - -{/if} - -{loop="$plugins_footer.js_files"} - -{/loop} diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html deleted file mode 100644 index cce61ec4..00000000 --- a/tpl/default/page.header.html +++ /dev/null @@ -1,59 +0,0 @@ - - - -
- {if="!empty($linkcount)"}{$linkcount} links{/if}
- {if="!empty($privateLinkcount)"}{$privateLinkcount} private links{/if} -
- - - -{if="!empty($plugin_errors) && isLoggedIn()"} - -{/if} - -
- - diff --git a/tpl/default/page.html b/tpl/default/page.html deleted file mode 100644 index 834915ec..00000000 --- a/tpl/default/page.html +++ /dev/null @@ -1,9 +0,0 @@ - - -{include="includes"} - - - You body goes here... - {include="page.footer"} - - \ No newline at end of file diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html deleted file mode 100644 index 4e227e37..00000000 --- a/tpl/default/picwall.html +++ /dev/null @@ -1,44 +0,0 @@ - - -{include="includes"} - - - - - -
- {loop="$plugin_start_zone"} - {$value} - {/loop} -
- -
-
- {loop="$linksToDisplay"} -
- {$value.thumbnail}{$value.title} - {loop="$value.picwall_plugin"} - {$value} - {/loop} -
- {/loop} -
-
- -
- -
- {loop="$plugin_end_zone"} - {$value} - {/loop} -
- -{include="page.footer"} - - - - diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html deleted file mode 100644 index ead1734e..00000000 --- a/tpl/default/pluginsadmin.html +++ /dev/null @@ -1,134 +0,0 @@ - - -{include="includes"} - - - - - -
-
-
-

Enabled Plugins

- -
- {if="count($enabledPlugins)==0"} -

No plugin enabled.

- {else} - - - - - - - - - - - {loop="$enabledPlugins"} - - - - - - - {/loop} - -
DisableOrderNameDescription
- - ▲ - - - ▼ - - -
- {/if} -
-
- -
-

Disabled Plugins

- -
- {if="count($disabledPlugins)==0"} -

No plugin disabled.

- {else} - - - - - - - {loop="$disabledPlugins"} - - - - - - {/loop} -
EnableNameDescription
- {/if} -
- -
- -
-
-
- -
-
-

Enabled Plugin Parameters

- -
- {if="count($enabledPlugins)==0"} -

No plugin enabled.

- {else} - {loop="$enabledPlugins"} - {if="count($value.parameters) > 0"} -
-

{function="str_replace('_', ' ', $key)"}

- {loop="$value.parameters"} -
-
- -
-
- -
-
- {/loop} -
- {/if} - {/loop} - {/if} -
- -
-
-
-
- -
-{include="page.footer"} - - - - diff --git a/tpl/default/readme.txt b/tpl/default/readme.txt deleted file mode 100644 index b18deaed..00000000 --- a/tpl/default/readme.txt +++ /dev/null @@ -1,42 +0,0 @@ -===== Shaarli template organisation ===== - -Any Shaarli page should conform to this RainTPL template: - ------------------------------------------------------ - -{include="includes"} - - - You body goes here... - {include="page.footer"} - - ------------------------------------------------------ - -If you want to also add something in the page header (in the dark area), do it here: - - - - -Example: "Add new link" form: ------------------------------------------------------ - -{include="includes"} - - -{include="page.footer"} - - ------------------------------------------------------ - - - - diff --git a/tpl/default/tagcloud.html b/tpl/default/tagcloud.html deleted file mode 100644 index 05e45273..00000000 --- a/tpl/default/tagcloud.html +++ /dev/null @@ -1,31 +0,0 @@ - - -{include="includes"} - - -
-
- {loop="$plugin_start_zone"} - {$value} - {/loop} -
- -
- {loop="$tags"} - {$value.count}{$key} - {loop="$value.tag_plugin"} - {$value} - {/loop} - {/loop} -
- -
- {loop="$plugin_end_zone"} - {$value} - {/loop} -
-
-{include="page.footer"} - - diff --git a/tpl/default/tools.html b/tpl/default/tools.html deleted file mode 100644 index c36aa5b5..00000000 --- a/tpl/default/tools.html +++ /dev/null @@ -1,98 +0,0 @@ - - -{include="includes"} - - -{include="page.footer"} - - diff --git a/tpl/vintage/404.html b/tpl/vintage/404.html new file mode 100644 index 00000000..53e98e2e --- /dev/null +++ b/tpl/vintage/404.html @@ -0,0 +1,17 @@ + + + + {include="includes"} + + + +
+

404 Not found Oh crap!

+

{$error_message}

+

Would you mind clicking here?

+
+{include="page.footer"} + + diff --git a/tpl/vintage/addlink.html b/tpl/vintage/addlink.html new file mode 100644 index 00000000..da50f45e --- /dev/null +++ b/tpl/vintage/addlink.html @@ -0,0 +1,16 @@ + + +{include="includes"} + + +{include="page.footer"} + + diff --git a/tpl/vintage/changepassword.html b/tpl/vintage/changepassword.html new file mode 100644 index 00000000..c40daf9d --- /dev/null +++ b/tpl/vintage/changepassword.html @@ -0,0 +1,15 @@ + + +{include="includes"} + + +{include="page.footer"} + + \ No newline at end of file diff --git a/tpl/vintage/changetag.html b/tpl/vintage/changetag.html new file mode 100644 index 00000000..a0df3328 --- /dev/null +++ b/tpl/vintage/changetag.html @@ -0,0 +1,34 @@ + + +{include="includes"} + + + + + + + +{include="page.footer"} + + diff --git a/tpl/vintage/configure.html b/tpl/vintage/configure.html new file mode 100644 index 00000000..5820e6e4 --- /dev/null +++ b/tpl/vintage/configure.html @@ -0,0 +1,121 @@ + + +{include="includes"} + + +{include="page.footer"} + + diff --git a/tpl/vintage/css/reset.css b/tpl/vintage/css/reset.css new file mode 100644 index 00000000..e29699e2 --- /dev/null +++ b/tpl/vintage/css/reset.css @@ -0,0 +1,6 @@ +/* CSS Reset from Yahoo to cope with browsers CSS inconsistencies. */ +/* + Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.com/yui/license.html + version: 2.8.2r1 + */ +html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;} \ No newline at end of file diff --git a/tpl/vintage/css/shaarli.css b/tpl/vintage/css/shaarli.css new file mode 100644 index 00000000..7ca567e7 --- /dev/null +++ b/tpl/vintage/css/shaarli.css @@ -0,0 +1,1208 @@ +/* Cascading Stylesheet for Shaarli - https://github.com/shaarli/Shaarli */ + +body { + font-family: "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif; + font-size: 10pt; + background-color: #ffffff; + word-wrap: break-word; +} + +input, textarea { + background-color: #dedede; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dedede), to(#ffffff)); + background: -webkit-linear-gradient(#dedede, #ffffff); + background: -moz-linear-gradient(#dedede, #ffffff); + background: -ms-linear-gradient(#dedede, #ffffff); + background: -o-linear-gradient(#dedede, #ffffff); + background: linear-gradient(#dedede, #ffffff); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); + padding: 5px; + border-radius: 3px 3px 3px 3px; + border: none; + color: #000; +} + +a { + text-decoration: none; +} + +h1 { + font-size: 20pt; + font-weight: bold; + font-style: italic; + margin-bottom: 20px; +} + +em { + font-style: italic; +} + +strong { + font-weight: bold; +} + +/* Buttons */ +.bigbutton, #pageheader a.bigbutton { + background-color: #c0c0c0; + background: -moz-linear-gradient(#c0c0c0, #ffffff) repeat scroll 0 0 transparent; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#c0c0c0), to(#ffffff)); + background: -webkit-linear-gradient(#c0c0c0, #ffffff); + background: -ms-linear-gradient(#c0c0c0, #ffffff); + background: -o-linear-gradient(#c0c0c0, #ffffff); + background: linear-gradient(#c0c0c0, #ffffff); + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.5); + cursor: pointer; + height: 24px; + padding: 0 5px; + margin: 0 5px 0 0; + color: #606060; + border-style: outset; + border-width: 1px; + display: inline-block; +} + +a.bigbutton, #pageheader a.bigbutton { + height: 22px; + line-height: 22px; +} + +.smallbutton { + background-color: #c0c0c0; + background: -moz-linear-gradient(#c0c0c0, #ffffff) repeat scroll 0 0 transparent; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#c0c0c0), to(#ffffff)); + background: -webkit-linear-gradient(#c0c0c0, #ffffff); + background: -ms-linear-gradient(#c0c0c0, #ffffff); + background: -o-linear-gradient(#c0c0c0, #ffffff); + background: linear-gradient(#c0c0c0, #ffffff); + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.5); + cursor: pointer; + height: 20px; + margin-left: 5px; + padding: 0 5px; + color: #606060; + border-style: outset; + border-width: 1px; +} + +/* 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; +} + +.linkeditbuttons { + position: absolute; + left: 2px; + padding: 4px 2px 2px 2px; + + -webkit-border-radius: 0px 6px 6px 0px; + -moz-border-radius: 0px 6px 6px 0px; + -o-border-radius: 0px 6px 6px 0px; + -ms-border-radius: 0px 6px 6px 0px; + border-radius: 0px 6px 6px 0px; +} + +#pageheader #logo { + background-image: url('../../../images/logo.png'); + background-repeat: no-repeat; + float: left; + margin: 0 10px 0 10px; + width: 105px; + height: 55px; + cursor: pointer; +} + +#pageheader #menu { + width: 100%; +} + +#pageheader #menu ul { + margin: auto; + padding: 7px 0px 0px 0px; + float: none; +} + +#pageheader #menu ul li { + list-style: none; + display: inline; + position: relative; + box-sizing: border-box; +} + +#pageheader a { + background-color: #333333; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#000000)); + background: -webkit-linear-gradient(#333333, #000000); + background: -moz-linear-gradient(#333333, #000000); + background: -ms-linear-gradient(#333333, #000000); + background: -o-linear-gradient(#333333, #000000); + background: linear-gradient(#333333, #000000); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); + padding: 5px; + border-radius: 3px 3px 3px 3px; + margin: 10px 3px 3px 3px; + color: #A2DD42; + text-decoration: none; + line-height: 2.5; + white-space: nowrap; +} + +#pageheader #linkcount { + float: right; + font-style: italic; + color: #bbb; + text-align: right; + padding-right: 5px; + margin: 3px 3px 0px 0px; +} + +#pageheader { + background-color: #333333; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#111111)); + background: -webkit-linear-gradient(#333333, #111111); + background: -moz-linear-gradient(#333333, #111111); + background: -ms-linear-gradient(#333333, #111111); + background: -o-linear-gradient(#333333, #111111); + background: linear-gradient(#333333, #111111); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); + width: auto; + padding: 0 10px 5px 10px; + margin: auto; +} + +#pageheader .search { + width: 100%; + white-space: nowrap; +} + +#toolsdiv a { + clear: both; +} + +#toolsdiv #bookmark { + clear: none; +} + +#toolsdiv a span { + color: #ffffff; +} + +.linksperpage, .tagfilter, .searchform, .addform { + background-color: #dedede; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dedede), to(#ffffff)); + background: -webkit-linear-gradient(#dedede, #ffffff); + background: -moz-linear-gradient(#dedede, #ffffff); + background: -ms-linear-gradient(#dedede, #ffffff); + background: -o-linear-gradient(#dedede, #ffffff); + background: linear-gradient(#dedede, #ffffff); + display: inline; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); + padding: 5px; + border: none; + border-radius: 3px 3px 3px 3px; + margin: 10px 3px 3px 3px; + color: #cecece; +} + +.linksperpage { + box-shadow: 0 0 0 rgba(0, 0, 0, 0.5); + padding: 3px; +} + +.linksperpage input, .tagfilter input, .searchform input, .addform input { + border: none; + color: #606060; + background: none; + box-shadow: none; + padding: 5px; +} + +.linksperpage input { + padding: 0; +} + +.searchform #searchform_value { + width: 30%; +} + +.tagfilter { + margin-left:24px; +} + +.tagfilter div.awesomplete { + width: 15%; +} + +.tagfilter #tagfilter_value { + display: inline; +} + +.tagfilter li { + color: black; +} + +.tagfilter input.bigbutton, .searchform input.bigbutton, .addform input.bigbutton { + background-color: #dedede; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dedede), to(#ffffff)); + background: -webkit-linear-gradient(#dedede, #ffffff); + background: -moz-linear-gradient(#dedede, #ffffff); + background: -ms-linear-gradient(#dedede, #ffffff); + background: -o-linear-gradient(#dedede, #ffffff); + background: linear-gradient(#dedede, #ffffff); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); + padding: 0 5px 0 5px; + margin: 5px 0 5px 0; + height: 20px; + border-radius: 3px 3px 3px 3px; + cursor: pointer; +} + +#shaarli_title { + font-weight: bold; + font-style: italic; + margin-top: 0; +} + +#shaarli_title a { + color: #fff !important; +} + +#pageheader a:visited { + color: #98C943; + text-decoration: none; +} + +#pageheader a:hover { + color: #FFFFC9; + text-decoration: none; +} + +#pageheader a:active { + color: #bbb; + text-decoration: none; +} + +#searchcriteria { + padding: 4px 0px 5px 5px; + font-weight: bold; +} + +.paging { + padding: 5px; + background-color: #777; + color: #ccc; + text-align: center; + clear: both; +} + +.paging a:link { + color: #ccc; + text-decoration: none; +} + +.paging a:visited { + color: #ccc; +} + +.paging a:hover { + color: #FFFFC9; +} + +.paging a:active { + color: #fff; +} + +.paging_privatelinks { + float: left; +} + +.paging_linksperpage { + float: right; + padding-right: 5px; + margin: 0px 10px 2px 0px; +} + +.paging_linksperpage form.linksperpage { + display: inline; +} + +.paging_linksperpage form.linksperpage input { + height: 15px; +} + +.paging_current { + display: inline; + color: #fff; + padding: 0 20 0 20; +} + +.paging_older { + margin-right: 15px; +} + +.paging_newer { + margin-left: 15px; +} + +#headerform { + color: #ffffff; + padding: 5px 5px 5px 5px; + clear: both; +} + +#headerform input.linkurl { + width: 50%; + font-size: inherit; +} + +#headerform label { + cursor: pointer; + margin-right: 10px; +} + +#headerform label[for=longlastingsession] { + display: block; + width: 100%; + margin-top: 5px; +} + +#toolsdiv { + color: #ffffff; + padding: 5px 5px 5px 5px; + clear: left; +} + +#uploaddiv { + color: #ffffff; + padding: 5px 5px 5px 5px; + clear: left; +} + +#editlinkform { + height: 100%; + padding: 5px 5px 5px 15px; + width: 80%; + clear: left; +} + +#editlinkform label { + cursor: pointer; + color: #ffffff; +} + +#editlinkform textarea, #editlinkform .lf_input { + width: 100%; +} + +#linklist li { + padding: 4px 10px 15px 20px; + border-top: 1px solid #bbb; + clear: both; + background-color: #F2F2F2; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#F2F2F2), to(#ffffff)); + background: -webkit-linear-gradient(#F2F2F2, #ffffff); + background: -moz-linear-gradient(#F2F2F2, #ffffff); + background: -ms-linear-gradient(#F2F2F2, #ffffff); + background: -o-linear-gradient(#F2F2F2, #ffffff); + background: linear-gradient(#F2F2F2, #ffffff); +} + +/* +#linklist li.publicLinkHightLight:hover, #linklist li:hover { + background: #E9FFCE; +} +*/ + +.linkdate { + font-size:8pt; + color:#888; +} + +.linkdate a { + color:#E28E3F; +} + +#linklist li.private { + background: url('../images/private.png') no-repeat 4px center; + padding-left: 30px; +} + +#linklist li { + padding-left: 30px; +} + +.private .linktitle a { + color: #969696; +} + +.linktitle { + font-size: 14pt; + font-weight: bold; +} + +.linktitle a { + text-decoration: none; + color: #80AD48; +} + +.linktitle a:hover { + color: #F57900; +} + +.linkdate { + font-size: 8pt; + color: #888; +} + +.linkdate a { + background-image: url('../images/calendar.png'); + padding: 2px 0 3px 20px; + background-repeat: no-repeat; + text-decoration: none; + color: #E28E3F; +} + +.linkdate a:hover { + color: #F57900 } + +.linkurl { + font-size: 8pt; + color: #4BAA74; +} + +.linkdescription { + color: #000; + margin-top: 0; + margin-bottom: 12px; + font-weight: normal; + overflow: auto; +} + +.linkdescription a { + text-decoration: none; + color: #3465A4; +} + +.linkdescription a:hover { + color: #F57900; +} + +.linktaglist { + padding-top: 10px; + line-height: 200%; +} + +.linktag { + font-size: 9pt; + background-color: #F2F2F2; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#F2F2F2), to(#ffffff)); + background: -webkit-linear-gradient(#F2F2F2, #ffffff); + background: -moz-linear-gradient(#F2F2F2, #ffffff); + background: -ms-linear-gradient(#F2F2F2, #ffffff); + background: -o-linear-gradient(#F2F2F2, #ffffff); + background: linear-gradient(#F2F2F2, #ffffff); + box-shadow: 0 0 2px rgba(0, 0, 0, 0.5); + padding: 3px 5px 3px 20px; + height: 20px; + border-radius: 3px; + cursor: pointer; + background-image: url('../images/tag_blue.png'); + background-repeat: no-repeat; + background-position: 3px center; + background-color: #ffffff; +} + +.linktag:hover { + border-color: #555573; + color: #000; +} + +.linktag a { + color: #777; + text-decoration: none; +} + +.linktag .remove { + border-left: 1px solid #aaa; + padding-left: 5px; + color:#6767A7; +} + +.linkshort { + font-size: 8pt; + color: #888; +} + +.linkshort a { + text-decoration: none; + color: #393964; +} + +.linkshort a:hover { + text-decoration: underline; +} + +.buttoneditform { + display: inline; +} + +#footer { + font-size: 8pt; + text-align: center; + color: #888; + clear: both; + max-width: 30em; + margin: 15px auto 15px auto; +} + +#footer a { + color: #486D08; +} + +#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 #version_id { + text-decoration: blink; +} + +#cloudtag { + padding-left: 10%; + padding-right: 10%; +} + +#cloudtag .count { + color: #99f; + font-size: 9pt; + padding-left: 5px; + padding-right: 2px; +} + +#cloudtag a { + color: black; + text-decoration: none; +} + +#install { + margin: 0 20px; +} + +#installform { + border: 1px solid black; + padding: 10px; +} + +#installform table { + border: none; +} + +#installform td { + font-size: 10pt; + color: black; + padding: 10px 5px 10px 5px; + clear: left; +} + +#installform input.bigbutton { + float: right; +} + +#changepasswordform { + color: #ccc; + padding: 10px 5px 10px 5px; + clear: left; +} + +#changetag { + color: #ccc; + padding: 10px 5px 10px 5px; + clear: left; +} + +#changetag #totag { + margin-left: 40px; +} + +#changetag div { + float:left; +} + +#changetag label { + padding: 5px; +} + +#changetag li { + color: #000; +} +#configform td { + color: #ccc; + font-size: 10pt; + padding: 10px 5px 10px 5px; +} + +#configform { + color: #ccc; + padding: 10px 5px 10px 5px; + clear: left; +} + +.thumbnail { + float: right; + margin: 0px 10px 0px 10px; +} + +.thumbnail img { + border-radius: 3px; + box-shadow: 0.5px 0.5px 0.5px 1px #dde4e6; +} + +/* If you want thumbnails on the left: +.thumbnail { + float: left; + margin-right: 10px; +} +.linkcontainer { + position: static; + margin-left: 130px; +} +*/ + +/* --- Picture wall CSS --- */ +#picwall_container { + color: #fff; + background-color: #000; + clear: both; +} + +.picwall_pictureframe { + background-color: #000; + z-index: 5; + position: relative; + display: table-cell; + vertical-align: middle; + width: 90px; + height: 90px; + overflow: hidden; + text-align: center; + float: left; +} + +.b-lazy { + -webkit-transition: opacity 500ms ease-in-out; + -moz-transition: opacity 500ms ease-in-out; + -o-transition: opacity 500ms ease-in-out; + transition: opacity 500ms ease-in-out; + opacity: 0; +} +.b-lazy.b-loaded { + opacity: 1; +} + +.picwall_pictureframe img { + max-width: 100%; + height: auto; + color: transparent; +} /* Adapt the width of the image */ + +.picwall_pictureframe a { + text-decoration: none; +} + +/* CSS to show title when hovering an image - no javascript required. */ +.picwall_pictureframe span.info { + display: none; +} + +.picwall_pictureframe:hover span.info { + display: block; + position: absolute; + top: 0; + left: 0; + width: 90px; + font-weight: bold; + font-size: 8pt; + color: #fff; + text-align: left; + background-color: transparent; + 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 */ + text-shadow: 2px 2px 1px #000000; +} + +#linklist li.publicLinkHightLight { + background: #ffffff; +} + +div.daily { + font-family: Georgia, 'DejaVu Serif', Norasi, serif; + background-color: #E6D6BE; + /* Background paper texture by BashCorpo: + http://www.bashcorpo.dk/textures.php + http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998 */ + background-image: url("../images/Paper_texture_v5_by_bashcorpo_w1000.jpg"); + -webkit-background-size: cover; + -moz-background-size: cover; + -o-background-size: cover; + background-size: cover; + position: relative; + border-bottom: 2px solid black; +} + +#daily_col1 { + float: left; + position: relative; + width: 33%; + padding-left: 1%; +} + +#daily_col2 { + float: left; + position: relative; + width: 33%; +} + +#daily_col3 { + float: left; + position: relative; + width: 33%; +} + +div.dailyAbout { + float: left; + border: 1px solid black; + font-size: 8pt; + position: absolute; + left: 10px; + top: 15px; + padding: 5px 5px 5px 5px; + text-align: center; +} + +div.dailyAbout a { + color: #890500; +} + +div.dailyAbout img { + position: relative; + top: 3px; + margin-right: 4px; + width: 14px; + height: 14px; +} + +div.dailyEntryPermalink { + float: right; +} + +div.dailyTitle { + font-weight: bold; + font-size: 44pt; + text-align: center; + padding: 10px 20px 0px 20px; +} + +div.dailyDate { + font-size: 12pt; + font-weight: bold; + text-align: center; + padding: 0px 20px 30px 20px; +} + +/* Individual entries in "Daily": */ +div.dailyEntry { + margin: 5px 10px 2px 5px; + font-size: 11pt; + border-top: 1px solid #555; +} + +div.dailyEntry a { + text-decoration: none; + color: #890500; +} + +div.dailyEntryTags { + font-size: 7.75pt; +} + +div.dailyEntryTitle { + font-size: 18pt; + font-weight: bold; +} + +div.dailyEntryLinkdate { + font-size: 8pt; +} + +div.dailyEntryThumbnail { + width: 100%; + text-align: center; + background-color: rgb(128, 128, 128); + background: url(../images/50pc_transparent.png); + padding: 4px 0px 2px 0px; +} + +div.dailyEntryDescription { + margin-top: 10px; + margin-bottom: 30px; + text-align: justify; + overflow: auto; +} + +div.dailyNoEntry { + text-align: center; + padding: 40px 0px 90px 0px; +} + +.daily #closing { + clear: both; + text-align: center; + padding-bottom: 20px; +} + +/* Common CSS screwdriver */ +.clear { + clear: both; +} + +.right { + text-align: right; +} + +.white { + color: white; +} + +/* For lazy images loading in picture wall. + Using http://www.appelsiini.net/projects/lazyload +*/ +.lazyimage { + display: none; +} + +#configuration_table td { + border: none; + padding: 10px; + vertical-align: top; +} + +@media print { + html { + border: none; + background: #fff !important; + color: #000 !important; + } + + body { + font-size: 12pt; + width: auto !important; + margin: auto !important; + } + + /* Minimum numer of lines to display when splitting a paragraph + over two pages */ + p { + orphans: 3; + widows: 3; + } + + a { + color: #000 !important; + text-decoration: none !important; + } + + #pageheader, .paging, #linklist li form, #footer { + display: none; + } + + #linklist li { + padding: 2 0 10 0; + border-top: 2px solid #000; + clear: both; + } + + #linklist li.private { + background-color: none; + border-left: 0; + } + + .linkdate { + line-height: 2; + } + + .linkurl { + color: #000; + } + + .linkdescription { + font-size: 10pt; + } + + .linktag { + border: 1px solid black; + font-style: italic; + font-size: 8pt; + } +} + +@media handheld, only screen and (max-width: 480px), only screen and (max-device-width: 854px) { + /* A few fixes for mobile devices (far from perfect). */ + + .tagfilter div.awesomplete { + width: 70%; + } + + .nomobile { + display: none; + } + + #logo { + display: none; + } + + #pageheader #menu ul { + text-align: center; + } + + #pageheader #menu a { + padding: 5px; + border-radius: 3px 3px 3px 3px; + margin: 3px; + } + + #headerform label { + width: 100%; + display: block; + height: auto; + line-height: 25px; + padding-bottom: 10px; + } + + #headerform label input[type=text], + #headerform label input[type=password]{ + float: right; + width: 70%; + } + + .searchform, .tagfilter { + display: block !important; + margin: 0px 3px 7px 0px !important; + padding: 0px !important; + width: 97% !important; + } + + .searchform input, .tagfilter input { + margin: 0px !important; + padding: 0px !important; + display: inline !important; + } + + .tagfilter input.bigbutton, .searchform input.bigbutton, .addform input.bigbutton, a.bigbutton { + width: 30%; + font-size: smaller; + } + + #searchform_value { + width: 70% !important; + } + + #tagfilter_value { + width: 70% !important; + } + + div.qrcode { + position: relative; + float: left; + top: -10px; + left: 0px; + } + + .paging_privatelinks { + float: none; + } + + .paging_linksperpage { + float: none; + margin-bottom: 10px; + font-size: smaller; + } + + #paging_older, #paging_newer, .paging_linksperpage a { + border: 1px solid black; + padding: 3px 5px 3px 5px; + background-color: #666; + color: #fff; + border-radius: 3px 3px 3px 3px; + } + + .thumbnail { + float: none; + height: auto; + margin: 0px; + text-align: center; + } + + #cloudtag { + padding: 0px; + } + + div.dailyAbout { + float: none; + position: relative; + width: 100%; + clear: both; + padding: 0px; + top: 0px; + left: 0px; + } + + #daily_col1, #daily_col2, #daily_col3 { + float: none; + width: 100%; + padding: 0px; + } + + div.dailyTitle { + font-size: 18pt; + margin-top: 5px; + padding: 0px; + } + + div.dailyDate { + font-size: 11pt; + padding: 0px; + display: block; + } + + div.dailyEntryTitle { + font-size: 16pt; + font-weight: bold; + } + + div.dailyEntryDescription { + font-size: 10pt; + } +} + +#toolsdiv a.button-description { + clear: none; +} + +/* Highlight search results */ +.highlight { + background-color: #FFFF33; +} + +.center { + text-align: center; +} + +ul.errors { + color: red; + float: left; +} + +#pluginsadmin { + width: 80%; + padding: 20px 0 0 20px; +} + +#pluginsadmin section { + padding: 20px 0; +} + +#pluginsadmin .plugin_parameters { + margin: 10px 0; +} + +#pluginsadmin h1 { + font-style: normal; +} + +#pluginsadmin h2 { + font-size: 1.4em; + font-weight: bold; +} + +#pluginsadmin table { + width: 100%; +} + +#pluginsadmin table, #pluginsadmin th, #pluginsadmin td { + border-width: 1px 0; + border-style: solid; + border-color: #c0c0c0; +} + +#pluginsadmin table th { + font-weight: bold; + padding: 10px 0; +} + +#pluginsadmin table td { + padding: 5px 0; +} + +#pluginsadmin input[type=submit] { + margin: 10px 0; +} + +#pluginsadmin label { + cursor: pointer; +} + +#pluginsadmin .plugin_parameter { + padding: 10px 0; + border-width: 1px 0; + border-style: solid; + border-color: #c0c0c0; +} + +#pluginsadmin .float_label { + float: left; + width: 40%; +} + +#pluginsadmin a { + color: #486D08; +} + +#pluginsadmin a.arrow { + color: black; +} + +/* 404 page */ +.error-container { + + margin: 50px; + margin-top: 20px; +} + +.error-container h1 { + text-decoration: none; + font-style: normal; + color: #80AD48; +} + +.linklist-plugin-icon { + width: 13px; + height: 13px; +} diff --git a/tpl/vintage/daily.html b/tpl/vintage/daily.html new file mode 100644 index 00000000..e86e90b1 --- /dev/null +++ b/tpl/vintage/daily.html @@ -0,0 +1,101 @@ + + +{include="includes"} + + +
+
+ {loop="$plugin_start_zone"} + {$value} + {/loop} +
+ +
+ All links of one day
in a single page.
+ {if="$previousday"} <Previous day{else}<Previous day{/if} + - + {if="$nextday"}Next day>{else}Next day>{/if} +
+ + {loop="$daily_about_plugin"} + {$value} + {/loop} + +
+ rss_feedDaily RSS Feed +
+ +
+ floral_left + The Daily Shaarli + floral_right +
+ +
+ ——————————— + {function="strftime('%A %d, %B %Y', $day)"} + ——————————— +
+ +
+ + {if="$linksToDisplay"} + {loop="$cols"} + {if="isset($value[0])"} +
+ {loop="$value"} + {$link=$value} +
+
+ + permalink + +
+ {if="!$hide_timestamps || isLoggedIn()"} +
+ {function="strftime('%c', $link.timestamp)"} +
+ {/if} + {if="$link.tags"} +
+ {loop="$link.taglist"} + {$value} - + {/loop} +
+ {/if} +
+ {$link.title} +
+ {if="$link.thumbnail"} +
{$link.thumbnail}
+ {/if} +
{$link.formatedDescription}
+ +
+ {loop="$link.link_plugin"} + {$value} + {/loop} +
+
+ {/loop} +
+ {/if} + {/loop} + {else} +
No articles on this day.
+ {/if} + +
+ +
+ {loop="$plugin_end_zone"} + {$value} + {/loop} +
+
-
+
+{include="page.footer"} + + diff --git a/tpl/vintage/dailyrss.html b/tpl/vintage/dailyrss.html new file mode 100644 index 00000000..ddbd6c5e --- /dev/null +++ b/tpl/vintage/dailyrss.html @@ -0,0 +1,16 @@ + + {$title} - {function="strftime('%A %e %B %Y', $daydate)"} + {$absurl} + {$absurl} + {$rssdate} + {$value.title} + {if="!$hide_timestamps"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags}{/if}
+ {$value.url}
+ {if="$value.thumbnail"}{$value.thumbnail}{/if}
+ {if="$value.description"}{$value.formatedDescription}{/if} +

+ {/loop} + ]]> + diff --git a/tpl/vintage/editlink.html b/tpl/vintage/editlink.html new file mode 100644 index 00000000..f855dfb1 --- /dev/null +++ b/tpl/vintage/editlink.html @@ -0,0 +1,63 @@ + + +{include="includes"} + + + + +{if="$source !== 'firefoxsocialapi'"} +{include="page.footer"} +{/if} + + + + + diff --git a/tpl/vintage/export.bookmarks.html b/tpl/vintage/export.bookmarks.html new file mode 100644 index 00000000..127a5c20 --- /dev/null +++ b/tpl/vintage/export.bookmarks.html @@ -0,0 +1,10 @@ + + +{ignore}The RainTPL loop is formatted to avoid generating extra newlines{/ignore} +{$pagetitle} +

Shaarli export of {$selection} bookmarks on {$date}

+

{loop="$links"} +

{$value.title}{if="$value.description"}{$eol}
{$value.description}{/if}{/loop} +

diff --git a/tpl/vintage/export.html b/tpl/vintage/export.html new file mode 100644 index 00000000..67c3d05f --- /dev/null +++ b/tpl/vintage/export.html @@ -0,0 +1,28 @@ + + +{include="includes"} + +

+ {include="page.footer"} + + diff --git a/tpl/vintage/feed.atom.html b/tpl/vintage/feed.atom.html new file mode 100644 index 00000000..49798e85 --- /dev/null +++ b/tpl/vintage/feed.atom.html @@ -0,0 +1,42 @@ + + + {$pagetitle} + Shaared links + {if="$show_dates"} + {$last_update} + {/if} + + + {loop="$feed_plugins_header"} + {$value} + {/loop} + + {$index_url} + {$index_url} + + {$index_url} + Shaarli + {loop="$links"} + + {$value.title} + {if="$usepermalinks"} + + {else} + + {/if} + {$value.guid} + {if="$show_dates"} + {$value.pub_iso_date} + {$value.up_iso_date} + {/if} + + {loop="$value.taglist"} + + {/loop} + {loop="$value.feed_plugins"} + {$value} + {/loop} + + {/loop} + diff --git a/tpl/vintage/feed.rss.html b/tpl/vintage/feed.rss.html new file mode 100644 index 00000000..ee3fef88 --- /dev/null +++ b/tpl/vintage/feed.rss.html @@ -0,0 +1,39 @@ + + + + {$pagetitle} + {$index_url} + Shaared links + {$language} + {$index_url} + Shaarli + + + diff --git a/tpl/vintage/images/50pc_transparent.png b/tpl/vintage/images/50pc_transparent.png new file mode 100644 index 00000000..8d8f99de Binary files /dev/null and b/tpl/vintage/images/50pc_transparent.png differ diff --git a/tpl/vintage/images/Paper_texture_v5_by_bashcorpo_w1000.jpg b/tpl/vintage/images/Paper_texture_v5_by_bashcorpo_w1000.jpg new file mode 100644 index 00000000..dd8e67ac Binary files /dev/null and b/tpl/vintage/images/Paper_texture_v5_by_bashcorpo_w1000.jpg differ diff --git a/tpl/vintage/images/calendar.png b/tpl/vintage/images/calendar.png new file mode 100644 index 00000000..81c74519 Binary files /dev/null and b/tpl/vintage/images/calendar.png differ diff --git a/tpl/vintage/images/floral_left.png b/tpl/vintage/images/floral_left.png new file mode 100644 index 00000000..f09a861d Binary files /dev/null and b/tpl/vintage/images/floral_left.png differ diff --git a/tpl/vintage/images/floral_right.png b/tpl/vintage/images/floral_right.png new file mode 100644 index 00000000..0dfb6112 Binary files /dev/null and b/tpl/vintage/images/floral_right.png differ diff --git a/tpl/vintage/images/private.png b/tpl/vintage/images/private.png new file mode 100644 index 00000000..8919d658 Binary files /dev/null and b/tpl/vintage/images/private.png differ diff --git a/tpl/vintage/images/squiggle.png b/tpl/vintage/images/squiggle.png new file mode 100644 index 00000000..c795f0a3 Binary files /dev/null and b/tpl/vintage/images/squiggle.png differ diff --git a/tpl/vintage/images/squiggle_closing.png b/tpl/vintage/images/squiggle_closing.png new file mode 100644 index 00000000..3f9d02b1 Binary files /dev/null and b/tpl/vintage/images/squiggle_closing.png differ diff --git a/tpl/vintage/images/tag_blue.png b/tpl/vintage/images/tag_blue.png new file mode 100644 index 00000000..7ec902fc Binary files /dev/null and b/tpl/vintage/images/tag_blue.png differ diff --git a/tpl/vintage/import.html b/tpl/vintage/import.html new file mode 100644 index 00000000..071e1160 --- /dev/null +++ b/tpl/vintage/import.html @@ -0,0 +1,33 @@ + + +{include="includes"} + + +{include="page.footer"} + + diff --git a/tpl/vintage/includes.html b/tpl/vintage/includes.html new file mode 100644 index 00000000..17b78b17 --- /dev/null +++ b/tpl/vintage/includes.html @@ -0,0 +1,15 @@ +{$pagetitle} + + + + + + + + + +{if="is_file('data/user.css')"}{/if} +{loop="$plugins_includes.css_files"} + +{/loop} + diff --git a/tpl/vintage/install.html b/tpl/vintage/install.html new file mode 100644 index 00000000..42874dcd --- /dev/null +++ b/tpl/vintage/install.html @@ -0,0 +1,35 @@ + + +{include="includes"}{$timezone_js} + +
+

Shaarli

+ It looks like it's the first time you run Shaarli. Please configure it:
+
+ + + + {$timezone_html} + + + + + + + + +
Login:
Password:
Page title:
Update: +
+ API: + + + +
+
+
+{include="page.footer"} + + diff --git a/tpl/vintage/linklist.html b/tpl/vintage/linklist.html new file mode 100644 index 00000000..5accc92f --- /dev/null +++ b/tpl/vintage/linklist.html @@ -0,0 +1,151 @@ + + + + + {include="includes"} + + + + + + + {include="page.footer"} + + + + + + diff --git a/tpl/vintage/linklist.paging.html b/tpl/vintage/linklist.paging.html new file mode 100644 index 00000000..86019c01 --- /dev/null +++ b/tpl/vintage/linklist.paging.html @@ -0,0 +1,32 @@ +
+{if="isLoggedIn()"} +
+ + {if="$privateonly"} + Click to see all links + {else} + Click to see only private links + {/if} + + + +
+{/if} + {loop="$action_plugin"} +
+ + {$value.html} + +
+ {/loop} +
+ Links per page: 20 50 100 +
+
+ {if="$previous_page_url"} ◄Older {/if} +
page {$page_current} / {$page_max}
+ {if="$next_page_url"} Newer► {/if} +
diff --git a/tpl/vintage/loginform.html b/tpl/vintage/loginform.html new file mode 100644 index 00000000..84176385 --- /dev/null +++ b/tpl/vintage/loginform.html @@ -0,0 +1,38 @@ + + +{include="includes"} + + + +{include="page.footer"} + + diff --git a/tpl/vintage/opensearch.html b/tpl/vintage/opensearch.html new file mode 100644 index 00000000..3fcc30b7 --- /dev/null +++ b/tpl/vintage/opensearch.html @@ -0,0 +1,45 @@ + + + Shaarli search - {$pagetitle} + Shaarli search - {$pagetitle} + + + + UTF-8 + Shaarli Community - https://github.com/shaarli/Shaarli/ + data:image/x-icon;base64,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 + + diff --git a/tpl/vintage/page.footer.html b/tpl/vintage/page.footer.html new file mode 100644 index 00000000..006d1d68 --- /dev/null +++ b/tpl/vintage/page.footer.html @@ -0,0 +1,31 @@ + + +{loop="$plugins_footer.endofpage"} + {$value} +{/loop} + +{if="$newVersion"} +
+ ● Shaarli {$newVersion} is + available. +
+{/if} +{if="$versionError"} +
+ Error: {$versionError} +
+{/if} +{if="isLoggedIn()"} + +{/if} + +{loop="$plugins_footer.js_files"} + +{/loop} diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html new file mode 100644 index 00000000..cce61ec4 --- /dev/null +++ b/tpl/vintage/page.header.html @@ -0,0 +1,59 @@ + + + +
+ {if="!empty($linkcount)"}{$linkcount} links{/if}
+ {if="!empty($privateLinkcount)"}{$privateLinkcount} private links{/if} +
+ + + +{if="!empty($plugin_errors) && isLoggedIn()"} + +{/if} + +
+ + diff --git a/tpl/vintage/page.html b/tpl/vintage/page.html new file mode 100644 index 00000000..834915ec --- /dev/null +++ b/tpl/vintage/page.html @@ -0,0 +1,9 @@ + + +{include="includes"} + + + You body goes here... + {include="page.footer"} + + \ No newline at end of file diff --git a/tpl/vintage/picwall.html b/tpl/vintage/picwall.html new file mode 100644 index 00000000..4e227e37 --- /dev/null +++ b/tpl/vintage/picwall.html @@ -0,0 +1,44 @@ + + +{include="includes"} + + + + + +
+ {loop="$plugin_start_zone"} + {$value} + {/loop} +
+ +
+
+ {loop="$linksToDisplay"} +
+ {$value.thumbnail}{$value.title} + {loop="$value.picwall_plugin"} + {$value} + {/loop} +
+ {/loop} +
+
+ +
+ +
+ {loop="$plugin_end_zone"} + {$value} + {/loop} +
+ +{include="page.footer"} + + + + diff --git a/tpl/vintage/pluginsadmin.html b/tpl/vintage/pluginsadmin.html new file mode 100644 index 00000000..ead1734e --- /dev/null +++ b/tpl/vintage/pluginsadmin.html @@ -0,0 +1,134 @@ + + +{include="includes"} + + + + + +
+
+
+

Enabled Plugins

+ +
+ {if="count($enabledPlugins)==0"} +

No plugin enabled.

+ {else} + + + + + + + + + + + {loop="$enabledPlugins"} + + + + + + + {/loop} + +
DisableOrderNameDescription
+ + ▲ + + + ▼ + + +
+ {/if} +
+
+ +
+

Disabled Plugins

+ +
+ {if="count($disabledPlugins)==0"} +

No plugin disabled.

+ {else} + + + + + + + {loop="$disabledPlugins"} + + + + + + {/loop} +
EnableNameDescription
+ {/if} +
+ +
+ +
+
+
+ +
+
+

Enabled Plugin Parameters

+ +
+ {if="count($enabledPlugins)==0"} +

No plugin enabled.

+ {else} + {loop="$enabledPlugins"} + {if="count($value.parameters) > 0"} +
+

{function="str_replace('_', ' ', $key)"}

+ {loop="$value.parameters"} +
+
+ +
+
+ +
+
+ {/loop} +
+ {/if} + {/loop} + {/if} +
+ +
+
+
+
+ +
+{include="page.footer"} + + + + diff --git a/tpl/vintage/readme.txt b/tpl/vintage/readme.txt new file mode 100644 index 00000000..b18deaed --- /dev/null +++ b/tpl/vintage/readme.txt @@ -0,0 +1,42 @@ +===== Shaarli template organisation ===== + +Any Shaarli page should conform to this RainTPL template: + +----------------------------------------------------- + +{include="includes"} + + + You body goes here... + {include="page.footer"} + + +----------------------------------------------------- + +If you want to also add something in the page header (in the dark area), do it here: + + + + +Example: "Add new link" form: +----------------------------------------------------- + +{include="includes"} + + +{include="page.footer"} + + +----------------------------------------------------- + + + + diff --git a/tpl/vintage/tagcloud.html b/tpl/vintage/tagcloud.html new file mode 100644 index 00000000..05e45273 --- /dev/null +++ b/tpl/vintage/tagcloud.html @@ -0,0 +1,31 @@ + + +{include="includes"} + + +
+
+ {loop="$plugin_start_zone"} + {$value} + {/loop} +
+ +
+ {loop="$tags"} + {$value.count}{$key} + {loop="$value.tag_plugin"} + {$value} + {/loop} + {/loop} +
+ +
+ {loop="$plugin_end_zone"} + {$value} + {/loop} +
+
+{include="page.footer"} + + diff --git a/tpl/vintage/tools.html b/tpl/vintage/tools.html new file mode 100644 index 00000000..c36aa5b5 --- /dev/null +++ b/tpl/vintage/tools.html @@ -0,0 +1,98 @@ + + +{include="includes"} + + +{include="page.footer"} + + -- cgit v1.2.3 From 402b03464812aaec76bc841ca7dacb775baf1e03 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 14 Jan 2017 15:52:17 +0100 Subject: Introduce the new default Shaarli template --- tpl/default/404.html | 16 + tpl/default/addlink.html | 24 + tpl/default/changepassword.html | 28 + tpl/default/changetag.html | 38 + tpl/default/configure.html | 210 +++ tpl/default/css/font-awesome.css | 2086 +++++++++++++++++++++++++++ tpl/default/css/font-awesome.min.css | 4 + tpl/default/css/grids-responsive.css | 861 +++++++++++ tpl/default/css/grids-responsive.min.css | 7 + tpl/default/css/pure-extras.css | 262 ++++ tpl/default/css/pure.css | 1475 +++++++++++++++++++ tpl/default/css/pure.min.css | 11 + tpl/default/css/shaarli.css | 1180 +++++++++++++++ tpl/default/daily.html | 113 ++ tpl/default/dailyrss.html | 16 + tpl/default/editlink.html | 98 ++ tpl/default/export.bookmarks.html | 10 + tpl/default/export.html | 68 + tpl/default/feed.atom.html | 40 + tpl/default/feed.rss.html | 37 + tpl/default/fonts/Fira-Sans-regular.woff | Bin 0 -> 14119 bytes tpl/default/fonts/Fira-Sans-regular.woff2 | Bin 0 -> 11464 bytes tpl/default/fonts/FontAwesome.otf | Bin 0 -> 109687 bytes tpl/default/fonts/fontawesome-webfont.eot | Bin 0 -> 70806 bytes tpl/default/fonts/fontawesome-webfont.svg | 655 +++++++++ tpl/default/fonts/fontawesome-webfont.ttf | Bin 0 -> 142049 bytes tpl/default/fonts/fontawesome-webfont.woff | Bin 0 -> 83588 bytes tpl/default/fonts/fontawesome-webfont.woff2 | Bin 0 -> 66623 bytes tpl/default/img/favicon.png | Bin 0 -> 41600 bytes tpl/default/img/icon.png | Bin 0 -> 530 bytes tpl/default/img/sad_star.png | Bin 0 -> 7099 bytes tpl/default/import.html | 85 ++ tpl/default/includes.html | 20 + tpl/default/install.html | 122 ++ tpl/default/js/shaarli.js | 228 +++ tpl/default/linklist.html | 246 ++++ tpl/default/linklist.paging.html | 55 + tpl/default/loginform.html | 59 + tpl/default/opensearch.html | 45 + tpl/default/page.footer.html | 25 + tpl/default/page.header.html | 174 +++ tpl/default/picwall.html | 50 + tpl/default/pluginsadmin.html | 182 +++ tpl/default/tagcloud.html | 42 + tpl/default/tools.html | 179 +++ 45 files changed, 8751 insertions(+) create mode 100644 tpl/default/404.html create mode 100644 tpl/default/addlink.html create mode 100644 tpl/default/changepassword.html create mode 100644 tpl/default/changetag.html create mode 100644 tpl/default/configure.html create mode 100644 tpl/default/css/font-awesome.css create mode 100644 tpl/default/css/font-awesome.min.css create mode 100644 tpl/default/css/grids-responsive.css create mode 100644 tpl/default/css/grids-responsive.min.css create mode 100644 tpl/default/css/pure-extras.css create mode 100644 tpl/default/css/pure.css create mode 100644 tpl/default/css/pure.min.css create mode 100644 tpl/default/css/shaarli.css create mode 100644 tpl/default/daily.html create mode 100644 tpl/default/dailyrss.html create mode 100644 tpl/default/editlink.html create mode 100644 tpl/default/export.bookmarks.html create mode 100644 tpl/default/export.html create mode 100644 tpl/default/feed.atom.html create mode 100644 tpl/default/feed.rss.html create mode 100644 tpl/default/fonts/Fira-Sans-regular.woff create mode 100644 tpl/default/fonts/Fira-Sans-regular.woff2 create mode 100644 tpl/default/fonts/FontAwesome.otf create mode 100644 tpl/default/fonts/fontawesome-webfont.eot create mode 100644 tpl/default/fonts/fontawesome-webfont.svg create mode 100644 tpl/default/fonts/fontawesome-webfont.ttf create mode 100644 tpl/default/fonts/fontawesome-webfont.woff create mode 100644 tpl/default/fonts/fontawesome-webfont.woff2 create mode 100644 tpl/default/img/favicon.png create mode 100644 tpl/default/img/icon.png create mode 100644 tpl/default/img/sad_star.png create mode 100644 tpl/default/import.html create mode 100644 tpl/default/includes.html create mode 100644 tpl/default/install.html create mode 100644 tpl/default/js/shaarli.js create mode 100644 tpl/default/linklist.html create mode 100644 tpl/default/linklist.paging.html create mode 100644 tpl/default/loginform.html create mode 100644 tpl/default/opensearch.html create mode 100644 tpl/default/page.footer.html create mode 100644 tpl/default/page.header.html create mode 100644 tpl/default/picwall.html create mode 100644 tpl/default/pluginsadmin.html create mode 100644 tpl/default/tagcloud.html create mode 100644 tpl/default/tools.html diff --git a/tpl/default/404.html b/tpl/default/404.html new file mode 100644 index 00000000..2de6b6da --- /dev/null +++ b/tpl/default/404.html @@ -0,0 +1,16 @@ + + + + {include="includes"} + + + + +
+
+ +
+
+{loop="$plugins_footer.endofpage"} + {$value} +{/loop} + +{loop="$plugins_footer.js_files"} + +{/loop} + + + + diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html new file mode 100644 index 00000000..c304e5d9 --- /dev/null +++ b/tpl/default/page.header.html @@ -0,0 +1,174 @@ +
+
+
+ + + {$shaarlititle} + + +
+
+
+
+ +
+ +
+
+
+
+ +
+ + {if="!isLoggedIn()"} +
+
+ + +
+ + +
+ + + +
+
+ {/if} +{if="!empty($newVersion) || !empty($versionError)"} +
+
+ {if="$newVersion"} +
+ Shaarli {$newVersion} + {'is available'|t}. +
+ {/if} + {if="$versionError"} +
+ {'Error'|t}: {$versionError} +
+ {/if} +
+ +
+
+{/if} + +{if="!empty($plugin_errors) && isLoggedIn()"} +
+
+
+ {loop="plugin_errors"} +

{$value}

+ {/loop} +
+
+ +
+
+{/if} + +
diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html new file mode 100644 index 00000000..b9ae2f2e --- /dev/null +++ b/tpl/default/picwall.html @@ -0,0 +1,50 @@ + + + + {include="includes"} + + +{include="page.header"} + +
+
+
+ {$countPics=count($linksToDisplay)} +

{'Picture Wall'|t} - {$countPics} {'pics'|t}

+ +
+ {loop="$plugin_start_zone"} + {$value} + {/loop} +
+ +
+ {loop="$linksToDisplay"} +
+ {$value.thumbnail}{$value.title} + {loop="$value.picwall_plugin"} + {$value} + {/loop} +
+ {/loop} +
+
+ +
+ {loop="$plugin_end_zone"} + {$value} + {/loop} +
+
+
+ +{include="page.footer"} + + + + + diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html new file mode 100644 index 00000000..92af2eef --- /dev/null +++ b/tpl/default/pluginsadmin.html @@ -0,0 +1,182 @@ + + + + {include="includes"} + + +{include="page.header"} + + + +
+
+
+
+

{'Plugin administration'|t}

+ +
+

{'Enabled Plugins'|t}

+ +
+ {if="count($enabledPlugins)==0"} +

{'No plugin enabled.'|t}

+ {else} + + + + + + + + + + + {loop="$enabledPlugins"} + + + + + + + + + + {/loop} + + + + + + + + + +
{'Disable'|t}{'Name'|t}
{'Description'|t}
{'Order'|t}
+ +
+ {if="count($enabledPlugins)>1"} + + ▲ + + + ▼ + + {/if} + +
{'Disable'|t}{'Name'|t}
{'Description'|t}
{'Order'|t}
+ {/if} +
+
+ +
+

{'Disabled Plugins'|t}

+ +
+ {if="count($disabledPlugins)==0"} +

{'No plugin disabled.'|t}

+ {else} + + + + + + + + + + {loop="$disabledPlugins"} + + + + + + + + + {/loop} + + + + + + + + +
{'Enable'|t}{'Name'|t}
{'Description'|t}
+ +
+ +
{'Enable'|t}{'Name'|t}
{'Description'|t}
+ {/if} +
+
+ +
+ More plugins available + in the documentation. +
+
+ +
+
+
+ +
+ +
+
+
+
+

{'Plugin configuration'|t}

+
+
+ {if="count($enabledPlugins)==0"} +

{'No plugin enabled.'|t}

+ {else} + {loop="$enabledPlugins"} + {if="count($value.parameters) > 0"} +
+

{function="str_replace('_', ' ', $key)"}

+ {loop="$value.parameters"} +
+

+ +

+
+ +
+
+ {/loop} +
+ {/if} + {/loop} + {/if} +
+ +
+
+
+
+
+
+ +{include="page.footer"} + + + + diff --git a/tpl/default/tagcloud.html b/tpl/default/tagcloud.html new file mode 100644 index 00000000..53c31748 --- /dev/null +++ b/tpl/default/tagcloud.html @@ -0,0 +1,42 @@ + + + + {include="includes"} + + +{include="page.header"} + +
+
+
+ {$countTags=count($tags)} +

{'Tag cloud'|t} - {$countTags} {'tags'|t}

+ +
+ {loop="$plugin_start_zone"} + {$value} + {/loop} +
+ +
+ {loop="tags"} + {$key}{$value.count} + {loop="$value.tag_plugin"} + {$value} + {/loop} + {/loop} +
+ +
+ {loop="$plugin_end_zone"} + {$value} + {/loop} +
+
+
+ +{include="page.footer"} + + + diff --git a/tpl/default/tools.html b/tpl/default/tools.html new file mode 100644 index 00000000..b9df32d9 --- /dev/null +++ b/tpl/default/tools.html @@ -0,0 +1,179 @@ + + + + {include="includes"} + + +{include="page.header"} + +
+
+
+

{'Settings'|t}

+
+ + {'Configure your Shaarli'|t} + +
+
+ + {'Plugin administration'|t} + +
+ {if="!$openshaarli"} +
+ + {'Change password'|t} + +
+ {/if} +
+ + {'Manage tags'|t} + +
+
+ + {'Import links'|t} + +
+
+ + {'Export database'|t} + +
+ + {loop="$tools_plugin"} +
+ {$value} +
+ {/loop} +
+ + +
+
+ +
+
+
+

Bookmarklets

+

+ {'Drag one of these button to your bookmarks toolbar or right-click it and "Bookmark This Link"'|t}, + {'then click on the bookmarklet in any page you want to share.'|t} +

+
+ + ✚ {'Shaare link'|t} + +
+
+ + ✚ {'Add Note'|t} + +
+
+
+ +{if="$sslenabled"} +
+
+
+

Firefox Social API

+

{'You need to browse your Shaarli over HTTPS to use this functionality.'|t}

+ +
+ + ✚ {'Add to'|t} Firefox Social + +
+
+
+{/if} + +
+
+
+

{'3rd party'|t}

+
+ + Firefox {'plugin'|t} + +
+
+ + Chrome {'plugin'|t} + +
+
+ + Android + +
+
+ + iOS + +
+
+
+ +{include="page.footer"} + + + + + -- cgit v1.2.3 From 147f4df8436fcd3d157c48c181d7b0c6a1fd474b Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 14 Jan 2017 15:53:39 +0100 Subject: Improve plugin_admin.js to support multiple ordered rows --- inc/plugin_admin.js | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/inc/plugin_admin.js b/inc/plugin_admin.js index 134ffb33..055ac285 100644 --- a/inc/plugin_admin.js +++ b/inc/plugin_admin.js @@ -22,14 +22,22 @@ function changePos(elem, toPos) function changeOrder(pos, move) { var newpos = parseInt(pos) + move; - var line = document.querySelector('[data-order="'+ pos +'"]'); - var changeline = document.querySelector('[data-order="'+ newpos +'"]'); - var parent = changeline.parentNode; + var lines = document.querySelectorAll('[data-order="'+ pos +'"]'); + var changelines = document.querySelectorAll('[data-order="'+ newpos +'"]'); + + // If we go down reverse lines to preserve the rows order + if (move > 0) { + lines = [].slice.call(lines).reverse(); + } + + for (var i = 0 ; i < lines.length ; i++) { + var parent = changelines[0].parentNode; + changePos(lines[i], newpos); + changePos(changelines[i], parseInt(pos)); + var changeItem = move < 0 ? changelines[0] : changelines[changelines.length - 1].nextSibling; + parent.insertBefore(lines[i], changeItem); + } - changePos(line, newpos); - changePos(changeline, parseInt(pos)); - var changeItem = move < 0 ? changeline : changeline.nextSibling; - parent.insertBefore(line, changeItem); } /** -- cgit v1.2.3 From 246d72e14344c417e37599b9ed4ce2c324e244f4 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 14 Jan 2017 15:57:34 +0100 Subject: Fix markdown plugin color overriding --- plugins/markdown/markdown.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/markdown/markdown.css b/plugins/markdown/markdown.css index 6789ce84..ce19cd2a 100644 --- a/plugins/markdown/markdown.css +++ b/plugins/markdown/markdown.css @@ -150,7 +150,7 @@ box-shadow: 0 -1px 0 #e5e5e5,0 0 1px rgba(0,0,0,0.12),0 1px 1px rgba(0,0,0,0.24); } -.md_help { +#pageheader .md_help { color: white; } -- cgit v1.2.3 From 430ff0710265ff281727ef6824cf292d1dfc50f1 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 14 Jan 2017 16:13:32 +0100 Subject: Upgrade awesomplete + fix multiple autocompletion fields --- inc/awesomplete-multiple-tags.js | 21 +++-- inc/awesomplete.js | 184 ++++++++++++++++++++++++++------------- inc/awesomplete.min.js | 11 +-- 3 files changed, 137 insertions(+), 79 deletions(-) diff --git a/inc/awesomplete-multiple-tags.js b/inc/awesomplete-multiple-tags.js index 4cc8429f..faecb417 100644 --- a/inc/awesomplete-multiple-tags.js +++ b/inc/awesomplete-multiple-tags.js @@ -1,13 +1,16 @@ var awp = Awesomplete.$; -awesomplete = new Awesomplete(awp('input[data-multiple]'), { - filter: function(text, input) { - return Awesomplete.FILTER_CONTAINS(text, input.match(/[^ ]*$/)[0]); - }, - replace: function(text) { - var before = this.input.value.match(/^.+ \s*|/)[0]; - this.input.value = before + text + " "; - }, - minChars: 1 +var autocompleteFields = document.querySelectorAll('input[data-multiple]'); +[].forEach.call(autocompleteFields, function(autocompleteField) { + awesomplete = new Awesomplete(awp(autocompleteField), { + filter: function (text, input) { + return Awesomplete.FILTER_CONTAINS(text, input.match(/[^ ]*$/)[0]); + }, + replace: function (text) { + var before = this.input.value.match(/^.+ \s*|/)[0]; + this.input.value = before + text + " "; + }, + minChars: 1 + }) }); /** diff --git a/inc/awesomplete.js b/inc/awesomplete.js index fae550e2..32f49e5b 100644 --- a/inc/awesomplete.js +++ b/inc/awesomplete.js @@ -12,26 +12,23 @@ // Setup + this.isOpened = false; + this.input = $(input); + this.input.setAttribute("autocomplete", "off"); this.input.setAttribute("aria-autocomplete", "list"); o = o || {}; - configure.call(this, { + configure(this, { minChars: 2, maxItems: 10, autoFirst: false, + data: _.DATA, filter: _.FILTER_CONTAINS, sort: _.SORT_BYLENGTH, - item: function (text, input) { - return $.create("li", { - innerHTML: text.replace(RegExp($.regExpEscape(input.trim()), "gi"), "$&"), - "aria-selected": "false" - }); - }, - replace: function (text) { - this.input.value = text; - } + item: _.ITEM, + replace: _.REPLACE }, o); this.index = -1; @@ -44,7 +41,7 @@ }); this.ul = $.create("ul", { - hidden: "", + hidden: "hidden", inside: this.container }); @@ -60,7 +57,7 @@ $.bind(this.input, { "input": this.evaluate.bind(this), - "blur": this.close.bind(this), + "blur": this.close.bind(this, { reason: "blur" }), "keydown": function(evt) { var c = evt.keyCode; @@ -72,7 +69,7 @@ me.select(); } else if (c === 27) { // Esc - me.close(); + me.close({ reason: "esc" }); } else if (c === 38 || c === 40) { // Down/Up arrow evt.preventDefault(); @@ -82,7 +79,7 @@ } }); - $.bind(this.input.form, {"submit": this.close.bind(this)}); + $.bind(this.input.form, {"submit": this.close.bind(this, { reason: "submit" })}); $.bind(this.ul, {"mousedown": function(evt) { var li = evt.target; @@ -93,15 +90,16 @@ li = li.parentNode; } - if (li) { - me.select(li); + if (li && evt.button === 0) { // Only select on left click + evt.preventDefault(); + me.select(li, evt.target); } } }}); if (this.input.hasAttribute("list")) { - this.list = "#" + input.getAttribute("list"); - input.removeAttribute("list"); + this.list = "#" + this.input.getAttribute("list"); + this.input.removeAttribute("list"); } else { this.list = this.input.getAttribute("data-list") || o.list || []; @@ -122,9 +120,18 @@ list = $(list); if (list && list.children) { - this._list = slice.apply(list.children).map(function (el) { - return el.innerHTML.trim(); + var items = []; + slice.apply(list.children).forEach(function (el) { + if (!el.disabled) { + var text = el.textContent.trim(); + var value = el.value || text; + var label = el.label || text; + if (value !== "") { + items.push({ label: label, value: value }); + } + } }); + this._list = items; } } @@ -138,18 +145,24 @@ }, get opened() { - return this.ul && this.ul.getAttribute("hidden") == null; + return this.isOpened; }, - close: function () { + close: function (o) { + if (!this.opened) { + return; + } + this.ul.setAttribute("hidden", ""); + this.isOpened = false; this.index = -1; - $.fire(this.input, "awesomplete-close"); + $.fire(this.input, "awesomplete-close", o || {}); }, open: function () { this.ul.removeAttribute("hidden"); + this.isOpened = true; if (this.autoFirst && this.index === -1) { this.goto(0); @@ -160,14 +173,14 @@ next: function () { var count = this.ul.children.length; - - this.goto(this.index < count - 1? this.index + 1 : -1); + this.goto(this.index < count - 1 ? this.index + 1 : (count ? 0 : -1) ); }, previous: function () { var count = this.ul.children.length; + var pos = this.index - 1; - this.goto(this.selected? this.index - 1 : count - 1); + this.goto(this.selected && pos !== -1 ? pos : count - 1); }, // Should not be used, highlights specific item without any checks! @@ -183,28 +196,37 @@ if (i > -1 && lis.length > 0) { lis[i].setAttribute("aria-selected", "true"); this.status.textContent = lis[i].textContent; - } - $.fire(this.input, "awesomplete-highlight"); + // scroll to highlighted element in case parent's height is fixed + this.ul.scrollTop = lis[i].offsetTop - this.ul.clientHeight + lis[i].clientHeight; + + $.fire(this.input, "awesomplete-highlight", { + text: this.suggestions[this.index] + }); + } }, - select: function (selected) { - selected = selected || this.ul.children[this.index]; + select: function (selected, origin) { + if (selected) { + this.index = $.siblingIndex(selected); + } else { + selected = this.ul.children[this.index]; + } if (selected) { - var prevented; + var suggestion = this.suggestions[this.index]; - $.fire(this.input, "awesomplete-select", { - text: selected.textContent, - preventDefault: function () { - prevented = true; - } + var allowed = $.fire(this.input, "awesomplete-select", { + text: suggestion, + origin: origin || selected }); - if (!prevented) { - this.replace(selected.textContent); - this.close(); - $.fire(this.input, "awesomplete-selectcomplete"); + if (allowed) { + this.replace(suggestion); + this.close({ reason: "select" }); + $.fire(this.input, "awesomplete-selectcomplete", { + text: suggestion + }); } } }, @@ -218,25 +240,28 @@ // Populate list with options that match this.ul.innerHTML = ""; - this._list + this.suggestions = this._list + .map(function(item) { + return new Suggestion(me.data(item, value)); + }) .filter(function(item) { return me.filter(item, value); }) .sort(this.sort) - .every(function(text, i) { - me.ul.appendChild(me.item(text, value)); + .slice(0, this.maxItems); - return i < me.maxItems - 1; - }); + this.suggestions.forEach(function(text) { + me.ul.appendChild(me.item(text, value)); + }); if (this.ul.children.length === 0) { - this.close(); + this.close({ reason: "nomatches" }); } else { this.open(); } } else { - this.close(); + this.close({ reason: "nomatches" }); } } }; @@ -261,27 +286,58 @@ return a < b? -1 : 1; }; + _.ITEM = function (text, input) { + var html = input.trim() === '' ? text : text.replace(RegExp($.regExpEscape(input.trim()), "gi"), "$&"); + return $.create("li", { + innerHTML: html, + "aria-selected": "false" + }); + }; + + _.REPLACE = function (text) { + this.input.value = text.value; + }; + + _.DATA = function (item/*, input*/) { return item; }; + // Private functions - function configure(properties, o) { + function Suggestion(data) { + var o = Array.isArray(data) + ? { label: data[0], value: data[1] } + : typeof data === "object" && "label" in data && "value" in data ? data : { label: data, value: data }; + + this.label = o.label || o.value; + this.value = o.value; + } + Object.defineProperty(Suggestion.prototype = Object.create(String.prototype), "length", { + get: function() { return this.label.length; } + }); + Suggestion.prototype.toString = Suggestion.prototype.valueOf = function () { + return "" + this.label; + }; + + function configure(instance, properties, o) { for (var i in properties) { var initial = properties[i], - attrValue = this.input.getAttribute("data-" + i.toLowerCase()); + attrValue = instance.input.getAttribute("data-" + i.toLowerCase()); if (typeof initial === "number") { - this[i] = +attrValue; + instance[i] = parseInt(attrValue); } else if (initial === false) { // Boolean options must be false by default anyway - this[i] = attrValue !== null; + instance[i] = attrValue !== null; } else if (initial instanceof Function) { - this[i] = null; + instance[i] = null; } else { - this[i] = attrValue; + instance[i] = attrValue; } - this[i] = this[i] || o[i] || initial; + if (!instance[i] && instance[i] !== 0) { + instance[i] = (i in o)? o[i] : initial; + } } } @@ -343,23 +399,29 @@ evt[j] = properties[j]; } - target.dispatchEvent(evt); + return target.dispatchEvent(evt); }; $.regExpEscape = function (s) { return s.replace(/[-\\^$*+?.()|[\]{}]/g, "\\$&"); - } + }; + + $.siblingIndex = function (el) { + /* eslint-disable no-cond-assign */ + for (var i = 0; el = el.previousElementSibling; i++); + return i; + }; // Initialization function init() { $$("input.awesomplete").forEach(function (input) { - new Awesomplete(input); + new _(input); }); } // Are we in a browser? Check for Document constructor - if (typeof Document !== 'undefined') { + if (typeof Document !== "undefined") { // DOM already loaded? if (document.readyState !== "loading") { init(); @@ -374,15 +436,15 @@ _.$$ = $$; // Make sure to export Awesomplete on self when in a browser - if (typeof self !== 'undefined') { + if (typeof self !== "undefined") { self.Awesomplete = _; } // Expose Awesomplete as a CJS module - if (typeof exports === 'object') { + if (typeof module === "object" && module.exports) { module.exports = _; } return _; -}()); +}()); \ No newline at end of file diff --git a/inc/awesomplete.min.js b/inc/awesomplete.min.js index 3bfb05e8..cd08c949 100644 --- a/inc/awesomplete.min.js +++ b/inc/awesomplete.min.js @@ -1,10 +1,3 @@ // Awesomplete - Lea Verou - MIT license -(function(){function m(a,b){for(var c in a){var f=a[c],e=this.input.getAttribute("data-"+c.toLowerCase());this[c]="number"===typeof f?+e:!1===f?null!==e:f instanceof Function?null:e;this[c]=this[c]||b[c]||f}}function d(a,b){return"string"===typeof a?(b||document).querySelector(a):a||null}function h(a,b){return k.call((b||document).querySelectorAll(a))}function l(){h("input.awesomplete").forEach(function(a){new Awesomplete(a)})}var g=self.Awesomplete=function(a,b){var c=this;this.input=d(a);this.input.setAttribute("aria-autocomplete", - "list");b=b||{};m.call(this,{minChars:2,maxItems:10,autoFirst:!1,filter:g.FILTER_CONTAINS,sort:g.SORT_BYLENGTH,item:function(a,b){return d.create("li",{innerHTML:a.replace(RegExp(d.regExpEscape(b.trim()),"gi"),"$&"),"aria-selected":"false"})},replace:function(a){this.input.value=a}},b);this.index=-1;this.container=d.create("div",{className:"awesomplete",around:a});this.ul=d.create("ul",{hidden:"",inside:this.container});this.status=d.create("span",{className:"visually-hidden",role:"status", - "aria-live":"assertive","aria-relevant":"additions",inside:this.container});d.bind(this.input,{input:this.evaluate.bind(this),blur:this.close.bind(this),keydown:function(a){var b=a.keyCode;if(c.opened)if(13===b&&c.selected)a.preventDefault(),c.select();else if(27===b)c.close();else if(38===b||40===b)a.preventDefault(),c[38===b?"previous":"next"]()}});d.bind(this.input.form,{submit:this.close.bind(this)});d.bind(this.ul,{mousedown:function(a){a=a.target;if(a!==this){for(;a&&!/li/i.test(a.nodeName);)a= - a.parentNode;a&&c.select(a)}}});this.input.hasAttribute("list")?(this.list="#"+a.getAttribute("list"),a.removeAttribute("list")):this.list=this.input.getAttribute("data-list")||b.list||[];g.all.push(this)};g.prototype={set list(a){Array.isArray(a)?this._list=a:"string"===typeof a&&-1=this.minChars&&0-1)this._list=t.split(/\s*,\s*/);else if(t=i(t),t&&t.children){var e=[];o.apply(t.children).forEach(function(t){if(!t.disabled){var i=t.textContent.trim(),n=t.value||i,s=t.label||i;""!==n&&e.push({label:s,value:n})}}),this._list=e}document.activeElement===this.input&&this.evaluate()},get selected(){return this.index>-1},get opened(){return this.isOpened},close:function(t){this.opened&&(this.ul.setAttribute("hidden",""),this.isOpened=!1,this.index=-1,i.fire(this.input,"awesomplete-close",t||{}))},open:function(){this.ul.removeAttribute("hidden"),this.isOpened=!0,this.autoFirst&&this.index===-1&&this.goto(0),i.fire(this.input,"awesomplete-open")},next:function(){var t=this.ul.children.length;this.goto(this.index-1&&e.length>0&&(e[t].setAttribute("aria-selected","true"),this.status.textContent=e[t].textContent,i.fire(this.input,"awesomplete-highlight",{text:this.suggestions[this.index]}))},select:function(t,e){if(t?this.index=i.siblingIndex(t):t=this.ul.children[this.index],t){var n=this.suggestions[this.index],s=i.fire(this.input,"awesomplete-select",{text:n,origin:e||t});s&&(this.replace(n),this.close({reason:"select"}),i.fire(this.input,"awesomplete-selectcomplete",{text:n}))}},evaluate:function(){var e=this,i=this.input.value;i.length>=this.minChars&&this._list.length>0?(this.index=-1,this.ul.innerHTML="",this.suggestions=this._list.map(function(n){return new t(e.data(n,i))}).filter(function(t){return e.filter(t,i)}).sort(this.sort).slice(0,this.maxItems),this.suggestions.forEach(function(t){e.ul.appendChild(e.item(t,i))}),0===this.ul.children.length?this.close({reason:"nomatches"}):this.open()):this.close({reason:"nomatches"})}},r.all=[],r.FILTER_CONTAINS=function(t,e){return RegExp(i.regExpEscape(e.trim()),"i").test(t)},r.FILTER_STARTSWITH=function(t,e){return RegExp("^"+i.regExpEscape(e.trim()),"i").test(t)},r.SORT_BYLENGTH=function(t,e){return t.length!==e.length?t.length-e.length:t$&");return i.create("li",{innerHTML:n,"aria-selected":"false"})},r.REPLACE=function(t){this.input.value=t.value},r.DATA=function(t){return t},Object.defineProperty(t.prototype=Object.create(String.prototype),"length",{get:function(){return this.label.length}}),t.prototype.toString=t.prototype.valueOf=function(){return""+this.label};var o=Array.prototype.slice;return i.create=function(t,e){var n=document.createElement(t);for(var s in e){var r=e[s];if("inside"===s)i(r).appendChild(n);else if("around"===s){var o=i(r);o.parentNode.insertBefore(n,o),n.appendChild(o)}else s in n?n[s]=r:n.setAttribute(s,r)}return n},i.bind=function(t,e){if(t)for(var i in e){var n=e[i];i.split(/\s+/).forEach(function(e){t.addEventListener(e,n)})}},i.fire=function(t,e,i){var n=document.createEvent("HTMLEvents");n.initEvent(e,!0,!0);for(var s in i)n[s]=i[s];return t.dispatchEvent(n)},i.regExpEscape=function(t){return t.replace(/[-\\^$*+?.()|[\]{}]/g,"\\$&")},i.siblingIndex=function(t){for(var e=0;t=t.previousElementSibling;e++);return e},"undefined"!=typeof Document&&("loading"!==document.readyState?s():document.addEventListener("DOMContentLoaded",s)),r.$=i,r.$$=n,"undefined"!=typeof self&&(self.Awesomplete=r),"object"==typeof module&&module.exports&&(module.exports=r),r}(); +//# sourceMappingURL=awesomplete.min.js.map \ No newline at end of file -- cgit v1.2.3 From 7040169069322d72cec4276b7b812291b57a0d40 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 21 Feb 2017 14:16:48 +0100 Subject: Multiple minor improvements and bugfixes regarding the new templates: * Add API settings in `configure.html` * Fix textarea autoresize * Load user.css from data folder * Move fold/expand all button to the right and fix an issue with already folded items * Reset datetime display to international datetime * Temporarilly remove JS login panel (need improvement and integration with the plugin system) * Body background is slightly lighter * Fix an issue where thumbnails were hidden by description * Fix an issue where private orange bar wasn't displayed with thumbnails * Remove the gradient bar behind titles * Fix empty bookmarklet name in Firefox --- tpl/default/configure.html | 30 ++++++++++++++++++ tpl/default/css/shaarli.css | 68 ++++++++++++++++++++++++---------------- tpl/default/editlink.html | 15 +++------ tpl/default/includes.html | 2 +- tpl/default/js/shaarli.js | 34 ++++++++++++++++++++ tpl/default/linklist.html | 2 +- tpl/default/linklist.paging.html | 5 ++- tpl/default/page.header.html | 2 +- 8 files changed, 116 insertions(+), 42 deletions(-) diff --git a/tpl/default/configure.html b/tpl/default/configure.html index a2425601..2f54a085 100644 --- a/tpl/default/configure.html +++ b/tpl/default/configure.html @@ -183,6 +183,36 @@
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index 161c36d6..b937c596 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -2,7 +2,7 @@ * General */ body { - background: #c5c5c5; + background: #d0d0d0; } .strong { @@ -268,6 +268,12 @@ pre { width: 200px; } +/* because chrome */ +#header-login-form input[type="text"]::-webkit-input-placeholder, +#header-login-form input[type="password"]::-webkit-input-placeholder { + color: #777777; +} + .subheader-form { visibility: hidden; position: fixed; @@ -384,6 +390,10 @@ pre { color: #252525; } +.toolbar-plugin input[type="submit"]:hover { + background: #fff; +} + @media screen and (max-width: 64em) { .toolbar-plugin input[type="text"] { width: 70%; @@ -484,19 +494,6 @@ pre { background: #f5f5f5; } -.linklist-item.private .linklist-item-title::before { - position: absolute; - left: 3px; - top: 0; - display: block; - content:""; - background: #F89406; - height: 95%; - width: 2px; - margin-top: 3px; - z-index: 1; -} - .linklist-item-title h2 { padding: 3px 10px 0 10px; line-height: 30px; @@ -563,14 +560,13 @@ pre { .linklist-item-description { position: relative; padding: 10px; - background: #f5f5f5; font-family: Roboto Slab, Arial, sans-serif; word-wrap: break-word; color: #252525; line-height: 1.3em; } -.linklist-item.private .linklist-item-description::before { + { position: absolute; left: 3px; top: 0; @@ -596,9 +592,29 @@ pre { } .linklist-item-thumbnail { + position: relative; margin-top: 10px; padding: 10px; float: left; + z-index: 50; +} + +.linklist-item.private .linklist-item-title::before, +.linklist-item.private .linklist-item-description::before, +.linklist-item.private .linklist-item-thumbnail::before { + position: absolute; + left: 3px; + top: 0; + display: block; + content:""; + background: #F89406; + height: 95%; + width: 2px; + z-index: 1; +} + +.linklist-item.private .linklist-item-title::before { + margin-top: 3px; } .linklist-item-infos { @@ -702,15 +718,6 @@ pre { text-align: center; } -.page-form .window-title:after { - display: block; - content:""; - background: linear-gradient(to right, #f5f5f5, #1b926c, #f5f5f5); - height: 1px; - width: 80%; - margin: auto; -} - .page-form .window-subtitle { text-align: center; } @@ -740,7 +747,7 @@ pre { } .page-form textarea { - height: 240px; + min-height: 240px; padding: 15px 5px 3px 15px; resize: vertical; overflow-y: auto; @@ -1163,7 +1170,7 @@ div.awesomplete > ul { .daily-entry-thumbnail { float: left; - margin: 15px 5px 5px 5px; + margin: 15px 5px 5px 15px; } .daily-entry-description a { @@ -1178,3 +1185,10 @@ div.awesomplete > ul { .daily-entry-description a:visited { color: #20b988; } + +/* + * Fix empty bookmarklet name in Firefox + */ +.pure-button { + -moz-user-select: auto; +} diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index 4f10ffb2..d6f81f96 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html @@ -33,8 +33,7 @@
- +
@@ -46,7 +45,7 @@
  @@ -62,7 +61,7 @@
{if="!$link_is_new"} - {'Delete'|t} @@ -75,7 +74,7 @@ {/if}
- {if="$source !== 'firefoxsocialapi'"} + {if="$source !== 'firefoxsocialapi' && $source !== 'bookmarklet'"} {include="page.footer"} {/if} diff --git a/tpl/default/includes.html b/tpl/default/includes.html index ca5c4f33..91c6ca3b 100644 --- a/tpl/default/includes.html +++ b/tpl/default/includes.html @@ -12,7 +12,7 @@ {if="is_file('inc/user.css')"} - + {/if} {loop="$plugins_includes.css_files"} diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index d8464aa4..d47c257f 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js @@ -84,7 +84,13 @@ window.onload = function () { [].forEach.call(foldAllButtons, function (foldAllButton) { foldAllButton.addEventListener('click', function (event) { event.preventDefault(); + var state = foldAllButton.firstElementChild.getAttribute('class').indexOf('down') != -1 ? 'down' : 'up'; [].forEach.call(foldButtons, function (foldButton) { + if (foldButton.firstElementChild.classList.contains('fa-chevron-up') && state == 'down' + || foldButton.firstElementChild.classList.contains('fa-chevron-down') && state == 'up' + ) { + return; + } // Retrieve description var description = null; var thumbnail = null; @@ -225,4 +231,32 @@ window.onload = function () { anchor.style.paddingTop = 0; } } + + /** + * Text area resizer + */ + var description = document.getElementById('lf_description'); + var observe = function (element, event, handler) { + element.addEventListener(event, handler, false); + }; + function init () { + function resize () { + description.style.height = 'auto'; + description.style.height = description.scrollHeight+10+'px'; + } + /* 0-timeout to get the already changed text */ + function delayedResize () { + window.setTimeout(resize, 0); + } + observe(description, 'change', resize); + observe(description, 'cut', delayedResize); + observe(description, 'paste', delayedResize); + observe(description, 'drop', delayedResize); + observe(description, 'keydown', delayedResize); + + resize(); + } + if (description != null) { + init(); + } }; diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 639fbe76..a9712704 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -174,7 +174,7 @@ {$updated=$value.updated_timestamp ? 'Edited: '. strftime('%c', $value.updated_timestamp) : 'Permalink'} - {function="strftime('%d %B %Y %H:%M', $value.timestamp)"}{if="$value.updated_timestamp"}*{/if} + {function="strftime('%c', $value.timestamp)"}{if="$value.updated_timestamp"}*{/if} · {/if} diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html index bc1591e4..d8c1e76e 100644 --- a/tpl/default/linklist.paging.html +++ b/tpl/default/linklist.paging.html @@ -10,7 +10,7 @@ class={if="$privateonly"}"filter-on"{else}"filter-off"{/if} > {/if} - + {loop="$action_plugin"} @@ -50,6 +50,9 @@
+ + +
\ No newline at end of file diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index c304e5d9..b76fc03e 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html @@ -76,7 +76,7 @@ {if="!isLoggedIn()"}
  • - -- cgit v1.2.3 From 7dcbfde5ffbc057a44f710e3be7e4856d235e90b Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Mon, 27 Feb 2017 20:20:53 +0100 Subject: Set the vintage theme by default for the time being --- application/Updater.php | 14 ++++++++++++++ tests/Updater/UpdaterTest.php | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/application/Updater.php b/application/Updater.php index 90aba745..3f5d325b 100644 --- a/application/Updater.php +++ b/application/Updater.php @@ -324,6 +324,20 @@ class Updater return rename('inc/user.css', 'data/user.css'); } + + /** + * While the new default theme is in an unstable state + * continue to use the vintage theme + */ + public function updateMethodDefaultThemeVintage() + { + if ($this->conf->get('resource.theme') !== 'default') { + return true; + } + $this->conf->set('resource.theme', 'vintage'); + $this->conf->write($this->isLoggedIn); + return true; + } } /** diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php index 1d15cfaa..de330ae2 100644 --- a/tests/Updater/UpdaterTest.php +++ b/tests/Updater/UpdaterTest.php @@ -466,4 +466,44 @@ $GLOBALS[\'privateLinkByDefault\'] = true;'; unlink('sandbox/'. $theme .'/linklist.html'); rmdir('sandbox/'. $theme); } + + /** + * Test updateMethodDefaultThemeVintage with the default theme enabled. + */ + public function testSetDefaultThemeToVintage() + { + $sandboxConf = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); + $this->conf = new ConfigManager($sandboxConf); + + $this->conf->set('resource.theme', 'default'); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodDefaultThemeVintage()); + $this->assertEquals('vintage', $this->conf->get('resource.theme')); + + // reload from file + $this->conf = new ConfigManager($sandboxConf); + $this->assertEquals('vintage', $this->conf->get('resource.theme')); + } + + /** + * Test updateMethodDefaultThemeVintage with custom theme enabled => nothing to do. + */ + public function testSetDefaultThemeNothingToDo() + { + $sandboxConf = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); + $this->conf = new ConfigManager($sandboxConf); + + $theme = 'myawesometheme'; + $this->conf->set('resource.theme', $theme); + $this->conf->write(true); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodDefaultThemeVintage()); + $this->assertEquals($theme, $this->conf->get('resource.theme')); + + // reload from file + $this->conf = new ConfigManager($sandboxConf); + $this->assertEquals($theme, $this->conf->get('resource.theme')); + } } -- cgit v1.2.3