1
0
mirror of https://github.com/gnosygnu/xowa.git synced 2024-09-28 22:40:50 +00:00

Html: Change div_view_fmtr to be sitename aware [#313]

This commit is contained in:
gnosygnu 2018-12-29 10:12:28 -05:00
parent b86228d6f2
commit e65d9268d6
2 changed files with 5 additions and 3 deletions

View File

@ -143,7 +143,9 @@ public class Xow_portal_mgr implements Gfo_invk {
div_view_fmtr.Bld_bfr_many(tmp_bfr, read_cls, edit_cls, html_cls, search_text div_view_fmtr.Bld_bfr_many(tmp_bfr, read_cls, edit_cls, html_cls, search_text
, Bry_.Add(Xoh_href_.Bry__wiki, ttl.Full_db()) , Bry_.Add(Xoh_href_.Bry__wiki, ttl.Full_db())
, Bry_.Add(url_frag_w_action_qarg, Xoa_url_.Qarg__action__edit) , Bry_.Add(url_frag_w_action_qarg, Xoa_url_.Qarg__action__edit)
, Bry_.Add(url_frag_w_action_qarg, Xoa_url_.Qarg__action__html)); , Bry_.Add(url_frag_w_action_qarg, Xoa_url_.Qarg__action__html)
, wiki.Props().Site_name()
);
return tmp_bfr.To_bry_and_rls(); return tmp_bfr.To_bry_and_rls();
} public static final byte[] Cls_selected_y = Bry_.new_a7("selected"), Cls_new = Bry_.new_a7("new"), Cls_display_none = Bry_.new_a7("xowa_display_none"); } public static final byte[] Cls_selected_y = Bry_.new_a7("selected"), Cls_new = Bry_.new_a7("new"), Cls_display_none = Bry_.new_a7("xowa_display_none");
@ -168,7 +170,7 @@ public class Xow_portal_mgr implements Gfo_invk {
private final Bry_fmtr private final Bry_fmtr
div_personal_fmtr = Bry_fmtr.new_("~{portal_personal_subj_href};~{portal_personal_subj_text};~{portal_personal_talk_cls};~{portal_personal_talk_href};~{portal_personal_talk_cls};", "portal_personal_subj_href", "portal_personal_subj_text", "portal_personal_subj_cls", "portal_personal_talk_href", "portal_personal_talk_cls") div_personal_fmtr = Bry_fmtr.new_("~{portal_personal_subj_href};~{portal_personal_subj_text};~{portal_personal_talk_cls};~{portal_personal_talk_href};~{portal_personal_talk_cls};", "portal_personal_subj_href", "portal_personal_subj_text", "portal_personal_subj_cls", "portal_personal_talk_href", "portal_personal_talk_cls")
, div_ns_fmtr = Bry_fmtr.new_("~{portal_ns_subj_href};~{portal_ns_subj_cls};~{portal_ns_talk_href};~{portal_ns_talk_cls};~{portal_div_vnts}", "portal_ns_subj_href", "portal_ns_subj_cls", "portal_ns_talk_href", "portal_ns_talk_cls", "portal_div_vnts") , div_ns_fmtr = Bry_fmtr.new_("~{portal_ns_subj_href};~{portal_ns_subj_cls};~{portal_ns_talk_href};~{portal_ns_talk_cls};~{portal_div_vnts}", "portal_ns_subj_href", "portal_ns_subj_cls", "portal_ns_talk_href", "portal_ns_talk_cls", "portal_div_vnts")
, div_view_fmtr = Bry_fmtr.new_("", "portal_view_read_cls", "portal_view_edit_cls", "portal_view_html_cls", "search_text", "portal_view_read_href", "portal_view_edit_href", "portal_view_html_href") , div_view_fmtr = Bry_fmtr.new_("", "portal_view_read_cls", "portal_view_edit_cls", "portal_view_html_cls", "search_text", "portal_view_read_href", "portal_view_edit_href", "portal_view_html_href", "sitename")
, div_logo_fmtr = Bry_fmtr.new_("", "portal_nav_main_href", "portal_logo_url") , div_logo_fmtr = Bry_fmtr.new_("", "portal_nav_main_href", "portal_logo_url")
, div_sync_fmtr = Bry_fmtr.new_("", "page_url") , div_sync_fmtr = Bry_fmtr.new_("", "page_url")
, div_wikis_fmtr = Bry_fmtr.new_("", "toggle_btn", "toggle_hdr") , div_wikis_fmtr = Bry_fmtr.new_("", "toggle_btn", "toggle_hdr")

View File

@ -170,7 +170,7 @@ app.wikis.get('~{wiki_key}').html.portal {
<li id="p-search" role="search"> <li id="p-search" role="search">
<form id="searchform" action="/wiki/~{<>app.gui.win_opts.search_url;<>}"> <form id="searchform" action="/wiki/~{<>app.gui.win_opts.search_url;<>}">
<div id="simpleSearch"> <div id="simpleSearch">
<input type="search" name="search" placeholder="~{<>msgs.get('searchbutton');<>}" id="searchInput"~{<>msgs.get_html_accesskey_and_title('search');<>} value="~{search_text}" autocomplete="off"> <input type="search" name="search" placeholder="~{<>msgs.get('searchbutton');<>} ~{sitename}" id="searchInput"~{<>msgs.get_html_accesskey_and_title('search');<>} value="~{search_text}" autocomplete="off">
<input type="hidden" name="fulltext" value="y"> <input type="hidden" name="fulltext" value="y">
<input type="submit"~{<>msgs.get_html_accesskey_and_title('search');<>} id="mw-searchButton" class="searchButton mw-fallbackSearchButton" /> <input type="submit"~{<>msgs.get_html_accesskey_and_title('search');<>} id="mw-searchButton" class="searchButton mw-fallbackSearchButton" />
<input type="submit" name="go" value="~{<>msgs.get('go');<>}" title="~{<>msgs.get('tooltip-search-go');<>}" id="searchButton" class="searchButton" /> <input type="submit" name="go" value="~{<>msgs.get('go');<>}" title="~{<>msgs.get('tooltip-search-go');<>}" id="searchButton" class="searchButton" />