Browse Source

- Remove misc TinyMCE mentions in docs and minifyjs

tags/3.5.1
Hypolite Petovan 3 years ago
parent
commit
46fe6b1908
4 changed files with 16 additions and 35 deletions
  1. +9
    -10
      doc/Settings.md
  2. +6
    -21
      doc/Text_editor.md
  3. +1
    -1
      util/README
  4. +0
    -3
      util/minifyjs.sh

+ 9
- 10
doc/Settings.md View File

@@ -36,7 +36,7 @@ Therefore this document does not yet cover all the options

Set the content for the site banner.
The default logo is the Friendica logo and name.
You may wish to provide HTML/CSS to style and/or position this content, as it may not be themed by default.
You may wish to provide HTML/CSS to style and/or position this content, as it may not be themed by default.

#### Language

@@ -65,7 +65,7 @@ You may find a lot of spammers trying to register on your site.
During testing we discovered that since these registrations were automatic, the "Full Name" field was often set to just an account name with no space between first and last name.
If you would like to support people with only one name as their full name, you may change this setting to true.
Default is false.
#### OpenID

By default, OpenID may be used for both registration and logins.
@@ -80,7 +80,7 @@ By default, logged in users can register additional accounts for use as pages.
These will still require approval if the registration policy is set to *require approval*
You may prohibit logged in users from creating additional accounts by setting *block multible registrations* to true.
Default is false.
### File upload

#### Maximum Image Size
@@ -94,7 +94,7 @@ The default is set to 0, which means no limits.

This configures the URL to update the global directory, and is supplied in the default configuration.
The undocumented part is that if this is not set, the global directory is completely unavailable to the application.
This allows a private community to be completely isolated from the global network.
This allows a private community to be completely isolated from the global network.

#### Force Publish

@@ -130,7 +130,7 @@ Wildcards are accepted.
(Wildcard support on Windows platforms requires PHP5.3).
By default, any (valid) email address is allowed in registrations.

#### Allow Users to set remote_self
#### Allow Users to set remote_self

If you enable the `Allow Users to set remote_self` users can select Atom feeds from their contact list being their *remote self* in die advanced contact settings.
Which means that postings by the remote self are automatically reposted by Friendica in their names.
@@ -165,7 +165,7 @@ By default Friendica allows SSL communication between websites that have "self-s
For the widest compatibility with browsers and other networks we do not recommend using self-signed certificates, but we will not prevent you from using them.
SSL encrypts all the data transmitted between sites (and to your browser).
This allows you to have completely encrypted communications, and also protect your login session from hijacking.
Self-signed certificates can be generated for free, without paying top-dollar for a website SSL certificate.
Self-signed certificates can be generated for free, without paying top-dollar for a website SSL certificate.
However these aren't looked upon favourably in the security community because they can be subject to so-called "man-in-the-middle" attacks.
If you wish, you can turn on strict certificate checking.
This will mean you cannot connect (at all) to self-signed SSL sites.
@@ -213,8 +213,7 @@ To select a default theme for the Friendica node, see the *Site* section of the

## Additional Features

There are several optional features in Friendica.
Like the *dislike* button or the usage of a *richtext editor* for composing new postings.
There are several optional features in Friendica like the *dislike* button.
In this section of the admin panel you can select a default setting for your node and eventually fix it, so users cannot change the setting anymore.

## DB Updates
@@ -270,7 +269,7 @@ You should set up some kind of [log rotation](https://en.wikipedia.org/wiki/Log_

By default PHP warnings and error messages are supressed.
If you want to enable those, you have to activate them in the ``.htconfig.php`` file.
Use the following settings to redirect PHP errors to a file.
Use the following settings to redirect PHP errors to a file.

Config:

@@ -283,7 +282,7 @@ This will put all PHP errors in the file php.out (which must be writeable by the
Undeclared variables are occasionally referenced in the program and therefore we do not recommend using `E_NOTICE` or `E_ALL`.
The vast majority of issues reported at these levels are completely harmless.
Please report to the developers any errors you encounter in the logs using the recommended settings above.
They generally indicate issues which need to be resolved.
They generally indicate issues which need to be resolved.

If you encounter a blank (white) page when using the application, view the PHP logs - as this almost always indicates an error has occurred.



+ 6
- 21
doc/Text_editor.md View File

@@ -1,7 +1,7 @@
<style>
<style>
figure { border: 4px #eeeeee solid; }
figure img { padding: 2px; }
figure figcaption { background: #eeeeee; color: #444444; padding: 2px; font-style: italic;}
figure figcaption { background: #eeeeee; color: #444444; padding: 2px; font-style: italic;}
</style>

Creating posts
@@ -9,7 +9,7 @@ Creating posts

* [Home](help)

Here you can find an overview of the different ways to create and edit your post.
Here you can find an overview of the different ways to create and edit your post.

One click on "Share" text box on top of your Home or Network page, and the post editor shows up:

@@ -42,7 +42,7 @@ The icons under the text area are there to help you to write posts quickly:
<img src="doc/img/video.png" width="32" height="32" alt="video" align="left"> Add a video. Enter the url to a video (ogg) or to a video page on youtube or vimeo, and it will be embedded in your post with a preview. Friendica is using [HTML5](http://en.wikipedia.org/wiki/HTML5_video) for embedding content. Therefore, the supported files are depending on your browser and operating system (OS). Some filetypes are WebM, MP4 and OGG.*
<p style="clear:both;"></p>

<img src="doc/img/mic.png" width="32" height="32" alt="mic" align="left" style="padding-bottom: 20px;"> Add an audio. Same as video, but for audio. Depending on your browser and operation system MP3, OGG and AAC are supported. Additionally, you are able to add URLs from audiohosters like Soundcloud.
<img src="doc/img/mic.png" width="32" height="32" alt="mic" align="left" style="padding-bottom: 20px;"> Add an audio. Same as video, but for audio. Depending on your browser and operation system MP3, OGG and AAC are supported. Additionally, you are able to add URLs from audiohosters like Soundcloud.

<p style="clear:both;"></p>

@@ -88,26 +88,11 @@ Click on "show" under contact name to hide the post to everyone but selected.

Click on "Visible to everybody" to make the post public again.

If you have defined some groups, you can check "show" for groups also. All contact in that group will see the post.
If you have defined some groups, you can check "show" for groups also. All contact in that group will see the post.
If you want to hide the post to one contact of a group selected for "show", click "don't show" under contact name.

Click again on "show" or "don't show" to switch it off.

You can search for contacts or groups with the search box.

See also [Group and Privacy](help/Groups-and-Privacy)



WYSIAWYG (What You See Is About What You Get)
--------------------------------------------------

Friendica can use TinyMCE as rich text editor. This way you can write beatifull post without the need to know [BBCode](help/BBCode).

By default, rich editor is disabled. You can enable it from Settings -> [Aditional features](settings/features) page, turn on Richtext Editor and click "Submit".

<figure>
<img src="doc/img/friendica_rich_editor.png" alt="default editor">
<figcaption>Rich editor, with default Friendica theme (duepuntozero)</figcaption>
</figure>

See also [Group and Privacy](help/Groups-and-Privacy)

+ 1
- 1
util/README View File

@@ -10,7 +10,7 @@ Internationalisation

extract.php - extracts translatable strings from our project files. It
currently doesn't pick up strings in other libraries we might be using such as
tinymce and the HTML parsers.
the HTML parsers.

In order for extract to do its job, every use of the t() translation function
must be preceded by one space. The string also can not contain parentheses. If


+ 0
- 3
util/minifyjs.sh View File

@@ -24,9 +24,6 @@ JSFILES=(
JSFILES2=(
"library/colorbox/jquery.colorbox.js"
)
JSFILES3=(
"library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js"
)

for i in ${JSFILES[@]}
do


Loading…
Cancel
Save