From 4cabd4070fa5e60c9d2b7071bbdc439b6ce857e1 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 22 Jul 2015 16:26:34 +0530 Subject: [PATCH] favicon and website theme --- frappe/hooks.py | 3 +- frappe/public/images/favicon.png | Bin 1286 -> 522 bytes frappe/public/images/frappe.svg | 92 ------------------ .../website_settings/website_settings.py | 6 +- .../doctype/website_theme/website_theme.py | 19 ++-- 5 files changed, 17 insertions(+), 103 deletions(-) delete mode 100644 frappe/public/images/frappe.svg diff --git a/frappe/hooks.py b/frappe/hooks.py index a8efdb5539..aac5628ef3 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -35,8 +35,7 @@ web_include_js = [ bootstrap = "assets/frappe/css/bootstrap.css" web_include_css = [ - "assets/css/frappe-web.css", - "website_theme.css" + "assets/css/frappe-web.css" ] website_route_rules = [ {"from_route": "/blog", "to_route": "Blog Post"}, diff --git a/frappe/public/images/favicon.png b/frappe/public/images/favicon.png index 00d97cb834066765a55cf8c8525f82bf99e271f5..62ff240fb26b0a3a244c07ea2739b35d4ada9d2e 100644 GIT binary patch delta 496 zcmVde#<86=d^8UHj@5 zXp<|H5I(;!x~wbGn{X%~UBGY?jyWAzTV4J&E(DOt7jbzLvsS>as_=}vI?heFUAVh{ zM6Ld5oj{}6#LH{C<6I_JG!*_PfpVpev*@+aWnGcpglR*8!4cq`0|0~&as=Xu6yD2K zJfxmY6`;f86LXJbkiqEzD+S6D^Gl3CQCaCkh%iCq6F~p(tN9ebT0XY7z5c|wGA{&9 m@juT|CPJ7-T8q0|o2f5@6n&*v19DlO5>P8y-LBUmq$L)i4F1eTFlDk{8B)w})z;tPvYH;9sxqH%{ZSJmj z*Cq{uu_!pi7dDik%+(i$2y;U_5e3(|N;^9&Vh8hu%?|xCD2q67vO#>VZK@y2K6u>S z^F06i|9=1XJDBcytaV%aHUL0tG9hNriaF0cccHgcsoX%zcDp-g_vr<@B$*Jz6g>~I zWKkM~87L_eqvv5K08O@<&DpusEW`}X)=~@UyBbC}9)~xkJp_CD2$si~nNfe7tT&voaoq_+lv8lF|oiHGgftEgI z%BUWNoeeO`-JK0NipU#&pQ)mvNF$;yj}@V2C&e(1zW5YX;c4hE$b~%XtZ+vxFPKoWbu+8$BaJRd59zjU4e16Z2u{@lSVu~dRm~AT;uLBvZV{U5I8@@M zUc^>2&8wSuLDDShqfmeh(PWUND3+#UT_hXq;oi2D zAD!*SAfUs>C_xR)kBJ85+*|u!2Ef&k6l2-)Px)sL=jTE5N6}wgv%ctsx#<4d)|dVQ zqb+S$3e9|U$2{wr-QvE{@=*2CcA3rt$X=_y+vk~K65rCb{*zN|{qPD%k1PG@bGzo= zzI>tf)$EI(d1m@Ox9fkrv3%<|H~re=_vXNotLbXBejxJR2jgGt0ol)QcRu&R^7Vy> z-3JQ&nTsxwNyL8uCwA0Suu}iJd8Na1-=!8a%1pnX(7`94w*OXraO&w@Z6}+qF50JV h`j>pK9}R&mZjhUNYWsO`W}owCN_O{%A9oE*{sWf0xe)*W diff --git a/frappe/public/images/frappe.svg b/frappe/public/images/frappe.svg deleted file mode 100644 index 6b6ea9df2b..0000000000 --- a/frappe/public/images/frappe.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - -image/svg+xml - - - - - - - diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py index fb5b34a83f..3f168edc35 100644 --- a/frappe/website/doctype/website_settings/website_settings.py +++ b/frappe/website/doctype/website_settings/website_settings.py @@ -118,8 +118,6 @@ def get_website_settings(): context.web_include_css = hooks.web_include_css or [] - add_website_theme(context) - via_hooks = frappe.get_hooks("website_context") for key in via_hooks: context[key] = via_hooks[key] @@ -127,10 +125,12 @@ def get_website_settings(): and isinstance(context[key], (list, tuple)): context[key] = context[key][0] + add_website_theme(context) + if not context.get("favicon"): context["favicon"] = "/assets/frappe/images/favicon.png" - if settings.favicon: + if settings.favicon and settings.favicon != "attach_files:": context["favicon"] = settings.favicon return context diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py index 33601b0935..2cea0329f4 100644 --- a/frappe/website/doctype/website_theme/website_theme.py +++ b/frappe/website/doctype/website_theme/website_theme.py @@ -63,13 +63,20 @@ def use_theme(theme): def add_website_theme(context): bootstrap = frappe.get_hooks("bootstrap")[0] - website_theme = get_active_theme() - context.theme = website_theme and website_theme.as_dict() or frappe._dict() - if website_theme: - if website_theme.bootstrap: - bootstrap = website_theme.bootstrap + web_include_css = context.web_include_css + context.theme = frappe._dict() - context.no_sidebar = website_theme.no_sidebar + if not context.disable_website_theme: + website_theme = get_active_theme() + context.theme = website_theme and website_theme.as_dict() or frappe._dict() + + if website_theme: + if website_theme.bootstrap: + bootstrap = website_theme.bootstrap + + context.no_sidebar = website_theme.no_sidebar + + context.web_include_css = ["website_theme.css"] + context.web_include_css context.web_include_css = [bootstrap] + context.web_include_css