From 69c97838eaa366a7f5258e69f4f15132c5f05cb0 Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Sun, 13 Nov 2016 13:47:26 -0500 Subject: [PATCH] Image: Show mockup of commons.wikimedia.org page when clicking on image --- .../src/gplx/xowa/guis/views/Xog_tab_itm.java | 3 +- .../htmls/ns_files/Xoh_file_page_wtr.java | 45 ++++++++--------- .../ns_files/Xoh_ns_file_page_mgr_tst.java | 48 +++++++++---------- 3 files changed, 49 insertions(+), 47 deletions(-) diff --git a/400_xowa/src/gplx/xowa/guis/views/Xog_tab_itm.java b/400_xowa/src/gplx/xowa/guis/views/Xog_tab_itm.java index 99727849f..d63d97dce 100644 --- a/400_xowa/src/gplx/xowa/guis/views/Xog_tab_itm.java +++ b/400_xowa/src/gplx/xowa/guis/views/Xog_tab_itm.java @@ -150,7 +150,8 @@ public class Xog_tab_itm implements Gfo_invk { try { if (page.Tab_data().Cancel_show()) return; // Special:Search canceled show; NOTE: must be inside try b/c finally handles thread wiki.Parser_mgr().Ctx().Page_(page); - if (page.Db().Page().Exists_n()) { + if ( page.Db().Page().Exists_n() + && !page.Commons_mgr().Xowa_mockup()) { // do not enter "missing" section if File_mockup; EX:en.wikipedia.org/wiki/File:Protoplanetary-disk.jpg DATE:2016-11-13 if (wiki.Db_mgr().Save_mgr().Create_enabled()) { page = Xoae_page.New_edit(wiki, ttl); view_mode = Xopg_page_.Tid_edit; diff --git a/400_xowa/src/gplx/xowa/htmls/ns_files/Xoh_file_page_wtr.java b/400_xowa/src/gplx/xowa/htmls/ns_files/Xoh_file_page_wtr.java index a3f285cc1..c93c00cec 100644 --- a/400_xowa/src/gplx/xowa/htmls/ns_files/Xoh_file_page_wtr.java +++ b/400_xowa/src/gplx/xowa/htmls/ns_files/Xoh_file_page_wtr.java @@ -24,28 +24,29 @@ public class Xoh_file_page_wtr { public byte[] Html_alt_dlm_dflt() {return html_alt_dlm_dflt;} private byte[] html_alt_dlm_dflt = Bry_.new_a7("|"); public byte[] Html_alt_dlm_last() {return html_alt_dlm_last;} private byte[] html_alt_dlm_last = Bry_.new_a7("."); public Bry_fmtr Html_main() {return html_main;} private final Bry_fmtr html_main = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last - ( "~{commons_notice}" + ( "~{commons_notice}
" +// , "" , "~{media}" ) , "media", "commons_notice"); diff --git a/400_xowa/src/gplx/xowa/htmls/ns_files/Xoh_ns_file_page_mgr_tst.java b/400_xowa/src/gplx/xowa/htmls/ns_files/Xoh_ns_file_page_mgr_tst.java index 9a159b90e..ae896cb2d 100644 --- a/400_xowa/src/gplx/xowa/htmls/ns_files/Xoh_ns_file_page_mgr_tst.java +++ b/400_xowa/src/gplx/xowa/htmls/ns_files/Xoh_ns_file_page_mgr_tst.java @@ -103,29 +103,29 @@ class Xoh_ns_file_page_mgr_fxt { wkr.Bld_html(wiki, bfr, file, ttl, opt, Bry_.To_a7_bry(html_file_size, 0)); // TEST: must pass in elem_val b/c test only uses 2nd Bld_html while app uses 1st Tfds.Eq_str_lines(expd, bfr.To_str_and_clear()); } - public static final String Hdr = String_.Concat_lines_nl_skip_last - ( "" - ); + public static final String Hdr = String_.Concat_lines_nl_skip_last("
"); +// ( "" +// ); }