From 3a65d7a1ff8689f9d9568044776abf14cc80c165 Mon Sep 17 00:00:00 2001 From: Ashish Acharya Date: Thu, 26 Nov 2015 20:46:18 +0530 Subject: [PATCH 01/14] Base Code --- .../api/config/frappe.config.desk.html | 2 +- .../api/config/frappe.config.desktop.html | 2 +- .../api/config/frappe.config.docs.html | 2 +- .../current/api/config/frappe.config.html | 2 +- .../api/config/frappe.config.setup.html | 2 +- .../api/config/frappe.config.website.html | 2 +- frappe/docs/current/api/config/index.html | 2 +- frappe/docs/current/api/core/frappe.core.html | 2 +- .../api/core/frappe.core.notifications.html | 2 +- frappe/docs/current/api/core/index.html | 2 +- .../current/api/custom/frappe.custom.html | 2 +- frappe/docs/current/api/custom/index.html | 2 +- .../desk/form/frappe.desk.form.assign_to.html | 2 +- .../api/desk/form/frappe.desk.form.html | 2 +- .../form/frappe.desk.form.linked_with.html | 2 +- .../api/desk/form/frappe.desk.form.load.html | 2 +- .../api/desk/form/frappe.desk.form.meta.html | 2 +- .../form/frappe.desk.form.run_method.html | 2 +- .../api/desk/form/frappe.desk.form.save.html | 2 +- .../desk/form/frappe.desk.form.test_form.html | 2 +- .../api/desk/form/frappe.desk.form.utils.html | 20 +- frappe/docs/current/api/desk/form/index.html | 2 +- .../api/desk/frappe.desk.calendar.html | 2 +- .../api/desk/frappe.desk.desk_page.html | 2 +- frappe/docs/current/api/desk/frappe.desk.html | 2 +- .../api/desk/frappe.desk.moduleview.html | 2 +- .../api/desk/frappe.desk.notifications.html | 2 +- .../api/desk/frappe.desk.query_builder.html | 2 +- .../api/desk/frappe.desk.query_report.html | 2 +- .../api/desk/frappe.desk.report_dump.html | 2 +- .../api/desk/frappe.desk.reportview.html | 2 +- .../current/api/desk/frappe.desk.search.html | 2 +- .../current/api/desk/frappe.desk.star.html | 2 +- .../current/api/desk/frappe.desk.tags.html | 2 +- frappe/docs/current/api/desk/index.html | 2 +- .../current/api/email/frappe.email.bulk.html | 2 +- .../api/email/frappe.email.email_body.html | 2 +- .../docs/current/api/email/frappe.email.html | 2 +- .../api/email/frappe.email.receive.html | 2 +- .../current/api/email/frappe.email.smtp.html | 2 +- frappe/docs/current/api/email/index.html | 2 +- frappe/docs/current/api/frappe.__init__.html | 18 +- .../docs/current/api/frappe.__version__.html | 2 +- frappe/docs/current/api/frappe.api.html | 2 +- frappe/docs/current/api/frappe.app.html | 2 +- frappe/docs/current/api/frappe.async.html | 2 +- frappe/docs/current/api/frappe.auth.html | 2 +- frappe/docs/current/api/frappe.boot.html | 2 +- frappe/docs/current/api/frappe.build.html | 2 +- .../docs/current/api/frappe.celery_app.html | 2 +- frappe/docs/current/api/frappe.client.html | 2 +- frappe/docs/current/api/frappe.commands.html | 2 +- frappe/docs/current/api/frappe.database.html | 2 +- frappe/docs/current/api/frappe.defaults.html | 2 +- .../docs/current/api/frappe.exceptions.html | 17 +- .../docs/current/api/frappe.frappeclient.html | 2 +- frappe/docs/current/api/frappe.handler.html | 18 +- frappe/docs/current/api/frappe.hooks.html | 2 +- frappe/docs/current/api/frappe.installer.html | 2 +- .../docs/current/api/frappe.middlewares.html | 2 +- .../docs/current/api/frappe.permissions.html | 2 +- frappe/docs/current/api/frappe.pythonrc.html | 2 +- frappe/docs/current/api/frappe.sessions.html | 2 +- .../current/api/frappe.setup_logging.html | 2 +- frappe/docs/current/api/frappe.share.html | 2 +- frappe/docs/current/api/frappe.tasks.html | 2 +- .../docs/current/api/frappe.test_runner.html | 2 +- frappe/docs/current/api/frappe.translate.html | 2 +- .../api/geo/frappe.geo.country_info.html | 2 +- frappe/docs/current/api/geo/frappe.geo.html | 2 +- frappe/docs/current/api/geo/index.html | 2 +- frappe/docs/current/api/index.html | 2 +- .../api/integrations/frappe.integrations.html | 2 +- .../docs/current/api/integrations/index.html | 2 +- .../api/model/frappe.model.base_document.html | 2 +- .../api/model/frappe.model.create_new.html | 2 +- .../api/model/frappe.model.db_query.html | 2 +- .../api/model/frappe.model.db_schema.html | 2 +- .../api/model/frappe.model.delete_doc.html | 2 +- .../api/model/frappe.model.docfield.html | 2 +- .../api/model/frappe.model.document.html | 2 +- .../docs/current/api/model/frappe.model.html | 2 +- .../api/model/frappe.model.mapper.html | 2 +- .../current/api/model/frappe.model.meta.html | 2 +- .../api/model/frappe.model.naming.html | 2 +- .../api/model/frappe.model.rename_doc.html | 2 +- .../current/api/model/frappe.model.sync.html | 2 +- .../api/model/frappe.model.workflow.html | 2 +- frappe/docs/current/api/model/index.html | 2 +- .../api/model/utils/frappe.model.utils.html | 2 +- .../frappe.model.utils.rename_field.html | 2 +- .../docs/current/api/model/utils/index.html | 2 +- .../modules/frappe.modules.export_file.html | 2 +- .../current/api/modules/frappe.modules.html | 2 +- .../modules/frappe.modules.import_file.html | 2 +- .../modules/frappe.modules.patch_handler.html | 2 +- .../api/modules/frappe.modules.utils.html | 2 +- frappe/docs/current/api/modules/index.html | 2 +- .../docs/current/api/print/frappe.print.html | 2 +- frappe/docs/current/api/print/index.html | 2 +- .../api/utils/frappe.utils.autodoc.html | 2 +- .../api/utils/frappe.utils.backups.html | 2 +- .../api/utils/frappe.utils.bench_helper.html | 4 +- .../api/utils/frappe.utils.boilerplate.html | 2 +- .../api/utils/frappe.utils.change_log.html | 2 +- .../api/utils/frappe.utils.csvutils.html | 2 +- .../current/api/utils/frappe.utils.data.html | 2 +- .../api/utils/frappe.utils.dateutils.html | 2 +- .../api/utils/frappe.utils.doctor.html | 2 +- .../api/utils/frappe.utils.file_lock.html | 2 +- .../api/utils/frappe.utils.file_manager.html | 2 +- .../api/utils/frappe.utils.fixtures.html | 2 +- .../api/utils/frappe.utils.formatters.html | 2 +- .../docs/current/api/utils/frappe.utils.html | 20 +- .../current/api/utils/frappe.utils.image.html | 2 +- .../api/utils/frappe.utils.install.html | 2 +- .../current/api/utils/frappe.utils.jinja.html | 2 +- .../api/utils/frappe.utils.make_random.html | 2 +- .../api/utils/frappe.utils.minify.html | 2 +- .../api/utils/frappe.utils.momentjs.html | 2 +- .../api/utils/frappe.utils.nestedset.html | 2 +- .../current/api/utils/frappe.utils.pdf.html | 2 +- .../api/utils/frappe.utils.redis_wrapper.html | 2 +- .../api/utils/frappe.utils.response.html | 2 +- .../api/utils/frappe.utils.scheduler.html | 2 +- .../current/api/utils/frappe.utils.sel.html | 2 +- .../api/utils/frappe.utils.setup_docs.html | 2 +- .../current/api/utils/frappe.utils.user.html | 2 +- .../utils/frappe.utils.verified_command.html | 2 +- frappe/docs/current/api/utils/index.html | 2 +- .../api/website/frappe.website.context.html | 2 +- .../current/api/website/frappe.website.html | 2 +- .../api/website/frappe.website.render.html | 2 +- .../api/website/frappe.website.router.html | 2 +- .../api/website/frappe.website.statics.html | 2 +- .../api/website/frappe.website.template.html | 2 +- .../api/website/frappe.website.utils.html | 2 +- .../frappe.website.website_generator.html | 2 +- frappe/docs/current/api/website/index.html | 2 +- .../frappe.website.website_theme.html | 2 +- .../api/website/website_theme/index.html | 2 +- ...frappe.website.website_theme.standard.html | 2 +- .../website/website_theme/standard/index.html | 2 +- .../current/api/workflow/frappe.workflow.html | 2 +- frappe/docs/current/api/workflow/index.html | 2 +- frappe/docs/current/index.html | 4 +- .../docs/current/models/core/async_task.html | 2 +- .../current/models/core/block_module.html | 2 +- frappe/docs/current/models/core/comment.html | 2 +- .../current/models/core/communication.html | 4 +- .../current/models/core/defaultvalue.html | 2 +- frappe/docs/current/models/core/docfield.html | 24 +- frappe/docs/current/models/core/docperm.html | 2 +- frappe/docs/current/models/core/docshare.html | 2 +- frappe/docs/current/models/core/file.html | 56 ++- frappe/docs/current/models/core/index.html | 2 +- .../docs/current/models/core/module_def.html | 52 ++- frappe/docs/current/models/core/page.html | 2 +- .../docs/current/models/core/page_role.html | 2 +- .../docs/current/models/core/patch_log.html | 2 +- frappe/docs/current/models/core/report.html | 2 +- frappe/docs/current/models/core/role.html | 100 ++-- .../current/models/core/scheduler_log.html | 2 +- .../current/models/core/system_settings.html | 2 +- frappe/docs/current/models/core/user.html | 428 +++++++++--------- frappe/docs/current/models/core/userrole.html | 2 +- frappe/docs/current/models/core/version.html | 2 +- .../current/models/custom/custom_field.html | 80 +++- .../current/models/custom/custom_script.html | 2 +- .../current/models/custom/customize_form.html | 79 ++-- .../models/custom/customize_form_field.html | 18 +- frappe/docs/current/models/custom/index.html | 2 +- .../models/custom/property_setter.html | 2 +- frappe/docs/current/models/desk/event.html | 2 +- .../docs/current/models/desk/event_role.html | 2 +- frappe/docs/current/models/desk/feed.html | 2 +- frappe/docs/current/models/desk/index.html | 2 +- frappe/docs/current/models/desk/note.html | 2 +- frappe/docs/current/models/desk/todo.html | 2 +- frappe/docs/current/models/doctype/index.html | 2 +- .../docs/current/models/email/bulk_email.html | 2 +- .../current/models/email/email_account.html | 308 +++++++------ .../current/models/email/email_alert.html | 2 +- .../models/email/email_alert_recipient.html | 2 +- .../models/email/email_unsubscribe.html | 2 +- frappe/docs/current/models/email/index.html | 2 +- .../current/models/email/standard_reply.html | 2 +- frappe/docs/current/models/geo/country.html | 2 +- frappe/docs/current/models/geo/currency.html | 2 +- frappe/docs/current/models/geo/index.html | 2 +- frappe/docs/current/models/index.html | 2 +- .../models/integrations/dropbox_backup.html | 2 +- .../current/models/integrations/index.html | 2 +- .../integrations/social_login_keys.html | 2 +- frappe/docs/current/models/models/index.html | 2 +- frappe/docs/current/models/print/index.html | 2 +- .../current/models/print/letter_head.html | 2 +- .../current/models/print/print_format.html | 6 +- .../current/models/print/print_settings.html | 2 +- .../models/website/about_us_settings.html | 2 +- .../models/website/about_us_team_member.html | 2 +- .../current/models/website/blog_category.html | 4 +- .../current/models/website/blog_post.html | 2 +- .../current/models/website/blog_settings.html | 2 +- .../docs/current/models/website/blogger.html | 4 +- .../models/website/company_history.html | 2 +- .../models/website/contact_us_settings.html | 2 +- frappe/docs/current/models/website/index.html | 2 +- .../current/models/website/top_bar_item.html | 16 +- .../docs/current/models/website/web_form.html | 84 +++- .../models/website/web_form_field.html | 3 +- .../docs/current/models/website/web_page.html | 6 +- .../models/website/website_script.html | 2 +- .../models/website/website_settings.html | 2 +- .../models/website/website_slideshow.html | 4 +- .../website/website_slideshow_item.html | 2 +- .../current/models/website/website_theme.html | 4 +- .../docs/current/models/workflow/index.html | 2 +- .../current/models/workflow/workflow.html | 2 +- .../models/workflow/workflow_action.html | 4 +- .../workflow/workflow_document_state.html | 2 +- .../models/workflow/workflow_state.html | 20 +- .../models/workflow/workflow_transition.html | 2 +- frappe/docs/index.html | 16 +- 224 files changed, 1041 insertions(+), 770 deletions(-) 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 - 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 -

    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 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.

    + +

    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.

    From 8693623a88111593f91a3c25ee2fe91b9e97a691 Mon Sep 17 00:00:00 2001 From: Ashish Acharya Date: Thu, 26 Nov 2015 20:48:43 +0530 Subject: [PATCH 02/14] Removing fixed width constraint from base template --- frappe/docs/current/api/utils/frappe.utils.html | 2 +- frappe/docs/index.html | 5 +++-- frappe/templates/autodoc/base_template.html | 1 - frappe/templates/autodoc/docs_home.html | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/frappe/docs/current/api/utils/frappe.utils.html b/frappe/docs/current/api/utils/frappe.utils.html index 4cd69cdcae..fe6f0aa8a3 100644 --- a/frappe/docs/current/api/utils/frappe.utils.html +++ b/frappe/docs/current/api/utils/frappe.utils.html @@ -300,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/index.html b/frappe/docs/index.html index 387901f120..c1a80dcecb 100644 --- a/frappe/docs/index.html +++ b/frappe/docs/index.html @@ -1,7 +1,7 @@ - -
    +
    +

    Superhero Web Framework

    Build extensions to ERPNext or make your own database driven app

    @@ -12,6 +12,7 @@ src="assets/img/home.png">
    +
    diff --git a/frappe/templates/autodoc/base_template.html b/frappe/templates/autodoc/base_template.html index 5a07b7a5c1..e7c8ffa25c 100644 --- a/frappe/templates/autodoc/base_template.html +++ b/frappe/templates/autodoc/base_template.html @@ -60,7 +60,6 @@ {%- endblock -%}
    {% block content %} -
    {{ content }}
    diff --git a/frappe/templates/autodoc/docs_home.html b/frappe/templates/autodoc/docs_home.html index 3134c40fc7..40734d5ec7 100644 --- a/frappe/templates/autodoc/docs_home.html +++ b/frappe/templates/autodoc/docs_home.html @@ -1,7 +1,7 @@ - -
    +
    +

    {{ app.headline }}

    {{ app.sub_heading }}

    @@ -12,6 +12,7 @@ src="assets/img/home.png">
    +
    {% if app.long_description %}
    From 67ae33f999c64b6c540a6412a3f1cbdd860a18c1 Mon Sep 17 00:00:00 2001 From: Ashish Acharya Date: Thu, 26 Nov 2015 20:50:51 +0530 Subject: [PATCH 03/14] Adding base styling for home splash --- frappe/public/css/docs.css | 4 ++++ frappe/public/less/docs.less | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css index d8408e9c4e..857584a45a 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -241,6 +241,10 @@ body { .container { max-width: 800px; } +.splash { + background: #383851; + color: #ffffff; +} .navbar a { font-size: 16px; font-weight: normal; diff --git a/frappe/public/less/docs.less b/frappe/public/less/docs.less index 3019661e48..ebbb645e37 100644 --- a/frappe/public/less/docs.less +++ b/frappe/public/less/docs.less @@ -11,6 +11,11 @@ body { max-width: 800px; } +.splash{ + background: #383851; + color: #ffffff; +} + .navbar { //background-color: @navbar-bg !important; //background-color: @text-color !important; From 2c9748b09aca6f7de165be8b39e5ec90a45732b4 Mon Sep 17 00:00:00 2001 From: Ashish Acharya Date: Thu, 26 Nov 2015 20:52:22 +0530 Subject: [PATCH 04/14] Some global styling --- frappe/public/css/docs.css | 5 ++++- frappe/public/less/docs.less | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css index 857584a45a..9c78b4fa73 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -237,6 +237,7 @@ body { body { font-size: 16px; line-height: 1.65em; + color: #454e57; } .container { max-width: 800px; @@ -249,6 +250,9 @@ body { font-size: 16px; font-weight: normal; } +.navbar a.navbar-brand { + font-weight: bold; +} .breadcrumb { line-height: 1.5em; color: #8D99A6; @@ -285,7 +289,6 @@ h2 { border: none; padding: 15px 0px; border-radius: 0px; - border-top: 5px solid #7575ff; border-bottom: 1px solid #d1d8dd; } .section { diff --git a/frappe/public/less/docs.less b/frappe/public/less/docs.less index ebbb645e37..403d603a38 100644 --- a/frappe/public/less/docs.less +++ b/frappe/public/less/docs.less @@ -5,6 +5,7 @@ body { font-size: 16px; line-height: 1.65em; + color: #454e57; } .container { @@ -25,6 +26,9 @@ body { font-size: 16px; font-weight: normal; //color: #fff !important; + &.navbar-brand{ + font-weight: bold; + } } .breadcrumb { @@ -60,10 +64,9 @@ h2 { .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 { From 59e80b70a0996b47225e1236b5d6215821878b0e Mon Sep 17 00:00:00 2001 From: Ashish Acharya Date: Thu, 26 Nov 2015 20:58:45 +0530 Subject: [PATCH 05/14] Separating out navbar from content* *To accommodate splash mostly --- frappe/public/css/docs.css | 7 +++++++ frappe/public/less/docs.less | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css index 9c78b4fa73..aa48a416f8 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -238,6 +238,7 @@ body { font-size: 16px; line-height: 1.65em; color: #454e57; + position: relative; } .container { max-width: 800px; @@ -246,6 +247,12 @@ body { background: #383851; color: #ffffff; } +.navbar { + position: absolute; + top: 0; + right: 0; + left: 0; +} .navbar a { font-size: 16px; font-weight: normal; diff --git a/frappe/public/less/docs.less b/frappe/public/less/docs.less index 403d603a38..a98f0c79d7 100644 --- a/frappe/public/less/docs.less +++ b/frappe/public/less/docs.less @@ -6,6 +6,7 @@ body { font-size: 16px; line-height: 1.65em; color: #454e57; + position: relative; } .container { @@ -21,6 +22,10 @@ body { //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; } .navbar a { font-size: 16px; From 3713ef5baa41b071ca28ab3c303fdb2e85e494e4 Mon Sep 17 00:00:00 2001 From: Ashish Acharya Date: Thu, 26 Nov 2015 21:32:22 +0530 Subject: [PATCH 06/14] Styling for homepage splash --- frappe/docs/index.html | 25 +++++++------ frappe/public/css/docs.css | 40 +++++++++++++------- frappe/public/less/docs.less | 49 ++++++++++++++++--------- frappe/templates/autodoc/docs_home.html | 25 +++++++------ 4 files changed, 85 insertions(+), 54 deletions(-) diff --git a/frappe/docs/index.html b/frappe/docs/index.html index c1a80dcecb..e46146fe1d 100644 --- a/frappe/docs/index.html +++ b/frappe/docs/index.html @@ -1,17 +1,20 @@
    -
    -

    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

    +
    +
    +
    + +
    +
    +
    +
    diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css index aa48a416f8..f382d50e0c 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -246,6 +246,30 @@ body { .splash { background: #383851; 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; } .navbar { position: absolute; @@ -318,26 +342,13 @@ h2 { display: inline-block; margin: 0 15px; } -.jumbotron { - background-color: transparent; - padding: 80px 30px; - text-align: center; -} -.jumbotron h1 { - font-size: 32px; - font-weight: 700; -} -.jumbotron p { - font-color: #8D99A6 !important; -} .browser-image { min-height: 300px; border: 1px solid #d1d8dd; } .fake-browser-frame { position: relative; - margin: 40px auto; - max-width: 600px; + margin: 24px auto 0px; } .fake-browser-frame::before { content: ""; @@ -347,6 +358,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; diff --git a/frappe/public/less/docs.less b/frappe/public/less/docs.less index a98f0c79d7..c63be0b581 100644 --- a/frappe/public/less/docs.less +++ b/frappe/public/less/docs.less @@ -16,6 +16,34 @@ body { .splash{ background: #383851; 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; + } } .navbar { @@ -99,21 +127,6 @@ h2 { } } -.jumbotron { - background-color: transparent; - padding: 80px 30px; - text-align: center; - - h1 { - font-size: 32px; - font-weight: 700; - } - - p { - font-color: @text-muted !important; - } -} - // fake frames .browser-image { min-height: 300px; @@ -122,8 +135,7 @@ h2 { .fake-browser-frame { position: relative; - margin: 40px auto; - max-width: 600px; + margin: 24px auto 0px; } .fake-browser-frame::before { @@ -134,6 +146,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; @@ -149,7 +162,7 @@ h2 { /* octicon */ font: normal normal; - font-size: 8px; + font-size: 8px; font-family: 'FontAwesome'; line-height: 1; display: inline-block; diff --git a/frappe/templates/autodoc/docs_home.html b/frappe/templates/autodoc/docs_home.html index 40734d5ec7..b2e30df217 100644 --- a/frappe/templates/autodoc/docs_home.html +++ b/frappe/templates/autodoc/docs_home.html @@ -1,17 +1,20 @@
    -
    -

    {{ app.headline }}

    -

    {{ app.sub_heading }}

    -
    - -
    -
    - -
    -
    +
    +
    +
    +

    {{ app.headline }}

    +

    {{ app.sub_heading }}

    +
    +
    +
    + +
    +
    +
    +
    {% if app.long_description %} From 30e7dac067107f307a1d95e71d1da851df574839 Mon Sep 17 00:00:00 2001 From: Ashish Acharya Date: Thu, 26 Nov 2015 21:48:21 +0530 Subject: [PATCH 07/14] Wrapping other home sections in a container --- frappe/docs/index.html | 8 +++++-- frappe/public/css/docs.css | 8 +++---- frappe/public/less/docs.less | 8 +++---- frappe/templates/autodoc/docs_home.html | 30 ++++++++++++------------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/frappe/docs/index.html b/frappe/docs/index.html index e46146fe1d..d5b63cfcdc 100644 --- a/frappe/docs/index.html +++ b/frappe/docs/index.html @@ -18,8 +18,10 @@
    -
    -

    Frappe is a full stack web application framework written in Python, +

    +
    +
    +

    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.

    @@ -35,6 +37,8 @@ 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 f382d50e0c..5e1f84c3d2 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -241,7 +241,7 @@ body { position: relative; } .container { - max-width: 800px; + max-width: 870px; } .splash { background: #383851; @@ -323,15 +323,13 @@ h2 { 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; + margin-top: 80px; padding: 30px 0px 60px 0px; border-top: 1px solid #d1d8dd; } diff --git a/frappe/public/less/docs.less b/frappe/public/less/docs.less index c63be0b581..fd3e1a33ef 100644 --- a/frappe/public/less/docs.less +++ b/frappe/public/less/docs.less @@ -10,7 +10,7 @@ body { } .container { - max-width: 800px; + max-width: 870px; } .splash{ @@ -103,9 +103,7 @@ h2 { } .section { - padding: 30px; - max-width: 800px; - margin: auto; + padding: 64px 0 0 0; } .dev-header { @@ -113,7 +111,7 @@ h2 { } .docs-footer { - margin-top: 50px; + margin-top: 80px; padding: 30px 0px 60px 0px; border-top: 1px solid @border-color; diff --git a/frappe/templates/autodoc/docs_home.html b/frappe/templates/autodoc/docs_home.html index b2e30df217..29eb33b7b2 100644 --- a/frappe/templates/autodoc/docs_home.html +++ b/frappe/templates/autodoc/docs_home.html @@ -18,36 +18,36 @@
    {% 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 %} From 481c441f53f682e1c4314d27d2b45254a19d8b54 Mon Sep 17 00:00:00 2001 From: Ashish Acharya Date: Thu, 26 Nov 2015 21:51:59 +0530 Subject: [PATCH 08/14] Anti-alias all text --- frappe/public/css/docs.css | 1 + frappe/public/less/docs.less | 1 + 2 files changed, 2 insertions(+) diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css index 5e1f84c3d2..58e747f0a8 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -239,6 +239,7 @@ body { line-height: 1.65em; color: #454e57; position: relative; + -webkit-font-smoothing: antialiased; } .container { max-width: 870px; diff --git a/frappe/public/less/docs.less b/frappe/public/less/docs.less index fd3e1a33ef..c61cab2c41 100644 --- a/frappe/public/less/docs.less +++ b/frappe/public/less/docs.less @@ -7,6 +7,7 @@ body { line-height: 1.65em; color: #454e57; position: relative; + -webkit-font-smoothing: antialiased; } .container { From 61a9e1dcec5332f56c71547f90488a37e32164e1 Mon Sep 17 00:00:00 2001 From: Ashish Acharya Date: Mon, 30 Nov 2015 16:07:56 +0530 Subject: [PATCH 09/14] Header background and footer --- .../docs/current/api/utils/frappe.utils.html | 2 +- frappe/public/css/docs.css | 28 ++++++++++++++-- frappe/public/less/docs.less | 32 ++++++++++++++++--- frappe/templates/autodoc/base_template.html | 10 +++--- 4 files changed, 60 insertions(+), 12 deletions(-) diff --git a/frappe/docs/current/api/utils/frappe.utils.html b/frappe/docs/current/api/utils/frappe.utils.html index fe6f0aa8a3..2104d63a5d 100644 --- a/frappe/docs/current/api/utils/frappe.utils.html +++ b/frappe/docs/current/api/utils/frappe.utils.html @@ -300,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/public/css/docs.css b/frappe/public/css/docs.css index 58e747f0a8..fc3943867d 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -245,7 +245,8 @@ body { max-width: 870px; } .splash { - background: #383851; + background-color: #383851; + background-image: url('/assets/img/background.png'); color: #ffffff; padding-top: 128px; } @@ -272,11 +273,16 @@ body { .splash .section { padding: 30px 0 0 0; } +code { + color: #ff0000; +} .navbar { position: absolute; top: 0; right: 0; left: 0; + width: 870px; + margin: 0 auto; } .navbar a { font-size: 16px; @@ -330,16 +336,32 @@ h2 { margin-bottom: 30px; } .docs-footer { - margin-top: 80px; padding: 30px 0px 60px 0px; border-top: 1px solid #d1d8dd; + width: 870px; + margin: 0 auto; + margin-top: 80px; + font-size: 14px; +} +.docs-footer h3 { + 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; +} +.docs-footer .built-with-frappe { + margin-top: -50px; } .browser-image { min-height: 300px; diff --git a/frappe/public/less/docs.less b/frappe/public/less/docs.less index c61cab2c41..e9a2c37e54 100644 --- a/frappe/public/less/docs.less +++ b/frappe/public/less/docs.less @@ -15,7 +15,8 @@ body { } .splash{ - background: #383851; + background-color: #383851; + background-image: url('/assets/img/background.png'); color: #ffffff; padding-top: 128px; @@ -47,6 +48,11 @@ body { } } + + code{ + color: #ff0000; + } + .navbar { //background-color: @navbar-bg !important; //background-color: @text-color !important; @@ -55,6 +61,8 @@ body { top:0; right: 0; left: 0; + width:870px; + margin:0 auto; } .navbar a { font-size: 16px; @@ -112,18 +120,34 @@ h2 { } .docs-footer { - margin-top: 80px; padding: 30px 0px 60px 0px; border-top: 1px solid @border-color; - + width:870px; + margin:0 auto; + margin-top: 80px; + font-size: 14px; + + h3 { + 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; + margin: 0 10px; } + .built-with-frappe{ + margin-top:-50px; + } } // fake frames diff --git a/frappe/templates/autodoc/base_template.html b/frappe/templates/autodoc/base_template.html index e7c8ffa25c..777a7ba4f7 100644 --- a/frappe/templates/autodoc/base_template.html +++ b/frappe/templates/autodoc/base_template.html @@ -68,7 +68,11 @@
    {%- if footer is defined -%}{{ footer }}{%- endif -%} -
    + +
    + +

    By Frappe Technologies

    +
    • @@ -93,9 +97,7 @@
    -
    - -
    +
    From fb1caa07270110403e9fac70694ecd12d616ef10 Mon Sep 17 00:00:00 2001 From: Ashish Acharya Date: Mon, 30 Nov 2015 17:26:17 +0530 Subject: [PATCH 10/14] Fixed documentation page width & docs index --- .../docs/current/api/utils/frappe.utils.html | 2 +- frappe/public/css/docs.css | 33 ++++++++++++++ frappe/public/less/docs.less | 44 +++++++++++++++++-- frappe/templates/autodoc/base_template.html | 2 +- 4 files changed, 76 insertions(+), 5 deletions(-) diff --git a/frappe/docs/current/api/utils/frappe.utils.html b/frappe/docs/current/api/utils/frappe.utils.html index 2104d63a5d..38cf1185a1 100644 --- a/frappe/docs/current/api/utils/frappe.utils.html +++ b/frappe/docs/current/api/utils/frappe.utils.html @@ -300,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/public/css/docs.css b/frappe/public/css/docs.css index fc3943867d..98df9db47a 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -273,6 +273,39 @@ body { .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: 26px auto; +} +.page-container .webpage-content ol > li li, +.page-container .webpage-content ul > li li { + margin: 13px auto; +} +.page-container .webpage-content ol li ol { + list-style-type: disc; +} +.page-container .webpage-content ul, +.page-container .webpage-content ol { + margin-bottom: 6px; +} +#page-index { + padding-top: 0; + width: 100%; + margin: 0; +} +#page-index .page-content { + width: 100%; + margin: 0; +} code { color: #ff0000; } diff --git a/frappe/public/less/docs.less b/frappe/public/less/docs.less index e9a2c37e54..d79e751ebf 100644 --- a/frappe/public/less/docs.less +++ b/frappe/public/less/docs.less @@ -42,16 +42,54 @@ body { line-height: 1.4em; } } - .section{ padding: 30px 0 0 0; } } - code{ - color: #ff0000; +.page-container{ + padding-top:128px; + margin:0 auto; + width:870px; + + .page-content { + width:83%; + margin:0 auto; + } + + .webpage-content{ + ol > li, ul > li { + margin: 26px auto; + } + + ol > li li, ul > li li { + margin: 13px auto; + } + + ol li ol { + list-style-type: disc; + } + ul, ol { + margin-bottom:26px; + } + } +} + +#page-index { + padding-top:0; + width:100%; + margin:0; + + .page-content { + width:100%; + margin:0; } +} + +code{ + color: #ff0000; +} .navbar { //background-color: @navbar-bg !important; diff --git a/frappe/templates/autodoc/base_template.html b/frappe/templates/autodoc/base_template.html index 777a7ba4f7..661a4ff32c 100644 --- a/frappe/templates/autodoc/base_template.html +++ b/frappe/templates/autodoc/base_template.html @@ -60,7 +60,7 @@ {%- endblock -%}
    {% block content %} - {{ content }} + {{ content }}
    {% endblock %} From 18dd901f9a8a608543a6fb64d9aae33c58ee208e Mon Sep 17 00:00:00 2001 From: Ashish Acharya Date: Mon, 30 Nov 2015 20:21:19 +0530 Subject: [PATCH 11/14] Content pages styling for typography + WIP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Need to figure out: - How to detect home page and change header styling - Where breadcrumbs are included in the layout - Where “Improve this Page” is included and how to get it in line with the “Next” link (in docs) --- frappe/public/css/docs.css | 107 +++++++++++++++++++++++++++++++++-- frappe/public/less/docs.less | 59 +++++++++++++++++-- 2 files changed, 155 insertions(+), 11 deletions(-) diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css index 98df9db47a..32a53b2a1c 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -295,7 +295,7 @@ body { } .page-container .webpage-content ul, .page-container .webpage-content ol { - margin-bottom: 6px; + margin-bottom: 26px; } #page-index { padding-top: 0; @@ -307,7 +307,86 @@ body { margin: 0; } code { - color: #ff0000; + 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; @@ -328,7 +407,7 @@ code { line-height: 1.5em; color: #8D99A6; background-color: transparent; - margin-bottom: 10px; + margin-bottom: 32px; padding: 0px; } .breadcrumb a, @@ -352,9 +431,24 @@ 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; @@ -377,6 +471,7 @@ h2 { font-size: 14px; } .docs-footer h3 { + margin-top: 24px; font-size: 16px; } .docs-footer img.frappe-bird { @@ -450,11 +545,11 @@ 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; } diff --git a/frappe/public/less/docs.less b/frappe/public/less/docs.less index d79e751ebf..3d871fcb31 100644 --- a/frappe/public/less/docs.less +++ b/frappe/public/less/docs.less @@ -88,9 +88,39 @@ body { } code{ - color: #ff0000; + 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; @@ -115,7 +145,7 @@ code{ line-height: 1.5em; color: @text-muted; background-color: transparent; - margin-bottom: 10px; + margin-bottom: 32px; padding: 0px; } .breadcrumb a, @@ -137,10 +167,28 @@ 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; @@ -166,6 +214,7 @@ h2 { font-size: 14px; h3 { + margin-top:24px; font-size:16px; } img.frappe-bird { @@ -252,12 +301,12 @@ 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; } From 5d3ab2021809d5ad6a3f1e7dbb4abbcbb1ad7055 Mon Sep 17 00:00:00 2001 From: Ashish Acharya Date: Mon, 30 Nov 2015 21:03:32 +0530 Subject: [PATCH 12/14] Icons for breadcrumbs, edit, next. Updated developer docs. --- .../docs/current/api/utils/frappe.utils.html | 2 +- frappe/docs/current/index.html | 4 +- frappe/public/css/docs.css | 40 ++++++++++++++++-- frappe/public/less/docs.less | 41 +++++++++++++++++-- frappe/templates/autodoc/base_template.html | 2 +- frappe/templates/autodoc/dev_home.html | 4 +- frappe/utils/setup_docs.py | 2 +- 7 files changed, 82 insertions(+), 13 deletions(-) diff --git a/frappe/docs/current/api/utils/frappe.utils.html b/frappe/docs/current/api/utils/frappe.utils.html index 38cf1185a1..d522131fa6 100644 --- a/frappe/docs/current/api/utils/frappe.utils.html +++ b/frappe/docs/current/api/utils/frappe.utils.html @@ -300,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/index.html b/frappe/docs/current/index.html index 6d383391e1..f8c951f1bb 100644 --- a/frappe/docs/current/index.html +++ b/frappe/docs/current/index.html @@ -13,9 +13,9 @@
    - +
    -
    + App Name diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css index 32a53b2a1c..f89f35d92c 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -404,18 +404,23 @@ pre { font-weight: bold; } .breadcrumb { - line-height: 1.5em; + line-height: 1em; color: #8D99A6; background-color: transparent; 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, @@ -553,3 +558,32 @@ p { hr { margin: 48px 0px 30px; } +.edit { + padding-left: 20px; + background: url('/assets/img/smiley.png') 0% 50% no-repeat; + color: #8d99a6; + position: relative; + top: -26px; +} +a.edit, +a.edit:hover, +a.edit:focus, +a.edit:visited { + color: #8d99a6; +} +.btn-next { + 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; +} diff --git a/frappe/public/less/docs.less b/frappe/public/less/docs.less index 3d871fcb31..87fc8883b3 100644 --- a/frappe/public/less/docs.less +++ b/frappe/public/less/docs.less @@ -142,18 +142,24 @@ pre { } .breadcrumb { - line-height: 1.5em; + line-height: 1em; color: @text-muted; background-color: transparent; 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 { @@ -310,3 +316,32 @@ p { hr { margin: 48px 0px 30px; } + +.edit { + padding-left: 20px; + background:url('/assets/img/smiley.png') 0% 50% no-repeat; + color:#8d99a6; + position:relative; + top:-26px; +} +a.edit, a.edit:hover, a.edit:focus, a.edit:visited { + color:#8d99a6; +} + +.btn-next { + 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; +} diff --git a/frappe/templates/autodoc/base_template.html b/frappe/templates/autodoc/base_template.html index 661a4ff32c..3e69a365be 100644 --- a/frappe/templates/autodoc/base_template.html +++ b/frappe/templates/autodoc/base_template.html @@ -61,7 +61,7 @@
    {% block content %} {{ content }} - +
    {% endblock %} 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/utils/setup_docs.py b/frappe/utils/setup_docs.py index 01cd215ce5..7c2f7a0d94 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, From 88495dd9a9d51e3aee5acec286bddfd980c81c26 Mon Sep 17 00:00:00 2001 From: Ashish Acharya Date: Tue, 1 Dec 2015 12:07:23 +0530 Subject: [PATCH 13/14] Home nav-bar color fix, breadcrumbs positioned above H1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To do: - Home navigation bar CSS is in the docs_home.html — figure out how to change this from docs.less instead - “Improve this page” has been hacked with negative top-margin to align it with “Next:… ->” link. Move this before the next link in content and style accordingly. --- frappe/docs/current/api/utils/frappe.utils.html | 2 +- frappe/docs/index.html | 14 +++++++++++++- frappe/public/css/docs.css | 9 +++++---- frappe/public/less/docs.less | 9 +++++---- frappe/templates/autodoc/docs_home.html | 14 +++++++++++++- frappe/templates/includes/page_content.html | 7 ++++--- 6 files changed, 41 insertions(+), 14 deletions(-) diff --git a/frappe/docs/current/api/utils/frappe.utils.html b/frappe/docs/current/api/utils/frappe.utils.html index d522131fa6..468917e298 100644 --- a/frappe/docs/current/api/utils/frappe.utils.html +++ b/frappe/docs/current/api/utils/frappe.utils.html @@ -300,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/index.html b/frappe/docs/index.html index d5b63cfcdc..35dd4520d5 100644 --- a/frappe/docs/index.html +++ b/frappe/docs/index.html @@ -1,5 +1,18 @@ +
    @@ -17,7 +30,6 @@
    -
    diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css index f89f35d92c..e2d790d505 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -284,18 +284,18 @@ body { } .page-container .webpage-content ol > li, .page-container .webpage-content ul > li { - margin: 26px auto; + margin: 13px auto; } .page-container .webpage-content ol > li li, .page-container .webpage-content ul > li li { - margin: 13px auto; + 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: 26px; + margin-bottom: 32px; } #page-index { padding-top: 0; @@ -563,7 +563,7 @@ hr { background: url('/assets/img/smiley.png') 0% 50% no-repeat; color: #8d99a6; position: relative; - top: -26px; + top: -10px; } a.edit, a.edit:hover, @@ -572,6 +572,7 @@ a.edit:visited { color: #8d99a6; } .btn-next { + margin-top: 16px; float: right; } .btn-next:after { diff --git a/frappe/public/less/docs.less b/frappe/public/less/docs.less index 87fc8883b3..98f8e7019c 100644 --- a/frappe/public/less/docs.less +++ b/frappe/public/less/docs.less @@ -60,18 +60,18 @@ body { .webpage-content{ ol > li, ul > li { - margin: 26px auto; + margin: 13px auto; } ol > li li, ul > li li { - margin: 13px auto; + margin: 4px auto; } ol li ol { list-style-type: disc; } ul, ol { - margin-bottom:26px; + margin-bottom:32px; } } } @@ -322,13 +322,14 @@ hr { background:url('/assets/img/smiley.png') 0% 50% no-repeat; color:#8d99a6; position:relative; - top:-26px; + 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 { diff --git a/frappe/templates/autodoc/docs_home.html b/frappe/templates/autodoc/docs_home.html index 29eb33b7b2..980fc4d166 100644 --- a/frappe/templates/autodoc/docs_home.html +++ b/frappe/templates/autodoc/docs_home.html @@ -1,5 +1,18 @@ +
    @@ -16,7 +29,6 @@
    - {% if app.long_description %}
    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 -%}
    From c651ed05fa5e1e7d06dfc287c616a5d5686b11c5 Mon Sep 17 00:00:00 2001 From: Ashish Acharya Date: Tue, 1 Dec 2015 12:33:47 +0530 Subject: [PATCH 14/14] Sync images --- frappe/docs/current/api/utils/frappe.utils.html | 2 +- frappe/public/css/docs.css | 8 ++++++++ frappe/public/images/background.png | Bin 0 -> 12460 bytes frappe/public/images/smiley.png | Bin 0 -> 390 bytes frappe/public/images/up.png | Bin 0 -> 235 bytes frappe/public/less/docs.less | 9 +++++++++ frappe/utils/setup_docs.py | 5 ++++- 7 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 frappe/public/images/background.png create mode 100644 frappe/public/images/smiley.png create mode 100644 frappe/public/images/up.png diff --git a/frappe/docs/current/api/utils/frappe.utils.html b/frappe/docs/current/api/utils/frappe.utils.html index 468917e298..4a8c04ccec 100644 --- a/frappe/docs/current/api/utils/frappe.utils.html +++ b/frappe/docs/current/api/utils/frappe.utils.html @@ -300,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/public/css/docs.css b/frappe/public/css/docs.css index e2d790d505..24c45c7d74 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -588,3 +588,11 @@ a.edit:visited { 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 0000000000000000000000000000000000000000..45b91e94ea7640cd6ea0df57ff5edd1f14e70bc1 GIT binary patch literal 12460 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 literal 0 HcmV?d00001 diff --git a/frappe/public/images/up.png b/frappe/public/images/up.png new file mode 100644 index 0000000000000000000000000000000000000000..949027e61e82b7b0e2c1c3f6eb546aeb1ac7de95 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1Gy`C7mq@>1p6e@)1uy?F?HkDkQ9l^BJ(XWyvwVo}BUtu55k=czi z<}zj}ai}nVG*_r&J5uDK_k-)mJcl)`N9-q>-Z>~dNul}N1MaX%j~Vq74l1WJABkC# gvEqOlhd=@YXQ0^c^j|XjfDU8uboFyt=akR{0Aw~#l>h($ literal 0 HcmV?d00001 diff --git a/frappe/public/less/docs.less b/frappe/public/less/docs.less index 98f8e7019c..af97c38370 100644 --- a/frappe/public/less/docs.less +++ b/frappe/public/less/docs.less @@ -346,3 +346,12 @@ a.edit, a.edit:hover, a.edit:focus, a.edit:visited { color:#454e57; font-size:16px; } + +@media (max-width: 767px) { + .offcanvas-container, + .offcanvas, + .offcanvas-main-section { + position: relative; + width:50%; + } +} diff --git a/frappe/utils/setup_docs.py b/frappe/utils/setup_docs.py index 7c2f7a0d94..077438e2e5 100644 --- a/frappe/utils/setup_docs.py +++ b/frappe/utils/setup_docs.py @@ -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():