Переглянути джерело

Merge pull request #2754 from KanchanChauhan/documentation-fixes

[Fix] Documentation Fixes
version-14
Nabin Hait 8 роки тому
committed by GitHub
джерело
коміт
fcf12c424b
15 змінених файлів з 25 додано та 23 видалено
  1. BIN
      frappe/docs/assets/img/app-development/confirm-dialog.png
  2. BIN
      frappe/docs/assets/img/app-development/dialog.png
  3. BIN
      frappe/docs/assets/img/app-development/msgprint.png
  4. BIN
      frappe/docs/assets/img/app-development/prompt.png
  5. BIN
      frappe/docs/assets/img/app-development/show-alert.png
  6. BIN
      frappe/docs/assets/img/general-ledger.png
  7. +2
    -1
      frappe/docs/user/en/guides/app-development/adding-custom-button-to-form.md
  8. +6
    -6
      frappe/docs/user/en/guides/app-development/dialogs-types.md
  9. +3
    -2
      frappe/docs/user/en/guides/integration/how_to_setup_oauth.md
  10. +8
    -8
      frappe/docs/user/en/guides/integration/openid_connect_and_frappe_social_login.md
  11. +1
    -1
      frappe/docs/user/en/guides/integration/using_oauth.md
  12. +1
    -1
      frappe/docs/user/en/guides/portal-development/ordering.md
  13. +1
    -1
      frappe/docs/user/en/guides/portal-development/portal-roles.md
  14. +2
    -2
      frappe/docs/user/en/guides/portal-development/web-forms.md
  15. +1
    -1
      frappe/docs/user/en/guides/reports-and-printing/print-format-for-reports.md

BIN
frappe/docs/assets/img/app-development/confirm-dialog.png Переглянути файл

Перед Після
Ширина: 1456  |  Висота: 454  |  Розмір: 71 KiB

BIN
frappe/docs/assets/img/app-development/dialog.png Переглянути файл

Перед Після
Ширина: 1626  |  Висота: 872  |  Розмір: 126 KiB

BIN
frappe/docs/assets/img/app-development/msgprint.png Переглянути файл

Перед Після
Ширина: 1548  |  Висота: 382  |  Розмір: 57 KiB

BIN
frappe/docs/assets/img/app-development/prompt.png Переглянути файл

Перед Після
Ширина: 1484  |  Висота: 622  |  Розмір: 78 KiB

BIN
frappe/docs/assets/img/app-development/show-alert.png Переглянути файл

Перед Після
Ширина: 1843  |  Висота: 207  |  Розмір: 20 KiB

BIN
frappe/docs/assets/img/general-ledger.png Переглянути файл

Перед Після
Ширина: 2302  |  Висота: 1098  |  Розмір: 342 KiB

+ 2
- 1
frappe/docs/user/en/guides/app-development/adding-custom-button-to-form.md Переглянути файл

@@ -22,6 +22,7 @@ We should edit `frappe\core\doctype\user\user.js`

You should be seeing a button on user form as shown below,

![add_custom_button_screenshot](/assets/img/app-development/add_custom_button.png)
<img class="screenshot" alt="Custom Button" src="{{docs_base_url}}/assets/img/app-development/add_custom_button.png">


<!-- markdown -->

+ 6
- 6
frappe/docs/user/en/guides/app-development/dialogs-types.md Переглянути файл

@@ -2,9 +2,9 @@ Frappe provide a group of standard dialogs that are very usefull while coding.

## Alert Dialog

![Alert](/files/show_alert.png)
<img class="screenshot" src="{{docs_base_url}}/assets/img/app-development/show_alert.png">

Is helpfull for show a non-obstrutive message.
Is helpfull for show a non-obstructive message.

This dialog have 2 parameters `txt`that is the message and `seconds` that is the time that the message will be showed for the user, the standard is `3 seconds`.

@@ -16,7 +16,7 @@ This dialog have 2 parameters `txt`that is the message and `seconds` that is the

## Prompt Dialog

![Prompt](/files/promp_dialog.png)
<img class="screenshot" src="{{docs_base_url}}/assets/img/app-development/prompt.png">

Is helpful for ask a value for the user

@@ -42,7 +42,7 @@ This dialog have 4 parameters, they are:
---
## Confirm Dialog

![Confirm](/files/confirm_dialog.png)
<img class="screenshot" src="{{docs_base_url}}/assets/img/app-development/confirm-dialog.png">

Usefull to get a confirmation from the user before do an action

@@ -68,7 +68,7 @@ This dialog have 3 arguments, they are:

## Message Print

![MSGPrint](/files/msgprint_dialog.png)
<img class="screenshot" src="{{docs_base_url}}/assets/img/app-development/msgprint.png">

Is helpfull for show a informational dialog for the user;

@@ -91,7 +91,7 @@ This dialog have 2 arguments, they are:

### Custom Dialog

![Class](/files/dialog_constructor.png)
<img class="screenshot" src="{{docs_base_url}}/assets/img/app-development/dialog.png">

Frappé provide too a `Class` that you can extend and build your own custom dialogs



+ 3
- 2
frappe/docs/user/en/guides/integration/how_to_setup_oauth.md Переглянути файл

@@ -26,7 +26,8 @@ Go to

> Setup > Integrations > OAuth Provider Settings

<img class="screenshot" src="assets/frappe/img/oauth_provider_settings.png">
<img class="screenshot" src="{{docs_base_url}}/assets/img/oauth_provider_settings.png">


## Add a Client App

@@ -34,7 +35,7 @@ As a System Manager go to

> Setup > Integrations > OAuth Client

<img class="screenshot" src="assets/frappe/img/oauth2_client_app.png">
<img class="screenshot" src="{{docs_base_url}}/assets/img/oauth2_client_app.png">

To add a client fill in the following details



+ 8
- 8
frappe/docs/user/en/guides/integration/openid_connect_and_frappe_social_login.md Переглянути файл

@@ -40,33 +40,33 @@ Now you will see Frappe icon on the login page. Click on this icon to login with
### Part 1 : on Frappe Identity Provider (IDP)

Login to IDP
<img img class="screenshot" src="/assets/img/00-login-to-idp.png">
<img class="screenshot" src="{{docs_base_url}}/assets/img/00-login-to-idp.png">

Add OAuth Client on IDP
<img img class="screenshot" src="/assets/img/01-add-oauth-client-on-idp.png">
<img class="screenshot" src="{{docs_base_url}}/assets/img/01-add-oauth-client-on-idp.png">

Set Server URL on IDP
<img img class="screenshot" src="/assets/img/02-set-server-url-on-idp.png">
<img class="screenshot" src="{{docs_base_url}}/assets/img/02-set-server-url-on-idp.png">

### Part 2 : on Frappe App Server

Set `Frappe Client ID` and `Frappe Client Secret` on App server (refer the client set on IDP)
<img img class="screenshot" src="/assets/img/03-set-clientid-client-secret-server-on-app-server.png">
<img class="screenshot" src="{{docs_base_url}}/assets/img/03-set-clientid-client-secret-server-on-app-server.png">

**Note**: Frappe Server URL is the main server where identities from your organization are stored.

Login Screen on App Server (login with frappe)
<img img class="screenshot" src="/assets/img/04-login-screen-on-app-server.png">
<img class="screenshot" src="{{docs_base_url}}/assets/img/04-login-screen-on-app-server.png">

### Part 3 : Redirected on IDP

login with user on IDP
<img img class="screenshot" src="/assets/img/05-login-with-user-on-idp.png">
<img class="screenshot" src="{{docs_base_url}}/assets/img/05-login-with-user-on-idp.png">

Confirm Access on IDP
<img img class="screenshot" src="/assets/img/06-confirm-grant-access-on-idp.png">
<img class="screenshot" src="{{docs_base_url}}/assets/img/06-confirm-grant-access-on-idp.png">

### Part 4 : Back on App Server

Logged in on app server with ID from IDP
<img img class="screenshot" src="/assets/img/07-logged-in-as-website-user-with-id-from-idp.png">
<img class="screenshot" src="{{docs_base_url}}/assets/img/07-logged-in-as-website-user-with-id-from-idp.png">

+ 1
- 1
frappe/docs/user/en/guides/integration/using_oauth.md Переглянути файл

@@ -20,7 +20,7 @@ redirect_uri = <redirect uri from OAuth Client>

#### Confirmation Dialog

<img class="screenshot" src="assets/frappe/img/oauth_confirmation_page.png">
<img class="screenshot" src="{{docs_base_url}}/assets/img/oauth_confirmation_page.png">

Click 'Allow' to receive authorization code in redirect uri.



+ 1
- 1
frappe/docs/user/en/guides/portal-development/ordering.md Переглянути файл

@@ -10,4 +10,4 @@ For example for this folder the `index.txt` looks like:
context
building

{next}
{next}

+ 1
- 1
frappe/docs/user/en/guides/portal-development/portal-roles.md Переглянути файл

@@ -8,7 +8,7 @@ Roles can be assigned to Website Users and they will see menu based on their rol
1. Each Portal Menu Item can have a role associated with it. If that role is set, then only those users having that role can see that menu item
1. Rules can be set for default roles that will be set on default users on hooks

<img class="screenshot" src="assets/frappe/img/portals/portal-settings.png">
<img class="screenshot" alt="Portal Settings" src="{{docs_base_url}}/assets/img/portals/portal-settings.png">

#### Rules for Default Role



+ 2
- 2
frappe/docs/user/en/guides/portal-development/web-forms.md Переглянути файл

@@ -1,8 +1,8 @@
# Customizing Web Forms

Web Forms are a powerful way to add forms to your website. Web forms are powerful and scriptable and from Version 7.1+ they also include tables, paging and other utilties
Web Forms are a powerful way to add forms to your website. Web forms are powerful and scriptable and from Version 7.1+ they also include tables, paging and other utilities

<img class="screenshot" src="assets/frappe/img/portals/sample-web-form.png">
<img class="screenshot" alt="Web Form" src="{{docs_base_url}}/assets/img/portals/sample-web-form.png">

### Standard Web Forms



+ 1
- 1
frappe/docs/user/en/guides/reports-and-printing/print-format-for-reports.md Переглянути файл

@@ -58,7 +58,7 @@ Here is how the General Ledger Report is built:

Here is what the report looks like:

![General Ledger](/assets/frappe_io/images/how-to/general-ledger.png)
<img class="screenshot" alt="General Ledger" src="{{docs_base_url}}/assets/img/general-ledger.png">

##### Comments:



Завантаження…
Відмінити
Зберегти