Browse Source

Updates settings UI with PR settings

Updates settings UI more info links to search for settings
main
Eric Amodio 4 years ago
parent
commit
b470482409
21 changed files with 550 additions and 28 deletions
  1. +5
    -2
      src/webviews/apps/settings/partials/blame.html
  2. +13
    -0
      src/webviews/apps/settings/partials/changes.html
  3. +5
    -2
      src/webviews/apps/settings/partials/code-lens.html
  4. +25
    -2
      src/webviews/apps/settings/partials/current-line.html
  5. +13
    -0
      src/webviews/apps/settings/partials/dates.html
  6. +13
    -0
      src/webviews/apps/settings/partials/heatmap.html
  7. +33
    -0
      src/webviews/apps/settings/partials/hovers.html
  8. +13
    -0
      src/webviews/apps/settings/partials/menus.html
  9. +5
    -2
      src/webviews/apps/settings/partials/modes.html
  10. +5
    -2
      src/webviews/apps/settings/partials/status-bar.html
  11. +60
    -2
      src/webviews/apps/settings/partials/views.branches.html
  12. +60
    -2
      src/webviews/apps/settings/partials/views.commits.html
  13. +45
    -2
      src/webviews/apps/settings/partials/views.compare.html
  14. +45
    -2
      src/webviews/apps/settings/partials/views.contributors.html
  15. +14
    -0
      src/webviews/apps/settings/partials/views.file-history.html
  16. +14
    -0
      src/webviews/apps/settings/partials/views.line-history.html
  17. +60
    -2
      src/webviews/apps/settings/partials/views.remotes.html
  18. +67
    -2
      src/webviews/apps/settings/partials/views.repositories.html
  19. +45
    -2
      src/webviews/apps/settings/partials/views.search.html
  20. +5
    -2
      src/webviews/apps/settings/partials/views.stashes.html
  21. +5
    -2
      src/webviews/apps/settings/partials/views.tags.html

+ 5
- 2
src/webviews/apps/settings/partials/blame.html View File

@ -224,8 +224,11 @@
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a class="command" title="Open User Settings" href="command:workbench.action.openGlobalSettings"
>User Settings</a
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.blame%22"
>Settings</a
>
and search for <b><i>gitlens.blame</i></b>
</p>

+ 13
- 0
src/webviews/apps/settings/partials/changes.html View File

@ -98,5 +98,18 @@
/>
</div>
</div>
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.changes%22"
>Settings</a
>
and search for <b><i>gitlens.changes</i></b>
</p>
</div>
</div>
</section>

+ 5
- 2
src/webviews/apps/settings/partials/code-lens.html View File

@ -272,8 +272,11 @@
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a class="command" title="Open User Settings" href="command:workbench.action.openGlobalSettings"
>User Settings</a
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.codeLens%22"
>Settings</a
>
and search for <b><i>gitlens.codeLens</i></b>
</p>

+ 25
- 2
src/webviews/apps/settings/partials/current-line.html View File

@ -38,6 +38,26 @@
<div class="section__content">
<div class="settings settings--fixed ml-1">
<div class="setting" data-enablement="currentLine.enabled">
<div class="setting__input">
<input
id="currentLine.pullRequests.enabled"
name="currentLine.pullRequests.enabled"
type="checkbox"
data-setting
disabled
/>
<label for="currentLine.pullRequests.enabled"
>Show the Pull Request (if any) that introduced the commit</label
>
</div>
<p class="setting__hint hidden" data-visibility="currentLine.pullRequests.enabled">
<i class="icon icon__info"></i>Requires a connection to a supported remote service (e.g.
GitHub)
</p>
</div>
<div class="setting" data-enablement="currentLine.enabled">
<div class="setting__input setting__input--format">
<label for="currentLine.format">Annotation&nbsp;format</label>
<input
@ -95,8 +115,11 @@
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a class="command" title="Open User Settings" href="command:workbench.action.openGlobalSettings"
>User Settings</a
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.currentLine%22"
>Settings</a
>
and search for <b><i>gitlens.currentLine</i></b>
</p>

+ 13
- 0
src/webviews/apps/settings/partials/dates.html View File

@ -92,5 +92,18 @@
</div>
</div>
</div>
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.default%22"
>Settings</a
>
and search for <b><i>gitlens.default</i></b>
</p>
</div>
</div>
</section>

+ 13
- 0
src/webviews/apps/settings/partials/heatmap.html View File

@ -78,5 +78,18 @@
<img class="image__preview" src="#{root}/images/settings/heatmap.png" />
</div>
</div>
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.heatmap%22"
>Settings</a
>
and search for <b><i>gitlens.heatmap</i></b>
</p>
</div>
</div>
</section>

+ 33
- 0
src/webviews/apps/settings/partials/hovers.html View File

@ -21,6 +21,26 @@
<div class="settings settings--fixed ml-1">
<div class="setting" data-enablement="hovers.enabled">
<div class="setting__input">
<input
id="hovers.pullRequests.enabled"
name="hovers.pullRequests.enabled"
type="checkbox"
data-setting
disabled
/>
<label for="hovers.pullRequests.enabled"
>Show the Pull Request (if any) that introduced the commit</label
>
</div>
<p class="setting__hint hidden" data-visibility="hovers.pullRequests.enabled">
<i class="icon icon__info"></i>Requires a connection to a supported remote service (e.g.
GitHub)
</p>
</div>
<div class="setting" data-enablement="hovers.enabled">
<div class="setting__input">
<input id="hovers.avatars" name="hovers.avatars" type="checkbox" data-setting disabled />
<label for="hovers.avatars">Use author avatars</label>
</div>
@ -343,5 +363,18 @@
/>
</div>
</div>
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.hovers%22"
>Settings</a
>
and search for <b><i>gitlens.hovers</i></b>
</p>
</div>
</div>
</section>

+ 13
- 0
src/webviews/apps/settings/partials/menus.html View File

@ -571,5 +571,18 @@
</div>
</div>
</div>
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.menus%22"
>Settings</a
>
and search for <b><i>gitlens.menus</i></b>
</p>
</div>
</div>
</section>

+ 5
- 2
src/webviews/apps/settings/partials/modes.html View File

@ -86,8 +86,11 @@
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options or to add your own custom modes, open
<a class="command" title="Open User Settings" href="command:workbench.action.openGlobalSettings"
>User Settings</a
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.modes%22"
>Settings</a
>
and search for <b><i>gitlens.modes</i></b>
</p>

+ 5
- 2
src/webviews/apps/settings/partials/status-bar.html View File

@ -118,8 +118,11 @@
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a class="command" title="Open User Settings" href="command:workbench.action.openGlobalSettings"
>User Settings</a
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.statusBar%22"
>Settings</a
>
and search for <b><i>gitlens.statusBar</i></b>
</p>

+ 60
- 2
src/webviews/apps/settings/partials/views.branches.html View File

@ -33,6 +33,61 @@
</div>
</div>
<div class="section__group">
<div class="section__content">
<div class="settings settings--fixed">
<div class="setting">
<div class="setting__input">
<input
id="views.branches.pullRequests.enabled"
name="views.branches.pullRequests.enabled"
type="checkbox"
data-setting
/>
<label for="views.branches.pullRequests.enabled"
>Show associated Pull Requests</label
>
</div>
<p class="setting__hint">
Requires a connection to a supported remote service (e.g. GitHub)
</p>
</div>
<div class="settings settings--fixed ml-2">
<div class="setting" data-enablement="views.branches.pullRequests.enabled">
<div class="setting__input">
<input
id="views.branches.pullRequests.showForBranches"
name="views.branches.pullRequests.showForBranches"
type="checkbox"
data-setting
disabled
/>
<label for="views.branches.pullRequests.showForBranches"
>Show the PR associated with each branch</label
>
</div>
</div>
<div class="setting" data-enablement="views.branches.pullRequests.enabled">
<div class="setting__input">
<input
id="views.branches.pullRequests.showForCommits"
name="views.branches.pullRequests.showForCommits"
type="checkbox"
data-setting
disabled
/>
<label for="views.branches.pullRequests.showForCommits"
>Show the PR that introduced each commit</label
>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="setting">
<div class="setting__input">
<label for="views.branches.branches.layout">Layout branches</label>
@ -137,8 +192,11 @@
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a class="command" title="Open User Settings" href="command:workbench.action.openGlobalSettings"
>User Settings</a
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.views.branches%22"
>Settings</a
>
and search for <b><i>gitlens.views.branches</i></b> or
<b><i>gitlens.views</i></b>

+ 60
- 2
src/webviews/apps/settings/partials/views.commits.html View File

@ -47,6 +47,61 @@
</div>
</div>
<div class="section__group">
<div class="section__content">
<div class="settings settings--fixed">
<div class="setting">
<div class="setting__input">
<input
id="views.commits.pullRequests.enabled"
name="views.commits.pullRequests.enabled"
type="checkbox"
data-setting
/>
<label for="views.commits.pullRequests.enabled"
>Show associated Pull Requests</label
>
</div>
<p class="setting__hint">
Requires a connection to a supported remote service (e.g. GitHub)
</p>
</div>
<div class="settings settings--fixed ml-2">
<div class="setting" data-enablement="views.commits.pullRequests.enabled">
<div class="setting__input">
<input
id="views.commits.pullRequests.showForBranches"
name="views.commits.pullRequests.showForBranches"
type="checkbox"
data-setting
disabled
/>
<label for="views.commits.pullRequests.showForBranches"
>Show the PR associated with the current branch</label
>
</div>
</div>
<div class="setting" data-enablement="views.commits.pullRequests.enabled">
<div class="setting__input">
<input
id="views.commits.pullRequests.showForCommits"
name="views.commits.pullRequests.showForCommits"
type="checkbox"
data-setting
disabled
/>
<label for="views.commits.pullRequests.showForCommits"
>Show the PR that introduced each commit</label
>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="setting">
<div class="setting__input">
<label for="views.commits.files.layout">Layout files</label>
@ -117,8 +172,11 @@
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a class="command" title="Open User Settings" href="command:workbench.action.openGlobalSettings"
>User Settings</a
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.views.commits%22"
>Settings</a
>
and search for <b><i>gitlens.views.commits</i></b> or
<b><i>gitlens.views</i></b>

+ 45
- 2
src/webviews/apps/settings/partials/views.compare.html View File

@ -20,6 +20,46 @@
<div class="section__group">
<div class="section__content">
<div class="settings settings--fixed ml-1">
<div class="section__group">
<div class="section__content">
<div class="settings settings--fixed">
<div class="setting">
<div class="setting__input">
<input
id="views.compare.pullRequests.enabled"
name="views.compare.pullRequests.enabled"
type="checkbox"
data-setting
/>
<label for="views.compare.pullRequests.enabled"
>Show associated Pull Requests</label
>
</div>
<p class="setting__hint">
Requires a connection to a supported remote service (e.g. GitHub)
</p>
</div>
<div class="settings settings--fixed ml-2">
<div class="setting" data-enablement="views.compare.pullRequests.enabled">
<div class="setting__input">
<input
id="views.compare.pullRequests.showForCommits"
name="views.compare.pullRequests.showForCommits"
type="checkbox"
data-setting
disabled
/>
<label for="views.compare.pullRequests.showForCommits"
>Show the PR that introduced each commit</label
>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="setting">
<div class="setting__input">
<label for="views.compare.files.layout">Layout files</label>
@ -87,8 +127,11 @@
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a class="command" title="Open User Settings" href="command:workbench.action.openGlobalSettings"
>User Settings</a
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.views.compare%22"
>Settings</a
>
and search for <b><i>gitlens.views.compare</i></b> or <b><i>gitlens.views</i></b>
</p>

+ 45
- 2
src/webviews/apps/settings/partials/views.contributors.html View File

@ -18,6 +18,46 @@
<div class="section__group">
<div class="section__content">
<div class="settings settings--fixed ml-1">
<div class="section__group">
<div class="section__content">
<div class="settings settings--fixed">
<div class="setting">
<div class="setting__input">
<input
id="views.contributors.pullRequests.enabled"
name="views.contributors.pullRequests.enabled"
type="checkbox"
data-setting
/>
<label for="views.contributors.pullRequests.enabled"
>Show associated Pull Requests</label
>
</div>
<p class="setting__hint">
Requires a connection to a supported remote service (e.g. GitHub)
</p>
</div>
<div class="settings settings--fixed ml-2">
<div class="setting" data-enablement="views.contributors.pullRequests.enabled">
<div class="setting__input">
<input
id="views.contributors.pullRequests.showForCommits"
name="views.contributors.pullRequests.showForCommits"
type="checkbox"
data-setting
disabled
/>
<label for="views.contributors.pullRequests.showForCommits"
>Show the PR that introduced each commit</label
>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="setting">
<div class="setting__input">
<label for="views.contributors.files.layout">Layout files</label>
@ -92,8 +132,11 @@
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a class="command" title="Open User Settings" href="command:workbench.action.openGlobalSettings"
>User Settings</a
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.views.contributors%22"
>Settings</a
>
and search for <b><i>gitlens.views.contributors</i></b> or
<b><i>gitlens.views</i></b>

+ 14
- 0
src/webviews/apps/settings/partials/views.file-history.html View File

@ -43,5 +43,19 @@
/>
</div>
</div>
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.views.fileHistory%22"
>Settings</a
>
and search for <b><i>gitlens.views.fileHistory</i></b> or
<b><i>gitlens.views</i></b>
</p>
</div>
</div>
</section>

+ 14
- 0
src/webviews/apps/settings/partials/views.line-history.html View File

@ -50,5 +50,19 @@
/>
</div>
</div>
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.views.lineHistory%22"
>Settings</a
>
and search for <b><i>gitlens.views.lineHistory</i></b> or
<b><i>gitlens.views</i></b>
</p>
</div>
</div>
</section>

+ 60
- 2
src/webviews/apps/settings/partials/views.remotes.html View File

@ -20,6 +20,61 @@
<div class="section__group">
<div class="section__content">
<div class="settings settings--fixed ml-1">
<div class="section__group">
<div class="section__content">
<div class="settings settings--fixed">
<div class="setting">
<div class="setting__input">
<input
id="views.remotes.pullRequests.enabled"
name="views.remotes.pullRequests.enabled"
type="checkbox"
data-setting
/>
<label for="views.remotes.pullRequests.enabled"
>Show associated Pull Requests</label
>
</div>
<p class="setting__hint">
Requires a connection to a supported remote service (e.g. GitHub)
</p>
</div>
<div class="settings settings--fixed ml-2">
<div class="setting" data-enablement="views.remotes.pullRequests.enabled">
<div class="setting__input">
<input
id="views.remotes.pullRequests.showForBranches"
name="views.remotes.pullRequests.showForBranches"
type="checkbox"
data-setting
disabled
/>
<label for="views.remotes.pullRequests.showForBranches"
>Show the PR associated with each branch</label
>
</div>
</div>
<div class="setting" data-enablement="views.remotes.pullRequests.enabled">
<div class="setting__input">
<input
id="views.remotes.pullRequests.showForCommits"
name="views.remotes.pullRequests.showForCommits"
type="checkbox"
data-setting
disabled
/>
<label for="views.remotes.pullRequests.showForCommits"
>Show the PR that introduced each commit</label
>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="setting">
<div class="setting__input">
<label for="views.remotes.branches.layout">Layout branches</label>
@ -120,8 +175,11 @@
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a class="command" title="Open User Settings" href="command:workbench.action.openGlobalSettings"
>User Settings</a
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.views.remotes%22"
>Settings</a
>
and search for <b><i>gitlens.views.remotes</i></b> or
<b><i>gitlens.views</i></b>

+ 67
- 2
src/webviews/apps/settings/partials/views.repositories.html View File

@ -52,6 +52,68 @@
</div>
</div>
<div class="section__group">
<div class="section__content">
<div class="settings settings--fixed">
<div class="setting" data-enablement="views.repositories.enabled">
<div class="setting__input">
<input
id="views.repositories.pullRequests.enabled"
name="views.repositories.pullRequests.enabled"
type="checkbox"
data-setting
disabled
/>
<label for="views.repositories.pullRequests.enabled"
>Show associated Pull Requests</label
>
</div>
<p class="setting__hint">
Requires a connection to a supported remote service (e.g. GitHub)
</p>
</div>
<div class="settings settings--fixed ml-2">
<div
class="setting"
data-enablement="views.repositories.enabled &amp; views.repositories.pullRequests.enabled"
>
<div class="setting__input">
<input
id="views.repositories.pullRequests.showForBranches"
name="views.repositories.pullRequests.showForBranches"
type="checkbox"
data-setting
disabled
/>
<label for="views.repositories.pullRequests.showForBranches"
>Show the PR associated with each branch</label
>
</div>
</div>
<div
class="setting"
data-enablement="views.repositories.enabled &amp; views.repositories.pullRequests.enabled"
>
<div class="setting__input">
<input
id="views.repositories.pullRequests.showForCommits"
name="views.repositories.pullRequests.showForCommits"
type="checkbox"
data-setting
disabled
/>
<label for="views.repositories.pullRequests.showForCommits"
>Show the PR that introduced each commit</label
>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="setting" data-enablement="views.repositories.enabled">
<div class="setting__input">
<label for="views.repositories.branches.layout">Layout branches</label>
@ -204,8 +266,11 @@
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a class="command" title="Open User Settings" href="command:workbench.action.openGlobalSettings"
>User Settings</a
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.views.repositories%22"
>Settings</a
>
and search for <b><i>gitlens.views.repositories</i></b> or
<b><i>gitlens.views</i></b>

+ 45
- 2
src/webviews/apps/settings/partials/views.search.html View File

@ -20,6 +20,46 @@
<div class="section__group">
<div class="section__content">
<div class="settings settings--fixed ml-1">
<div class="section__group">
<div class="section__content">
<div class="settings settings--fixed">
<div class="setting">
<div class="setting__input">
<input
id="views.search.pullRequests.enabled"
name="views.search.pullRequests.enabled"
type="checkbox"
data-setting
/>
<label for="views.search.pullRequests.enabled"
>Show associated Pull Requests</label
>
</div>
<p class="setting__hint">
Requires a connection to a supported remote service (e.g. GitHub)
</p>
</div>
<div class="settings settings--fixed ml-2">
<div class="setting" data-enablement="views.search.pullRequests.enabled">
<div class="setting__input">
<input
id="views.search.pullRequests.showForCommits"
name="views.search.pullRequests.showForCommits"
type="checkbox"
data-setting
disabled
/>
<label for="views.search.pullRequests.showForCommits"
>Show the PR that introduced each commit</label
>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="setting">
<div class="setting__input">
<label for="views.search.files.layout">Layout files</label>
@ -82,8 +122,11 @@
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a class="command" title="Open User Settings" href="command:workbench.action.openGlobalSettings"
>User Settings</a
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.views.search%22"
>Settings</a
>
and search for <b><i>gitlens.views.search</i></b> or <b><i>gitlens.views</i></b>
</p>

+ 5
- 2
src/webviews/apps/settings/partials/views.stashes.html View File

@ -71,8 +71,11 @@
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a class="command" title="Open User Settings" href="command:workbench.action.openGlobalSettings"
>User Settings</a
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.views.stashes%22"
>Settings</a
>
and search for <b><i>gitlens.views.stashes</i></b> or
<b><i>gitlens.views</i></b>

+ 5
- 2
src/webviews/apps/settings/partials/views.tags.html View File

@ -109,8 +109,11 @@
<div class="section__group">
<p class="section__hint">
<i class="icon icon__info"></i> For more options, open
<a class="command" title="Open User Settings" href="command:workbench.action.openGlobalSettings"
>User Settings</a
<a
class="command"
title="Open Settings"
href="command:workbench.action.openSettings?%22gitlens.views.tags%22"
>Settings</a
>
and search for <b><i>gitlens.views.tags</i></b> or
<b><i>gitlens.views</i></b>

Loading…
Cancel
Save