Эх сурвалжийг харах

HUE-6077 [frontend] Override table headers for sorting and fixed malformed FB dom

Enrico Berti 8 жил өмнө
parent
commit
e1627ec

+ 2 - 2
apps/filebrowser/src/filebrowser/templates/listdir.mako

@@ -55,7 +55,7 @@ ${ fb_components.menubar() }
       <%def name="actions()">
         <div class="btn-toolbar" style="display: inline; vertical-align: middle">
           <div id="ch-dropdown" class="btn-group" style="vertical-align: middle">
-            <button href="javascript: void(0)" class="btn dropdown-toggle" title="${_('Actions')}" data-toggle="dropdown"
+            <button class="btn dropdown-toggle" title="${_('Actions')}" data-toggle="dropdown"
             data-bind="visible: !inTrash(), enable: selectedFiles().length > 0 && (!isS3() || (isS3() && !isS3Root()))">
               <i class="fa fa-cog"></i> ${_('Actions')}
               <span class="caret" style="line-height: 15px"></span>
@@ -64,7 +64,7 @@ ${ fb_components.menubar() }
               <li><a href="javascript: void(0)" title="${_('Rename')}" data-bind="visible: !inTrash() && selectedFiles().length == 1, click: renameFile,
               enable: selectedFiles().length == 1 && isCurrentDirSelected().length == 0"><i class="fa fa-fw fa-font"></i>
               ${_('Rename')}</a></li>
-              <li><a href="javascript: void(0)"title="${_('Move')}" data-bind="click: move, enable: selectedFiles().length > 0 &&
+              <li><a href="javascript: void(0)" title="${_('Move')}" data-bind="click: move, enable: selectedFiles().length > 0 &&
               isCurrentDirSelected().length == 0"><i class="fa fa-fw fa-random"></i> ${_('Move')}</a></li>
               <li><a href="javascript: void(0)" title="${_('Copy')}" data-bind="click: copy, enable: selectedFiles().length > 0 &&
               isCurrentDirSelected().length == 0"><i class="fa fa-fw fa-files-o"></i> ${_('Copy')}</a></li>

+ 9 - 9
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -260,7 +260,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
         <div id="renameNameExistsAlert" class="hide" style="position: absolute; left: 10px;">
           <span class="label label-important"><span class="newName"></span> ${_('already exists.')}</span>
         </div>
-        <input id="renameSrcPath" type="hidden" name="src_path" type="text">
+        <input id="renameSrcPath" type="hidden" name="src_path">
         <a class="btn" data-dismiss="modal">${_('Cancel')}</a>
         <input type="submit" value="${_('Rename')}" class="btn btn-primary" />
       </div>
@@ -282,7 +282,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
         <div id="replicationFactorRequiredAlert" class="hide" style="position: absolute; left: 10px;">
           <span class="label label-important">${_('Replication factor is required.')}</span>
         </div>
-        <input id="SrcPath" type="hidden" name="src_path" type="text">
+        <input id="SrcPath" type="hidden" name="src_path">
         <a class="btn" data-dismiss="modal">${_('Cancel')}</a>
         <input type="submit" value="${_('Submit')}" class="btn btn-primary" />
       </div>
@@ -342,7 +342,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
               <th class="center">${_('Group')}</th>
               <th class="center">${_('Other')}</th>
               <th class="center">&nbsp;</th>
-              <th width="120">&nbsp</th>
+              <th width="120">&nbsp;</th>
             </tr>
           </thead>
           <tbody>
@@ -437,7 +437,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
   <div id="uploadFileModal" class="modal hide fade">
     <div class="modal-header">
       <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-      <h2 class="modal-title">${_('Upload to')} <span id="uploadDirName" data-bind="text: currentPath"></span></h2>
+      <h2 class="modal-title">${_('Upload to')} <span data-bind="text: currentPath"></span></h2>
     </div>
     <div class="modal-body form-inline">
       <div id="fileUploader" class="uploader">
@@ -453,7 +453,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
   <div id="uploadArchiveModal" class="modal hide fade">
     <div class="modal-header">
       <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-      <h2 class="modal-title">${_('Upload and extract in')} <span id="uploadDirName" data-bind="text: currentPath"></span></h2>
+      <h2 class="modal-title">${_('Upload and extract in')} <span data-bind="text: currentPath"></span></h2>
     </div>
     <div class="modal-body form-inline">
       <div id="archiveUploader" class="uploader">
@@ -487,7 +487,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
           ${_('Bucket Name')}
           <!-- /ko -->
           <input id="newDirectoryNameInput" name="name" value="" type="text" class="input-xlarge"/></label>
-        <input type="hidden" name="path" type="text" data-bind="value: currentPath"/>
+          <input type="hidden" name="path" data-bind="value: currentPath"/>
       </div>
       <div class="modal-footer">
         <div id="directoryNameRequiredAlert" class="hide" style="position: absolute; left: 10px;">
@@ -512,7 +512,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
         </div>
         <div class="modal-body">
           <label>${_('File Name')} <input id="newFileNameInput" name="name" value="" type="text" class="input-xlarge"/></label>
-          <input type="hidden" name="path" type="text" data-bind="value: currentPath"/>
+          <input type="hidden" name="path" data-bind="value: currentPath"/>
         </div>
         <div class="modal-footer">
            <div id="fileNameRequiredAlert" class="alert-message error hide" style="position: absolute; left: 10px;">
@@ -579,7 +579,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
     <li data-bind="visible: !isS3() || (isS3() && !isS3Root())"><a href="#" title="${_('Rename')}" data-bind="visible: !$root.inTrash() && $root.selectedFiles().length == 1, click: $root.renameFile,
     enable: $root.selectedFiles().length == 1 && isCurrentDirSelected().length == 0"><i class="fa fa-fw fa-font"></i>
     ${_('Rename')}</a></li>
-    <li data-bind="visible: !isS3() || (isS3() && !isS3Root())"><a href="#"title="${_('Move')}" data-bind="click: $root.move, enable: $root.selectedFiles().length > 0 &&
+    <li data-bind="visible: !isS3() || (isS3() && !isS3Root())"><a href="#" title="${_('Move')}" data-bind="click: $root.move, enable: $root.selectedFiles().length > 0 &&
     isCurrentDirSelected().length == 0"><i class="fa fa-fw fa-random"></i> ${_('Move')}</a></li>
     <li data-bind="visible: !isS3() || (isS3() && !isS3Root())"><a href="#" title="${_('Copy')}" data-bind="click: $root.copy, enable: $root.selectedFiles().length > 0 &&
     isCurrentDirSelected().length == 0"><i class="fa fa-fw fa-files-o"></i> ${_('Copy')}</a></li>
@@ -683,7 +683,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
   <script src="${ static('desktop/ext/js/datatables-paging-0.1.js') }" type="text/javascript" charset="utf-8"></script>
 
 
-  <script charset="utf-8">
+  <script>
     var _dragged;
     var _dropzone;
 

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue.css


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue3-extra.css


+ 0 - 1
desktop/core/src/desktop/static/desktop/less/components/hue-tables.less

@@ -130,7 +130,6 @@ table.display td.center {
 
 .sorting {
   cursor: pointer;
-  border-top: 1px solid transparent !important;
   padding-right: 20px !important;
   vertical-align: middle!important;
 }

+ 7 - 0
desktop/core/src/desktop/static/desktop/less/hue-cui-overrides.less

@@ -81,4 +81,11 @@
 
 .alert .close {
   width: 16px !important;
+}
+
+table {
+  border-top: none!important;
+  th {
+    border-top: 1px solid @cui-gray-300 !important;
+  }
 }

+ 1 - 1
desktop/libs/indexer/src/indexer/templates/indexer.mako

@@ -360,7 +360,7 @@ ${ assist.assistPanel() }
       <!-- /ko -->
 
       <!-- ko if: currentStep() == 3 -->
-        <button href="javascript:void(0)" class="btn btn-primary disable-feedback" data-bind="click: createWizard.indexFile, enable: createWizard.readyToIndex() && !createWizard.indexingStarted()">
+        <button class="btn btn-primary disable-feedback" data-bind="click: createWizard.indexFile, enable: createWizard.readyToIndex() && !createWizard.indexingStarted()">
           ${_('Index it!')} <i class="fa fa-spinner fa-spin" data-bind="visible: createWizard.indexingStarted"></i>
         </button>
       <!-- /ko -->

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно