hyde_admin 0.0.13 → 0.0.14

data/bin/admin_views/editor_js.erb

@@ -1,130 +1,131 @@
-$(document).on('click', '.codemirror-toolbar .fa-undo-alt', function(){
-  window.myCodeMirror.undo();
-});
-$(document).on('click', '.codemirror-toolbar .fa-redo-alt', function(){
-  window.myCodeMirror.redo();
-});
-$(document).on('click', '.codemirror-toolbar .fa-file-image', function(){
-  $('.modal-image').modal('show');
-});
-$(document).on('click', '.modal-image img', function(){
-  let img_src = '<img src="' + $(this).attr('src') + '" alt="<%= EscapeUtils.escape_html t.default_alt_img %>" title="<%= EscapeUtils.escape_html t.default_title_img %>" />';
-  if(window.mode_markdown){
-    img_src = '![<%= EscapeUtils.escape_html t.default_alt_img %>](' + $(this).attr('src') + ')';
+document.addEventListener('click', function(e){
+  if(e.target.closest('.codemirror-toolbar .fa-undo-alt')){
+    window.myCodeMirror.undo();
+    return;
   }
-  window.myCodeMirror.replaceSelection(img_src);
-  $('.modal-image').modal('hide');
-});
-$(document).on('click', '.codemirror-toolbar .fa-heading', function(){
-  let obj_cursor = window.myCodeMirror.getCursor();
-
-  let heading_number = 0;
-  if($(this).hasClass('cmt-heading-1')){
-    heading_number = 1;
-  }else if($(this).hasClass('cmt-heading-2')){
-    heading_number = 2;
-  }else if($(this).hasClass('cmt-heading-3')){
-    heading_number = 3;
-  }else if($(this).hasClass('cmt-heading-4')){
-    heading_number = 4;
-  }else if($(this).hasClass('cmt-heading-5')){
-    heading_number = 5;
+  if(e.target.closest('.codemirror-toolbar .fa-redo-alt')){
+    window.myCodeMirror.redo();
+    return;
   }
-
-  let begin_str = '<h' + heading_number + '>';
-  let end_str = '</h' + heading_number + '>';
-  if(window.mode_markdown){
-    begin_str = '#';
-    for (let i = 1; i < heading_number; i++) {
-      begin_str = begin_str + '#';
-    }
-    begin_str = begin_str + ' ';
-    end_str = '';
-  }
-  window.myCodeMirror.replaceSelection(begin_str + window.myCodeMirror.getSelection() + end_str);
-  if(!window.myCodeMirror.somethingSelected()){
-    window.myCodeMirror.setCursor({ line: obj_cursor.line, ch: obj_cursor.ch + begin_str.length });
+  if(e.target.closest('.codemirror-toolbar .fa-file-image')){
+    var modal = new bootstrap.Modal(document.querySelector('.modal-image'));
+    modal.show();
+    return;
   }
-  window.myCodeMirror.focus();
-});
-$(document).on('click', '.codemirror-toolbar .cmt-replace', function(){
-  let begin_str = '';
-  let end_str = '';
 
-  if($(this).hasClass('fa-underline')){
-  begin_str = '<u>';
-    end_str = '</u>';
-    /*if(window.mode_markdown){
-      begin_str = '';
-      end_str = '';
-    }*/
-  }else if($(this).hasClass('fa-bold')){
-  begin_str = '<b>';
-    end_str = '</b>';
-    if(window.mode_markdown){
-      begin_str = '**';
-      end_str = '**';
-    }
-  }else if($(this).hasClass('fa-italic')){
-  begin_str = '<i>';
-    end_str = '</i>';
-    if(window.mode_markdown){
-      begin_str = '*';
-      end_str = '*';
-    }
-  }else if($(this).hasClass('fa-strikethrough')){
-  begin_str = '<s>';
-    end_str = '</s>';
+  var imgTarget = e.target.closest('.modal-image img');
+  if(imgTarget){
+    var src = imgTarget.getAttribute('src');
+    var img_src = '<img src="' + src + '" alt="<%= CGI.escapeHTML t.default_alt_img %>" title="<%= CGI.escapeHTML t.default_title_img %>" />';
     if(window.mode_markdown){
-      begin_str = '~~';
-      end_str = '~~';
+      img_src = '![<%= CGI.escapeHTML t.default_alt_img %>](' + src + ')';
     }
-  }else if($(this).hasClass('fa-link')){
-  begin_str = '<a href="https://www.example.com/">';
-    end_str = '</a>';
-    if(window.mode_markdown){
-      begin_str = '[';
-      end_str = '](https://www.example.com/)';
+    window.myCodeMirror.replaceSelection(img_src);
+    bootstrap.Modal.getInstance(document.querySelector('.modal-image')).hide();
+    return;
+  }
+
+  var headingBtn = e.target.closest('.codemirror-toolbar .fa-heading');
+  if(headingBtn){
+    var obj_cursor = window.myCodeMirror.getCursor();
+    var heading_number = 0;
+    for(var i = 1; i <= 5; i++){
+      if(headingBtn.classList.contains('cmt-heading-' + i)){
+        heading_number = i;
+        break;
+      }
     }
-  }else if($(this).hasClass('fa-quote-left')){
-  begin_str = '<blockquote>\n  <p>';
-    end_str = '</p>\n</blockquote>';
+    var begin_str = '<h' + heading_number + '>';
+    var end_str = '</h' + heading_number + '>';
     if(window.mode_markdown){
-      begin_str = '>';
+      begin_str = '#'.repeat(heading_number) + ' ';
       end_str = '';
     }
-  }else if($(this).hasClass('fa-list')){
-  begin_str = '<ul>\n  <li>';
-    end_str = '</li>\n</ul>';
-    if(window.mode_markdown){
-      begin_str = '- ';
-      end_str = '';
+    window.myCodeMirror.replaceSelection(begin_str + window.myCodeMirror.getSelection() + end_str);
+    if(!window.myCodeMirror.somethingSelected()){
+      window.myCodeMirror.setCursor({ line: obj_cursor.line, ch: obj_cursor.ch + begin_str.length });
     }
-  }else if($(this).hasClass('fa-list-ol')){
-    begin_str = '<ol>\n  <li>';
+    window.myCodeMirror.focus();
+    return;
+  }
+
+  var replaceBtn = e.target.closest('.codemirror-toolbar .cmt-replace');
+  if(replaceBtn){
+    var begin_str = '';
+    var end_str = '';
+
+    if(replaceBtn.classList.contains('fa-underline')){
+      begin_str = '<u>';
+      end_str = '</u>';
+    }else if(replaceBtn.classList.contains('fa-bold')){
+      begin_str = '<b>';
+      end_str = '</b>';
+      if(window.mode_markdown){
+        begin_str = '**';
+        end_str = '**';
+      }
+    }else if(replaceBtn.classList.contains('fa-italic')){
+      begin_str = '<i>';
+      end_str = '</i>';
+      if(window.mode_markdown){
+        begin_str = '*';
+        end_str = '*';
+      }
+    }else if(replaceBtn.classList.contains('fa-strikethrough')){
+      begin_str = '<s>';
+      end_str = '</s>';
+      if(window.mode_markdown){
+        begin_str = '~~';
+        end_str = '~~';
+      }
+    }else if(replaceBtn.classList.contains('fa-link')){
+      begin_str = '<a href="https://www.example.com/">';
+      end_str = '</a>';
+      if(window.mode_markdown){
+        begin_str = '[';
+        end_str = '](https://www.example.com/)';
+      }
+    }else if(replaceBtn.classList.contains('fa-quote-left')){
+      begin_str = '<blockquote>\n  <p>';
+      end_str = '</p>\n</blockquote>';
+      if(window.mode_markdown){
+        begin_str = '>';
+        end_str = '';
+      }
+    }else if(replaceBtn.classList.contains('fa-list')){
+      begin_str = '<ul>\n  <li>';
+      end_str = '</li>\n</ul>';
+      if(window.mode_markdown){
+        begin_str = '- ';
+        end_str = '';
+      }
+    }else if(replaceBtn.classList.contains('fa-list-ol')){
+      begin_str = '<ol>\n  <li>';
       end_str = '</li>\n</ol>';
       if(window.mode_markdown){
         begin_str = '1. ';
         end_str = '';
       }
-  }else if($(this).hasClass('fa-code')){
-    begin_str = '{% highlight ruby linenos %}\n';
-    end_str = '{% endhighlight %}\n';
-  }else if($(this).hasClass('fa-terminal')){
-    begin_str = '<pre>\n';
-    end_str = '\n</pre>';
-    if(window.mode_markdown){
-      begin_str = '```';
-      end_str = '```';
+    }else if(replaceBtn.classList.contains('fa-code')){
+      begin_str = '{% highlight ruby linenos %}\n';
+      end_str = '{% endhighlight %}\n';
+    }else if(replaceBtn.classList.contains('fa-terminal')){
+      begin_str = '<pre>\n';
+      end_str = '\n</pre>';
+      if(window.mode_markdown){
+        begin_str = '```';
+        end_str = '```';
+      }
     }
-  }
 
-  let obj_cursor = window.myCodeMirror.getCursor();
-  window.myCodeMirror.replaceSelection(begin_str + window.myCodeMirror.getSelection() + end_str);
-  if(!window.myCodeMirror.somethingSelected()){
-    let moreline = (begin_str.split('\n').length > 1 ? begin_str.split('\n').length / 2 : 0);
-    let morech = (moreline > 0 ? begin_str.split('\n')[begin_str.split('\n').length - 1].length : begin_str.length);
-    window.myCodeMirror.setCursor({ line: obj_cursor.line + moreline, ch: obj_cursor.ch + morech });
+    var obj_cursor = window.myCodeMirror.getCursor();
+    window.myCodeMirror.replaceSelection(begin_str + window.myCodeMirror.getSelection() + end_str);
+    if(!window.myCodeMirror.somethingSelected()){
+      var moreline = (begin_str.split('\n').length > 1 ? begin_str.split('\n').length / 2 : 0);
+      var morech = (moreline > 0 ? begin_str.split('\n')[begin_str.split('\n').length - 1].length : begin_str.length);
+      window.myCodeMirror.setCursor({ line: obj_cursor.line + moreline, ch: obj_cursor.ch + morech });
+    }
+    window.myCodeMirror.focus();
+    return;
   }
-  window.myCodeMirror.focus();
-});
+});

data/bin/admin_views/files/edit.erb

@@ -1,14 +1,14 @@
-<h2><%= EscapeUtils.escape_html t.edit.capitalize %></h2>
+<h2><%= CGI.escapeHTML t.edit.capitalize %></h2>
 
 <form action="/files/update?file=<%= @file %>" method="post">
   <% if @has_header %>
     <div class="mb-3">
-      <label for="i-header" class="form-label"><%= EscapeUtils.escape_html t.header.capitalize %></label>
+      <label for="i-header" class="form-label"><%= CGI.escapeHTML t.header.capitalize %></label>
       <textarea class="form-control text-editor" id="i-header" rows="3" name="header" style="font-family: <%= (['.html', '.xml', '.yml', '.js', '.md'].include?(File.extname(@file)) ? 'monospace' : 'inherit') %>"><%= @header %></textarea>
     </div>
   <% end %>
   <div class="mb-3">
-    <label for="i-content" class="form-label"><%= EscapeUtils.escape_html t.content.capitalize %>
+    <label for="i-content" class="form-label"><%= CGI.escapeHTML t.content.capitalize %>
       <% if ['.html','.md'].include?(File.extname(@file)) %>
         <a href="https://jekyllrb.com/docs/liquid/" class="text-secondary" target="_blank"><i class="fas fa-question-circle"></i></a>
       <% end %>
@@ -26,5 +26,5 @@
         <%= ERB.new(File.read(path)).result(binding) %>
     </script>
   </div>
-  <button type="submit" class="btn btn-primary"><%= EscapeUtils.escape_html t.submit.capitalize %></button>
+  <button type="submit" class="btn btn-primary"><%= CGI.escapeHTML t.submit.capitalize %></button>
 </form>

data/bin/admin_views/files/listing.erb

@@ -1,4 +1,4 @@
-<h2><%= EscapeUtils.escape_html t.files.capitalize %></h2>
+<h2><%= CGI.escapeHTML t.files.capitalize %></h2>
 
 <div class="row g-3">
   <div class="col-auto">
@@ -8,7 +8,7 @@
           <input type="file" multiple name="files[]" class="form-control">
         </div>
         <div class="col-auto">
-          <button type="submit" class="btn btn-outline-secondary"><i class="fa fa-plus" title="<%= EscapeUtils.escape_html t.create.capitalize %>"></i> <%= EscapeUtils.escape_html t.upload %></button>
+          <button type="submit" class="btn btn-outline-secondary"><i class="fa fa-plus" title="<%= CGI.escapeHTML t.create.capitalize %>"></i> <%= CGI.escapeHTML t.upload %></button>
         </div>
       </div>
     </form>
@@ -19,10 +19,10 @@
     <form method="post" action="/files/create_dir?dir_path=<%= @dir_path %>">
       <div class="row g-2 align-items-center">
         <div class="col-auto">
-          <input type="text" name="directory_name" class="form-control" placeholder="<%= EscapeUtils.escape_html t.directory_input_placeholder %>">
+          <input type="text" name="directory_name" class="form-control" placeholder="<%= CGI.escapeHTML t.directory_input_placeholder %>">
         </div>
         <div class="col-auto">
-          <button type="submit" class="btn btn-outline-secondary"><i class="fa fa-plus" title="<%= EscapeUtils.escape_html t.create.capitalize %>"></i> <%= EscapeUtils.escape_html t.create %></button>
+          <button type="submit" class="btn btn-outline-secondary"><i class="fa fa-plus" title="<%= CGI.escapeHTML t.create.capitalize %>"></i> <%= CGI.escapeHTML t.create %></button>
         </div>
       </div>
     </form>
@@ -33,10 +33,10 @@
     <form method="post" action="/files/create_file?dir_path=<%= @dir_path %>">
       <div class="row g-2 align-items-center">
         <div class="col-auto">
-          <input type="text" name="file_name" class="form-control" placeholder="<%= EscapeUtils.escape_html t.file_input_placeholder %>">
+          <input type="text" name="file_name" class="form-control" placeholder="<%= CGI.escapeHTML t.file_input_placeholder %>">
         </div>
         <div class="col-auto">
-          <button type="submit" class="btn btn-outline-secondary"><i class="fa fa-plus" title="<%= EscapeUtils.escape_html t.create.capitalize %>"></i> <%= EscapeUtils.escape_html t.create %></button>
+          <button type="submit" class="btn btn-outline-secondary"><i class="fa fa-plus" title="<%= CGI.escapeHTML t.create.capitalize %>"></i> <%= CGI.escapeHTML t.create %></button>
         </div>
       </div>
     </form>
@@ -46,23 +46,23 @@
 <br>
 
 <div class="table-responsive">
-  <table class="table table-striped table-sm">
+  <table class="table table-striped table-sm table-bordered">
     <tr>
       <th>
-        <%= EscapeUtils.escape_html t.file.capitalize %>
+        <%= CGI.escapeHTML t.file.capitalize %>
       </th>
       <th class="text-center">
-        <%= EscapeUtils.escape_html t.edit.capitalize %>
+        <%= CGI.escapeHTML t.edit.capitalize %>
       </th>
       <th class="text-center">
-        <%= EscapeUtils.escape_html t.delete.capitalize %>
+        <%= CGI.escapeHTML t.delete.capitalize %>
       </th>
     </tr>
     <% if @parent_dir %>
       <tr>
         <td colspan="3">
           <i class="fas fa-folder"></i>
-          <a href="/files/index?dir_path=<%= File.dirname(@dir_path) %>">[<%= EscapeUtils.escape_html t.parent_dir.capitalize %>]</a>
+          <a href="/files/index?dir_path=<%= File.dirname(@dir_path) %>">[<%= CGI.escapeHTML t.parent_dir.capitalize %>]</a>
         </td>
       </tr>
     <% end %>
@@ -95,13 +95,13 @@
         </td>
         <td class="text-center">
           <% if !File.directory?(f) %>
-            <a href="/files/edit?file=<%= f %>&dir_path=<%= @dir_path %>" class="btn btn-default"><i class="fa fa-edit" title="<%= EscapeUtils.escape_html t.edit %>"></i></a>
+            <a href="/files/edit?file=<%= f %>&dir_path=<%= @dir_path %>" class="btn btn-default"><i class="fa fa-edit" title="<%= CGI.escapeHTML t.edit %>"></i></a>
           <% end %>
         </td>
         <td class="text-center">
-          <form method="post" action="/files/delete?file=<%= f %>" class="inline form-confirm" data-confirm="<%= EscapeUtils.escape_html t.are_you_sure %>">
+          <form method="post" action="/files/delete?file=<%= f %>" class="inline form-confirm" data-confirm="<%= CGI.escapeHTML t.are_you_sure %>">
             <input name="path" type="hidden" value="<%= @dir_path %>">
-            <button type="submit" class="btn btn-default"><i class="fa fa-trash" title="<%= EscapeUtils.escape_html t.delete %>"></i></button>
+            <button type="submit" class="btn btn-default"><i class="fa fa-trash" title="<%= CGI.escapeHTML t.delete %>"></i></button>
           </form>
         </td>
       </tr>