Skip to content

Commit

Permalink
feat: announcement widget in navbar settings
Browse files Browse the repository at this point in the history
(cherry picked from commit 88d8b6c)
(cherry picked from commit a947f44)
  • Loading branch information
GursheenK authored and mergify[bot] committed Apr 13, 2024
1 parent cbb96c8 commit 7f19d1a
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 23 deletions.
47 changes: 24 additions & 23 deletions frappe/core/doctype/navbar_settings/navbar_settings.json
Expand Up @@ -11,63 +11,63 @@
"logo_width",
"section_break_2",
"settings_dropdown",
"help_dropdown"
"help_dropdown",
"announcements_section",
"announcement_widget"
],
"fields": [
{
"fieldname": "app_logo",
"fieldtype": "Attach Image",
"label": "Application Logo",
"show_days": 1,
"show_seconds": 1
"label": "Application Logo"
},
{
"fieldname": "settings_dropdown",
"fieldtype": "Table",
"label": "Settings Dropdown",
"options": "Navbar Item",
"show_days": 1,
"show_seconds": 1
"options": "Navbar Item"
},
{
"fieldname": "help_dropdown",
"fieldtype": "Table",
"label": "Help Dropdown",
"options": "Navbar Item",
"show_days": 1,
"show_seconds": 1
"options": "Navbar Item"
},
{
"fieldname": "section_break_2",
"fieldtype": "Section Break",
"label": "Dropdowns",
"show_days": 1,
"show_seconds": 1
"label": "Dropdowns"
},
{
"fieldname": "logo_section",
"fieldtype": "Section Break",
"label": "Application Logo",
"show_days": 1,
"show_seconds": 1
"label": "Application Logo"
},
{
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"show_days": 1,
"show_seconds": 1
"fieldtype": "Column Break"
},
{
"fieldname": "logo_width",
"fieldtype": "Int",
"label": "Logo Width",
"show_days": 1,
"show_seconds": 1
"label": "Logo Width"
},
{
"fieldname": "announcements_section",
"fieldtype": "Section Break",
"label": "Announcements"
},
{
"description": "These announcements will appear inside a dismissible alert below the Navbar.",
"fieldname": "announcement_widget",
"fieldtype": "Text Editor",
"label": "Announcement Widget",
"max_height": "10em"
}
],
"issingle": 1,
"links": [],
"modified": "2020-08-06 18:11:29.955835",
"modified": "2024-03-18 13:54:44.498352",
"modified_by": "Administrator",
"module": "Core",
"name": "Navbar Settings",
Expand All @@ -87,5 +87,6 @@
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"track_changes": 1
}
1 change: 1 addition & 0 deletions frappe/core/doctype/navbar_settings/navbar_settings.py
Expand Up @@ -16,6 +16,7 @@ class NavbarSettings(Document):
from frappe.core.doctype.navbar_item.navbar_item import NavbarItem
from frappe.types import DF

announcement_widget: DF.TextEditor | None
app_logo: DF.AttachImage | None
help_dropdown: DF.Table[NavbarItem]
logo_width: DF.Int
Expand Down

0 comments on commit 7f19d1a

Please sign in to comment.