Explorar o código

HUE-7114 [filebrowser] Edit File could be in a fixed width font

jdesjean %!s(int64=8) %!d(string=hai) anos
pai
achega
1b9c238

+ 1 - 1
apps/filebrowser/src/filebrowser/static/filebrowser/css/display.css

@@ -14,4 +14,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
- */#fileviewerComponents .card-body{padding:0;margin:0}#fileviewerComponents .hue-breadcrumbs-bar{margin:0;padding-bottom:0}#fileviewerComponents #fileArea{overflow:auto;background-color:#F8F8F8;position:relative;font-size:12px}#fileviewerComponents #fileArea.loading{opacity:.7}#fileviewerComponents .binary{font-family:Roboto Mono,Menlo,Monaco,Consolas,"Courier New",monospace}#fileviewerComponents pre{border:none}#fileviewerComponents pre a{color:#444;cursor:default;white-space:inherit}#fileviewerComponents pre a:hover{color:#444;text-decoration:none}#fileviewerComponents .pagination-input-form{position:relative;right:1em;top:-10px}#fileviewerComponents .pagination-input{text-align:center;width:40px}#fileviewerComponents dd{margin-left:0;margin-bottom:6px}
+ */#fileviewerComponents .card-body{padding:0;margin:0}#fileviewerComponents .hue-breadcrumbs-bar{margin:0;padding-bottom:0}#fileviewerComponents #fileArea{overflow:auto;background-color:#F8F8F8;position:relative;font-size:12px}#fileviewerComponents #fileArea.loading{opacity:.7}#fileviewerComponents .binary{font-family:Roboto Mono,Menlo,Monaco,Consolas,"Courier New",monospace}#fileviewerComponents pre{border:none}#fileviewerComponents pre a{color:#444;cursor:default;white-space:inherit}#fileviewerComponents pre a:hover{color:#444;text-decoration:none}#fileviewerComponents .pagination-input-form{position:relative;right:1em;top:-10px}#fileviewerComponents .pagination-input{text-align:center;width:40px}#fileviewerComponents dd{margin-left:0;margin-bottom:6px}#fileviewerComponents .monospace{font-family:Roboto Mono,Menlo,Monaco,Consolas,"Courier New",monospace}

+ 4 - 0
apps/filebrowser/src/filebrowser/static/filebrowser/less/display.less

@@ -73,5 +73,9 @@
     margin-left: 0;
     margin-bottom: 6px;
   }
+  
+  .monospace {
+    font-family: @font-family-monospace
+  }
 }
 

+ 1 - 1
apps/filebrowser/src/filebrowser/templates/display.mako

@@ -146,7 +146,7 @@ ${ fb_components.menubar() }
             <!-- /ko -->
             <!-- ko hueSpinner: { spin: !$root.file() && isLoading(), center: true, size: 'xlarge' } --><!-- /ko -->
             <!-- ko if: $root.isViewing -->
-            <div id="fileArea" data-bind="css: {'loading': isLoading}, visible: $root.file() && $root.file().stats.size()">
+            <div id="fileArea" data-bind="css: {'loading': isLoading}, visible: $root.file() && $root.file().stats.size()" class="monospace" >
               <!-- ko hueSpinner: { spin: isLoading, center: true, size: 'xlarge' } --><!-- /ko -->
               <pre></pre>
               <table class="binary">

+ 1 - 1
apps/filebrowser/src/filebrowser/templates/edit.mako

@@ -58,7 +58,7 @@ ${ fb_components.menubar() }
               % endif
               ${edit.render_field(form["path"], hidden=True, notitle=True)}
               ${edit.render_field(form["encoding"], hidden=True, notitle=True)}
-              <div style="width: 98%; height: 100%;">${edit.render_field(form["contents"], tag="textarea", nolabel=True, notitle=True, attrs=dict(
+              <div style="width: 98%; height: 100%;">${edit.render_field(form["contents"], tag="textarea", nolabel=True, notitle=True, klass="monospace", attrs=dict(
                 style="width:100%; height:400px; resize:none")) | n}</div>
               <input class="btn btn-primary" type="submit" name="save" value="${_('Save')}">
               <a id="saveAsBtn" class="btn">${_('Save as')}</a>

+ 4 - 4
apps/filebrowser/src/filebrowser/templates/editor_components.mako

@@ -83,13 +83,13 @@
         ${unicode(field) | n}
       % else:
         % if tag == 'textarea':
-          <textarea name="${name or field.html_name | n}" ${make_attr_str(attrs) | n}>${extract_field_data(field) or ''}</textarea>
+          <textarea name="${name or field.html_name | n}" ${make_attr_str(attrs) | n} class="${cls}">${extract_field_data(field) or ''}</textarea>
         % elif tag == 'button':
-          <button name="${name or field.html_name | n}" ${make_attr_str(attrs) | n} value="${value}">${button_text or field.name or ''}</button>
+          <button name="${name or field.html_name | n}" ${make_attr_str(attrs) | n} value="${value}" class="${cls}">${button_text or field.name or ''}</button>
         % elif tag == 'checkbox':
-          <input type="checkbox" name="${name or field.html_name | n}" ${make_attr_str(attrs) | n} ${value and "CHECKED" or ""}/>${button_text or field.name or ''}
+          <input type="checkbox" name="${name or field.html_name | n}" ${make_attr_str(attrs) | n} ${value and "CHECKED" or ""} class="${cls}"/>${button_text or field.name or ''}
         % elif hidden:
-          <input type="hidden" name="${name or field.html_name | n}" ${make_attr_str(attrs) | n} value="${extract_field_data(field)}" />
+          <input type="hidden" name="${name or field.html_name | n}" ${make_attr_str(attrs) | n} value="${extract_field_data(field)}" class="${cls}"/>
         % else:
           %if file_chooser:
             <${tag} type="text" name="${name or field.html_name | n}" value="${extract_field_data(field) or ''}" class="${cls}" ${make_attr_str(attrs) | n}/><a class="btn fileChooserBtn" href="#" data-filechooser-destination="${field.html_name | n}">..</a>

+ 1 - 3
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -1382,8 +1382,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
           self.searchQuery("");
           self.targetPath("${url('filebrowser.views.view', path='')}" + stripHashes(file.path));
           updateHash(stripHashes(file.path));
-        } else {
-          
+        } else {   
           %if is_embeddable:
           huePubSub.publish('open.link', file.url);
           %else:
@@ -2574,7 +2573,6 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
         home: "/user/${ user }/",
         skipKeydownEvents: true,
         onEnter: function (el) {
-          console.log("test");
           viewModel.targetPath("${url('filebrowser.views.view', path='')}" + stripHashes(el.val()));
           viewModel.getStats(function (data) {
             if (data.type != null && data.type == "file") {