diff --git a/doc/markdown.php b/doc/markdown.php new file mode 100644 index 0000000..093d930 --- /dev/null +++ b/doc/markdown.php @@ -0,0 +1,201 @@ + + + + + + + + '; + } + ?> + Markdown help + + +
+

Headings

+

+ #Heading 1 +
+ ##Heading 2 +
+ ###Heading 3 +
+ ####Heading 4 +
+ #####Heading 5 +
+ ######Heading 6 +
+

+ Result +
+ text("#Heading 1 \n##Heading 2 \n###Heading 3 \n####Heading 4 \n#####Heading 5 \n######Heading 6 \n "); + ?> +
+

Phrase Emphasis

+

+ *italic* **bold** ~~strike~~ +

+ Result +
+ text('*italic* **bold** ~~strike~~'); + ?> +
+

Links

+

+ [Shaarli original homepage](http://sebsauvage.net/wiki/doku.php?id=php:shaarli "php:shaarli [sebsauvage]") +
+ or simply put link http://sebsauvage.net/wiki/doku.php?id=php:shaarli +

+ Result +
+ text('[Shaarli original homepage](http://sebsauvage.net/wiki/doku.php?id=php:shaarli "php:shaarli [sebsauvage]") or simply put link http://sebsauvage.net/wiki/doku.php?id=php:shaarli'); + ?> +
+

Lists

+

+ Ordered list : +
+ 1. item +
+ 2. item +
+   1. item +
+   2. item +
+ 3. item +

+ Result +
+ text(" 1. item \n 2. item \n 1. item \n 2. item \n 3. item"); + ?> +
+

+ Unordered list : +
+ * item +
+ * item +
+   * item +
+   * item +

+ Result +
+ text("* item \n* item \n * item \n * item"); + ?> +
+

Images

+

+ ![Shaarli logo](/images/logo.png "Shaarli logo") +

+ Result +
+ text('![Shaarli logo](/images/logo.png "Shaarli logo")'); + ?> +
+

Blockquotes

+

+ >You want to share the links you discover ? Shaarli is a minimalist delicious clone you can install on your own website. It is designed to be personal (single-user), fast and handy. +
+ >> Citation under citation +

+ Result +
+ text(">You want to share the links you discover ? Shaarli is a minimalist delicious clone you can install on your own website. It is designed to be personal (single-user), fast and handy. + \n + >> Citation under citation"); + ?> +
+

Inline code

+

+ Try this command ``uptime`` in Linux terminal +

+ Result +
+ text('Try this command ``uptime`` in Linux terminal'); + ?> +
+

Block code

+

+ Try this command +
+ ``` +
+ uptime +
+ ``` +
+ in Linux terminal +

+ Result +
+ text("Try this command \n ``` \n uptime \n ``` \n in Linux terminal"); + ?> +
+

Horizontal Rules

+ * * * or +
+ *** or +
+ ***** or +
+ - - - or +
+ --------------------------------------- +
+ Result +
+ text('* * *'); + ?> +
+

Manual Line Breaks

+

+ Add two space at endline +
+ This line break => +
+ here +

+ Result +
+ setMarkupEscaped(true) -> setBreaksEnabled(true) -> text("This line break =>    + here"); + ?> +
+
+ + + \ No newline at end of file diff --git a/images/help_icon.png b/images/help_icon.png new file mode 100644 index 0000000..f25fc3f Binary files /dev/null and b/images/help_icon.png differ diff --git a/inc/user.css b/inc/user.css index 1ae6f94..eae98cc 100644 --- a/inc/user.css +++ b/inc/user.css @@ -1,23 +1,31 @@ +* { + box-sizing: border-box; +} + html { overflow-y: scroll; background: #434343; - /* Old browsers */ - background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#434343), color-stop(100%,#cdcdcd) )no-repeat scroll 0 0 transparent; -/* Chrome,Safari4+ */ + /* Old browsers */ + background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#434343), color-stop(100%,#cdcdcd) ) no-repeat scroll 0 0 transparent; + /* Chrome,Safari4+ */ background: -webkit-linear-gradient(top,#434343 0,#cdcdcd 100%) no-repeat scroll 0 0 transparent; background: -o-linear-gradient(top,#434343 0,#cdcdcd 100%) no-repeat scroll 0 0 transparent; background: -ms-linear-gradient(top,#434343 0,#cdcdcd 100%) no-repeat scroll 0 0 transparent; background: linear-gradient(to bottom,#434343 0,#cdcdcd 100%) no-repeat scroll 0 0 transparent; background: -moz-linear-gradient(center top,#434343,#cdcdcd) no-repeat scroll 0 0 transparent; - filter: progid: DXImageTransform.Microsoft.gradient( startColorstr='#434343', endColorstr='#cdcdcd', GradientType=0); + filter: progid : DXImageTransform.Microsoft.gradient( startColorstr='#434343', endColorstr='#cdcdcd', GradientType=0); } body { background-color: inherit; } -a, -.linkdescription a { +.markdownHelp{ + background-color: #FFFFFF; + padding: 0.3em; +} + +a, .linkdescription a { color: #E28E3F; -webkit-transition: all 100ms ease-in-out; -moz-transition: all 100ms ease-in-out; @@ -26,8 +34,7 @@ a, transition: all 100ms ease-in-out; } -a:hover, -.linkdescription a:hover { +a:hover, .linkdescription a:hover { color: #F57900; } @@ -55,15 +62,13 @@ pre code { margin-left: 130px; } -#linklist, -#cloudtag { +#linklist, #cloudtag { margin: 0 auto; padding: 0.3em; max-width: 80%; } -#linklist li, -#linklist li.private { +#linklist li, #linklist li.private { margin: 1em 0; padding: 0.3em; border: 1px solid #cdcdcd; @@ -75,23 +80,25 @@ pre code { background: #fff; } -#linklist li .linkdescription li { +#linklist li .linkdescription li, +.markdownHelp li { margin: 0; border: none; list-style-position: outside; list-style-type: disc; } -#linklist li .linkdescription ol li { +#linklist li .linkdescription ol li, +.markdownHelp ol li { list-style: decimal; } -#linklist li .linkdescription ol { +#linklist li .linkdescription ol, +.markdownHelp ol { list-style: decimal outside; } -.linktitle, -.linkeditbuttons { +.linktitle, .linkeditbuttons { font-size: 1.6em; font-weight: bold; } @@ -192,9 +199,7 @@ pre code { color: #ffffc9; } -.searchform, -.tagfilter, -.addform { +.searchform, .tagfilter, .addform { display: inline-block; text-align: left; margin: 0; @@ -207,17 +212,13 @@ pre code { align-items: flex-start; } -.searchform input:nth-child(1), -.tagfilter input:nth-child(1), -.addform input:nth-child(1){ +.searchform input:nth-child(1), .tagfilter input:nth-child(1), .addform input:nth-child(1) { order: 1; flex: 1 0 auto; align-self: stretch; } -.searchform input:nth-child(2), -.tagfilter input:nth-child(2), -.addform input:nth-child(2) { +.searchform input:nth-child(2), .tagfilter input:nth-child(2), .addform input:nth-child(2) { order: 2; flex: 0 0 20%; align-self: stretch; @@ -236,16 +237,49 @@ pre code { margin-left: 0.3em; } -.tagfilter input.bigbutton, -.searchform input.bigbutton, -.addform input.bigbutton { +.tagfilter input.bigbutton, .searchform input.bigbutton, .addform input.bigbutton { height: auto; margin: 0; padding: 0; } #editlinkform { - margin: 0 auto; + margin: 0 auto; + padding: 0; +} + +#editlinkform p { + margin: 0.3em 0; +} + +#editlinkform label { + font-style: italic; +} + +#editlinkform input[type='text'], +#editlinkform textarea { + width: 100%; +} + +#editlinkform a { + float: none; + background: none; + box-shadow: none; + margin: 0; + padding: 0; + border-radius: none; +} + +.submitButton { + text-align: center; +} + +.submitButton .bigbutton{ + width : 25%; +} + +.ui-autocomplete { + width : 80%; } #pageheader #logo { @@ -284,20 +318,14 @@ img { max-width: 100%; } -h1, -h2, -h3, -h4, -h5, -h6 { +h1, h2, h3, h4, h5, h6 { font-weight: normal; line-height: 1em; color: #111; + margin-bottom: 0.5em; } -h4, -h5, -h6 { +h4, h5, h6 { font-weight: bold; } @@ -342,14 +370,11 @@ hr { border-bottom: 1px solid #eee; } -pre, -code, -kbd, -samp { - font-family: monospace,monospace; +pre, code, kbd, samp { + font-family: monospace, monospace; font-size: 0.98em; color: #000; - _font-family: 'courier new',monospace; + _font-family: 'courier new', monospace; } pre { @@ -363,8 +388,7 @@ pre { background-color: #f7f7f7; } -b, -strong { +b, strong { font-weight: bold; } @@ -385,8 +409,7 @@ mark { background: #ff0; } -sub, -sup { +sub, sup { position: relative; font-size: 75%; line-height: 0; @@ -401,8 +424,7 @@ sub { bottom: -0.25em; } -ul, -ol { +ul, ol { margin: 1em 0; padding: 0 0 0 2em; } @@ -429,8 +451,7 @@ td { vertical-align: top; } -del, -ins { +del, ins { text-decoration: line-through; } @@ -438,8 +459,12 @@ em { font-style: italic; } -@media handheld, only screen and (max-width: 480px), only screen and (max-device-width: 854px) { -/* A few fixes for mobile devices (far from perfect). */ +.result { + /*display: none;*/ +} + +@media handheld, only screen and (max-width: 480px) , only screen and (max-device-width: 854px) { + /* A few fixes for mobile devices (far from perfect). */ .nomobile { display: none; } @@ -457,26 +482,25 @@ em { #headerform { width: 100%; max-width: 100%; - display : block; + display: block; } - .searchform,.tagfilter { + .searchform, .tagfilter { display: block !important; margin: 0px !important; padding: 0px !important; width: 100% !important; - height : 2em; + height: 2em; } - .searchform input,.tagfilter input { - height : 2em; - padding 0.1em; + .searchform input, .tagfilter input { + height: 2em;padding 0.1em; } - .tagfilter input.bigbutton,.searchform input.bigbutton,.addform input.bigbutton { + .tagfilter input.bigbutton, .searchform input.bigbutton, .addform input.bigbutton { width: 30%; font-size: smaller; - height : 2em; + height: 2em; } #searchform_value { @@ -494,8 +518,7 @@ em { left: 0px; } - #paging_privatelinks { - float;none; + #paging_privatelinks {float;none; } #paging_linksperpage { @@ -504,7 +527,7 @@ em { font-size: smaller; } - #paging_older,#paging_newer,#paging_linksperpage a { + #paging_older, #paging_newer, #paging_linksperpage a { border: 1px solid black; padding: 3px 5px 3px 5px; background-color: #666; @@ -533,7 +556,7 @@ em { left: 0px; } - #daily_col1,#daily_col2,#daily_col3 { + #daily_col1, #daily_col2, #daily_col3 { float: none; width: 100%; padding: 0px; @@ -566,7 +589,7 @@ em { max-width: 100%; } .linkcontainer { - margin : 0; + margin: 0; } } @@ -583,8 +606,7 @@ em { font-size: 12pt; } - a, - a:visited { + a, a:visited { text-decoration: underline; } @@ -602,21 +624,17 @@ em { content: " (" attr(title) ") "; } - .ir a:after, - a[href^="javascript:"]:after, - a[href^="#"]:after { + .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; } - pre, - blockquote { + pre, blockquote { padding-right: 1em; border: 1px solid #999; page-break-inside: avoid; } - tr, - img { + tr, img { page-break-inside: avoid; } @@ -624,23 +642,22 @@ em { max-width: 100% !important; } - @ page:left { + @ + page:left { margin: 15mm 20mm 15mm 10mm; } - @ page:right { + @ + page:right { margin: 15mm 10mm 15mm 20mm; } - p, - h2, - h3 { + p, h2, h3 { orphans: 3; widows: 3; } - h2, - h3 { + h2, h3 { page-break-after: avoid; }; } \ No newline at end of file diff --git a/tpl/editlink.html b/tpl/editlink.html index 14d4f9c..2800bc9 100644 --- a/tpl/editlink.html +++ b/tpl/editlink.html @@ -1,45 +1,80 @@ -{include="includes"} -{if="empty($GLOBALS['disablejquery'])"}{/if} - - - + {include="page.footer"} + {if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) && empty($GLOBALS['disablejquery'])"} + + {/if} + \ No newline at end of file