diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-08-27 10:27:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-27 10:27:34 +0200 |
commit | af41d5ab5d2bd3ba64d052c997bc6afa6966a63c (patch) | |
tree | 8fad2829c55f94022e359fa8914e11f80a2afc2a /doc | |
parent | b8e3630f2ecd142d397b1b062a346a667bb78595 (diff) | |
parent | 0c6fdbe12bbbb336348666b14b82096f24d5858b (diff) | |
download | Shaarli-af41d5ab5d2bd3ba64d052c997bc6afa6966a63c.tar.gz Shaarli-af41d5ab5d2bd3ba64d052c997bc6afa6966a63c.tar.zst Shaarli-af41d5ab5d2bd3ba64d052c997bc6afa6966a63c.zip |
Merge pull request #1511 from ArthurHoaro/wip-slim-routing
Diffstat (limited to 'doc')
-rw-r--r-- | doc/md/Plugin-System.md | 6 | ||||
-rw-r--r-- | doc/md/RSS-feeds.md | 12 | ||||
-rw-r--r-- | doc/md/Translations.md | 26 |
3 files changed, 22 insertions, 22 deletions
diff --git a/doc/md/Plugin-System.md b/doc/md/Plugin-System.md index d5b16e2d..f264e873 100644 --- a/doc/md/Plugin-System.md +++ b/doc/md/Plugin-System.md | |||
@@ -131,7 +131,7 @@ If it's still not working, please [open an issue](https://github.com/shaarli/Sha | |||
131 | | ------------- |:-------------:| | 131 | | ------------- |:-------------:| |
132 | | [render_header](#render_header) | Allow plugin to add content in page headers. | | 132 | | [render_header](#render_header) | Allow plugin to add content in page headers. | |
133 | | [render_includes](#render_includes) | Allow plugin to include their own CSS files. | | 133 | | [render_includes](#render_includes) | Allow plugin to include their own CSS files. | |
134 | | [render_footer](#render_footer) | Allow plugin to add content in page footer and include their own JS files. | | 134 | | [render_footer](#render_footer) | Allow plugin to add content in page footer and include their own JS files. | |
135 | | [render_linklist](#render_linklist) | It allows to add content at the begining and end of the page, after every link displayed and to alter link data. | | 135 | | [render_linklist](#render_linklist) | It allows to add content at the begining and end of the page, after every link displayed and to alter link data. | |
136 | | [render_editlink](#render_editlink) | Allow to add fields in the form, or display elements. | | 136 | | [render_editlink](#render_editlink) | Allow to add fields in the form, or display elements. | |
137 | | [render_tools](#render_tools) | Allow to add content at the end of the page. | | 137 | | [render_tools](#render_tools) | Allow to add content at the end of the page. | |
@@ -515,7 +515,7 @@ Otherwise, you can use your own JS as long as this field is send by the form: | |||
515 | 515 | ||
516 | ### Placeholder system | 516 | ### Placeholder system |
517 | 517 | ||
518 | In order to make plugins work with every custom themes, you need to add variable placeholder in your templates. | 518 | In order to make plugins work with every custom themes, you need to add variable placeholder in your templates. |
519 | 519 | ||
520 | It's a RainTPL loop like this: | 520 | It's a RainTPL loop like this: |
521 | 521 | ||
@@ -537,7 +537,7 @@ At the end of the menu: | |||
537 | 537 | ||
538 | At the end of file, before clearing floating blocks: | 538 | At the end of file, before clearing floating blocks: |
539 | 539 | ||
540 | {if="!empty($plugin_errors) && isLoggedIn()"} | 540 | {if="!empty($plugin_errors) && $is_logged_in"} |
541 | <ul class="errors"> | 541 | <ul class="errors"> |
542 | {loop="plugin_errors"} | 542 | {loop="plugin_errors"} |
543 | <li>{$value}</li> | 543 | <li>{$value}</li> |
diff --git a/doc/md/RSS-feeds.md b/doc/md/RSS-feeds.md index d943218e..ecbff09a 100644 --- a/doc/md/RSS-feeds.md +++ b/doc/md/RSS-feeds.md | |||
@@ -1,14 +1,14 @@ | |||
1 | ### Feeds options | 1 | ### Feeds options |
2 | 2 | ||
3 | Feeds are available in ATOM with `?do=atom` and RSS with `do=RSS`. | 3 | Feeds are available in ATOM with `/feed/atom` and RSS with `/feed/rss`. |
4 | 4 | ||
5 | Options: | 5 | Options: |
6 | 6 | ||
7 | - You can use `permalinks` in the feed URL to get permalink to Shaares instead of direct link to shaared URL. | 7 | - You can use `permalinks` in the feed URL to get permalink to Shaares instead of direct link to shaared URL. |
8 | - E.G. `https://my.shaarli.domain/?do=atom&permalinks`. | 8 | - E.G. `https://my.shaarli.domain/feed/atom?permalinks`. |
9 | - You can use `nb` parameter in the feed URL to specify the number of Shaares you want in a feed (default if not specified: `50`). The keyword `all` is available if you want everything. | 9 | - You can use `nb` parameter in the feed URL to specify the number of Shaares you want in a feed (default if not specified: `50`). The keyword `all` is available if you want everything. |
10 | - `https://my.shaarli.domain/?do=atom&permalinks&nb=42` | 10 | - `https://my.shaarli.domain/feed/atom?permalinks&nb=42` |
11 | - `https://my.shaarli.domain/?do=atom&permalinks&nb=all` | 11 | - `https://my.shaarli.domain/feed/atom?permalinks&nb=all` |
12 | 12 | ||
13 | ### RSS Feeds or Picture Wall for a specific search/tag | 13 | ### RSS Feeds or Picture Wall for a specific search/tag |
14 | 14 | ||
@@ -21,8 +21,8 @@ For example, if you want to subscribe only to links tagged `photography`: | |||
21 | - Click on the `RSS Feed` button. | 21 | - Click on the `RSS Feed` button. |
22 | - You are presented with an RSS feed showing only these links. Subscribe to it to receive only updates with this tag. | 22 | - You are presented with an RSS feed showing only these links. Subscribe to it to receive only updates with this tag. |
23 | - The same method **also works for a full-text search** (_Search_ box) **and for the Picture Wall** (want to only see pictures about `nature`?) | 23 | - The same method **also works for a full-text search** (_Search_ box) **and for the Picture Wall** (want to only see pictures about `nature`?) |
24 | - You can also build the URLs manually: | 24 | - You can also build the URLs manually: |
25 | - `https://my.shaarli.domain/?do=rss&searchtags=nature` | 25 | - `https://my.shaarli.domain/?do=rss&searchtags=nature` |
26 | - `https://my.shaarli.domain/links/?do=picwall&searchterm=poney` | 26 | - `https://my.shaarli.domain/links/picture-wall?searchterm=poney` |
27 | 27 | ||
28 | ![](images/rss-filter-1.png) ![](images/rss-filter-2.png) | 28 | ![](images/rss-filter-1.png) ![](images/rss-filter-2.png) |
diff --git a/doc/md/Translations.md b/doc/md/Translations.md index 58b92da3..c23ec962 100644 --- a/doc/md/Translations.md +++ b/doc/md/Translations.md | |||
@@ -32,20 +32,20 @@ Here is a list : | |||
32 | ``` | 32 | ``` |
33 | http://<replace_domain>/ | 33 | http://<replace_domain>/ |
34 | http://<replace_domain>/?nonope | 34 | http://<replace_domain>/?nonope |
35 | http://<replace_domain>/?do=addlink | 35 | http://<replace_domain>/admin/add-shaare |
36 | http://<replace_domain>/?do=changepasswd | 36 | http://<replace_domain>/admin/password |
37 | http://<replace_domain>/?do=changetag | 37 | http://<replace_domain>/admin/tags |
38 | http://<replace_domain>/?do=configure | 38 | http://<replace_domain>/admin/configure |
39 | http://<replace_domain>/?do=tools | 39 | http://<replace_domain>/admin/tools |
40 | http://<replace_domain>/?do=daily | 40 | http://<replace_domain>/daily |
41 | http://<replace_domain>/?post | 41 | http://<replace_domain>/admin/shaare |
42 | http://<replace_domain>/?do=export | 42 | http://<replace_domain>/admin/export |
43 | http://<replace_domain>/?do=import | 43 | http://<replace_domain>/admin/import |
44 | http://<replace_domain>/login | 44 | http://<replace_domain>/login |
45 | http://<replace_domain>/?do=picwall | 45 | http://<replace_domain>/picture-wall |
46 | http://<replace_domain>/?do=pluginadmin | 46 | http://<replace_domain>/admin/plugins |
47 | http://<replace_domain>/?do=tagcloud | 47 | http://<replace_domain>/tags/cloud |
48 | http://<replace_domain>/?do=taglist | 48 | http://<replace_domain>/tags/list |
49 | ``` | 49 | ``` |
50 | 50 | ||
51 | #### Improve existing translation | 51 | #### Improve existing translation |