diff --git a/src/AccountTeams.vue b/src/AccountTeams.vue index 1d127e7..175f3bc 100644 --- a/src/AccountTeams.vue +++ b/src/AccountTeams.vue @@ -118,33 +118,34 @@ fieldset.settings.view-panel.account-teams div(v-if="!teams.length") You do not currently own any F@H teams. table.view-table(v-else) - tr - th.team-logo Logo - th.team-id Team - th.team-name Name - th.team-wus WUs - th.team-score Score - th.team-actions Actions - - tr(v-for="team in teams") - td.team-logo: img(:src="team.logo") - - td.team-id - a(:href="`${$stats.url}/team/${team.team}`", target="_blank") - | {{team.team}} - - td.team-name: component(:href="team.url", target="_blank", - :is="team.url ? 'a' : 'span'") {{team.name}} - - td.team-wus {{team.wus.toLocaleString()}} - td.team-score {{team.score.toLocaleString()}} - - td.team-actions - div - Button.button-icon(icon="trash", @click="delete_team(team)", - title="Delete team.", :disabled="!!team.wus") - Button.button-icon(icon="pencil", @click="edit_team(team)", - title="Edit team settings.") + tbody + tr + th.team-logo Logo + th.team-id Team + th.team-name Name + th.team-wus WUs + th.team-score Score + th.team-actions Actions + + tr(v-for="team in teams") + td.team-logo: img(:src="team.logo") + + td.team-id + a(:href="`${$stats.url}/team/${team.team}`", target="_blank") + | {{team.team}} + + td.team-name: component(:href="team.url", target="_blank", + :is="team.url ? 'a' : 'span'") {{team.name}} + + td.team-wus {{team.wus.toLocaleString()}} + td.team-score {{team.score.toLocaleString()}} + + td.team-actions + div + Button.button-icon(icon="trash", @click="delete_team(team)", + title="Delete team.", :disabled="!!team.wus") + Button.button-icon(icon="pencil", @click="edit_team(team)", + title="Edit team settings.") .actions Button(text="New Team", icon="plus", @click="create_team", diff --git a/src/GroupSettings.vue b/src/GroupSettings.vue index 97195a9..ddedac5 100644 --- a/src/GroupSettings.vue +++ b/src/GroupSettings.vue @@ -103,18 +103,19 @@ fieldset.settings.view-panel table.gpus-input.view-table - tr - th Description - th Enabled - - tr.gpu-row(v-for="gpu in gpus", - :class="{unsupported: !gpu.supported}", - :title="gpu.supported ? `${gpu.id} ${gpu.description}` : \ - 'Unsupported GPU'") - td.gpu-description {{gpu.description}} - - td.gpu-enabled - input(type="checkbox", v-model="config.gpus[gpu.id].enabled") + tbody + tr + th Description + th Enabled + + tr.gpu-row(v-for="gpu in gpus", + :class="{unsupported: !gpu.supported}", + :title="gpu.supported ? `${gpu.id} ${gpu.description}` : \ + 'Unsupported GPU'") + td.gpu-description {{gpu.description}} + + td.gpu-enabled + input(type="checkbox", v-model="config.gpus[gpu.id].enabled") fieldset.settings.view-panel(v-if="advanced") legend diff --git a/src/LoginDialog.vue b/src/LoginDialog.vue index aade3de..bb9f96d 100644 --- a/src/LoginDialog.vue +++ b/src/LoginDialog.vue @@ -169,7 +169,7 @@ Dialog(:buttons="buttons", ref="dialog", width="40em") p. When registering your Folding@home account you can generate - a secure passphrase by clicking the #[.fa.fa-refresh] icon. + a secure passphrase by clicking the #[i .fa.fa-refresh] icon. Make sure you save this passphrase somewhere safe, preferably in a password manager. diff --git a/src/MachinesView.vue b/src/MachinesView.vue index 252c4d8..466b57e 100644 --- a/src/MachinesView.vue +++ b/src/MachinesView.vue @@ -69,30 +69,31 @@ export default { table.machines-info.view-table - tr - th Machines - th CPUs - th GPUs - th PPD - th Actions - - td(title="Active machine count") - | {{$machs.get_count().toLocaleString()}} - td(title="Active CPU count") {{$machs.active_cpus.toLocaleString()}} - td(title="Active GPU count") {{$machs.active_gpus.toLocaleString()}} - td(title="Current total Points Per Day") - | {{$machs.ppd.toLocaleString()}} - td - .machines-actions - Button(text="Fold All", - @click="$root.fold()", success, icon="play", - :disabled="$machs.is_empty()", - title="Start folding on all machines") - - Button(text="Pause All", - @click="$root.pause()", icon="pause", - :disabled="$machs.is_empty()", - title="Pause folding on all machines") + tbody + tr + th Machines + th CPUs + th GPUs + th PPD + th Actions + tr + td(title="Active machine count") + | {{$machs.get_count().toLocaleString()}} + td(title="Active CPU count") {{$machs.active_cpus.toLocaleString()}} + td(title="Active GPU count") {{$machs.active_gpus.toLocaleString()}} + td(title="Current total Points Per Day") + | {{$machs.ppd.toLocaleString()}} + td + .machines-actions + Button(text="Fold All", + @click="$root.fold()", success, icon="play", + :disabled="$machs.is_empty()", + title="Start folding on all machines") + + Button(text="Pause All", + @click="$root.pause()", icon="pause", + :disabled="$machs.is_empty()", + title="Pause folding on all machines") template(v-for="mach in machs") MachineView(v-if="!mach.is_hidden()", :mach="mach") diff --git a/src/SettingsView.vue b/src/SettingsView.vue index b896f2c..d3b226f 100644 --- a/src/SettingsView.vue +++ b/src/SettingsView.vue @@ -318,7 +318,7 @@ Dialog.new-group-dialog(ref="new_group_dialog", buttons="Create") include a-z, 0-9, dashes (-) and dots (.). p. If the local machine is linked to another account you can link it to - this account by clicking on the #[.fa.fa-link] icon. + this account by clicking on the #[i .fa.fa-link] icon. .setting label Name diff --git a/src/UnitDetailsView.vue b/src/UnitDetailsView.vue index e5d1893..c39febd 100644 --- a/src/UnitDetailsView.vue +++ b/src/UnitDetailsView.vue @@ -120,21 +120,22 @@ export default { div(v-else-if="!credits.length") No credits logged template(v-else) table.view-table - tr - th Code - th User - th Team - th Credit - th Assigned - th Credited - - tr(v-for="credit in credits") - td.code {{credit.code}} - td.user {{credit.user}} - td.team {{credit.team}} - td.credit {{(credit.credit || 0).toLocaleString()}} - td.assigned {{credit.assign_time}} - td.credited {{credit.credit_time}} + tbody + tr + th Code + th User + th Team + th Credit + th Assigned + th Credited + + tr(v-for="credit in credits") + td.code {{credit.code}} + td.user {{credit.user}} + td.team {{credit.team}} + td.credit {{(credit.credit || 0).toLocaleString()}} + td.assigned {{credit.assign_time}} + td.credited {{credit.credit_time}} p May included credits awarded to other users. diff --git a/src/WUsView.vue b/src/WUsView.vue index 3496fc3..2b88f8a 100644 --- a/src/WUsView.vue +++ b/src/WUsView.vue @@ -152,73 +152,75 @@ export default { Filter Work Units to compute stats on different groups of units. table.view-table.wu-filters - tr - th Machine - th Project - th OS - th State - th Resources - th With in - th Complete - th.actions Actions - - tr - td - select(v-model="filter.machine") - option(value="Any") Any - option(v-for="machine in machines", :value="machine") {{machine}} - - td - select(v-model="filter.project") - option(value="Any") Any - option(v-for="project in projects", :value="project") {{project}} - - td - select(v-model="filter.os") - option(value="Any") Any - option(v-for="os in oses", :value="os") {{os}} - - td - select(v-model="filter.state") - option(value="Any") Any - option(v-for="v in states", :value="v") {{v}} - - td - select(v-model="filter.resources") - option(value="Any") Any - option(v-for="r in resources", :value="r") {{r}} - - td(title="Only include units assigned with in this number of days.") - input(v-model="filter.days", type=number, placeholder="days", - :class="{error: !isFinite(filter.days)}") - - td(title="Only include completed units.") - input(type="checkbox", v-model="filter.complete") - - td.actions - span - Button.button-icon(icon="refresh", @click="reset", - title="Reset stats filter") + tbody + tr + th Machine + th Project + th OS + th State + th Resources + th With in + th Complete + th.actions Actions + + tr + td + select(v-model="filter.machine") + option(value="Any") Any + option(v-for="machine in machines", :value="machine") {{machine}} + + td + select(v-model="filter.project") + option(value="Any") Any + option(v-for="project in projects", :value="project") {{project}} + + td + select(v-model="filter.os") + option(value="Any") Any + option(v-for="os in oses", :value="os") {{os}} + + td + select(v-model="filter.state") + option(value="Any") Any + option(v-for="v in states", :value="v") {{v}} + + td + select(v-model="filter.resources") + option(value="Any") Any + option(v-for="r in resources", :value="r") {{r}} + + td(title="Only include units assigned with in this number of days.") + input(v-model="filter.days", type=number, placeholder="days", + :class="{error: !isFinite(filter.days)}") + + td(title="Only include completed units.") + input(type="checkbox", v-model="filter.complete") + + td.actions + span + Button.button-icon(icon="refresh", @click="reset", + title="Reset stats filter") p(v-if="!wus.length") No matching work units. table.view-table.wu-stats(v-else) - tr - th - th Average - th Min - th Max - - tr(title="Time Per Frame. Time to complete 1% of the unit.") - th TPF - td {{tpf_avg ? $util.time_interval(tpf_avg) : '???'}} - td {{tpf_min ? $util.time_interval(tpf_min) : '???'}} - td {{tpf_max ? $util.time_interval(tpf_max) : '???'}} - - tr(title="Points Per Day") - th PPD - td {{isFinite(ppd_avg) ? Math.round(ppd_avg).toLocaleString() : '???'}} - td {{isFinite(ppd_min) ? ppd_min.toLocaleString() : '???'}} - td {{isFinite(ppd_max) ? ppd_max.toLocaleString() : '???'}} + tbody + tr + th + th Average + th Min + th Max + + tr(title="Time Per Frame. Time to complete 1% of the unit.") + th TPF + td {{tpf_avg ? $util.time_interval(tpf_avg) : '???'}} + td {{tpf_min ? $util.time_interval(tpf_min) : '???'}} + td {{tpf_max ? $util.time_interval(tpf_max) : '???'}} + + tr(title="Points Per Day") + th PPD + td {{isFinite(ppd_avg) ? Math.round(ppd_avg).toLocaleString() : '???'}} + td {{isFinite(ppd_min) ? ppd_min.toLocaleString() : '???'}} + td {{isFinite(ppd_max) ? ppd_max.toLocaleString() : '???'}} HelpBalloon.header-title(name="Recent Work Unit History"): p. A log of recent work WUs completed by your machines.