diff --git a/KiwixWebApp.jsproj b/KiwixWebApp.jsproj index af6402e8..5944202e 100644 --- a/KiwixWebApp.jsproj +++ b/KiwixWebApp.jsproj @@ -116,6 +116,9 @@ + + + diff --git a/bin/Release/AppX/resources.pri b/bin/Release/AppX/resources.pri index 550b17e6..a2d5c21c 100644 Binary files a/bin/Release/AppX/resources.pri and b/bin/Release/AppX/resources.pri differ diff --git a/bin/Release/AppX/vs.appxrecipe b/bin/Release/AppX/vs.appxrecipe index e6b3e2a2..6c851478 100644 --- a/bin/Release/AppX/vs.appxrecipe +++ b/bin/Release/AppX/vs.appxrecipe @@ -32,7 +32,7 @@ AppxManifest.xml true - 2017-07-10T16:02:59.952 + 2017-07-10T17:02:01.327 @@ -297,6 +297,18 @@ www\-\s\css_modules\ext.cite.styles.css 2017-07-09T20:07:35.865 + + www\-\s\css_modules\ext.scribunto.logs.css + 2017-07-10T16:53:20.370 + + + www\-\s\css_modules\ext.timeline.styles.css + 2017-07-10T16:45:46.762 + + + www\-\s\css_modules\mediawiki.page.gallery.styles.css + 2017-07-10T16:59:16.695 + www\-\s\css_modules\mediawiki.toc.css 2017-07-09T20:06:05.109 @@ -359,11 +371,11 @@ www\js\app.js - 2017-07-10T16:02:28.314 + 2017-07-10T17:00:39.343 www\js\init.js - 2017-07-10T15:57:20.553 + 2017-07-10T16:37:03.525 www\js\lib\abstractFilesystemAccess.js @@ -428,7 +440,7 @@ resources.pri true - 2017-07-10T15:23:00.830 + 2017-07-10T17:02:01.227 diff --git a/bin/Release/AppX/www/-/s/css_modules/ext.scribunto.logs.css b/bin/Release/AppX/www/-/s/css_modules/ext.scribunto.logs.css new file mode 100644 index 00000000..2183c7f9 --- /dev/null +++ b/bin/Release/AppX/www/-/s/css_modules/ext.scribunto.logs.css @@ -0,0 +1 @@ +.scribunto-limitreport-logs{margin:0;white-space:pre-wrap} \ No newline at end of file diff --git a/bin/Release/AppX/www/-/s/css_modules/ext.timeline.styles.css b/bin/Release/AppX/www/-/s/css_modules/ext.timeline.styles.css new file mode 100644 index 00000000..cc9c30f6 --- /dev/null +++ b/bin/Release/AppX/www/-/s/css_modules/ext.timeline.styles.css @@ -0,0 +1 @@ +.timeline-wrapper{max-width:100%;overflow:auto} \ No newline at end of file diff --git a/bin/Release/AppX/www/-/s/css_modules/mediawiki.page.gallery.styles.css b/bin/Release/AppX/www/-/s/css_modules/mediawiki.page.gallery.styles.css new file mode 100644 index 00000000..4365e318 --- /dev/null +++ b/bin/Release/AppX/www/-/s/css_modules/mediawiki.page.gallery.styles.css @@ -0,0 +1 @@ +@media print{li.gallerybox{vertical-align:top;display:inline-block}ul.gallery,li.gallerybox{zoom:1;*display:inline}ul.gallery{margin:2px;padding:2px;display:block}li.gallerycaption{font-weight:bold;text-align:center;display:block;word-wrap:break-word}li.gallerybox div.thumb{text-align:center;border:1px solid #ccc;margin:2px}div.gallerytext{overflow:hidden;font-size:94%;padding:2px 4px;word-wrap:break-word}}li.gallerybox{vertical-align:top;display:-moz-inline-box;display:inline-block}ul.gallery,li.gallerybox{zoom:1;*display:inline}ul.gallery{margin:2px;padding:2px;display:block}li.gallerycaption{font-weight:bold;text-align:center;display:block;word-wrap:break-word}li.gallerybox div.thumb{text-align:center;border:1px solid #c8ccd1;background-color:#f8f9fa;margin:2px}li.gallerybox div.thumb img{display:block;margin:0 auto}div.gallerytext{overflow:hidden;font-size:94%;padding:2px 4px;word-wrap:break-word}.galleryfilename{display:block}.galleryfilename-truncate{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}ul.mw-gallery-nolines li.gallerybox div.thumb{background-color:transparent;border:0}ul.mw-gallery-nolines li.gallerybox div.gallerytext{text-align:center}ul.mw-gallery-packed li.gallerybox div.thumb,ul.mw-gallery-packed-overlay li.gallerybox div.thumb,ul.mw-gallery-packed-hover li.gallerybox div.thumb{background-color:transparent;border:0}ul.mw-gallery-packed li.gallerybox div.thumb img,ul.mw-gallery-packed-overlay li.gallerybox div.thumb img,ul.mw-gallery-packed-hover li.gallerybox div.thumb img{margin:0 auto}ul.mw-gallery-packed-hover li.gallerybox,ul.mw-gallery-packed-overlay li.gallerybox{position:relative}ul.mw-gallery-packed-hover div.gallerytextwrapper{overflow:hidden;height:0}ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper,ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper,ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper{position:absolute;background:#fff;background:rgba( 255,255,255,0.8 );padding:5px 10px;bottom:0;left:0;height:auto;max-height:40%;overflow:hidden;font-weight:bold;margin:2px}ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper p,ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper p,ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper p{text-overflow:ellipsis;white-space:nowrap;overflow:hidden}ul.mw-gallery-packed-hover li.gallerybox div.gallerytextwrapper:hover,ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper:hover,ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper:hover{overflow:visible;max-height:none}ul.mw-gallery-packed-hover li.gallerybox div.gallerytextwrapper:hover p,ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper:hover p,ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper:hover p{text-overflow:clip;white-space:normal;overflow:visible}ul.mw-gallery-packed-hover,ul.mw-gallery-packed-overlay,ul.mw-gallery-packed{text-align:center}ul.gallery.mw-gallery-slideshow{display:block;margin:4em 0}ul.gallery.mw-gallery-slideshow .gallerycaption{font-size:1.3em;margin:0}ul.gallery.mw-gallery-slideshow .gallerycarousel.mw-gallery-slideshow-thumbnails-toggled{margin-bottom:1.3em}ul.gallery.mw-gallery-slideshow .mw-gallery-slideshow-buttons{opacity:0.5;padding:1.3em 0}ul.gallery.mw-gallery-slideshow .mw-gallery-slideshow-buttons .oo-ui-buttonElement{margin:0 2em}.mw-gallery-slideshow li.gallerybox.slideshow-current{background:#efefef}.mw-gallery-slideshow .gallerybox > div{max-width:120px}ul.mw-gallery-slideshow li.gallerybox div.thumb{border:0;background:transparent}ul.mw-gallery-slideshow li.gallerycarousel{display:block;text-align:center}.mw-gallery-slideshow-img-container a{display:block} \ No newline at end of file diff --git a/bin/Release/AppX/www/js/app.js b/bin/Release/AppX/www/js/app.js index f1997ddd..36e61c20 100644 --- a/bin/Release/AppX/www/js/app.js +++ b/bin/Release/AppX/www/js/app.js @@ -798,6 +798,9 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles (zimLink.match(/-\/s\/style\.css/i) || zimLink.match(/-\/s\/css_modules\/mediawiki\.toc\.css/i) || zimLink.match(/-\/s\/css_modules\/ext\.cite\.styles\.css/i) || + zimLink.match(/-\/s\/css_modules\/ext\.timeline\.styles\.css/i) || + zimLink.match(/-\/s\/css_modules\/ext\.scribunto\.logs\.css/i) || + zimLink.match(/-\/s\/css_modules\/mediawiki\.page\.gallery\.styles\.css/i) || zimLink.match(/-\/s\/css_modules\/ext\.cite\.a11y\.css/i))) { blobArray[i] = zimLink.match(/-\/s\/style\.css/i) && module.config().cssSource == "mobile" ? "../-/s/style-mobile.css" : zimLink; console.log("Matched #" + i + " [" + blobArray[i] + "] from local filesystem"); @@ -818,7 +821,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles selectedArchive.getDirEntryByTitle(title).then( function (dirEntry) { selectedArchive.readBinaryFile(dirEntry, function (readableTitle, content) { - //var cssContent = util.uintToString(content); + var cssContent = util.uintToString(content); //Uncomment this line and break on next to capture cssContent for local filesystem cache var cssBlob = new Blob([content], { type: 'text/css' }); var newURL = URL.createObjectURL(cssBlob); blobArray[index] = newURL; diff --git a/bin/Release/AppX/www/js/init.js b/bin/Release/AppX/www/js/init.js index 3697e4b7..37c88289 100644 --- a/bin/Release/AppX/www/js/init.js +++ b/bin/Release/AppX/www/js/init.js @@ -23,7 +23,7 @@ 'use strict'; var params = {}; var results = params['results'] || 10; //Number of search results to display -var cssSource = params['cssSource'] || "mobile"; //One of "zimfile", "local" or "mobile"" +var cssSource = params['cssSource'] || "local"; //One of "zimfile", "local" or "mobile"" require.config({ baseUrl: 'js/lib', diff --git a/bin/Release/KiwixWebApp.build.appxrecipe b/bin/Release/KiwixWebApp.build.appxrecipe index 81308dbb..db8b734d 100644 --- a/bin/Release/KiwixWebApp.build.appxrecipe +++ b/bin/Release/KiwixWebApp.build.appxrecipe @@ -232,6 +232,15 @@ www\-\s\css_modules\ext.cite.styles.css + + www\-\s\css_modules\ext.scribunto.logs.css + + + www\-\s\css_modules\ext.timeline.styles.css + + + www\-\s\css_modules\mediawiki.page.gallery.styles.css + www\-\s\css_modules\mediawiki.toc.css diff --git a/bin/Release/ReverseMap/resources.pri b/bin/Release/ReverseMap/resources.pri index 550b17e6..a2d5c21c 100644 Binary files a/bin/Release/ReverseMap/resources.pri and b/bin/Release/ReverseMap/resources.pri differ diff --git a/bld/Release/PackageLayout/www/js/app.js b/bld/Release/PackageLayout/www/js/app.js index f1997ddd..99be9a38 100644 --- a/bld/Release/PackageLayout/www/js/app.js +++ b/bld/Release/PackageLayout/www/js/app.js @@ -798,6 +798,9 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles (zimLink.match(/-\/s\/style\.css/i) || zimLink.match(/-\/s\/css_modules\/mediawiki\.toc\.css/i) || zimLink.match(/-\/s\/css_modules\/ext\.cite\.styles\.css/i) || + zimLink.match(/-\/s\/css_modules\/ext\.timeline\.styles\.css/i) || + zimLink.match(/-\/s\/css_modules\/ext\.scribunto\.logs\.css/i) || + zimLink.match(/-\/s\/css_modules\/mediawiki\.page\.gallery\.styles\.css/i) || zimLink.match(/-\/s\/css_modules\/ext\.cite\.a11y\.css/i))) { blobArray[i] = zimLink.match(/-\/s\/style\.css/i) && module.config().cssSource == "mobile" ? "../-/s/style-mobile.css" : zimLink; console.log("Matched #" + i + " [" + blobArray[i] + "] from local filesystem"); @@ -818,7 +821,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles selectedArchive.getDirEntryByTitle(title).then( function (dirEntry) { selectedArchive.readBinaryFile(dirEntry, function (readableTitle, content) { - //var cssContent = util.uintToString(content); + //var cssContent = util.uintToString(content); //Uncomment this line and break on next to capture cssContent for local filesystem cache var cssBlob = new Blob([content], { type: 'text/css' }); var newURL = URL.createObjectURL(cssBlob); blobArray[index] = newURL; diff --git a/bld/Release/PackageLayout/www/js/init.js b/bld/Release/PackageLayout/www/js/init.js index 77cf41b7..3697e4b7 100644 --- a/bld/Release/PackageLayout/www/js/init.js +++ b/bld/Release/PackageLayout/www/js/init.js @@ -23,7 +23,7 @@ 'use strict'; var params = {}; var results = params['results'] || 10; //Number of search results to display -var cssSource = params['cssSource'] || "zimfile"; //One of "zimfile", "local" or "mobile"" +var cssSource = params['cssSource'] || "mobile"; //One of "zimfile", "local" or "mobile"" require.config({ baseUrl: 'js/lib', diff --git a/bld/Release/layout.resfiles b/bld/Release/layout.resfiles index a6c58054..3e5ce31f 100644 --- a/bld/Release/layout.resfiles +++ b/bld/Release/layout.resfiles @@ -50,6 +50,9 @@ images\Wide310x150Logo.scale-200.png images\Wide310x150Logo.scale-400.png www\-\s\css_modules\ext.cite.a11y.css www\-\s\css_modules\ext.cite.styles.css +www\-\s\css_modules\ext.scribunto.logs.css +www\-\s\css_modules\ext.timeline.styles.css +www\-\s\css_modules\mediawiki.page.gallery.styles.css www\-\s\css_modules\mediawiki.toc.css www\-\s\style.css www\-\s\style-mobile.css diff --git a/bld/Release/layout.resfiles.intermediate b/bld/Release/layout.resfiles.intermediate index a6c58054..3e5ce31f 100644 --- a/bld/Release/layout.resfiles.intermediate +++ b/bld/Release/layout.resfiles.intermediate @@ -50,6 +50,9 @@ images\Wide310x150Logo.scale-200.png images\Wide310x150Logo.scale-400.png www\-\s\css_modules\ext.cite.a11y.css www\-\s\css_modules\ext.cite.styles.css +www\-\s\css_modules\ext.scribunto.logs.css +www\-\s\css_modules\ext.timeline.styles.css +www\-\s\css_modules\mediawiki.page.gallery.styles.css www\-\s\css_modules\mediawiki.toc.css www\-\s\style.css www\-\s\style-mobile.css