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.

Sign up for GitHub

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

Removes "recording" from verbage #165

Merged
merged 11 commits into from
Nov 16, 2023
Merged

Removes "recording" from verbage #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
90b3d81
Removes "recording" from verbage
Shrinks99 Jun 30, 2023
a6fc4c2
Updates terminology
Shrinks99 Jul 26, 2023
ec31164
Merge branch 'main' into frontend-strip-recording-language
Shrinks99 Jul 26, 2023
91acf3e
Replaces Web Captures with Archived Items
Shrinks99 Aug 1, 2023
4a55d7f
Update src/ui/app.js
Shrinks99 Nov 15, 2023
92868aa
Update src/ui/app.js
Shrinks99 Nov 15, 2023
9cc9f48
Update src/ui/coll-info.js
Shrinks99 Nov 15, 2023
02ebee3
Update src/ui/coll-info.js
Shrinks99 Nov 15, 2023
d223c87
Update src/ui/coll-info.js
Shrinks99 Nov 16, 2023
ecd30a4
Update src/ui/app.js
Shrinks99 Nov 16, 2023
03a0d4d
Update src/ui/app.js
Shrinks99 Nov 16, 2023
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
2 changes: 1 addition & 1 deletion src/electron/app-popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class AppRecPopup extends RecPopup
}

get notRecordingMessage() {
return "Not Recording this Window";
return "Not Archiving this Window";
}

getHomePage() {
Expand Down
6 changes: 3 additions & 3 deletions src/electron/electron-recorder-app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ class ElectronRecorderApp extends ElectronReplayApp
async handleClose(theWindow) {
const res = await dialog.showMessageBox(theWindow, {
type: "question",
buttons: ["Cancel", "Stop Recording and Quit"],
buttons: ["Cancel", "Stop Archiving and Quit"],
defaultId: 1,
cancelId: 0,
title: "Stop Recording and Quit",
message: `There are still ${this.recorders.size} active recording sessions. Stop all and quit?`
title: "Stop Archiving and Quit",
message: `There are still ${this.recorders.size} active archiving sessions. Stop all and quit?`
});

// not closing
Expand Down
10 changes: 5 additions & 5 deletions src/ext/browser-recorder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,26 +185,26 @@ class BrowserRecorder extends Recorder {

if (this.running) {
if (this.behaviorState === BEHAVIOR_RUNNING) {
title = "Recording: Autopilot Running!";
title = "Archiving: Autopilot Running!";
color = "#3298dc";
text = " ";

} else if (this.numPending === 0) {
title = "Recording: No URLs pending, can continue";
title = "Archiving: No URLs pending, can continue";
color = "#64e986";
text = " ";

} else {
title = `Recording: ${this.numPending} URLs pending, please wait`;
title = `Archiving: ${this.numPending} URLs pending, please wait`;
color = "#bb9f08";
text = "" + this.numPending;
}
} else if (this.failureMsg) {
title = "Error: Can't Record this page";
title = "Error: Can't Archive this page";
text = "X";
color = "#F00";
} else {
title = "Not Recording";
title = "Not Archiving";
text = "";
color = "#64e986";
}
Expand Down
32 changes: 16 additions & 16 deletions src/popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class RecPopup extends LitElement
}

get notRecordingMessage() {
return "Not Recording this Tab";
return "Not Archiving this Tab";
}

static get styles() {
Expand Down Expand Up @@ -359,7 +359,7 @@ class RecPopup extends LitElement
}

if (this.recording) {
return html`<b>${this.waitingForStop ? "Finishing " : ""} Recording:&nbsp;</b>${this.status && this.status.numPending ? html`
return html`<b>${this.waitingForStop ? "Finishing " : ""} Archiving:&nbsp;</b>${this.status && this.status.numPending ? html`
<span class="status-pending">${this.status.numPending} URLs pending${this.waitingForStop ? "." : ", please wait before loading a new page."}</span>
` :
html`
Expand All @@ -369,7 +369,7 @@ class RecPopup extends LitElement
if (this.failureMsg) {
return html`
<div class="error">
<p>Sorry, there was an error starting recording on this page. Please try again or try a different page.</p>
<p>Sorry, there was an error starting archiving on this page. Please try again or try a different page.</p>
<p class="error-msg">Error Details: <i>${this.failureMsg}</i></p>
<p>If the error persists, check the <a href="https://archiveweb.page/guide/troubleshooting/errors" target="_blank">Common Errors and Issues</a> page in the guide for
known issues and possible solutions.
Expand All @@ -381,18 +381,18 @@ class RecPopup extends LitElement
if (!this.canRecord) {
if (this.pageUrl && this.pageUrl.startsWith(this.extRoot)) {
return html`
<p class="is-size-7">This page is part of the extension. You can view existing archives from here.
To start a new recording, click the
<wr-icon .src="${wrRec}"></wr-icon> button and enter a new URL.
<p class="is-size-7">This page is part of the extension. You can view existing archived items from here.
To start a new archiving session, click the
<wr-icon .src="${wrRec}"></wr-icon> Start Archiving button and enter a new URL.
</p>
`;
}

return html`<i>Can't record this page.</i>`;
return html`<i>Can't archive this page.</i>`;
}

if (this.waitingForStart) {
return html`<i>Recording will start after the page reloads...</i>`;
return html`<i>Archiving will start after the page reloads...</i>`;
}

return html`<i>${this.notRecordingMessage}</i>`;
Expand All @@ -401,7 +401,7 @@ class RecPopup extends LitElement
renderCollDropdown() {
return html`
<div class="coll-select">
<div class="is-size-7">${this.recording ? "Recording" : "Record"} To:&nbsp;</div>
<div class="is-size-7">${this.recording ? "Currently archiving" : "Save"} to:&nbsp;</div>
<div class="dropdown ${this.collDrop === "show" ? "is-active" : ""}">
<div class="dropdown-trigger">
<button @click="${this.onShowDrop}" class="coll button is-small" aria-haspopup="true" aria-controls="dropdown-menu" ?disabled="${this.recording}">
Expand All @@ -418,7 +418,7 @@ class RecPopup extends LitElement
<a @click="${() => this.collDrop = "create"}" class="dropdown-item">
<span class="icon is-small">
<wr-icon .src="${fasPlus}"></wr-icon>
</span>Create New Archive...
</span>New Archiving Session
</a>
<hr class="dropdown-divider">` : ""}
${this.collections.map((coll) => html`
Expand Down Expand Up @@ -455,9 +455,9 @@ class RecPopup extends LitElement
<div class="view-row is-marginless" style="background-color: #ddddff">
<form @submit="${this.onNewColl}">
<div class="flex-form">
<label for="new-name" class="is-size-7 is-italic">Create New Archive:</label>
<label for="new-name" class="is-size-7 is-italic">New Archiving Session:</label>
<div class="control">
<input class="input is-small" id="new-name" type="text" required placeholder="Enter Archive Name">
<input class="input is-small" id="new-name" type="text" required placeholder="Enter Archiving Session Name">
</div>
<button class="button is-small is-outlined" type="submit">
<wr-icon .src=${fasCheck}></wr-icon>
Expand Down Expand Up @@ -500,15 +500,15 @@ class RecPopup extends LitElement
<wr-icon .src=${wrRec}></wr-icon>` : html`
<wr-icon .src=${fasBox}></wr-icon>`}
</span>
<span>${!this.recording ? "Start" : "Stop"}</span>
<span>${!this.recording ? "Start Archiving" : "Stop Archiving"}</span>
</button>
` : ""}
</div>
${this.renderCollCreate()}
<div class="view-row is-marginless">
<div>
${this.canRecord ? html`
<p><a target="_blank" href="${this.getCollPage()}" class="is-size-6">Browse Archive</a></p>` : ""}
<p><a target="_blank" href="${this.getCollPage()}" class="is-size-6">View Archived Pages</a></p>` : ""}
</div>
${this.renderStartOpt()}
</div>
Expand All @@ -525,9 +525,9 @@ class RecPopup extends LitElement

${this.status && this.status.sizeTotal ? html`
<div class="view-row underline">
<div class="session-head">Recorded in this tab</div>
<div class="session-head">Archived in this tab</div>
${this.replayUrl ?
html`<a target="_blank" class="is-size-6" href="${this.replayUrl}">View Recorded Page</a>` : ""}
html`<a target="_blank" class="is-size-6" href="${this.replayUrl}">Replay Current Page</a>` : ""}
</div>
<div class="view-row">
<table class="status">
Expand Down
48 changes: 24 additions & 24 deletions src/ui/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,26 +317,26 @@ class ArchiveWebApp extends ReplayWebApp
<div class="message is-small">
<div class="message-body">
<div class="buttons">
<button class="button is-small no-pad-mobile" title="Create New..." @click="${() => this.showNew = "show"}">
<button class="button is-small no-pad-mobile" title="New Archiving Session" @click="${() => this.showNew = "show"}">
<span class="icon">
<fa-icon .svg=${fasPlus}></fa-icon>
</span>
<span class="is-hidden-mobile">Create New...</span>
<span class="is-hidden-mobile">New Archiving Session</span>
</button>
<button class="button is-small no-pad-mobile" title="Import Archive..." @click="${() => this.showImport = true}">
<button class="button is-small no-pad-mobile" title="Import File" @click="${() => this.showImport = true}">
<span class="icon">
<fa-icon .svg=${fasUpload}></fa-icon>
</span>
<span class="is-hidden-mobile">Import Archive...</span>
<span class="is-hidden-mobile">Import File</span>
</button>
<button class="button is-small no-pad-mobile" title="Start Recording..." ?disabled="${!this.colls}" @click="${this.onShowStart}">
<button class="button is-small no-pad-mobile" title="Start Archiving" ?disabled="${!this.colls}" @click="${this.onShowStart}">
<span class="icon">
<fa-icon size="1.0em" aria-hidden="true" .svg="${wrRec}"></fa-icon>
</span>
<span class="is-hidden-mobile">Start Recording...</span>
<span class="is-hidden-mobile">Start Archiving</span>
</button>
<div class="rightbar">
<div class="infomsg is-hidden-mobile">The ArchiveWeb.page ${IS_APP ? "App" : "Extension"} allows you to create web archives directly in your browser!</div>
<div class="infomsg is-hidden-mobile">The ArchiveWeb.page ${IS_APP ? "App" : "Extension"} allows you to archive webpages directly in your browser!</div>
tw4l marked this conversation as resolved.
Show resolved Hide resolved
<button class="button is-small" @click="${() => this.showSettings = true}">
<fa-icon .svg=${fasCog}></fa-icon>
</button>
Expand All @@ -348,7 +348,7 @@ class ArchiveWebApp extends ReplayWebApp

<wr-rec-coll-index
dateName="Date Created"
headerName="Current Web Archives"
headerName="Archived Items"
.shareOpts=${{ipfsOpts: this.ipfsOpts, btrixOpts: this.btrixOpts}}
@show-start=${this.onShowStart}
@show-import=${this.onShowImport}
Expand Down Expand Up @@ -415,8 +415,8 @@ class ArchiveWebApp extends ReplayWebApp

renderStartModal() {
return html`
<wr-modal @modal-closed="${() => this.showStartRecord = false}" title="Start Recording">
${this.renderCollList("Archive To:")}
<wr-modal @modal-closed="${() => this.showStartRecord = false}" title="Start Archiving">
${this.renderCollList("Save To:")}
<div class="field">
<label class="checkbox is-size-7">
<input type="checkbox" ?checked="${this.autorun}" @change="${(e) => this.autorun = e.currentTarget.checked}">
Expand All @@ -429,7 +429,7 @@ class ArchiveWebApp extends ReplayWebApp
<p class="control is-expanded">
<input class="input" type="url" required
name="url" id="url" value="${this.recordUrl}"
placeholder="Enter a URL to Start Recording">
placeholder="Enter a URL to Start Archiving">
</p>
<div class="control">
<button type="submit" class="button is-hidden-mobile is-outlined is-link">
Expand All @@ -442,22 +442,22 @@ class ArchiveWebApp extends ReplayWebApp
</div>
${IS_APP ? html`
<label class="checkbox">
<input id="preview" type="checkbox"><span>&nbsp;Start in Preview Mode (without recording.)</span>
<input id="preview" type="checkbox"><span>&nbsp;Start in Preview Mode (without archiving.)</span>
</label>` : ""}
</form>
</wr-modal>`;
}

renderNewCollModal() {
return html`
<wr-modal @modal-closed="${() => this.showNew = null}" title="Create New Archive">
<wr-modal @modal-closed="${() => this.showNew = null}" title="New Archiving Session">
<form @submit="${this.onNewColl}" class="create-new">
<div class="field has-addons">
<p class="control is-expanded">
<input type="text" id="new-title" name="new-title" class="input" required placeholder="Enter the title for the new archive">
<input type="text" id="new-title" name="new-title" class="input" required placeholder="Give this archiving session a name">
</p>
<div class="control">
<button type="submit" class="button is-hidden-mobile is-primary ${this.showNew === "loading" ? "is-loading " : ""}" ?disabled="${this.showNew === "loading"}">Create New</button>
<button type="submit" class="button is-hidden-mobile is-primary ${this.showNew === "loading" ? "is-loading " : ""}" ?disabled="${this.showNew === "loading"}">Create</button>
</div>
</div>
</form>
Expand All @@ -466,7 +466,7 @@ class ArchiveWebApp extends ReplayWebApp

renderImportModal() {
return html`
<wr-modal style="--modal-width: 740px" @modal-closed="${() => this.showImport = false}" title="Import an Existing Archive">
<wr-modal style="--modal-width: 740px" @modal-closed="${() => this.showImport = false}" title="Import File">
<wr-chooser
style="flex: auto"
.newFullImport="${true}"
Expand All @@ -477,7 +477,7 @@ class ArchiveWebApp extends ReplayWebApp
<div class="control">
<label class="checkbox">
<input type="checkbox" name="add-existing" .checked="${this.isImportExisting}" @change="${(e) => this.isImportExisting = e.currentTarget.checked}">
Add to an existing archive collection${this.isImportExisting ? ":" : ""}
Add to an existing archived item${this.isImportExisting ? ":" : ""}
</label>
</div>
${this.isImportExisting ? this.renderCollList() : ""}
Expand Down Expand Up @@ -596,10 +596,10 @@ class ArchiveWebApp extends ReplayWebApp
</div>

${IS_APP ? html`
<p>ArchiveWeb.page App is a standalone app for Mac, Windows and Linux that allows users to create web archives as they browse</p>
<p>ArchiveWeb.page App is a standalone app for Mac, Windows and Linux that allows users to archive webpages as they browse</p>

` : html`
<p>ArchiveWeb.page allows users to create web archives directly in your browser!</p>`}
<p>ArchiveWeb.page allows users to archive webpages directly in your browser!</p>`}
</div>

<p>See the <a href="https://archiveweb.page/guide" target="_blank">ArchiveWeb.page Guide</a> for more info on how to use this tool.</p>
Expand All @@ -611,13 +611,13 @@ class ArchiveWebApp extends ReplayWebApp
<p>ArchiveWeb.page is part of the <a href="https://webrecorder.net/" target="_blank">Webrecorder Project</a>.</p>

<h3>Privacy Policy</h3>
<p class="is-size-7">ArchiveWeb.page allows users to archive what they browse, this archive data is stored directly in the browser.
Users can downloaded this data as files to their harddrive. Users can also delete any and all archived data at any time.
<p class="is-size-7">ArchiveWeb.page allows users to archive what they browse, storing captured data directly in the browser.
Users can downloaded this data as files to their hard drive. Users can also delete any and all archived data at any time.
ArchiveWeb.page does not collect any usage or tracking data.</p>

<p class="is-size-7">ArchiveWeb.page includes an experimental sharing option for each archive collection. Users can choose to share select archives on a peer-to-peer network (IPFS) via a unique id.
Once shared on this network, the data may become accessible to others.
All archives are private and not shared by default, unless explicitly opted-in by the user. (A warning is displayed when sharing via IPFS.)</p>
All archived items are private and not shared by default, unless explicitly opted-in by the user. (A warning is displayed when sharing via IPFS.)</p>

<h4>Disclaimer of Warranties</h4>
<p class="is-size-7">The application is provided "as is" without any guarantees.</p>
Expand Down Expand Up @@ -656,7 +656,7 @@ class ArchiveWebApp extends ReplayWebApp
<form class="is-flex is-flex-direction-column is-size-7" @submit="${this.onSaveSettings}">

${this.settingsTab === "ipfs" ? html`
<p class="is-size-6 mb-3">Configure IPFS settings for sharing archives to IPFS.</p>
<p class="is-size-6 mb-3">Configure settings for sharing archived items to IPFS.</p>
<fieldset>
<div class="field">
<input name="ipfsAutoDetect" id="ipfsAutoDetect" class="checkbox is-small" type="checkbox" ?checked="${this.ipfsOpts.autoDetect}"><span class="ml-1">Auto-Detect IPFS</span>
Expand All @@ -680,7 +680,7 @@ class ArchiveWebApp extends ReplayWebApp
</fieldset>` : ""}

${this.settingsTab === "browsertrix" ? html`
<p class="is-size-6 mb-3">Configure your credentials to upload archives to Browsertrix Cloud.</p>
<p class="is-size-6 mb-3">Configure your credentials to upload archived items to Browsertrix Cloud.</p>
<fieldset>
<div class="field has-addons">
<p class="is-expanded">
Expand Down
4 changes: 2 additions & 2 deletions src/ui/coll-index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ class WrRecCollIndex extends CollIndex
}

renderEmpty() {
return html`No Archives. Click "Create New" above to create a new archive and start recording!`;
return html`No archived items. Click "New Archiving Session" above to begin archiving pages!`;
}
}

customElements.define("wr-rec-coll-index", WrRecCollIndex);
customElements.define("wr-rec-coll-index", WrRecCollIndex);
Loading
Loading