diff --git a/frappe/docs/current/api/config/frappe.config.desk.html b/frappe/docs/current/api/config/frappe.config.desk.html index a499c40197..fe15d9887c 100644 --- a/frappe/docs/current/api/config/frappe.config.desk.html +++ b/frappe/docs/current/api/config/frappe.config.desk.html @@ -1,7 +1,7 @@
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 Public API -
/api/method/frappe.desk.form.utils.get_fields -

-

- - - frappe.desk.form.utils.get_fields - () -

-

get fields

-
-
- - - - - -

Public API
/api/method/frappe.desk.form.utils.get_next

diff --git a/frappe/docs/current/api/desk/form/index.html b/frappe/docs/current/api/desk/form/index.html index e1fbcf6011..b5b9db3e59 100644 --- a/frappe/docs/current/api/desk/form/index.html +++ b/frappe/docs/current/api/desk/form/index.html @@ -4,7 +4,7 @@
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 + + + frappe.__init__.get_doctype_app + (doctype) +

+

No docs

+
+
+ + + + + + +

diff --git a/frappe/docs/current/api/frappe.__version__.html b/frappe/docs/current/api/frappe.__version__.html index c657323dbc..72304ab01c 100644 --- a/frappe/docs/current/api/frappe.__version__.html +++ b/frappe/docs/current/api/frappe.__version__.html @@ -1,7 +1,7 @@

- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 Class AppNotInstalledError + +

Inherits from frappe.exceptions.ValidationError + +

+
+
+ +
+
+ + + + +

Class AuthenticationError

Inherits from exceptions.Exception diff --git a/frappe/docs/current/api/frappe.frappeclient.html b/frappe/docs/current/api/frappe.frappeclient.html index bc4aa14f67..cb6103d009 100644 --- a/frappe/docs/current/api/frappe.frappeclient.html +++ b/frappe/docs/current/api/frappe.frappeclient.html @@ -1,7 +1,7 @@

- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 + + + frappe.handler.is_whitelisted + (method) +

+

No docs

+
+
+ + + + + +

Public API
/api/method/frappe.handler.logout

diff --git a/frappe/docs/current/api/frappe.hooks.html b/frappe/docs/current/api/frappe.hooks.html index 2c00ab27cc..3c2edd325b 100644 --- a/frappe/docs/current/api/frappe.hooks.html +++ b/frappe/docs/current/api/frappe.hooks.html @@ -1,7 +1,7 @@
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 frappe.utils.bench_helper.app_group - (ctx, site=False, force=False, verbose=False, profile=False) + ()

No docs

diff --git a/frappe/docs/current/api/utils/frappe.utils.boilerplate.html b/frappe/docs/current/api/utils/frappe.utils.boilerplate.html index 99cfd6c85e..6cd46acc54 100644 --- a/frappe/docs/current/api/utils/frappe.utils.boilerplate.html +++ b/frappe/docs/current/api/utils/frappe.utils.boilerplate.html @@ -1,7 +1,7 @@
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 + + + frappe.utils.get_bench_path + () +

+

No docs

+
+
+ + + + + + +

@@ -284,7 +300,7 @@ frappe.utils.get_formatted_email (user)

-

get email id of user formatted as: John Doe johndoe@example.com

+

get email id of user formatted as: John Doe johndoe@example.com


diff --git a/frappe/docs/current/api/utils/frappe.utils.image.html b/frappe/docs/current/api/utils/frappe.utils.image.html index f49981c48f..2c8eb83cc3 100644 --- a/frappe/docs/current/api/utils/frappe.utils.image.html +++ b/frappe/docs/current/api/utils/frappe.utils.image.html @@ -1,7 +1,7 @@
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - +
-
+ App Name @@ -35,7 +35,7 @@ Version - 6.7.7 +
diff --git a/frappe/docs/current/models/core/async_task.html b/frappe/docs/current/models/core/async_task.html index 91507c0810..a77e0cc972 100644 --- a/frappe/docs/current/models/core/async_task.html +++ b/frappe/docs/current/models/core/async_task.html @@ -7,7 +7,7 @@
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1

Linked In:

 diff --git a/frappe/docs/current/models/core/defaultvalue.html b/frappe/docs/current/models/core/defaultvalue.html index 21b0f306c1..9257891d8f 100644 --- a/frappe/docs/current/models/core/defaultvalue.html +++ b/frappe/docs/current/models/core/defaultvalue.html @@ -7,7 +7,7 @@
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 31 + print_hide_if_no_value + + Check + + Print Hide If No Value + + + + + + + 32 print_width Data @@ -457,7 +469,7 @@ For Select, enter list of Options, each on a new line.

- 32 + 33 width Data @@ -469,7 +481,7 @@ For Select, enter list of Options, each on a new line.

- 33 + 34 column_break_22 Column Break @@ -481,7 +493,7 @@ For Select, enter list of Options, each on a new line.

- 34 + 35 description Small Text @@ -493,7 +505,7 @@ For Select, enter list of Options, each on a new line.

- 35 + 36 oldfieldname Data @@ -505,7 +517,7 @@ For Select, enter list of Options, each on a new line.

- 36 + 37 oldfieldtype Data diff --git a/frappe/docs/current/models/core/docperm.html b/frappe/docs/current/models/core/docperm.html index cabaa96439..debe34b49a 100644 --- a/frappe/docs/current/models/core/docperm.html +++ b/frappe/docs/current/models/core/docperm.html @@ -7,7 +7,7 @@
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 9 file_url - Data + Small Text File URL @@ -150,7 +150,7 @@ 10 thumbnail_url - Data + Small Text Thumbnail URL @@ -686,6 +686,54 @@ +

+ + + frappe.core.doctype.file.file.get_extension + (filename, extn, content) +

+

No docs

+
+
+ + + + + + + +

+ + + frappe.core.doctype.file.file.get_local_image + (file_url) +

+

No docs

+
+
+ + + + + + + +

+ + + frappe.core.doctype.file.file.get_web_image + (file_url) +

+

No docs

+
+
+ + + + + + +

@@ -754,12 +802,14 @@

Linked In:

diff --git a/frappe/docs/current/models/core/index.html b/frappe/docs/current/models/core/index.html index 95f33e2101..510ef4068d 100644 --- a/frappe/docs/current/models/core/index.html +++ b/frappe/docs/current/models/core/index.html @@ -4,7 +4,7 @@
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 modules.txt of app if missing.

Linked In:

 diff --git a/frappe/docs/current/models/core/page.html b/frappe/docs/current/models/core/page.html index 18b962aac9..496e34a50b 100644 --- a/frappe/docs/current/models/core/page.html +++ b/frappe/docs/current/models/core/page.html @@ -7,7 +7,7 @@
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 Linked In: diff --git a/frappe/docs/current/models/core/scheduler_log.html b/frappe/docs/current/models/core/scheduler_log.html index f9a2286456..a70c75dd5f 100644 --- a/frappe/docs/current/models/core/scheduler_log.html +++ b/frappe/docs/current/models/core/scheduler_log.html @@ -7,7 +7,7 @@
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - + 13 - change_password - - Section Break - - - - - - - - - 14 - new_password - - Password - - Set New Password - - - - - - - 15 - send_password_update_notification - - Check - - Send Password Update Notification - - - - - - - 16 - reset_password_key - - Data - - Reset Password Key - - - - - - - 17 - display_settings - - Section Break - - - - - - - - - 18 user_image - Attach + Attach Image User Image

@@ -259,121 +199,20 @@ Represents a User in the system. - - 19 - cb21 - - Column Break - - - - - - - - - 20 - user_image_show - - Image - - user_image_show - - - - 

user_image
- - - - 21 - email_settings - - Section Break - - Email Settings - - - - - - - 22 - thread_notify - - Check - - Send Notifications for Transactions I Follow - - - - - - - 23 - email_signature - - Small Text - - Email Signature - - - - - - - 24 - background - - Section Break - - - - - - - - - 25 - background_image - - Attach - - Background Image - - - - - - - 26 - background_style - - Select - - Background Style - - - - 
Fill Screen
-Tile
- - - - - 27 + 14 short_bio Section Break - + More Information - 28 + 15 gender Select @@ -390,7 +229,7 @@ Other - 29 + 16 birth_date Date @@ -402,7 +241,7 @@ Other - 30 + 17 location Data @@ -414,7 +253,7 @@ Other - 31 + 18 column_break_22 Column Break @@ -426,7 +265,7 @@ Other - 32 + 19 bio Small Text @@ -437,8 +276,143 @@ Other + + 20 + mute_sounds + + Check + + Mute Sounds + + + + + - 33 + 21 + change_password + + Section Break + + Change Password + + + + + + + 22 + new_password + + Password + + Set New Password + + + + + + + 23 + send_password_update_notification + + Check + + Send Password Update Notification + + + + + + + 24 + reset_password_key + + Data + + Reset Password Key + + + + + + + 25 + email_settings + + Section Break + + Email Settings + + + + + + + 26 + thread_notify + + Check + + Send Notifications for Transactions I Follow + + + + + + + 27 + email_signature + + Small Text + + Email Signature + + + + + + + 28 + background + + Section Break + + Desktop Background + + + + + + + 29 + background_image + + Attach + + Background Image + + + + + + + 30 + background_style + + Select + + Background Style + + + + 
Fill Screen
+Tile
+ + + + + 31 sb1 Section Break @@ -451,7 +425,7 @@ Other - 34 + 32 roles_html HTML @@ -463,7 +437,7 @@ Other - 35 + 33 user_roles Table @@ -484,7 +458,7 @@ Other - 36 + 34 modules_access Section Break @@ -497,7 +471,7 @@ Other - 37 + 35 modules_html HTML @@ -509,7 +483,7 @@ Other - 38 + 36 block_modules Table @@ -530,7 +504,7 @@ Other - 39 + 37 sb2 Section Break @@ -543,7 +517,7 @@ Other - 40 + 38 defaults Table @@ -565,7 +539,7 @@ Other - 41 + 39 sb3 Section Break @@ -577,7 +551,7 @@ Other - 42 + 40 user_type Select @@ -593,7 +567,7 @@ Website User - 43 + 41 login_after Int @@ -606,7 +580,7 @@ Website User - 44 + 42 login_before Int @@ -619,7 +593,7 @@ Website User - 45 + 43 restrict_ip Data @@ -632,7 +606,7 @@ Website User - 46 + 44 column_break1 Column Break @@ -644,7 +618,7 @@ Website User - 47 + 45 last_login Read Only @@ -656,7 +630,7 @@ Website User - 48 + 46 last_ip Read Only @@ -668,7 +642,19 @@ Website User - 49 + 47 + last_active + + Datetime + + Last Active + + + + + + + 48 last_known_versions Text @@ -681,7 +667,7 @@ Website User - 50 + 49 third_party_authentication Section Break @@ -693,7 +679,7 @@ Website User - 51 + 50 fb_username Data @@ -705,7 +691,7 @@ Website User - 52 + 51 fb_userid Data @@ -717,7 +703,7 @@ Website User - 53 + 52 google_userid Data @@ -729,7 +715,7 @@ Website User - 54 + 53 column_break_49 Column Break @@ -741,7 +727,7 @@ Website User - 55 + 54 github_userid Data @@ -753,7 +739,7 @@ Website User - 56 + 55 github_username Data @@ -1491,40 +1477,50 @@ Website User

Linked In:

 diff --git a/frappe/docs/current/models/core/userrole.html b/frappe/docs/current/models/core/userrole.html index c2980fbc72..9ced7b4068 100644 --- a/frappe/docs/current/models/core/userrole.html +++ b/frappe/docs/current/models/core/userrole.html @@ -7,7 +7,7 @@
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 7 + collapsible + + Check + + Collapsible + + + + + + + 8 + collapsible_depends_on + + Data + + Collapsible Depends On + + + + + + + 9 options_help HTML @@ -172,7 +196,7 @@ Time - 8 + 10 options Text @@ -184,7 +208,7 @@ Time - 9 + 11 description Text @@ -196,7 +220,7 @@ Time - 10 + 12 fieldname Data @@ -208,7 +232,7 @@ Time - 11 + 13 properties Column Break @@ -220,7 +244,7 @@ Time - 12 + 14 permlevel Int @@ -232,7 +256,7 @@ Time - 13 + 15 reqd Check @@ -244,7 +268,7 @@ Time - 14 + 16 unique Check @@ -256,7 +280,7 @@ Time - 15 + 17 read_only Check @@ -268,7 +292,7 @@ Time - 16 + 18 ignore_user_permissions Check @@ -280,7 +304,7 @@ Time - 17 + 19 width Data @@ -292,7 +316,7 @@ Time - 18 + 20 default Text @@ -304,7 +328,7 @@ Time - 19 + 21 hidden Check @@ -316,7 +340,7 @@ Time - 20 + 22 depends_on Small Text @@ -328,7 +352,7 @@ Time - 21 + 23 print_hide Check @@ -340,7 +364,19 @@ Time - 22 + 24 + print_hide_if_no_value + + Check + + Print Hide If No Value + + + + + + + 25 print_width Data @@ -352,7 +388,7 @@ Time - 23 + 26 no_copy Check @@ -364,7 +400,7 @@ Time - 24 + 27 allow_on_submit Check @@ -376,7 +412,7 @@ Time - 25 + 28 in_filter Check @@ -388,7 +424,7 @@ Time - 26 + 29 in_list_view Check @@ -400,7 +436,7 @@ Time - 27 + 30 report_hide Check @@ -412,7 +448,7 @@ Time - 28 + 31 search_index Check diff --git a/frappe/docs/current/models/custom/custom_script.html b/frappe/docs/current/models/custom/custom_script.html index 825c7f64ac..7255d8fbfd 100644 --- a/frappe/docs/current/models/custom/custom_script.html +++ b/frappe/docs/current/models/custom/custom_script.html @@ -7,7 +7,7 @@
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 4 - search_fields - - Data - - Search Fields -

- Fields separated by comma (,) will be included in the "Search By" list of Search dialog box

- - - - - - 5 - column_break_5 - - Column Break - - - - - - - - - 6 max_attachments Int @@ -128,7 +103,7 @@ - 7 + 5 allow_copy Check @@ -139,8 +114,46 @@ - + + 6 + column_break_5 + + Column Break + + + + + + + + + 7 + title_field + + Data + + Title Field +

+ Use this fieldname to generate title

+ + + + + 8 + search_fields + + Data + + Search Fields +

+ Fields separated by comma (,) will be included in the "Search By" list of Search dialog box

+ + + + + + 9 section_break_8 Section Break @@ -152,7 +165,7 @@ - 9 + 10 sort_field Select @@ -164,7 +177,7 @@ - 10 + 11 column_break_10 Column Break @@ -176,7 +189,7 @@ - 11 + 12 sort_order Select @@ -191,7 +204,7 @@ DESC - 12 + 13 fields_section_break Section Break @@ -204,7 +217,7 @@ DESC - 13 + 14 fields Table diff --git a/frappe/docs/current/models/custom/customize_form_field.html b/frappe/docs/current/models/custom/customize_form_field.html index 4bff2ef405..eb76faf92f 100644 --- a/frappe/docs/current/models/custom/customize_form_field.html +++ b/frappe/docs/current/models/custom/customize_form_field.html @@ -7,7 +7,7 @@
- Version 6.7.7 + Version 6.10.1 18

29 + print_hide_if_no_value + + Check + + Print Hide If No Value + + + + + + + 30 print_width Data @@ -436,7 +448,7 @@ eval:doc.age>18

- 30 + 31 width Data @@ -448,7 +460,7 @@ eval:doc.age>18

- 31 + 32 is_custom_field Check diff --git a/frappe/docs/current/models/custom/index.html b/frappe/docs/current/models/custom/index.html index 8d50880d52..160904e0af 100644 --- a/frappe/docs/current/models/custom/index.html +++ b/frappe/docs/current/models/custom/index.html @@ -4,7 +4,7 @@
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - + 1 email_settings Section Break - - + + - + 2 service @@ -57,7 +57,7 @@ Select Service - + 
@@ -67,7 +67,7 @@ Outlook.com
 Yandex.Mail
- + 3 email_id @@ -75,13 +75,13 @@ Yandex.Mail Data Email Id - + 
Email
- + 4 login_id_is_different @@ -89,11 +89,11 @@ Yandex.Mail Check Login Id is Different - + - + 5 login_id @@ -101,11 +101,11 @@ Yandex.Mail Data Login Id - + - + 6 password @@ -113,11 +113,11 @@ Yandex.Mail Password Password - + - + 7 email_account_name @@ -130,19 +130,19 @@ Yandex.Mail - + 8 mailbox_settings Section Break - - + + - + 9 enable_incoming @@ -155,7 +155,7 @@ Yandex.Mail - + 10 pop3_server @@ -168,7 +168,7 @@ Yandex.Mail - + 11 use_ssl @@ -176,11 +176,11 @@ Yandex.Mail Check Use SSL - + - + 12 attachment_limit @@ -193,7 +193,7 @@ Yandex.Mail - + 13 append_to @@ -205,17 +205,17 @@ Yandex.Mail Append as communication against this DocType (must have fields, "Status", "Subject")

- - + + DocType - + - + 14 default_incoming @@ -228,19 +228,19 @@ Yandex.Mail - + 15 section_break_13 Section Break - - + + - + 16 notify_if_unreplied @@ -248,11 +248,11 @@ Yandex.Mail Check Notify if unreplied - + - + 17 unreplied_for_mins @@ -260,11 +260,11 @@ Yandex.Mail Int Notify if unreplied for (in mins) - + - + 18 send_notification_to @@ -277,19 +277,19 @@ Yandex.Mail - + 19 outgoing_mail_settings Section Break - - + + - + 20 enable_outgoing @@ -302,7 +302,7 @@ Yandex.Mail - + 21 smtp_server @@ -315,7 +315,7 @@ Yandex.Mail - + 22 use_tls @@ -323,11 +323,11 @@ Yandex.Mail Check Use TLS - + - + 23 smtp_port @@ -340,7 +340,7 @@ Yandex.Mail - + 24 default_outgoing @@ -353,7 +353,7 @@ Yandex.Mail - + 25 always_use_account_email_id_as_sender @@ -366,19 +366,19 @@ Yandex.Mail - + 26 signature_section Section Break - - + + - + 27 add_signature @@ -386,11 +386,11 @@ Yandex.Mail Check Add Signature - + - + 28 signature @@ -398,23 +398,23 @@ Yandex.Mail Text Editor Signature - + - + 29 auto_reply Section Break - - + + - + 30 enable_auto_reply @@ -422,11 +422,11 @@ Yandex.Mail Check Enable Auto Reply - + - + 31 auto_reply_message @@ -439,19 +439,19 @@ Yandex.Mail - + 32 set_footer Section Break - - + + - + 33 footer @@ -459,11 +459,11 @@ Yandex.Mail Text Editor Footer - + - + @@ -472,23 +472,23 @@ Yandex.Mail

Controller

frappe.email.doctype.email_account.email_account

+ - - - + +

Class EmailAccount

- +

Inherits from frappe.model.document.Document - +

- - - - + + + +

@@ -499,10 +499,10 @@ Yandex.Mail


- - - - + + + +

@@ -513,24 +513,24 @@ Yandex.Mail


- - - - + + + +

get_pop3 - (self) + (self, in_receive=False)

Returns logged in POP3 connection object.


- - - - + + + +

@@ -541,10 +541,24 @@ Yandex.Mail


+ + + + +

+ + + handle_incoming_connect_error + (self, description) +

+

No docs

+
+
- - - + + + +

@@ -555,10 +569,10 @@ Yandex.Mail


- - - - + + + +

@@ -569,10 +583,10 @@ Yandex.Mail


- - - - + + + +

@@ -583,10 +597,10 @@ Yandex.Mail


- - - - + + + +

@@ -597,10 +611,10 @@ Yandex.Mail


- - - - + + + +

@@ -611,10 +625,10 @@ Yandex.Mail


- - - - + + + +

@@ -630,10 +644,10 @@ it will create a new parent transaction (e.g. Issue)


- - - - + + + +

@@ -644,10 +658,10 @@ it will create a new parent transaction (e.g. Issue)


- - - - + + + +

@@ -658,30 +672,30 @@ it will create a new parent transaction (e.g. Issue)


- +
+ - - - + +

Class SentEmailInInbox

- +

Inherits from exceptions.Exception - +

- +
+ - - - - + + +

Public API
/api/method/frappe.email.doctype.email_account.email_account.get_append_to

@@ -695,12 +709,12 @@ it will create a new parent transaction (e.g. Issue)


+ - - - - - + + + +

@@ -712,12 +726,12 @@ and notify_if_unreplied is set as true.


+ - - - - - + + + +

@@ -728,25 +742,27 @@ and notify_if_unreplied is set as true.


+ - - - + +

Linked In:

- + - + \ No newline at end of file diff --git a/frappe/docs/current/models/email/email_alert.html b/frappe/docs/current/models/email/email_alert.html index 46b13cc932..2fcd4b5555 100644 --- a/frappe/docs/current/models/email/email_alert.html +++ b/frappe/docs/current/models/email/email_alert.html @@ -7,7 +7,7 @@
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 frappe.print.doctype.print_format.print_format.make_default (name)

-

No docs

+

Set print format as default


@@ -410,12 +410,14 @@ Monospace

Linked In:

 diff --git a/frappe/docs/current/models/print/print_settings.html b/frappe/docs/current/models/print/print_settings.html index 1d74eed67b..91e538f1af 100644 --- a/frappe/docs/current/models/print/print_settings.html +++ b/frappe/docs/current/models/print/print_settings.html @@ -7,7 +7,7 @@
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 Linked In: diff --git a/frappe/docs/current/models/website/blog_post.html b/frappe/docs/current/models/website/blog_post.html index 440ead2a05..1c0e044694 100644 --- a/frappe/docs/current/models/website/blog_post.html +++ b/frappe/docs/current/models/website/blog_post.html @@ -7,7 +7,7 @@
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 Linked In: diff --git a/frappe/docs/current/models/website/company_history.html b/frappe/docs/current/models/website/company_history.html index 7914b96b6e..a451994b06 100644 --- a/frappe/docs/current/models/website/company_history.html +++ b/frappe/docs/current/models/website/company_history.html @@ -7,7 +7,7 @@
- Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1
  • -Website Settings - -
    • - -
  • - - -Website Settings - -
    • - -
  • - - Website Settings
    • diff --git a/frappe/docs/current/models/website/web_form.html b/frappe/docs/current/models/website/web_form.html index f311231581..ad6db6d6c5 100644 --- a/frappe/docs/current/models/website/web_form.html +++ b/frappe/docs/current/models/website/web_form.html @@ -7,7 +7,7 @@
    - Version 6.7.7 + Version 6.10.1 5 + is_standard + + Check + + Is Standard + + + + + + + 6 published Check @@ -109,7 +121,7 @@ - 6 + 7 login_required Check @@ -121,7 +133,7 @@ - 7 + 8 allow_edit Check @@ -133,7 +145,7 @@ - 8 + 9 allow_multiple Check @@ -145,7 +157,7 @@ - 9 + 10 allow_delete Check @@ -157,7 +169,7 @@ - 10 + 11 allow_comments Check @@ -169,7 +181,7 @@ - 11 + 12 fields Section Break @@ -181,7 +193,7 @@ - 12 + 13 introduction_text Text @@ -193,7 +205,7 @@ - 13 + 14 web_form_fields Table @@ -214,7 +226,7 @@ - 14 + 15 actions Section Break @@ -226,7 +238,7 @@ - 15 + 16 success_message Text @@ -239,7 +251,7 @@ - 16 + 17 success_url Data @@ -252,7 +264,7 @@ - 17 + 18 advanced Section Break @@ -264,7 +276,7 @@ - 18 + 19 web_page_link_text Data @@ -277,7 +289,7 @@ - 19 + 20 breadcrumbs Small Text @@ -353,6 +365,48 @@
    + + + +

    + + + onload + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + use_meta_fields + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + +
    diff --git a/frappe/docs/current/models/website/web_form_field.html b/frappe/docs/current/models/website/web_form_field.html index dc1daf51f4..68decf3f7f 100644 --- a/frappe/docs/current/models/website/web_form_field.html +++ b/frappe/docs/current/models/website/web_form_field.html @@ -7,7 +7,7 @@
    - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 24 template_path - Data + Small Text Template Path @@ -559,12 +559,14 @@ Right

    Linked In:

     diff --git a/frappe/docs/current/models/website/website_script.html b/frappe/docs/current/models/website/website_script.html index 023d272d42..14084c387b 100644 --- a/frappe/docs/current/models/website/website_script.html +++ b/frappe/docs/current/models/website/website_script.html @@ -7,7 +7,7 @@
    - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 Linked In: diff --git a/frappe/docs/current/models/website/website_slideshow_item.html b/frappe/docs/current/models/website/website_slideshow_item.html index ed495e0f57..1717bb7a78 100644 --- a/frappe/docs/current/models/website/website_slideshow_item.html +++ b/frappe/docs/current/models/website/website_slideshow_item.html @@ -7,7 +7,7 @@
    - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1

    Linked In:

     diff --git a/frappe/docs/current/models/workflow/index.html b/frappe/docs/current/models/workflow/index.html index 6b1d430fb6..14cbaee39f 100644 --- a/frappe/docs/current/models/workflow/index.html +++ b/frappe/docs/current/models/workflow/index.html @@ -4,7 +4,7 @@
    - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1 Linked In: diff --git a/frappe/docs/current/models/workflow/workflow_document_state.html b/frappe/docs/current/models/workflow/workflow_document_state.html index 1abd462e54..65d153545d 100644 --- a/frappe/docs/current/models/workflow/workflow_document_state.html +++ b/frappe/docs/current/models/workflow/workflow_document_state.html @@ -7,7 +7,7 @@
    - Version 6.7.7 + Version 6.10.1 - Version 6.7.7 + Version 6.10.1

    Linked In:

     diff --git a/frappe/docs/current/models/workflow/workflow_transition.html b/frappe/docs/current/models/workflow/workflow_transition.html index bf7985751f..dea6be4803 100644 --- a/frappe/docs/current/models/workflow/workflow_transition.html +++ b/frappe/docs/current/models/workflow/workflow_transition.html @@ -7,7 +7,7 @@
    - Version 6.7.7 + Version 6.10.1 - -
    -

    Superhero Web Framework

    -

    Build extensions to ERPNext or make your own database driven app

    + +
    +
    +
    +
    +

    Superhero Web Framework

    +

    Build extensions to ERPNext or make your own database driven app

    +
    +
    +
    + +
    +
    +
    +
    -
    -
    - -
    -
    +
    +
    +
    +

    Frappe is a full stack web application framework written in Python, +Javascript, HTML/CSS with MySQL as the backend. It was built for ERPNext +but is pretty generic and can be used to build database driven apps.

    +

    The key differece in Frappe compared to other frameworks is that Frappe +is that meta-data is also treated as data and is used to build front-ends +very easily. Frappe comes with a full blown admin UI called the Desk +that handles forms, navigation, lists, menus, permissions, file attachment +and much more out of the box.

    -
    -

    The Frappe Framework is a server side and client side -framework and is built with the philosophy make it "battries included". -It has libraries and API for authentication, MVC, permissions, REST API, -templating, admin interface, forms, reports and much more.

    +

    Frappe also has a plug-in architecture that can be used to build plugins +to ERPNext.

    Frappe Framework was designed to build ERPNext, open source ERP for managing small and medium sized businesses.

    +
    +
    diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css index d8408e9c4e..24c45c7d74 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -237,27 +237,190 @@ body { body { font-size: 16px; line-height: 1.65em; + color: #454e57; + position: relative; + -webkit-font-smoothing: antialiased; } .container { - max-width: 800px; + max-width: 870px; +} +.splash { + background-color: #383851; + background-image: url('/assets/img/background.png'); + color: #ffffff; + padding-top: 128px; +} +.splash .jumbotron { + background-color: transparent; + padding: 14px 0 60px 0; + text-align: center; + text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.7); +} +.splash .jumbotron h1 { + font-size: 36px; + font-weight: 700; + opacity: 0.9; +} +.splash .jumbotron p { + font-size: 24px; + font-color: #8D99A6 !important; + letter-spacing: 0px; + opacity: 0.7; + margin-top: 20px; + font-weight: 300; + line-height: 1.4em; +} +.splash .section { + padding: 30px 0 0 0; +} +.page-container { + padding-top: 128px; + margin: 0 auto; + width: 870px; +} +.page-container .page-content { + width: 83%; + margin: 0 auto; +} +.page-container .webpage-content ol > li, +.page-container .webpage-content ul > li { + margin: 13px auto; +} +.page-container .webpage-content ol > li li, +.page-container .webpage-content ul > li li { + margin: 4px auto; +} +.page-container .webpage-content ol li ol { + list-style-type: disc; +} +.page-container .webpage-content ul, +.page-container .webpage-content ol { + margin-bottom: 32px; +} +#page-index { + padding-top: 0; + width: 100%; + margin: 0; +} +#page-index .page-content { + width: 100%; + margin: 0; +} +code { + color: #e66a12; + background: #fff6df; +} +pre { + background: #fafbfc; + border: 1px solid #e1e9f0; + border-radius: 2px; +} +.hljs { + background: transparent; + border: none; + padding: 1.2em 1.5em 1.5em; + color: #454e57; +} +.hljs-keyword, +.hljs-tag, +.css .hljs-class, +.css .hljs-id, +.lisp .hljs-title, +.nginx .hljs-title, +.hljs-request, +.hljs-status, +.clojure .hljs-attribute { + color: #e66a12; +} +.diff .hljs-deletion, +.hljs-string, +.hljs-tag .hljs-value, +.hljs-preprocessor, +.hljs-pragma, +.hljs-built_in, +.hljs-javadoc, +.smalltalk .hljs-class, +.smalltalk .hljs-localvars, +.smalltalk .hljs-array, +.css .hljs-rules .hljs-value, +.hljs-attr_selector, +.hljs-pseudo, +.apache .hljs-cbracket, +.tex .hljs-formula, +.coffeescript .hljs-attribute { + color: #dd4a68; +} +.hljs-number, +.hljs-date, +.hljs-regexp, +.hljs-literal, +.hljs-hexcolor, +.smalltalk .hljs-symbol, +.smalltalk .hljs-char, +.go .hljs-constant, +.hljs-change, +.lasso .hljs-variable, +.makefile .hljs-variable, +.asciidoc .hljs-bullet, +.markdown .hljs-bullet, +.asciidoc .hljs-link_url, +.markdown .hljs-link_url { + color: #7575ff; +} +.hljs-shebang, +.diff .hljs-addition, +.hljs-comment, +.hljs-annotation, +.hljs-template_comment, +.hljs-pi, +.hljs-doctype { + color: #6a906a; +} +.dos .hljs-keyword, +.hljs-decorator, +.hljs-title, +.hljs-type, +.diff .hljs-header, +.ruby .hljs-class .hljs-parent, +.apache .hljs-tag, +.nginx .hljs-built_in, +.tex .hljs-command, +.hljs-prompt { + color: #4f4fa4; +} +.navbar { + position: absolute; + top: 0; + right: 0; + left: 0; + width: 870px; + margin: 0 auto; } .navbar a { font-size: 16px; font-weight: normal; } +.navbar a.navbar-brand { + font-weight: bold; +} .breadcrumb { - line-height: 1.5em; + line-height: 1em; color: #8D99A6; background-color: transparent; - margin-bottom: 10px; + margin-bottom: 32px; padding: 0px; + padding-left: 20px; + background: url('/assets/img/up.png') 0% 30% no-repeat; +} +.breadcrumb .icon { + display: none; } .breadcrumb a, .breadcrumb a:hover, .breadcrumb a:focus, .breadcrumb a:visited { - color: inherit; - font-size: 14px; + color: #7575ff; + font-size: 16px; } a, a:hover, @@ -273,48 +436,65 @@ a.btn-primary:focus, a.btn-primary:visited { color: #fff; } +.btn-next-wrapper { + margin: 32px 0 16px; +} h2 { + margin-top: 48px; font-size: 24px; } +h3, +h4 { + margin-top: 48px; +} +p { + margin-bottom: 16px; +} +.hero-and-content > p { + max-width: 723px; + margin: 0 auto; +} .navbar { background-color: transparent; border: none; padding: 15px 0px; border-radius: 0px; - border-top: 5px solid #7575ff; border-bottom: 1px solid #d1d8dd; } .section { - padding: 30px; - max-width: 800px; - margin: auto; + padding: 64px 0 0 0; } .dev-header { margin-bottom: 30px; } .docs-footer { - margin-top: 50px; padding: 30px 0px 60px 0px; border-top: 1px solid #d1d8dd; + width: 870px; + margin: 0 auto; + margin-top: 80px; + font-size: 14px; +} +.docs-footer h3 { + margin-top: 24px; + font-size: 16px; +} +.docs-footer img.frappe-bird { + width: 40px; + height: 40px; + background: #fff; + margin-bottom: 10px; + padding: 5px; } .docs-footer a { color: #8D99A6; } .docs-footer li { display: inline-block; - margin: 0 15px; + margin: 0 10px; } -.jumbotron { - background-color: transparent; - padding: 80px 30px; - text-align: center; -} -.jumbotron h1 { - font-size: 32px; - font-weight: 700; -} -.jumbotron p { - font-color: #8D99A6 !important; +.docs-footer .built-with-frappe { + margin-top: -50px; } .browser-image { min-height: 300px; @@ -322,8 +502,7 @@ h2 { } .fake-browser-frame { position: relative; - margin: 40px auto; - max-width: 600px; + margin: 24px auto 0px; } .fake-browser-frame::before { content: ""; @@ -333,6 +512,7 @@ h2 { left: 0px; right: 0px; border: 1px solid #d1d8dd; + background: #ffffff; border-bottom: none; border-top-left-radius: 4px; border-top-right-radius: 4px; @@ -370,11 +550,49 @@ h2 { border-radius: 15px; } .screenshot { - border: 2px solid #d1d8dd; + border: 1px solid #d1d8dd; box-shadow: 1px 1px 7px rgba(0, 0, 0, 0.15); - margin: 30px 0px; + margin: 8px 0px; max-width: 100%; } hr { - margin: 30px 0px; + margin: 48px 0px 30px; +} +.edit { + padding-left: 20px; + background: url('/assets/img/smiley.png') 0% 50% no-repeat; + color: #8d99a6; + position: relative; + top: -10px; +} +a.edit, +a.edit:hover, +a.edit:focus, +a.edit:visited { + color: #8d99a6; +} +.btn-next { + margin-top: 16px; + float: right; +} +.btn-next:after { + content: " \2192"; +} +#current td { + font-weight: bold; +} +#current td code { + font-weight: normal; + background: transparent; + font-family: "Helvetica Neue", Helvetica, Arial, "Open Sans", sans-serif; + color: #454e57; + font-size: 16px; +} +@media (max-width: 767px) { + .offcanvas-container, + .offcanvas, + .offcanvas-main-section { + position: relative; + width: 50%; + } } diff --git a/frappe/public/images/background.png b/frappe/public/images/background.png new file mode 100644 index 0000000000..45b91e94ea Binary files /dev/null and b/frappe/public/images/background.png differ diff --git a/frappe/public/images/smiley.png b/frappe/public/images/smiley.png new file mode 100644 index 0000000000..80aaf48f35 Binary files /dev/null and b/frappe/public/images/smiley.png differ diff --git a/frappe/public/images/up.png b/frappe/public/images/up.png new file mode 100644 index 0000000000..949027e61e Binary files /dev/null and b/frappe/public/images/up.png differ diff --git a/frappe/public/less/docs.less b/frappe/public/less/docs.less index 3019661e48..af97c38370 100644 --- a/frappe/public/less/docs.less +++ b/frappe/public/less/docs.less @@ -5,36 +5,161 @@ body { font-size: 16px; line-height: 1.65em; + color: #454e57; + position: relative; + -webkit-font-smoothing: antialiased; } .container { - max-width: 800px; + max-width: 870px; } +.splash{ + background-color: #383851; + background-image: url('/assets/img/background.png'); + color: #ffffff; + padding-top: 128px; + + .jumbotron{ + background-color: transparent; + padding: 14px 0 60px 0; + text-align: center; + text-shadow: 0px 1px 2px rgba(0,0,0,0.7); + + h1 { + font-size: 36px; + font-weight: 700; + opacity: 0.9; + } + + p { + font-size: 24px; + font-color: @text-muted !important; + letter-spacing: 0px; + opacity: 0.7; + margin-top: 20px; + font-weight: 300; + line-height: 1.4em; + } + } + .section{ + padding: 30px 0 0 0; + } +} + + +.page-container{ + padding-top:128px; + margin:0 auto; + width:870px; + + .page-content { + width:83%; + margin:0 auto; + } + + .webpage-content{ + ol > li, ul > li { + margin: 13px auto; + } + + ol > li li, ul > li li { + margin: 4px auto; + } + + ol li ol { + list-style-type: disc; + } + ul, ol { + margin-bottom:32px; + } + } +} + +#page-index { + padding-top:0; + width:100%; + margin:0; + + .page-content { + width:100%; + margin:0; + } +} + +code{ + color: #e66a12; + background: #fff6df; +} + +pre { + background:#fafbfc; + border: 1px solid #e1e9f0; + border-radius:2px; +} + +.hljs { + background:transparent; + border:none; + padding:1.2em 1.5em 1.5em; + color:#454e57; +} + +.hljs-keyword, .hljs-tag, .css .hljs-class, .css .hljs-id, .lisp .hljs-title, .nginx .hljs-title, .hljs-request, .hljs-status, .clojure .hljs-attribute{ + color:#e66a12; + } + .diff .hljs-deletion, .hljs-string, .hljs-tag .hljs-value, .hljs-preprocessor, .hljs-pragma, .hljs-built_in, .hljs-javadoc, .smalltalk .hljs-class, .smalltalk .hljs-localvars, .smalltalk .hljs-array, .css .hljs-rules .hljs-value, .hljs-attr_selector, .hljs-pseudo, .apache .hljs-cbracket, .tex .hljs-formula, .coffeescript .hljs-attribute{ + color:#dd4a68; + } + .hljs-number, .hljs-date, .hljs-regexp, .hljs-literal, .hljs-hexcolor, .smalltalk .hljs-symbol, .smalltalk .hljs-char, .go .hljs-constant, .hljs-change, .lasso .hljs-variable, .makefile .hljs-variable, .asciidoc .hljs-bullet, .markdown .hljs-bullet, .asciidoc .hljs-link_url, .markdown .hljs-link_url{ + color:#7575ff; + } + .hljs-shebang, .diff .hljs-addition, .hljs-comment, .hljs-annotation, .hljs-template_comment, .hljs-pi, .hljs-doctype{ + color:#6a906a; + } + .dos .hljs-keyword, .hljs-decorator, .hljs-title, .hljs-type, .diff .hljs-header, .ruby .hljs-class .hljs-parent, .apache .hljs-tag, .nginx .hljs-built_in, .tex .hljs-command, .hljs-prompt { + color:#4f4fa4; + } + .navbar { //background-color: @navbar-bg !important; //background-color: @text-color !important; // border-bottom: 3px solid @border-color !important; + position: absolute; + top:0; + right: 0; + left: 0; + width:870px; + margin:0 auto; } .navbar a { font-size: 16px; font-weight: normal; //color: #fff !important; + &.navbar-brand{ + font-weight: bold; + } } .breadcrumb { - line-height: 1.5em; + line-height: 1em; color: @text-muted; background-color: transparent; - margin-bottom: 10px; + margin-bottom: 32px; padding: 0px; + padding-left:20px; + background:url('/assets/img/up.png') 0% 30% no-repeat; + + .icon { + display:none; + } } .breadcrumb a, .breadcrumb a:hover, .breadcrumb a:focus, .breadcrumb a:visited { - color: inherit; - font-size: 14px; + color:#7575ff; + font-size: 16px; } a, a:hover, a:focus, a:visited { @@ -48,23 +173,38 @@ a.btn-primary& { } } +.btn-next-wrapper { + margin:32px 0 16px; +} + h2 { + margin-top:48px; font-size: 24px; } +h3, h4 { + margin-top:48px; +} + +p { + margin-bottom:16px; +} + +.hero-and-content > p { + max-width:723px; + margin:0 auto; +} + .navbar { background-color: transparent; border: none; - padding: 15px 0px; + padding: 15px 0px; border-radius: 0px; - border-top: 5px solid @erpnext-blue; - border-bottom: 1px solid @border-color; + border-bottom: 1px solid @border-color; } .section { - padding: 30px; - max-width: 800px; - margin: auto; + padding: 64px 0 0 0; } .dev-header { @@ -72,33 +212,35 @@ h2 { } .docs-footer { - margin-top: 50px; padding: 30px 0px 60px 0px; border-top: 1px solid @border-color; - + width:870px; + margin:0 auto; + margin-top: 80px; + font-size: 14px; + + h3 { + margin-top:24px; + font-size:16px; + } + img.frappe-bird { + width:40px; + height:40px; + background:#fff; + margin-bottom:10px; + padding:5px; + } a { color: @text-muted; } li { display: inline-block; - margin: 0 15px; - } -} - -.jumbotron { - background-color: transparent; - padding: 80px 30px; - text-align: center; - - h1 { - font-size: 32px; - font-weight: 700; - } - - p { - font-color: @text-muted !important; + margin: 0 10px; } + .built-with-frappe{ + margin-top:-50px; + } } // fake frames @@ -109,8 +251,7 @@ h2 { .fake-browser-frame { position: relative; - margin: 40px auto; - max-width: 600px; + margin: 24px auto 0px; } .fake-browser-frame::before { @@ -121,6 +262,7 @@ h2 { left: 0px; right: 0px; border: 1px solid #d1d8dd; + background: #ffffff; border-bottom: none; border-top-left-radius: 4px; border-top-right-radius: 4px; @@ -136,7 +278,7 @@ h2 { /* octicon */ font: normal normal; - font-size: 8px; + font-size: 8px; font-family: 'FontAwesome'; line-height: 1; display: inline-block; @@ -165,12 +307,51 @@ h2 { } .screenshot { - border: 2px solid @border-color; + border: 1px solid @border-color; box-shadow: 1px 1px 7px rgba(0,0,0,0.15); - margin: 30px 0px; + margin: 8px 0px; max-width: 100%; } hr { - margin: 30px 0px; + margin: 48px 0px 30px; +} + +.edit { + padding-left: 20px; + background:url('/assets/img/smiley.png') 0% 50% no-repeat; + color:#8d99a6; + position:relative; + top:-10px; +} +a.edit, a.edit:hover, a.edit:focus, a.edit:visited { + color:#8d99a6; +} + +.btn-next { + margin-top:16px; + float:right; +} +.btn-next:after { + content:" \2192"; +} + +#current td { + font-weight:bold; +} +#current td code { + font-weight:normal; + background:transparent; + font-family:"Helvetica Neue", Helvetica, Arial, "Open Sans", sans-serif; + color:#454e57; + font-size:16px; +} + +@media (max-width: 767px) { + .offcanvas-container, + .offcanvas, + .offcanvas-main-section { + position: relative; + width:50%; + } } diff --git a/frappe/templates/autodoc/base_template.html b/frappe/templates/autodoc/base_template.html index 5a07b7a5c1..3e69a365be 100644 --- a/frappe/templates/autodoc/base_template.html +++ b/frappe/templates/autodoc/base_template.html @@ -60,16 +60,19 @@ {%- endblock -%}
    {% block content %} -
    - {{ content }} - + {{ content }} +
    {% endblock %}
    {%- if footer is defined -%}{{ footer }}{%- endif -%} -
    + +
    + +

    By Frappe Technologies

    +
    • @@ -94,9 +97,7 @@
    -
    - -
    +
    diff --git a/frappe/templates/autodoc/dev_home.html b/frappe/templates/autodoc/dev_home.html index cfe2d5755d..20176d6769 100644 --- a/frappe/templates/autodoc/dev_home.html +++ b/frappe/templates/autodoc/dev_home.html @@ -7,9 +7,9 @@ {{ source_link(app, app.name, True) }}
    - +
    -
    + App Name diff --git a/frappe/templates/autodoc/docs_home.html b/frappe/templates/autodoc/docs_home.html index 3134c40fc7..980fc4d166 100644 --- a/frappe/templates/autodoc/docs_home.html +++ b/frappe/templates/autodoc/docs_home.html @@ -1,49 +1,65 @@ - -
    -

    {{ app.headline }}

    -

    {{ app.sub_heading }}

    + +
    +
    +
    +
    +

    {{ app.headline }}

    +

    {{ app.sub_heading }}

    +
    +
    +
    + +
    +
    +
    +
    - -
    -
    - -
    -
    - {% if app.long_description %} -
    - {{ app.long_description|markdown }} +
    +
    +
    + {{ app.long_description|markdown }} +
    +
    {% endif %} {% if not app.hide_install %} -
    +
    +
    +

    Install

    -

    From your site

    -

    To install this app, login to your site and click on "Installer". Search for {{ app.title }} and click on "Install"

    -

    Using Bench

    -

    Go to your bench folder and setup the new app

    - 
    $ bench get-app {{app.name}} {{app.source_link}}
 $ bench new-site testsite
 $ bench --site testsite install-app {{app.name}}
    -

    Login to your site to configure the app.

    -

    Detailed Installation Steps

    -
    +
    +
    +

    Author

    -
    -

    Author

    - -

    {{ app.publisher }} ({{ app.email }})

    +

    {{ app.publisher }} ({{ app.email }})

    +
    +
    {% endif %} diff --git a/frappe/templates/includes/page_content.html b/frappe/templates/includes/page_content.html index 82f28de8aa..6083e4ef11 100644 --- a/frappe/templates/includes/page_content.html +++ b/frappe/templates/includes/page_content.html @@ -4,6 +4,9 @@
    +
    + {%- if breadcrumbs is defined -%}{{ breadcrumbs }}{%- endif -%} +
    {%- if header is defined -%} {% if header %}{{ header }}{% endif %} @@ -18,9 +21,7 @@
    -
    - {%- if breadcrumbs is defined -%}{{ breadcrumbs }}{%- endif -%} -
    +
    {%- block content -%}{{ content or "" }}{%- endblock -%}
    diff --git a/frappe/utils/setup_docs.py b/frappe/utils/setup_docs.py index 01cd215ce5..077438e2e5 100644 --- a/frappe/utils/setup_docs.py +++ b/frappe/utils/setup_docs.py @@ -321,7 +321,7 @@ class setup_docs(object): if not "" in html: html = html.replace('', - '


    Improve this page

    '.format(\ + '


    Improve this page

    '.format(\ source_link = self.docs_config.source_link, app_name = self.app, branch = context.app.branch, @@ -372,7 +372,10 @@ class setup_docs(object): "css/octicons": "css/octicons", # always overwrite octicons.css to fix the path "css/octicons/octicons.css": "css/octicons/octicons.css", - "images/frappe-bird-grey.svg": "img/frappe-bird-grey.svg" + "images/frappe-bird-grey.svg": "img/frappe-bird-grey.svg", + "images/background.png": "img/background.png", + "images/smiley.png": "img/smiley.png", + "images/up.png": "img/up.png" } for source, target in copy_files.iteritems():