X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=doc%2FBBCode.md;h=3fe5991308963a8003daa2e05a2ad9dda61c4ccc;hb=531085890aa1a7fc00c658a972c04f973887ba82;hp=595c2da8608de744a72a05f2b43aa794975ce5d4;hpb=50651340ce0d546faf3b77762bba8a85328ba0f3;p=friendica.git
diff --git a/doc/BBCode.md b/doc/BBCode.md
index 595c2da860..3fe5991308 100644
--- a/doc/BBCode.md
+++ b/doc/BBCode.md
@@ -26,7 +26,8 @@ table.bbcodes > * > tr > td {
table.bbcodes > tr > th,
table.bbcodes > * > tr > th {
background-color: #f2f2f2;
- text-align: center
+ text-align: center;
+ width: 50%
}
@@ -60,17 +61,21 @@ table.bbcodes > * > tr > th {
red |
- [url=http://www.friendica.com]Friendica[/url] |
- Friendica |
+ [url=http://friendi.ca]Friendica[/url] |
+ Friendica |
- [img]http://friendica.com/sites/default/files/friendika-32.png[/img] |
- |
+ [img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png[/img] |
+ |
- [img=64x32]http://friendica.com/sites/default/files/friendika-32.png[/img]
+ | [img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png]The Friendica Logo[/img] |
+ |
+
+
+ [img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg[/img]
Note: provided height is simply discarded. |
- |
+ |
[size=xx-small]small text[/size] |
@@ -81,7 +86,7 @@ table.bbcodes > * > tr > th {
big text |
- [size=20]exact size[/size] (size can be any number, in pixel) |
+ [size=20]exact size[/size] (size can be any number, in pixels) |
exact size |
@@ -98,27 +103,27 @@ table.bbcodes > * > tr > th {
Result |
- [url]http://friendica.com[/url] |
- http://friendica.com |
+ [url]http://friendi.ca[/url] |
+ http://friendi.ca |
- [url=http://friendica.com]Friendica[/url] |
- Friendica |
+ [url=http://friendi.ca]Friendica[/url] |
+ Friendica |
- [bookmark]http://friendica.com[/bookmark]
-#^[url]http://friendica.com[/url] |
- |
+ [bookmark]http://friendi.ca[/bookmark]
+#^[url]http://friendi.ca[/url] |
+ |
- [bookmark=http://friendica.com]Bookmark[/bookmark]
-#^[url=http://friendica.com]Bookmark[/url]
-#[url=http://friendica.com]^[/url][url=http://friendica.com]Bookmark[/url] |
- |
+ [bookmark=http://friendi.ca]Bookmark[/bookmark]
+#^[url=http://friendi.ca]Bookmark[/url]
+#[url=http://friendi.ca]^[/url][url=http://friendi.ca]Bookmark[/url] |
+ |
[url=/posts/f16d77b0630f0134740c0cc47a0ea02a]Diaspora post with GUID[/url] |
- Diaspora post with GUID |
+ Diaspora post with GUID |
#Friendica |
@@ -164,7 +169,7 @@ line
code
- [code=php]function text_highlight($s,$lang)[/code] |
+ [code=php]function text_highlight($s,$lang)[/code]1 |
- function text_highlight($s,$lang)
|
@@ -207,6 +212,27 @@ code
+1: Supported language parameter values for code highlighting:
+- abap
+- avrc
+- cpp
+- css
+- diff
+- dtd
+- html
+- java
+- javascript
+- js
+- mysql
+- perl
+- php
+- python
+- ruby
+- sh
+- sql
+- vbscript
+- xml
+
### Titles
@@ -473,8 +499,8 @@ You can embed video, audio and more in a message.
Vimeo player iframe embed. |
- [iframe]URL[/iframe] |
- General embed, iframe size is limited by the theme size for video players. |
+ [embed]URL[/embed] |
+ Embed OEmbed rich content. |
[url]*url*[/url] |
@@ -485,8 +511,8 @@ Page title with a link to *url* will be shown.
## Map
-This require "openstreetmap" addon version 1.3 or newer. If the addon isn't activated,
-the raw coordinates are shown instead.
+This requires "openstreetmap" or "Google Maps" addon version 1.3 or newer.
+If the addon isn't activated, the raw coordinates are shown instead.
@@ -509,10 +535,10 @@ the raw coordinates are shown instead.
## Abstract for longer posts
-If you want to spread your post to several third party networks you can have the problem that these networks have a length limitation like on Twitter.
+If you want to spread your post to several third party networks you may have the problem that these networks have a length limitation like on Twitter.
-Friendica is using a semi intelligent mechanism to generate a fitting abstract.
-But it can be interesting to define a custom abstract that will only be displayed on the external network.
+Friendica uses a semi-intelligent mechanism to generate a fitting abstract.
+But it can be useful to define a custom abstract that will only be displayed on the external network.
This is done with the [abstract]-element.
@@ -543,7 +569,7 @@ pictures?[/abstract]
that I wanted to share with you.[/abstract]
Today I was in the woods and took some real cool pictures ...
For Twitter and App.net the system will use the defined abstracts.
-For other networks (e.g. when you are using the "statusnet" connector that is used to post to GNU Social) the general abstract element will be used. |
+For other networks (e.g. when you are using the "statusnet" connector that is used to post to your GNU Social account) the general abstract element will be used.
@@ -561,7 +587,7 @@ Instead you have to name the explicit network:
[abstract]These days I had a strange encounter...[/abstract]
-[abstract=goog]Helly my dear Google+ followers. You have to read my newest blog post![/abstract]
+[abstract=goog]Hello my dear Google+ followers. You have to read my newest blog post![/abstract]
[abstract=face]Hello my Facebook friends. These days happened something really cool.[/abstract]
While taking pictures in the woods I had a really strange encounter... |
Google and Facebook will show the respective abstracts while the other networks will show the default one.
@@ -569,7 +595,11 @@ While taking pictures in the woods I had a really strange encounter... |
-The [abstract] element isn't working with the native OStatus connection or with connectors where we post the HTML like Tumblr, Wordpress or Pump.io.
+The [abstract] element is not working with connectors where we post HTML directly, like Tumblr, Wordpress or Pump.io.
+For the native connections--that is to e.g. Friendica, Hubzilla, Diaspora or GNU Social--the full posting is used and the contacts instance will display the posting as desired.
+
+For postings that are delivered via ActivityPub, the text from the abstract is placed in the summary field.
+On Mastodon this field is used for the content warning.
## Special
@@ -579,15 +609,34 @@ The [abstract] element isn't working with the native OStatus connection or with
Result |
- If you need to put literal bbcode in a message, [noparse], [nobb] or [pre] are used to escape bbcode:
+ | If you need to put literal BBCode in a message, [noparse], [nobb] or [pre] blocks prevent BBCode conversion:
- [noparse][b]bold[/b][/noparse]
- [nobb][b]bold[/b][/nobb]
- [pre][b]bold[/b][/pre]
+ Note: [code] has priority over [noparse], [nobb] and [pre] which makes them display as BBCode tags in code blocks instead of being removed.
+ [code] blocks inside [noparse] will still be converted to a code block.
|
[b]bold[/b] |
+
+ Additionally, [noparse] and [pre] blocks prevent mention and hashtag conversion to links:
+
+ - [noparse]@user@domain.tld #hashtag[/noparse]
+ - [pre]@user@domain.tld #hashtag[/pre]
+
+ |
+ @user@domain.tld #hashtag |
+
+
+ Additionally, [pre] blocks preserve spaces:
+
+ |
+ Spaces |
+
[nosmile] is used to disable smilies on a post by post basis
@@ -596,15 +645,15 @@ The [abstract] element isn't working with the native OStatus connection or with
| ;-) :-O |
- Custom inline styles
+ | Custom block styles
[style=text-shadow: 0 0 4px #CC0000;]You can change all the CSS properties of this block.[/style] |
- You can change all the CSS properties of this block. |
+ You can change all the CSS properties of this block. |
- Custom class block
+ | Custom inline styles
-[class=custom]If the class exists, this block will have the custom class style applied.[/class] |
- <span class="custom">If the class exists, this block will have the custom class style applied.</span> |
+[style=text-shadow: 0 0 4px #CC0000;]You can change all the CSS properties of this block.[/style]
+ You can change all the CSS properties of this inline text. |