diff --git a/frappe/docs/assets/img/app-development/confirm-dialog.png b/frappe/docs/assets/img/app-development/confirm-dialog.png new file mode 100644 index 0000000000..236017efd8 Binary files /dev/null and b/frappe/docs/assets/img/app-development/confirm-dialog.png differ diff --git a/frappe/docs/assets/img/app-development/dialog.png b/frappe/docs/assets/img/app-development/dialog.png new file mode 100644 index 0000000000..0a03b4870b Binary files /dev/null and b/frappe/docs/assets/img/app-development/dialog.png differ diff --git a/frappe/docs/assets/img/app-development/msgprint.png b/frappe/docs/assets/img/app-development/msgprint.png new file mode 100644 index 0000000000..7676b7a695 Binary files /dev/null and b/frappe/docs/assets/img/app-development/msgprint.png differ diff --git a/frappe/docs/assets/img/app-development/prompt.png b/frappe/docs/assets/img/app-development/prompt.png new file mode 100644 index 0000000000..b3600ee6df Binary files /dev/null and b/frappe/docs/assets/img/app-development/prompt.png differ diff --git a/frappe/docs/assets/img/app-development/show-alert.png b/frappe/docs/assets/img/app-development/show-alert.png new file mode 100644 index 0000000000..f19b7900fa Binary files /dev/null and b/frappe/docs/assets/img/app-development/show-alert.png differ diff --git a/frappe/docs/assets/img/general-ledger.png b/frappe/docs/assets/img/general-ledger.png new file mode 100644 index 0000000000..6ca37ec939 Binary files /dev/null and b/frappe/docs/assets/img/general-ledger.png differ diff --git a/frappe/docs/user/en/guides/app-development/adding-custom-button-to-form.md b/frappe/docs/user/en/guides/app-development/adding-custom-button-to-form.md index 022320384d..29a1a608b3 100644 --- a/frappe/docs/user/en/guides/app-development/adding-custom-button-to-form.md +++ b/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) +Custom Button + diff --git a/frappe/docs/user/en/guides/app-development/dialogs-types.md b/frappe/docs/user/en/guides/app-development/dialogs-types.md index 6b17121dd0..e92c40f34f 100755 --- a/frappe/docs/user/en/guides/app-development/dialogs-types.md +++ b/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) + -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) + 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) + 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) + 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) + Frappé provide too a `Class` that you can extend and build your own custom dialogs diff --git a/frappe/docs/user/en/guides/integration/how_to_setup_oauth.md b/frappe/docs/user/en/guides/integration/how_to_setup_oauth.md index 7a1d615cfe..9add268aa8 100644 --- a/frappe/docs/user/en/guides/integration/how_to_setup_oauth.md +++ b/frappe/docs/user/en/guides/integration/how_to_setup_oauth.md @@ -26,7 +26,8 @@ Go to > Setup > Integrations > OAuth Provider Settings - + + ## Add a Client App @@ -34,7 +35,7 @@ As a System Manager go to > Setup > Integrations > OAuth Client - + To add a client fill in the following details diff --git a/frappe/docs/user/en/guides/integration/openid_connect_and_frappe_social_login.md b/frappe/docs/user/en/guides/integration/openid_connect_and_frappe_social_login.md index b112e05b55..b214841f90 100644 --- a/frappe/docs/user/en/guides/integration/openid_connect_and_frappe_social_login.md +++ b/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 - + Add OAuth Client on IDP - + Set Server URL on IDP - + ### Part 2 : on Frappe App Server Set `Frappe Client ID` and `Frappe Client Secret` on App server (refer the client set on IDP) - + **Note**: Frappe Server URL is the main server where identities from your organization are stored. Login Screen on App Server (login with frappe) - + ### Part 3 : Redirected on IDP login with user on IDP - + Confirm Access on IDP - + ### Part 4 : Back on App Server Logged in on app server with ID from IDP - + diff --git a/frappe/docs/user/en/guides/integration/using_oauth.md b/frappe/docs/user/en/guides/integration/using_oauth.md index 1a6f694574..e174dc3002 100644 --- a/frappe/docs/user/en/guides/integration/using_oauth.md +++ b/frappe/docs/user/en/guides/integration/using_oauth.md @@ -20,7 +20,7 @@ redirect_uri = #### Confirmation Dialog - + Click 'Allow' to receive authorization code in redirect uri. diff --git a/frappe/docs/user/en/guides/portal-development/ordering.md b/frappe/docs/user/en/guides/portal-development/ordering.md index 76db949fbb..179951739e 100755 --- a/frappe/docs/user/en/guides/portal-development/ordering.md +++ b/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} \ No newline at end of file diff --git a/frappe/docs/user/en/guides/portal-development/portal-roles.md b/frappe/docs/user/en/guides/portal-development/portal-roles.md index 19434181f0..d3f5be7287 100644 --- a/frappe/docs/user/en/guides/portal-development/portal-roles.md +++ b/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 - +Portal Settings #### Rules for Default Role diff --git a/frappe/docs/user/en/guides/portal-development/web-forms.md b/frappe/docs/user/en/guides/portal-development/web-forms.md index 92e9c603ac..533790952e 100644 --- a/frappe/docs/user/en/guides/portal-development/web-forms.md +++ b/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 - +Web Form ### Standard Web Forms diff --git a/frappe/docs/user/en/guides/reports-and-printing/print-format-for-reports.md b/frappe/docs/user/en/guides/reports-and-printing/print-format-for-reports.md index b979654d86..f663816757 100755 --- a/frappe/docs/user/en/guides/reports-and-printing/print-format-for-reports.md +++ b/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) +General Ledger ##### Comments: