Mercurial > kallithea
changeset 5585:e8922e1d92e5
files: rename the edit mime type field to mimetype as it is named in gists
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Tue, 17 Nov 2015 02:42:01 +0100 |
parents | ef70f1594acf |
children | 007d1a34a35a |
files | kallithea/public/js/base.js kallithea/templates/files/files_add.html kallithea/templates/files/files_edit.html |
diffstat | 3 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/js/base.js Tue Nov 17 02:31:01 2015 +0100 +++ b/kallithea/public/js/base.js Tue Nov 17 02:42:01 2015 +0100 @@ -914,14 +914,14 @@ $('#editor_container').show(); $('#upload_file_container').hide(); $('#filename_container').show(); - $('#set_mode_header').show(); + $('#mimetype_header').show(); }); $('#upload_file_enable').click(function(){ $('#editor_container').hide(); $('#upload_file_container').show(); $('#filename_container').hide(); - $('#set_mode_header').hide(); + $('#mimetype_header').hide(); }); return myCodeMirror
--- a/kallithea/templates/files/files_add.html Tue Nov 17 02:31:01 2015 +0100 +++ b/kallithea/templates/files/files_add.html Tue Nov 17 02:42:01 2015 +0100 @@ -44,14 +44,14 @@ ${_('or')} <div class="btn btn-small" id="upload_file_enable">${_('Upload File')}</div> </span> <span id="upload_file_container" class="reviewer_ac" style="display:none"> - <input type="file" size="20" name="upload_file" id="upload_file"> + <input type="file" size="20" name="upload_file" id="upload_file"> ${_('or')} <div class="btn btn-small" id="file_enable">${_('Create New File')}</div> </span> </h3> <div id="body" class="codeblock"> - <div class="code-header" id="set_mode_header"> - <label class="commit" for="set_mode">${_('New file mode')}</label> - <select id="set_mode" name="set_mode"/> + <div class="code-header" id="mimetype_header"> + <label class="commit" for="mimetype">${_('New file type')}</label> + <select id="mimetype" name="mimetype"/> </div> <div id="editor_container"> <pre id="editor_pre"></pre> @@ -71,7 +71,7 @@ var myCodeMirror = initCodeMirror('editor', "${request.script_name}", reset_url); //inject new modes, based on codeMirrors modeInfo object - $('#set_mode').each(function(){ + $('#mimetype').each(function(){ var modes_select = this; var index = 1; for(var i=0;i<CodeMirror.modeInfo.length;i++){ @@ -87,7 +87,7 @@ } } }); - $('#set_mode').change(function(e){ + $('#mimetype').change(function(e){ var selected = e.currentTarget; var node = selected.options[selected.selectedIndex]; var detected_mode = CodeMirror.findModeByMIME(node.value); @@ -107,7 +107,7 @@ var detected_mode = CodeMirror.findModeByExtension(file_data['ext']) || CodeMirror.findModeByMIME('text/plain'); if (detected_mode){ setCodeMirrorMode(myCodeMirror, detected_mode); - $('#set_mode').val(detected_mode.mime); + $('#mimetype').val(detected_mode.mime); } } });
--- a/kallithea/templates/files/files_edit.html Tue Nov 17 02:31:01 2015 +0100 +++ b/kallithea/templates/files/files_edit.html Tue Nov 17 02:42:01 2015 +0100 @@ -55,8 +55,8 @@ % endif </div> </div> - <label class="commit" for="set_mode">${_('Editing file')}: ${c.file.unicode_path}</label> - <select id="set_mode" name="set_mode"/> + <label class="commit" for="mimetype">${_('Editing file')}: ${c.file.unicode_path}</label> + <select id="mimetype" name="mimetype"/> </div> <pre id="editor_pre"></pre> <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea> @@ -78,7 +78,7 @@ var myCodeMirror = initCodeMirror('editor', "${request.script_name}", reset_url); //inject new modes, based on codeMirrors modeInfo object - $('#set_mode').each(function(){ + $('#mimetype').each(function(){ var modes_select = this; var index = 1; for(var i=0;i<CodeMirror.modeInfo.length;i++){ @@ -98,10 +98,10 @@ var detected_mode = CodeMirror.findModeByExtension("${c.file.extension}"); if(detected_mode){ setCodeMirrorMode(myCodeMirror, detected_mode); - $($('#set_mode option[value="'+detected_mode.mime+'"]')[0]).prop('selected', true); + $($('#mimetype option[value="'+detected_mode.mime+'"]')[0]).prop('selected', true); } - $('#set_mode').on('change', function(e){ + $('#mimetype').on('change', function(e){ var selected = e.currentTarget; var node = selected.options[selected.selectedIndex]; var detected_mode = CodeMirror.findModeByMIME(node.value);