Skip to content

G
gitlab-ce
Commit c42b08a2 authored by Thomas Randolph's avatar Thomas Randolph
Browse files
Options

Refactor keyboard shortcuts modal

parent 1ddd9076
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 105 deletions
app/views/help/_shortcuts.html.haml
View file @ c42b08a2
...@@ -65,25 +65,23 @@ ...@@ -65,25 +65,23 @@
%tbody %tbody
%tr %tr
%th %th
%th= _('Web IDE') %th= _('Editing')
%tr %tr
%td.shortcut %td.shortcut
- if browser.platform.mac? - if browser.platform.mac?
%kbd ⌘ p %kbd ⌘ shift p
- else - else
%kbd ctrl p %kbd ctrl shift p
%td= _('Go to file') %td= _('Toggle Markdown preview')
%tr %tr
%td.shortcut %td.shortcut
- if browser.platform.mac? %kbd
%kbd ⌘ enter %i.fa.fa-arrow-up
- else %td= _('Edit your most recent comment in a thread (from an empty textarea)')
%kbd ctrl enter
%td= _('Commit (when editing commit message)')
%tbody %tbody
%tr %tr
%th %th
%th= _('Wiki pages') %th= _('Wiki')
%tr %tr
%td.shortcut %td.shortcut
%kbd e %kbd e
...@@ -91,19 +89,49 @@ ...@@ -91,19 +89,49 @@
%tbody %tbody
%tr %tr
%th %th
%th= _('Editing') %th= _('Repository Graph')
%tr %tr
%td.shortcut %td.shortcut
- if browser.platform.mac? %kbd
%kbd ⌘ shift p %i.fa.fa-arrow-left
- else \/
%kbd ctrl shift p %kbd h
%td= _('Toggle Markdown preview') %td= _('Scroll left')
%tr
%td.shortcut
%kbd
%i.fa.fa-arrow-right
\/
%kbd l
%td= _('Scroll right')
%tr %tr
%td.shortcut %td.shortcut
%kbd %kbd
%i.fa.fa-arrow-up %i.fa.fa-arrow-up
%td= _('Edit your most recent comment in a thread (from an empty textarea)') \/
%kbd k
%td= _('Scroll up')
%tr
%td.shortcut
%kbd
%i.fa.fa-arrow-down
\/
%kbd j
%td= _('Scroll down')
%tr
%td.shortcut
%kbd
shift
%i.fa.fa-arrow-up
\/ k
%td= _('Scroll to top')
%tr
%td.shortcut
%kbd
shift
%i.fa.fa-arrow-down
\/ j
%td= _('Scroll to bottom')
.col-lg-4 .col-lg-4
%table.shortcut-mappings.text-2 %table.shortcut-mappings.text-2
%tbody %tbody
...@@ -229,15 +257,7 @@ ...@@ -229,15 +257,7 @@
%tbody %tbody
%tr %tr
%th %th
%th= _('Issues / Merge Requests') %th= _('Epics, Issues, and Merge Requests')
%tr
%td.shortcut
%kbd a
%td= _('Change assignee')
%tr
%td.shortcut
%kbd m
%td= _('Change milestone')
%tr %tr
%td.shortcut %td.shortcut
%kbd r %kbd r
...@@ -250,92 +270,64 @@ ...@@ -250,92 +270,64 @@
%td.shortcut %td.shortcut
%kbd l %kbd l
%td= _('Change label') %td= _('Change label')
%tbody
%tr
%th
%th= _('Issues and Merge Requests')
%tr
%td.shortcut
%kbd a
%td= _('Change assignee')
%tr
%td.shortcut
%kbd m
%td= _('Change milestone')
%tbody
%tr
%th
%th= _('Merge Requests')
%tr %tr
%td.shortcut %td.shortcut
%kbd ] %kbd ]
\/ \/
%kbd j %kbd j
%td= _('Next file in diff (MRs only)') %td= _('Next file in diff')
%tr %tr
%td.shortcut %td.shortcut
%kbd [ %kbd [
\/ \/
%kbd k %kbd k
%td= _('Previous file in diff (MRs only)') %td= _('Previous file in diff')
%tr %tr
%td.shortcut %td.shortcut
- if browser.platform.mac? - if browser.platform.mac?
%kbd ⌘ p %kbd ⌘ p
- else - else
%kbd ctrl p %kbd ctrl p
%td= _('Go to file (MRs only)') %td= _('Go to file')
%tr %tr
%td.shortcut %td.shortcut
%kbd n %kbd n
%td= _('Next unresolved discussion (MRs only)') %td= _('Next unresolved discussion')
%tr %tr
%td.shortcut %td.shortcut
%kbd p %kbd p
%td= _('Previous unresolved discussion (MRs only)') %td= _('Previous unresolved discussion')
%tbody %tbody
%tr %tr
%th %th
%th= _('Epics (Ultimate / Gold license only)') %th= _('Web IDE')
%tr
%td.shortcut
%kbd r
%td= _('Comment/Reply (quoting selected text)')
%tr
%td.shortcut
%kbd e
%td= _('Edit epic description')
%tr
%td.shortcut
%kbd l
%td= _('Change label')
%tbody
%tr
%th
%th= _('Repository Graph')
%tr
%td.shortcut
%kbd
%i.fa.fa-arrow-left
\/
%kbd h
%td= _('Scroll left')
%tr
%td.shortcut
%kbd
%i.fa.fa-arrow-right
\/
%kbd l
%td= _('Scroll right')
%tr
%td.shortcut
%kbd
%i.fa.fa-arrow-up
\/
%kbd k
%td= _('Scroll up')
%tr
%td.shortcut
%kbd
%i.fa.fa-arrow-down
\/
%kbd j
%td= _('Scroll down')
%tr %tr
%td.shortcut %td.shortcut
%kbd - if browser.platform.mac?
shift %kbd ⌘ p
%i.fa.fa-arrow-up - else
\/ k %kbd ctrl p
%td= _('Scroll to top') %td= _('Go to file')
%tr %tr
%td.shortcut %td.shortcut
%kbd - if browser.platform.mac?
shift %kbd ⌘ enter
%i.fa.fa-arrow-down - else
\/ j %kbd ctrl enter
%td= _('Scroll to bottom') %td= _('Commit (when editing commit message)')
locale/gitlab.pot
View file @ c42b08a2
...@@ -7490,9 +7490,6 @@ msgstr "" ...@@ -7490,9 +7490,6 @@ msgstr ""
msgid "Edit environment" msgid "Edit environment"
msgstr "" msgstr ""
msgid "Edit epic description"
msgstr ""
msgid "Edit file" msgid "Edit file"
msgstr "" msgstr ""
...@@ -8114,9 +8111,6 @@ msgstr "" ...@@ -8114,9 +8111,6 @@ msgstr ""
msgid "Epics" msgid "Epics"
msgstr "" msgstr ""
msgid "Epics (Ultimate / Gold license only)"
msgstr ""
msgid "Epics Roadmap" msgid "Epics Roadmap"
msgstr "" msgstr ""
...@@ -8126,6 +8120,9 @@ msgstr "" ...@@ -8126,6 +8120,9 @@ msgstr ""
msgid "Epics let you manage your portfolio of projects more efficiently and with less effort" msgid "Epics let you manage your portfolio of projects more efficiently and with less effort"
msgstr "" msgstr ""
msgid "Epics, Issues, and Merge Requests"
msgstr ""
msgid "Epics|Add an epic" msgid "Epics|Add an epic"
msgstr "" msgstr ""
...@@ -10013,9 +10010,6 @@ msgstr "" ...@@ -10013,9 +10010,6 @@ msgstr ""
msgid "Go to file" msgid "Go to file"
msgstr "" msgstr ""
msgid "Go to file (MRs only)"
msgstr ""
msgid "Go to file permalink (while viewing a file)" msgid "Go to file permalink (while viewing a file)"
msgstr "" msgstr ""
...@@ -11441,15 +11435,15 @@ msgstr "" ...@@ -11441,15 +11435,15 @@ msgstr ""
msgid "Issues" msgid "Issues"
msgstr "" msgstr ""
msgid "Issues / Merge Requests"
msgstr ""
msgid "Issues Analytics" msgid "Issues Analytics"
msgstr "" msgstr ""
msgid "Issues Rate Limits" msgid "Issues Rate Limits"
msgstr "" msgstr ""
msgid "Issues and Merge Requests"
msgstr ""
msgid "Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable." msgid "Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable."
msgstr "" msgstr ""
...@@ -13538,10 +13532,10 @@ msgstr "" ...@@ -13538,10 +13532,10 @@ msgstr ""
msgid "Next" msgid "Next"
msgstr "" msgstr ""
msgid "Next file in diff (MRs only)" msgid "Next file in diff"
msgstr "" msgstr ""
msgid "Next unresolved discussion (MRs only)" msgid "Next unresolved discussion"
msgstr "" msgstr ""
msgid "Nickname" msgid "Nickname"
...@@ -15208,10 +15202,10 @@ msgstr "" ...@@ -15208,10 +15202,10 @@ msgstr ""
msgid "Previous Artifacts" msgid "Previous Artifacts"
msgstr "" msgstr ""
msgid "Previous file in diff (MRs only)" msgid "Previous file in diff"
msgstr "" msgstr ""
msgid "Previous unresolved discussion (MRs only)" msgid "Previous unresolved discussion"
msgstr "" msgstr ""
msgid "Primary" msgid "Primary"
...@@ -23391,9 +23385,6 @@ msgstr "" ...@@ -23391,9 +23385,6 @@ msgstr ""
msgid "Wiki" msgid "Wiki"
msgstr "" msgstr ""
msgid "Wiki pages"
msgstr ""
msgid "Wiki was successfully updated." msgid "Wiki was successfully updated."
msgstr "" msgstr ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7