Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature updates #607

Merged
merged 1 commit into from
Mar 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/features/readability/readability.css
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ sup.reference {
background-repeat: no-repeat;
}

.wbe-icon-forbidden {
/* https://www.streamlinehq.com/icons/download/forbidden-circle--29194 */
background-image: url(data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSItMSAtMSAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBpZD0iRm9yYmlkZGVuLUNpcmNsZS0tU3RyZWFtbGluZS1Tb2xhci1BciI+PGRlc2M+Rm9yYmlkZGVuIENpcmNsZSBTdHJlYW1saW5lIEljb246IGh0dHBzOi8vc3RyZWFtbGluZWhxLmNvbTwvZGVzYz48cGF0aCBkPSJNMTYuOTU4MzMzMzMzMzMzMzMyIDUuMDQxNjY2NjY2NjY2NjY2IDUuMDQxNjg1IDE2Ljk1ODE1IiBzdHJva2U9IiMyNTQyMmQiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLXdpZHRoPSIyIj48L3BhdGg+PHBhdGggc3Ryb2tlPSIjMjU0MjJkIiBkPSJNMS44MzMzMzMzMzMzMzMzMzMzIDExYTkuMTY2NjY2NjY2NjY2NjY2IDkuMTY2NjY2NjY2NjY2NjY2IDAgMSAwIDE4LjMzMzMzMzMzMzMzMzMzMiAwIDkuMTY2NjY2NjY2NjY2NjY2IDkuMTY2NjY2NjY2NjY2NjY2IDAgMSAwIC0xOC4zMzMzMzMzMzMzMzMzMzIgMCIgc3Ryb2tlLXdpZHRoPSIyIj48L3BhdGg+PC9zdmc+) !important;
.wbe-icon-sunglasses {
/* https://www.streamlinehq.com/icons/download/glasses--29265 */
background-image: url(data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgaWQ9IkdsYXNzZXMtLVN0cmVhbWxpbmUtU29sYXIiPjxkZXNjPkdsYXNzZXMgU3RyZWFtbGluZSBJY29uOiBodHRwczovL3N0cmVhbWxpbmVocS5jb208L2Rlc2M+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik02LjIzNzE3IDQuNzExNzJjMC4zOTI5NSAtMC4xMzA5OSAwLjYwNTMyIC0wLjU1NTczIDAuNDc0MzQgLTAuOTQ4NjkgLTAuMTMwOTkgLTAuMzkyOTUgLTAuNTU1NzMgLTAuNjA1MzIgLTAuOTQ4NjkgLTAuNDc0MzRsLTAuNTU0NzkgMC4xODQ5M2MtMC41NzA4OSAwLjE5MDI4IC0xLjA1NDgyIDAuMzUxNTcgLTEuNDM4OTYgMC41MjcxNiAtMC40MDg4IDAuMTg2ODUgLTAuNzY2NjMgMC40MTYxMSAtMS4wNTE0NyAwLjc3NTc2IC0wLjI4NDg1IDAuMzU5NjUgLTAuNDI2MDYgMC43NjA0OCAtMC41MTQzMiAxLjIwMTIgLTAuMDgyOTMgMC40MTQxNSAtMC4xMjkxIDAuOTIyMTUgLTAuMTgzNTYgMS41MjE0NWwtMC42OTcyNiA3LjY2OTkxYy0wLjA0NzE4IDAuMjY3MyAtMC4wNzIgMC41NDIzIC0wLjA3MjQ2IDAuODIzMSAwLjAwNTQ0IDIuNjE4NyAyLjEzIDQuNzU4IDQuNzQ5OTkgNC43NTggMi4zNjMyNSAwIDQuMzIzNDEgLTEuNzI1OCA0LjY4ODkxIC0zLjk4NTlsMC4yMTkgLTAuMDc4MmMwLjcwNjMgLTAuMjUxOSAxLjQ3NzkgLTAuMjUxOSAyLjE4NDIgMGwwLjIxOSAwLjA3ODJjMC4zNjU1IDIuMjYwMSAyLjMyNTYgMy45ODU5IDQuNjg4OSAzLjk4NTkgMi42MiAwIDQuNzQ0NSAtMi4xMzkzIDQuNzUgLTQuNzU4IC0wLjAwMDUgLTAuMjgwOCAtMC4wMjUzIC0wLjU1NTggLTAuMDcyNSAtMC44MjMxbC0wLjY5NzIgLTcuNjY5OTJjLTAuMDU0NSAtMC41OTkyOSAtMC4xMDA3IC0xLjEwNzI5IC0wLjE4MzYgLTEuNTIxNDQgLTAuMDg4MyAtMC40NDA3MiAtMC4yMjk1IC0wLjg0MTU1IC0wLjUxNDMgLTEuMjAxMiAtMC4yODQ5IC0wLjM1OTY1IC0wLjY0MjcgLTAuNTg4OTEgLTEuMDUxNSAtMC43NzU3NiAtMC4zODQxIC0wLjE3NTU5IC0wLjg2OCAtMC4zMzY4OCAtMS40Mzg5IC0wLjUyNzE2bC0wLjU1NDggLTAuMTg0OTNjLTAuMzkzIC0wLjEzMDk4IC0wLjgxNzcgMC4wODEzOSAtMC45NDg3IDAuNDc0MzQgLTAuMTMxIDAuMzkyOTYgMC4wODE0IDAuODE3NyAwLjQ3NDMgMC45NDg2OWwwLjUxODIgMC4xNzI3MmMwLjYxNzQgMC4yMDU3OSAxLjAyNDEgMC4zNDI0MiAxLjMyNjMgMC40ODA1OCAwLjI4NTggMC4xMzA2MyAwLjQxNDEgMC4yMzUzIDAuNDk5MiAwLjM0MjgzIDAuMDg1MiAwLjEwNzUyIDAuMTU3NyAwLjI1NjMgMC4yMTk0IDAuNTY0NDMgMC4wNjUzIDAuMzI1ODcgMC4xMDUxIDAuNzUzMDggMC4xNjQgMS40MDExNWwwLjQxNTMgNC41Njg1N2MtMC44MDMxIC0wLjYyMTggLTEuODEwOSAtMC45OTE4IC0yLjkwNTIgLTAuOTkxOCAtMi4zNDUxIDAgLTQuMjkzMyAxLjY5OTUgLTQuNjgwMiAzLjkzNCAtMC44NjIxIC0wLjI0OTQgLTEuNzc3NSAtMC4yNDk0IC0yLjYzOTYgMCAtMC4zODY5IC0yLjIzNDUgLTIuMzM1MDkgLTMuOTM0IC00LjY4MDIxIC0zLjkzNCAtMS4wOTQyNyAwIC0yLjEwMjEyIDAuMzcgLTIuOTA1MjUgMC45OTE4bDAuMDQ4MzUgLTAuNTMxOCAwLjM2Njk4IC00LjAzNjc3YzAuMDU4OTEgLTAuNjQ4MDcgMC4wOTg3NSAtMS4wNzUyOCAwLjE2NDAxIC0xLjQwMTE1IDAuMDYxNzEgLTAuMzA4MTMgMC4xMzQyMyAtMC40NTY5MSAwLjIxOTM5IC0wLjU2NDQzIDAuMDg1MTYgLTAuMTA3NTMgMC4yMTMzNyAtMC4yMTIyIDAuNDk5MTcgLTAuMzQyODMgMC4zMDIyNyAtMC4xMzgxNiAwLjcwODk5IC0wLjI3NDc5IDEuMzI2MzQgLTAuNDgwNThsMC41MTgxOSAtMC4xNzI3MloiIGZpbGw9IiMyNTQyMmQiIHN0cm9rZS13aWR0aD0iMSI+PC9wYXRoPjwvc3ZnPg==) !important;
background-repeat: no-repeat;
}

Expand All @@ -82,9 +82,7 @@ sup.reference {
}

.action--reading-mode > span {
background-position: top center !important;
background-size: 50% !important;
opacity: 0.5;
background-position: top center;
visibility: hidden;
}

Expand Down
2 changes: 1 addition & 1 deletion src/features/readability/readability.js
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ async function initReadability() {
<a class="action--reading-mode wbe-button wbe-icon-glasses${
options.readingMode_toggle ? " toggled-on" : ""
}" data-tooltip="Reading Mode" title="Reading Mode">
<span class="wbe-icon-forbidden"></span>
<span class="wbe-icon-sunglasses"></span>
</a>
`);
toggleElement.on("click", function (e) {
Expand Down
2 changes: 1 addition & 1 deletion src/features/register_feature_options.js
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ registerFeature({
registerFeature({
name: "Sticky Header",
id: "stickyHeader",
description: "Makes the WikiTree header stick to the top and more compact on narrow screens.",
description: "Makes the WikiTree header stick to the top of the screen when scrolling down the page.",
category: "Global/Style",
creators: [{ name: "Jonathan Duke", wikitreeid: "Duke-5773" }],
contributors: [],
Expand Down
2 changes: 1 addition & 1 deletion src/features/sourcepreview/sourcepreview.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
-webkit-box-shadow: 3px 3px 12px 6px rgba(0, 0, 0, 0.3);
box-shadow: 3px 3px 12px 6px rgba(0, 0, 0, 0.3);
background-color: #fff;
border: 2px solid #ccc;
border: 2px solid #000;
margin-top: 1em;
padding: 10px;
-webkit-border-radius: 1em;
Expand Down
67 changes: 31 additions & 36 deletions src/features/spacepreview/spacepreview.css
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
.x-page-preview {
position: absolute;
left: 2%;
z-index: 9999;
background-color: #fff;
border: 2px solid #ccc;
border: 2px solid #000;
margin: 0 2rem;
box-sizing: border-box;
padding: 10px;
-webkit-border-radius: 1em;
-moz-border-radius: 1em;
border-radius: 1em;
min-width: min(min(98vw, 94%), max(50vw, 50%, 800px));
max-width: min(98vw, 94%);
min-width: min(min(98vw, 94%), 400px);
max-width: min(98vw, 94%, 1200px);
max-height: min(90vh, 450px);
overflow: scroll !important;
overflow-x: auto !important;
Expand All @@ -20,6 +21,12 @@
text-decoration: none;
text-align: left;
line-height: normal;
scrollbar-width: 0;
}

.x-page-preview::-webkit-scrollbar {
width: 0;
height: 0;
}

/* special handling for previews on pins inside WT+ modal dialogs and autocomplete suggestions */
Expand Down Expand Up @@ -47,18 +54,21 @@ body > .x-page-preview {
right: 0;
top: 0;
display: inline-block;
padding: 0 7px;
font-size: 14px;
margin: 7px;
font-size: 10px;
border-radius: 100%;
box-sizing: border-box;
width: 17px;
height: 17px;
line-height: 17px;
text-align: center;
vertical-align: middle;
}
.x-preview-close,
.x-preview-close:visited,
.x-preview-close:active {
color: #000;
text-decoration: none !important;
}
.x-preview-close:hover {
color: #fff;
background-color: #8fc641;
color: #fff !important;
background-color: #25422d;
text-decoration: none !important;
}

Expand All @@ -74,37 +84,24 @@ body > .x-page-preview {
text-decoration: none !important;
}

.x-page-preview .preview-header.box,
.x-page-preview .preview-links.box {
.x-page-preview aside.footnote {
float: right;
clear: right;
z-index: 1;
box-sizing: border-box;
padding: 0.75em;
margin: 0 0.25em 0.5em 0.25em;
margin-top: 0;
max-width: max(50%, min(380px, 100%));
}
@media (max-width: 767px) {
.x-page-preview .preview-header.box,
.x-page-preview .preview-links.box {
min-width: 98%;
}
}
.x-page-preview .preview-links > p {
margin: 0 auto;
}
.x-page-preview .preview-links > p + p {
margin-top: 0.5em;
}
.x-page-preview .TAG {
line-height: 1.5;
max-width: min(450px, 100%);
}

.x-page-preview > .toc {
margin-top: 1em;
.x-page-preview .toc td,
.x-page-preview .toc td > div > h2 {
margin-top: 0;
}
.x-page-preview > .toc td > div > h2,
.x-page-preview > .toc td > ul {
.x-page-preview .toc,
.x-page-preview .toc td > div > h2,
.x-page-preview .toc td > ul {
margin-bottom: 0;
}

Expand All @@ -117,9 +114,7 @@ body > .x-page-preview {
.x-page-preview:not(.show-title) > .preview-title,
.x-page-preview:not(.show-scissors) > .preview-title .copy--buttons,
.x-page-preview.show-title > .same-title,
.x-page-preview:not(.show-header) > .preview-header,
.x-page-preview:not(.show-audit) .preview-audit,
.x-page-preview:not(.show-links) > .preview-links,
.x-page-preview:not(.show-edit) .EDIT,
.x-page-preview:not(.show-edit) .BLANK,
.x-page-preview:not(.show-edit) .preview-links .SMALL,
Expand Down
15 changes: 12 additions & 3 deletions src/features/spacepreview/spacepreview.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,17 @@ function parsePageContent(response) {

function parseSpaceContent(response) {
let content = parsePageContent(response);
if (previewClasses.indexOf("show-audit") > -1) {
console.log(content.body);
let $audit = $("<div></div>").html(response.replace(/(<\/?)(?=(script|style|link))/g, "$1no"));
$audit = $audit.find("aside > #Manager").first().closest("aside");
if ($audit.length > 0) {
const aside = $audit.prop("outerHTML");
if (aside) {
content.body = `${aside}\n${content.body}`;
}
}
}
return content;
}

Expand Down Expand Up @@ -292,7 +303,7 @@ function attachHover(target) {
// do not apply to certain links
if (
$(this).closest(
".no-link-preview, .reference, #header, #footer, .profile-tabs, #views-wrap, .pureCssMenu, #customMenuOptions, .button"
".no-link-preview, .reference, header, footer, .tabs--wrapper, .dropdown-item, #customMenuOptions, .btn, .button"
).length > 0
) {
return false;
Expand Down Expand Up @@ -334,8 +345,6 @@ async function initFeature() {

if (options.showTitle !== false) previewClasses += " show-title";
if (options.showScissors !== false) previewClasses += " show-scissors";
if (options.showHeader !== false) previewClasses += " show-header";
if (options.showLinks !== false) previewClasses += " show-links";
if (!!options.showAudit) previewClasses += " show-audit";
if (!!options.showEdit) previewClasses += " show-edit";
if (options.tocDisplay % 2 === 1) {
Expand Down
16 changes: 2 additions & 14 deletions src/features/spacepreview/spacepreview_options.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,27 +59,15 @@ const pagePreviewFeature = {
{
id: "showScissors",
type: OptionType.CHECKBOX,
label: "Show scissors beside the title to copy the ID or link",
defaultValue: true,
},
{
id: "showHeader",
type: OptionType.CHECKBOX,
label: "Show header information (date, location, tags/surnames)",
label: "Show copy links beside the title",
defaultValue: true,
},
{
id: "showAudit",
type: OptionType.CHECKBOX,
label: "Show page manager, times accessed, etc.",
label: "Show the box with the page profile, manager, etc.",
defaultValue: false,
},
{
id: "showLinks",
type: OptionType.CHECKBOX,
label: 'Show "Categories:" and "Other:" links at the top',
defaultValue: true,
},
{
id: "showEdit",
type: OptionType.CHECKBOX,
Expand Down