codemirror: move everything to separate codemirror folder - splitting it up in css and js serves no purpose

- but it should perhaps not show up directly in /codemirror ...

LICENSE.md

@@ -52,7 +52,7 b' and licensed under the MIT-permissive li'
 
 Additional files from upstream Codemirror are copyrighted by various authors
 and licensed under other permissive licenses.  The sub-directories under
-[.../public/js/mode/](kallithea/public/js/mode) include the copyright and
+[.../public/codemirror](kallithea/public/codemirror) include the copyright and
 license notice and information as they appeared in Codemirror's upstream
 release.
 

kallithea/public/js/codemirror_loadmode.js

@@ -1,4 +1,5 b''
 (function() {
+  // FIXME: if this default value ever is used, it will probably be wrong
   if (!CodeMirror.modeURL) CodeMirror.modeURL = "../mode/%N/%N.js";
 
   var loading = {};

kallithea/templates/admin/gists/edit.html

@@ -9,13 +9,13 b''
 </%def>
 
 <%def name="js_extra()">
-<script type="text/javascript" src="${h.url('/js/codemirror.js')}"></script>
+<script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
 <script type="text/javascript" src="${h.url('/js/codemirror_loadmode.js')}"></script>
-<script type="text/javascript" src="${h.url('/js/mode/meta.js')}"></script>
+<script type="text/javascript" src="${h.url('/codemirror/mode/meta.js')}"></script>
 <script type="text/javascript" src="${h.url('/js/meta_ext.js')}"></script>
 </%def>
 <%def name="css_extra()">
-<link rel="stylesheet" type="text/css" href="${h.url('/css/codemirror.css')}"/>
+<link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 </%def>
 
 <%def name="breadcrumbs_links()">
@@ -89,7 +89,7 b''
                 ## dynamic edit box.
                 <script type="text/javascript">
                 var myCodeMirror = initCodeMirror("editor_${h.FID('f',file.path)}", '');
-                CodeMirror.modeURL = "${h.url('/js/mode/%N/%N.js')}";
+                CodeMirror.modeURL = "${h.url('/codemirror/mode/%N/%N.js')}";
 
                 //inject new modes
                 var $modes_select = $('#mimetype_${h.FID('f',file.path)}');

kallithea/templates/admin/gists/new.html

@@ -9,13 +9,13 b''
 </%def>
 
 <%def name="js_extra()">
-<script type="text/javascript" src="${h.url('/js/codemirror.js')}"></script>
+<script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
 <script type="text/javascript" src="${h.url('/js/codemirror_loadmode.js')}"></script>
-<script type="text/javascript" src="${h.url('/js/mode/meta.js')}"></script>
+<script type="text/javascript" src="${h.url('/codemirror/mode/meta.js')}"></script>
 <script type="text/javascript" src="${h.url('/js/meta_ext.js')}"></script>
 </%def>
 <%def name="css_extra()">
-<link rel="stylesheet" type="text/css" href="${h.url('/css/codemirror.css')}"/>
+<link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 </%def>
 
 <%def name="breadcrumbs_links()">
@@ -64,7 +64,7 b''
             ${h.end_form()}
             <script type="text/javascript">
             var myCodeMirror = initCodeMirror('editor', '');
-            CodeMirror.modeURL = "${h.url('/js/mode/%N/%N.js')}";
+            CodeMirror.modeURL = "${h.url('/codemirror/mode/%N/%N.js')}";
 
             //inject new modes
             var $modes_select = $('#mimetype');

kallithea/templates/files/diff_2way.html

@@ -3,11 +3,11 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="js_extra()">
-<script type="text/javascript" src="${h.url('/js/codemirror.js')}"></script>
+<script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
 <script type="text/javascript" src="${h.url('/js/mergely.js')}"></script>
 </%def>
 <%def name="css_extra()">
-<link rel="stylesheet" type="text/css" href="${h.url('/css/codemirror.css')}"/>
+<link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 <link rel="stylesheet" type="text/css" href="${h.url('/css/mergely.css')}"/>
 </%def>
 

kallithea/templates/files/files_add.html

@@ -8,13 +8,13 b''
 </%def>
 
 <%def name="js_extra()">
-<script type="text/javascript" src="${h.url('/js/codemirror.js')}"></script>
+<script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
 <script type="text/javascript" src="${h.url('/js/codemirror_loadmode.js')}"></script>
-<script type="text/javascript" src="${h.url('/js/mode/meta.js')}"></script>
+<script type="text/javascript" src="${h.url('/codemirror/mode/meta.js')}"></script>
 <script type="text/javascript" src="${h.url('/js/meta_ext.js')}"></script>
 </%def>
 <%def name="css_extra()">
-<link rel="stylesheet" type="text/css" href="${h.url('/css/codemirror.css')}"/>
+<link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 </%def>
 
 <%def name="page_nav()">
@@ -72,7 +72,7 b''
             <script type="text/javascript">
             var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path)}";
             var myCodeMirror = initCodeMirror('editor',reset_url);
-            CodeMirror.modeURL = "${h.url('/js/mode/%N/%N.js')}";
+            CodeMirror.modeURL = "${h.url('/codemirror/mode/%N/%N.js')}";
 
             //inject new modes, based on codeMirrors modeInfo object
             $('#set_mode').each(function(){

kallithea/templates/files/files_delete.html

@@ -8,13 +8,13 b''
 </%def>
 
 <%def name="js_extra()">
-<script type="text/javascript" src="${h.url('/js/codemirror.js')}"></script>
+<script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
 <script type="text/javascript" src="${h.url('/js/codemirror_loadmode.js')}"></script>
-<script type="text/javascript" src="${h.url('/js/mode/meta.js')}"></script>
+<script type="text/javascript" src="${h.url('/codemirror/mode/meta.js')}"></script>
 <script type="text/javascript" src="${h.url('/js/meta_ext.js')}"></script>
 </%def>
 <%def name="css_extra()">
-<link rel="stylesheet" type="text/css" href="${h.url('/css/codemirror.css')}"/>
+<link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 </%def>
 
 <%def name="page_nav()">

kallithea/templates/files/files_edit.html

@@ -8,13 +8,13 b''
 </%def>
 
 <%def name="js_extra()">
-<script type="text/javascript" src="${h.url('/js/codemirror.js')}"></script>
+<script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
 <script type="text/javascript" src="${h.url('/js/codemirror_loadmode.js')}"></script>
-<script type="text/javascript" src="${h.url('/js/mode/meta.js')}"></script>
+<script type="text/javascript" src="${h.url('/codemirror/mode/meta.js')}"></script>
 <script type="text/javascript" src="${h.url('/js/meta_ext.js')}"></script>
 </%def>
 <%def name="css_extra()">
-<link rel="stylesheet" type="text/css" href="${h.url('/css/codemirror.css')}"/>
+<link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 </%def>
 
 <%def name="page_nav()">
@@ -80,7 +80,7 b''
 $(document).ready(function(){
     var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.file.path)}";
     var myCodeMirror = initCodeMirror('editor',reset_url);
-    CodeMirror.modeURL = "${h.url('/js/mode/%N/%N.js')}";
+    CodeMirror.modeURL = "${h.url('/codemirror/mode/%N/%N.js')}";
 
    //inject new modes, based on codeMirrors modeInfo object
     var modes_select = $('#set_mode');