소스 검색

HUE-5885 [editor] Remove double scrollbar on the editor help

Enrico Berti 8 년 전
부모
커밋
a1c5eb3

+ 29 - 24
desktop/core/src/desktop/templates/common_notebook_ko_components.mako

@@ -456,32 +456,37 @@ except ImportError, e:
 
 <%def name="aceKeyboardShortcuts()">
   <script type="text/html" id="ace-keyboard-shortcuts-template">
-    <input class="clearable" type="text" placeholder="${ _('Search...')}" data-bind="clearable: query, value: query, valueUpdate: 'afterkeydown'">
-
-    <ul class="nav nav-tabs" data-bind="foreach: categories">
-      <li data-bind="css: { 'active': $parent.activeCategory().label === $data.label }, visible: filteredShortcuts().length > 0"><a href="javascript: void(0);" data-bind="click: function () { $parent.activeCategory($data); }, text: label"></a></li>
-    </ul>
-    <div class="tab-content" data-bind="with: activeCategory">
-      <div class="tab-pane active">
-        <table class="table">
-          <thead>
-            <tr>
-              <th>${ _('Windows/Linux')}</th>
-              <th>${ _('Mac')}</th>
-              <th>${ _('Action')}</th>
-            </tr>
-          </thead>
-          <tbody data-bind="foreach: filteredShortcuts">
-            <tr>
-              <td data-bind="text: shortcut"></td>
-              <td data-bind="text: macShortcut"></td>
-              <td data-bind="text: description"></td>
-            </tr>
-          </tbody>
-        </table>
+    <div class="editor-help">
+      <input class="clearable pull-right margin-right-5" type="text" placeholder="${ _('Search...')}" data-bind="clearable: query, value: query, valueUpdate: 'afterkeydown'">
+      <!-- ko if: activeCategory() &&  activeCategory().filteredShortcuts().length === 0 -->
+        <em>${ _('No matches found for your search.') }</em>
+      <!-- /ko -->
+      <ul class="nav nav-pills" data-bind="foreach: categories">
+        <li data-bind="css: { 'active': $parent.activeCategory().label === $data.label }, visible: filteredShortcuts().length > 0"><a href="javascript: void(0);" data-bind="click: function () { $parent.activeCategory($data); }, text: label"></a></li>
+      </ul>
+      <div class="tab-content" data-bind="with: activeCategory">
+        <div class="tab-pane active">
+          <!-- ko if: filteredShortcuts().length > 0 -->
+          <table class="table table-striped">
+            <thead>
+              <tr>
+                <th>${ _('Windows/Linux')}</th>
+                <th>${ _('Mac')}</th>
+                <th>${ _('Action')}</th>
+              </tr>
+            </thead>
+            <tbody data-bind="foreach: filteredShortcuts">
+              <tr>
+                <td data-bind="text: shortcut"></td>
+                <td data-bind="text: macShortcut"></td>
+                <td data-bind="text: description"></td>
+              </tr>
+            </tbody>
+          </table>
+          <!-- /ko -->
+        </div>
       </div>
     </div>
-
   </script>
 
   <script type="text/javascript" charset="utf-8">

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
desktop/libs/notebook/src/notebook/static/notebook/css/notebook.css


+ 4 - 0
desktop/libs/notebook/src/notebook/static/notebook/less/notebook.less

@@ -298,6 +298,10 @@
   border-right: 1px solid #dddddd;
 }
 
+.notebook .editor-help .tab-content {
+  border: none;
+}
+
 .empty-title {
   font-weight: normal;
 }

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.