Web editor: improve edit file

conf/locale/locale_en-US.ini

@@ -426,14 +426,9 @@ file_view_raw = View Raw
 file_permalink = Permalink
 file_too_large = This file is too large to be shown
 
-cancel_lower = cancel
-or = or
-upload_files = Upload files
-edit_file = Edit file
-unable_to_update_file = Unable to update this file, error occurred
-filename_help = To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
-new_branch = new branch
 editor.new_file = New file
+editor.edit_file = Edit file
+editor.preview_changes = Preview Changes
 editor.cannot_edit_non_text_files = Cannot edit non-text files
 editor.edit_this_file = Edit this file
 editor.must_be_on_a_branch = You must be on a branch to make or propose changes to this file
@@ -441,6 +436,10 @@ editor.fork_before_edit = You must fork this repository before editing the file
 editor.delete_this_file = Delete this file
 editor.must_have_write_access = You must have write access to make or propose changes to this file
 editor.file_delete_success = File '%s' has been deleted successfully!
+editor.name_your_file = Name your file...
+editor.filename_help = To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or = or
+editor.cancel_lower = cancel
 editor.commit_changes = Commit Changes
 editor.add_tmpl = Add '%s/<filename>'
 editor.add = Add '%s'
@@ -458,14 +457,11 @@ editor.filename_is_a_directory = The filename '%s' is an existing directory in t
 editor.file_editing_no_longer_exists = The file '%s' you are editing no longer exists in the repository.
 editor.file_changed_while_editing = File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
 editor.file_already_exists = A file with name '%s' already exists in this repository.
-editor.failed_to_upload_files = An error occurred while updating file: %v
 editor.no_changes_to_show = There are no changes to show.
+upload_files = Upload files
 upload_file = Upload file
 add_files_to_dir = Add files to %s
 add_subdir = Add subdirectory...
-name_your_file = Name your file...
-copy_file_path_to_clipboard = Copy file path to clipboard
-preview_changes = Preview Changes
 
 commits.commits = Commits
 commits.search = Search commits

modules/bindata/bindata.go

@@ -4346,7 +4346,7 @@ func confLocaleLocale_deDeIni() (*asset, error) {
 	return a, nil
 }
 
-var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xac\xbd\xfb\x72\xdb\x48\x92\x2f\xfc\x3f\x9e\x02\xed\x09\x87\xed\x08\x99\x1d\x3d\xb3\xdf\x25\x3a\xfa\xf2\xa9\xe5\xf6\x65\xd7\xb2\xb5\x96\x7a\xe6\x9b\xd3\xe1\x60\x83\x24\x44\x62\x4d\x02\x1c\x00\xb4\xac\x99\x98\x37\x38\x0f\x70\x9e\xef\x3c\xc9\xc9\xfc\x65\x66\x55\x16\x00\x4a\x76\xcf\xfa\x0f\x8b\xa8\xca\xba\x67\x65\xe5\xad\xb2\x8a\xfd\x7e\xbe\x2a\xbb\x65\xfe\x7d\x7e\x9a\xef\x8b\xaa\xde\x96\x5d\x97\x77\xe5\xf6\xfa\xe9\xa6\xe9\xfa\x72\x95\xbf\xa8\x7a\xfa\x6e\x3f\x56\xcb\x32\xcb\x36\xcd\xae\x24\xd0\x97\xf4\x27\x5b\x15\xdd\x66\xd1\x14\xed\x8a\x12\x9e\xd9\xef\xac\xfc\xb4\xdf\x36\x2d\x03\xfd\x2c\xbf\xb2\x4d\xb9\xdd\x73\x19\xfa\x93\x75\xd5\xba\x9e\x57\x35\x7d\x5e\xd2\xaf\xfc\x55\x2d\x29\xcd\xa1\xb7\xa4\xb7\x87\x5e\xd2\x0e\x7b\x4b\xfa\x65\x9f\xb5\xe5\xba\xa2\xde\xb4\x94\xf4\x4e\x7f\x66\x37\xe5\xa2\xab\x7a\x6e\xe9\x2f\xf2\x2b\xfb\x58\xb6\x5d\xd5\x70\xed\x7f\x96\x5f\xd9\xbe\x58\x33\xc0\x05\xfd\xc9\xfa\x72\xb7\xdf\x16\x28\x70\xa5\x3f\xb3\x6d\x51\xaf\x0f\x02\xf3\x5a\x7f\x66\xcb\xb6\xa4\xac\x79\x5d\xde\x50\xea\x19\x3e\x66\xb3\x59\x76\xa0\x49\x98\xef\xdb\xe6\xba\xda\x96\xf3\xa2\x5e\xcd\x77\x32\xcc\x5f\x28\x3d\xd7\xf4\x9c\xd2\x73\x4e\xc7\x10\xca\x15\x0d\x75\x5e\x74\x3a\x0e\x9a\x4b\x1a\x79\xd1\x65\xa8\xaa\x2e\x76\x56\x9a\x7f\x66\xe5\xae\xa8\xb6\x3c\x6b\xfc\x97\xfa\xdd\x75\x37\x0d\xa6\xf6\x42\x7f\xd2\x1c\xcc\xfb\xdb\x7d\x89\x29\x78\x7a\x45\xbf\xb2\x65\xb1\xef\x97\x9b\x82\xbb\x29\xbf\x32\x02\xda\x37\x34\x17\x4d\x7b\x0b\x38\xfb\xc8\x9a\x76\x5d\xd4\xd5\xdf\x8b\x5e\xe6\xe7\xad\xfb\xcc\x76\x55\xdb\x36\x3c\xb5\xe7\xf8\x91\xd1\xc8\xe7\x5c\x0f\xa5\xbc\xa1\x49\x70\xb5\x70\xce\xae\x5a\xb7\x32\x8b\x9c\x79\x8e\x2f\xae\x45\xf2\xb4\x26\xc9\x0a\xb5\x5d\x37\xed\x07\x4d\x7d\xce\x3f\x07\x55\x52\xe7\x34\x37\xed\x57\x51\xd3\x7a\x68\xee\x39\x3e\x12\x80\x2e\x2b\x56\x3b\x9a\xe1\x7d\x51\x97\x3c\x75\xa7\xfc\x45\xf3\x45\x5f\x59\xb1\x5c\x36\x87\xba\x9f\x77\x65\xdf\x57\xf5\x9a\xd7\xe0\x54\x92\xf2\x4b\x4d\xca\x5c\x5e\x48\xbb\x6d\x0e\x61\x95\x29\xfd\xaf\xf4\x99\x5f\xc8\xa7\xe4\xb9\x42\xc8\x0c\x25\xa9\xc9\xbe\xfa\x58\xf5\x55\x29\x8d\xd9\x47\xb6\x3f\x6c\xb7\x34\x9f\x7f\x3b\x94\x5d\xcf\x59\x17\xf4\x4d\x33\x20\xdf\x59\xd5\x75\x07\x94\x78\x85\x1f\x19\x2d\x6a\xbd\xc4\x70\xce\xf0\x23\xcb\x7e\xad\xea\xae\x2f\xb6\xdb\xf7\x99\xfe\x60\x60\xf9\x25\xf3\xd4\x57\x3d\x3a\xab\x89\xf9\x65\x5f\xee\x3b\x9e\xe8\xfc\x79\xd5\x76\xfd\xd3\xbe\x22\x54\x7b\x77\xa8\xb3\x55\xb3\xfc\x40\x48\xcc\x1b\x12\x5b\xe9\xd5\x75\x4e\x63\x7a\x44\x68\xdc\x1e\xea\x9a\x46\x91\xbf\x68\x68\x64\xd4\x4c\xb5\x2a\xf3\x67\x80\x3e\xc9\xf7\xdb\xb2\xe8\x08\xa4\x2c\x56\xf9\x77\x45\xde\x17\xed\xba\xec\xbf\x7f\x30\x5f\xd0\xe6\xf9\xf0\x20\xdf\xb4\xe5\xf5\xf7\x0f\x1e\x76\x0f\x7e\x78\x71\xa0\x62\xdb\xaa\x2e\xbb\xef\xbe\x2e\x7e\xc8\x97\x05\xe5\xd0\x58\x6f\xf3\x45\x79\xcd\x7b\x85\xda\xca\x09\x49\xeb\x35\xef\x93\xdb\x7e\xc3\x0d\xd2\x82\xd1\x8f\x2e\xe7\x8d\xfa\x55\xc6\xb3\x44\x1b\x79\xbe\x5a\x18\x51\x42\x87\x90\xdc\xd2\x2c\x9d\xdf\x5e\xfe\xe7\xeb\x93\xfc\x82\x28\xd3\xba\x2d\xf1\x9b\xfe\xa3\x12\x7f\xca\x69\xb4\x57\xd5\xb3\x9f\x66\x19\x95\xb5\x09\x79\x56\xf4\xc5\x82\xfb\x1e\x16\x89\x33\x65\x0f\x85\x3c\xec\x24\xa6\x75\xa0\x6b\x5d\x8f\xdd\xa9\x3b\x73\x72\x1f\x52\x1d\xba\x79\x43\x1d\x6f\x78\x07\x53\x7a\x98\xd9\x0b\x99\x33\xaa\x2a\x7f\xf5\xe6\xcd\xdb\x67\x3f\xe5\x65\xbd\xa6\x99\xc9\x6f\xaa\x7e\x93\x1f\xfa\xeb\xff\x77\xbe\x2e\xeb\xb2\x2d\xb6\xf3\x65\xc5\x93\xd2\x12\x5e\xe5\x34\x4b\x32\xc4\x59\xd6\x75\x5b\x22\x30\x2b\x6e\xe5\xf2\xf2\x75\x7e\x4e\x3f\xa9\x33\x54\x96\x3b\xd2\x6f\xb2\xee\x6f\x5b\x9e\xa8\xd0\xe0\xd5\xa6\xcc\x81\xb3\x00\x6a\xae\x87\xf3\x92\xaf\xb4\xaf\xb3\xfc\xbb\x45\xfb\x83\xeb\x5f\xb1\xe8\x9a\xed\xa1\xd7\x92\x37\x9b\xb2\xc6\x42\x11\x2a\xb5\x3d\x51\x2b\xa3\xfd\xb3\xac\x6c\xdb\x39\xd1\xcd\xfe\x96\x97\x47\xfb\x72\xac\x15\xa9\x8c\x50\xb9\x6e\x7a\x5a\xfe\x1c\xe5\xa4\x8a\xaa\xfe\x58\x6c\xab\x15\x2d\x52\x9c\xc8\xb4\x2c\x12\x57\x0d\xad\x37\x97\x26\x8c\x6e\x6e\x30\x45\xb4\xc1\x88\xac\xe7\x0f\x66\x0f\x40\x67\x1f\x3c\x7d\x30\xcb\xea\x66\x2e\x44\x80\x29\xf2\xaa\xea\x8a\x05\x51\x67\x39\x2d\x5a\x23\x76\x7f\x65\xbc\x93\xae\x28\x44\x9e\x40\xf0\x9a\xf0\x09\x04\xc2\xcf\x48\x59\x10\x99\x06\x2d\x51\x2a\xe2\xc7\x6e\x24\x27\xe0\x85\x50\x9d\x90\x30\x1a\x73\x66\x0b\x6d\x58\x79\xba\xdf\x6f\xab\xa5\x34\xfd\x42\xf2\x22\x82\xf2\x79\xac\x93\xe2\xe1\x80\x60\x96\xe7\xd0\x8c\x7a\xcd\x54\x29\x4f\xc8\x3b\xca\x6f\x4a\xda\x71\x9b\xc3\x5a\xce\xa4\x6d\x73\x58\x7d\x85\xc3\xc1\x56\x2e\x92\xe0\xfc\x5d\x43\x1d\x06\x56\x05\x80\xd8\xc4\x29\x11\x14\x66\x01\xda\x72\xd7\xf4\x3c\x71\x5a\x8c\xc9\xdc\x4d\x45\x99\x34\xd2\xae\xf8\x48\x87\x5b\xdf\xc8\x56\x5e\xd1\x56\x5d\x72\xc5\xb3\x8c\xc8\xca\x5c\xb7\x13\xd1\x1f\xd9\x52\x96\x96\xe2\x2e\xa0\x76\x07\xda\x85\x1b\xaa\x8c\x27\x9e\xf9\x10\xaa\x72\xaa\x9f\x18\x12\xd5\x03\xea\x40\x3b\xbe\xa1\x33\x93\x17\xfa\x19\x7e\xe8\xb7\xaf\x9f\x7a\x55\x5c\x5f\x53\xaf\x3a\xda\x4d\x2f\xf3\xe5\xb6\xa1\xad\xf8\xcb\xbb\xd7\x1d\x6f\xb4\xcd\x7c\xdf\xb4\xe0\x3f\x28\xeb\x82\x7e\x86\x34\x37\xd1\x0c\x51\x1f\x76\x0b\xfa\xba\xd9\x54\xcb\x8d\x4c\x3b\x97\xe0\xfd\x41\xa9\xdLine truncated
+var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xac\xbd\xfb\x72\xdb\x48\x92\x2f\xfc\x3f\x9e\x02\xed\x09\x87\xed\x08\x99\x1d\x3d\xb3\xdf\x25\x3a\xfa\xf2\xa9\xe5\xf6\x65\xd7\xb2\xb5\x96\x7a\xe6\x9b\xd3\xe1\x60\x83\x24\x44\x62\x4d\x02\x1c\x00\xb4\xac\x99\x98\x37\x38\x0f\x70\x9e\xef\x3c\xc9\xc9\xfc\x65\x66\x55\x16\x00\x4a\x76\xcf\xfa\x0f\x0b\xac\xca\xba\x67\x65\xe5\xad\xb2\x8a\xfd\x7e\xbe\x2a\xbb\x65\xfe\x7d\x7e\x9a\xef\x8b\xaa\xde\x96\x5d\x97\x77\xe5\xf6\xfa\xe9\xa6\xe9\xfa\x72\x95\xbf\xa8\x7a\xfa\xdd\x7e\xac\x96\x65\x96\x6d\x9a\x5d\x49\xa0\x2f\xe9\x4f\xb6\x2a\xba\xcd\xa2\x29\xda\x15\x25\x3c\xb3\xef\xac\xfc\xb4\xdf\x36\x2d\x03\xfd\x2c\x5f\xd9\xa6\xdc\xee\xb9\x0c\xfd\xc9\xba\x6a\x5d\xcf\xab\x9a\x7e\x5e\xd2\x57\xfe\xaa\x96\x94\xe6\xd0\x5b\xd2\xdb\x43\x2f\x69\x87\xbd\x25\xfd\xb2\xcf\xda\x72\x5d\x51\x6f\x5a\x4a\x7a\xa7\x9f\xd9\x4d\xb9\xe8\xaa\x9e\x5b\xfa\x8b\x7c\x65\x1f\xcb\xb6\xab\x1a\xae\xfd\xcf\xf2\x95\xed\x8b\x35\x03\x5c\xd0\x9f\xac\x2f\x77\xfb\x6d\x81\x02\x57\xfa\x99\x6d\x8b\x7a\x7d\x10\x98\xd7\xfa\x99\x2d\xdb\x92\xb2\xe6\x75\x79\x43\xa9\x67\xf8\x31\x9b\xcd\xb2\x03\x4d\xc2\x7c\xdf\x36\xd7\xd5\xb6\x9c\x17\xf5\x6a\xbe\x93\x61\xfe\x42\xe9\xb9\xa6\xe7\x94\x9e\x73\x3a\x86\x50\xae\x68\xa8\xf3\xa2\xd3\x71\xd0\x5c\xd2\xc8\x8b\x2e\x43\x55\x75\xb1\xb3\xd2\xfc\x99\x95\xbb\xa2\xda\xf2\xac\xf1\x5f\xea\x77\xd7\xdd\x34\x98\xda\x0b\xfd\xa4\x39\x98\xf7\xb7\xfb\x12\x53\xf0\xf4\x8a\xbe\xb2\x65\xb1\xef\x97\x9b\x82\xbb\x29\x5f\x19\x01\xed\x1b\x9a\x8b\xa6\xbd\x05\x9c\xfd\xc8\x9a\x76\x5d\xd4\xd5\xdf\x8b\x5e\xe6\xe7\xad\xfb\x99\xed\xaa\xb6\x6d\x78\x6a\xcf\xf1\x91\xd1\xc8\xe7\x5c\x0f\xa5\xbc\xa1\x49\x70\xb5\x70\xce\xae\x5a\xb7\x32\x8b\x9c\x79\x8e\x5f\x5c\x8b\xe4\x69\x4d\x92\x15\x6a\xbb\x6e\xda\x0f\x9a\xfa\x9c\x3f\x07\x55\x52\xe7\x34\x37\xed\x57\x51\xd3\x7a\x68\xee\x39\x7e\x24\x00\x5d\x56\xac\x76\x34\xc3\xfb\xa2\x2e\x79\xea\x4e\xf9\x17\xcd\x17\xfd\xca\x8a\xe5\xb2\x39\xd4\xfd\xbc\x2b\xfb\xbe\xaa\xd7\xbc\x06\xa7\x92\x94\x5f\x6a\x52\xe6\xf2\x42\xda\x6d\x73\x08\xab\x4c\xe9\x7f\xa5\x9f\xf9\x85\xfc\x94\x3c\x57\x08\x99\xa1\x24\x35\xd9\x57\x1f\xab\xbe\x2a\xa5\x31\xfb\x91\xed\x0f\xdb\x2d\xcd\xe7\xdf\x0e\x65\xd7\x73\xd6\x05\xfd\xa6\x19\x90\xdf\x59\xd5\x75\x07\x94\x78\x85\x8f\x8c\x16\xb5\x5e\x62\x38\x67\xf8\xc8\xb2\x5f\xab\xba\xeb\x8b\xed\xf6\x7d\xa6\x1f\x0c\x2c\x5f\x32\x4f\x7d\xd5\xa3\xb3\x9a\x98\x5f\xf6\xe5\xbe\xe3\x89\xce\x9f\x57\x6d\xd7\x3f\xed\x2b\x42\xb5\x77\x87\x3a\x5b\x35\xcb\x0f\x84\xc4\xbc\x21\xb1\x95\x5e\x5d\xe7\x34\xa6\x47\x84\xc6\xed\xa1\xae\x69\x14\xf9\x8b\x86\x46\x46\xcd\x54\xab\x32\x7f\x06\xe8\x93\x7c\xbf\x2d\x8b\x8e\x40\xca\x62\x95\x7f\x57\xe4\x7d\xd1\xae\xcb\xfe\xfb\x07\xf3\x05\x6d\x9e\x0f\x0f\xf2\x4d\x5b\x5e\x7f\xff\xe0\x61\xf7\xe0\x87\x17\x07\x2a\xb6\xad\xea\xb2\xfb\xee\xeb\xe2\x87\x7c\x59\x50\x0e\x8d\xf5\x36\x5f\x94\xd7\xbc\x57\xa8\xad\x9c\x90\xb4\x5e\xf3\x3e\xb9\xed\x37\xdc\x20\x2d\x18\x7d\x74\x39\x6f\xd4\xaf\x32\x9e\x25\xda\xc8\xf3\xd5\xc2\x88\x12\x3a\x84\xe4\x96\x66\xe9\xfc\xf6\xf2\x3f\x5f\x9f\xe4\x17\x44\x99\xd6\x6d\x89\x6f\xfa\x8f\x4a\xfc\x29\xa7\xd1\x5e\x55\xcf\x7e\x9a\x65\x54\xd6\x26\xe4\x59\xd1\x17\x0b\xee\x7b\x58\x24\xce\x94\x3d\x14\xf2\xb0\x93\x98\xd6\x81\xae\x75\x3d\x76\xa7\xee\xcc\xc9\x7d\x48\x75\xe8\xe6\x0d\x75\xbc\xe1\x1d\x4c\xe9\x61\x66\x2f\x64\xce\xa8\xaa\xfc\xd5\x9b\x37\x6f\x9f\xfd\x94\x97\xf5\x9a\x66\x26\xbf\xa9\xfa\x4d\x7e\xe8\xaf\xff\xdf\xf9\xba\xac\xcb\xb6\xd8\xce\x97\x15\x4f\x4a\x4b\x78\x95\xd3\x2c\xc9\x10\x67\x59\xd7\x6d\x89\xc0\xac\xb8\x95\xcb\xcb\xd7\xf9\x39\x7d\x52\x67\xa8\x2c\x77\xa4\xdf\x64\xdd\xdf\xb6\x3c\x51\xa1\xc1\xab\x4d\x99\x03\x67\x01\xd4\x5c\x0f\xe7\x25\x5f\x69\x5f\x67\xf9\x77\x8b\xf6\x07\xd7\xbf\x62\xd1\x35\xdb\x43\xaf\x25\x6f\x36\x65\x8d\x85\x22\x54\x6a\x7b\xa2\x56\x46\xfb\x67\x59\xd9\xb6\x73\xa2\x9b\xfd\x2d\x2f\x8f\xf6\xe5\x58\x2b\x52\x19\xa1\x72\xdd\xf4\xb4\xfc\x39\xca\x49\x15\x55\xfd\xb1\xd8\x56\x2b\x5a\xa4\x38\x91\x69\x59\x24\xae\x1a\x5a\x6f\x2e\x4d\x18\xdd\xdc\x60\x8a\x68\x83\x11\x59\xcf\x1f\xcc\x1e\x80\xce\x3e\x78\xfa\x60\x96\xd5\xcd\x5c\x88\x00\x53\xe4\x55\xd5\x15\x0b\xa2\xce\x72\x5a\xb4\x46\xec\xfe\xca\x78\x27\x5d\x51\x88\x3c\x81\xe0\x35\xe1\x13\x08\x84\x9f\x91\xb2\x20\x32\x0d\x5a\xa2\x54\xc4\x8f\xdd\x48\x4e\xc0\x0b\xa1\x3a\x21\x61\x34\xe6\xcc\x16\xda\xb0\xf2\x74\xbf\xdf\x56\x4b\x69\xfa\x85\xe4\x45\x04\xe5\xf3\x58\x27\xc5\xc3\x01\xc1\x2c\xcf\xa1\x19\xf5\x9a\xa9\x52\x9e\x90\x77\x94\xdf\x94\xb4\xe3\x36\x87\xb5\x9c\x49\xdb\xe6\xb0\xfa\x0a\x87\x83\xad\x5c\x24\xc1\xf9\xbb\x86\x3a\x0c\xac\x0a\x00\xb1\x89\x53\x22\x28\xcc\x02\xb4\xe5\xae\xe9\x79\xe2\xb4\x18\x93\xb9\x9b\x8a\x32\x69\xa4\x5d\xf1\x91\x0e\xb7\xbe\x91\xad\xbc\xa2\xad\xba\xe4\x8a\x67\x19\x91\x95\xb9\x6e\x27\xa2\x3f\xb2\xa5\x2c\x2d\xc5\x5d\x40\xed\x0e\xb4\x0b\x37\x54\x19\x4f\x3c\xf3\x21\x54\xe5\x54\x3f\x31\x24\xaa\x07\xd4\x81\x76\x7c\x43\x67\x26\x2f\xf4\x33\x7c\xe8\x6f\x5f\x3f\xf5\xaa\xb8\xbe\xa6\x5e\x75\xb4\x9b\x5e\xe6\xcb\x6d\x43\x5b\xf1\x97\x77\xaf\x3b\xde\x68\x9b\xf9\xbe\x69\xc1\x7f\x50\xd6\x05\x7d\x86\x34\x37\xd1\x0c\x51\x1f\x76\x0b\xfa\x75\xb3\xa9\x96\x1b\x99\x76\x2e\xc1\xfb\x83\x52\xa9\x8Line truncated
 
 func confLocaleLocale_enUsIniBytes() ([]byte, error) {
 	return bindataRead(
@@ -4361,7 +4361,7 @@ func confLocaleLocale_enUsIni() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 55565, mode: os.FileMode(420), modTime: time.Unix(1472373004, 0)}
+	info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 55208, mode: os.FileMode(420), modTime: time.Unix(1472383451, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }

routers/repo/commit.go

@@ -20,7 +20,7 @@ import (
 
 const (
 	COMMITS base.TplName = "repo/commits"
-	DIFF    base.TplName = "repo/diff"
+	DIFF    base.TplName = "repo/diff/page"
 )
 
 func RefCommits(ctx *context.Context) {

routers/repo/editor.go

@@ -22,7 +22,6 @@ import (
 const (
 	EDIT_FILE         base.TplName = "repo/editor/edit"
 	EDIT_DIFF_PREVIEW base.TplName = "repo/editor/diff_preview"
-	NEW_DIFF_PREVIEW  base.TplName = "repo/editor/diff_preview_new"
 	DELETE_FILE       base.TplName = "repo/editor/delete"
 )
 
@@ -289,15 +288,9 @@ func DiffPreviewPost(ctx *context.Context, form auth.EditPreviewDiffForm) {
 
 	entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treePath)
 	if err != nil {
-		if git.IsErrNotExist(err) {
+		ctx.Error(500, "GetTreeEntryByPath: "+err.Error())
-			ctx.Data["FileContent"] = content
-			ctx.HTML(200, NEW_DIFF_PREVIEW)
-		} else {
-			ctx.Error(500, "GetTreeEntryByPath: "+err.Error())
-		}
 		return
-	}
+	} else if entry.IsDir() {
-	if entry.IsDir() {
 		ctx.Error(422)
 		return
 	}

templates/repo/diff/box.tmpl

@@ -52,7 +52,6 @@
 				</h4>
 			</div>
 		{{else}}
-			{{$highlightClass := $file.GetHighlightClass}}
 			<div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}}" id="diff-{{.Index}}">
 				<h4 class="ui top attached normal header">
 					<div class="diff-counter count ui left">
@@ -90,6 +89,7 @@
 								<table>
 									<tbody>
 										{{if $.IsSplitStyle}}
+											{{$highlightClass := $file.GetHighlightClass}}
 											{{range $j, $section := $file.Sections}}
 												{{range $k, $line := $section.Lines}}
 													<tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}">
@@ -109,27 +109,7 @@
 												{{end}}
 											{{end}}
 										{{else}}
-											{{range $j, $section := $file.Sections}}
+											{{template "repo/diff/section_unified" .}}
-												{{range $k, $line := $section.Lines}}
-													<tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}">
-														{{if eq .GetType 4}}
-														<td colspan="2" class="lines-num">
-															{{/* {{if gt $j 0}}<span class="fold octicon octicon-fold"></span>{{end}} */}}
-														</td>
-														{{else}}
-														<td class="lines-num lines-num-old">
-															<span rel="{{if $line.LeftIdx}}diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}{{end}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span>
-														</td>
-														<td class="lines-num lines-num-new">
-															<span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span>
-														</td>
-														{{end}}
-														<td class="lines-code">
-															<pre><code class="{{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{$section.GetComputedInlineDiffFor $line}}</code></pre>
-														</td>
-													</tr>
-												{{end}}
-											{{end}}
 										{{end}}
 									</tbody>
 								</table>

templates/repo/diff/page.tmpl

@@ -39,7 +39,7 @@
 			</div>
 		{{end}}
 
-		{{template "repo/diff_box" .}}
+		{{template "repo/diff/box" .}}
 	</div>
 </div>
 {{template "base/footer" .}}

templates/repo/diff/section_unified.tmpl

@@ -0,0 +1,23 @@
+{{$file := .}}
+{{$highlightClass := $file.GetHighlightClass}}
+{{range $j, $section := $file.Sections}}
+	{{range $k, $line := $section.Lines}}
+		<tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}">
+			{{if eq .GetType 4}}
+			<td colspan="2" class="lines-num">
+				{{/* {{if gt $j 0}}<span class="fold octicon octicon-fold"></span>{{end}} */}}
+			</td>
+			{{else}}
+			<td class="lines-num lines-num-old">
+				<span rel="{{if $line.LeftIdx}}diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}{{end}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span>
+			</td>
+			<td class="lines-num lines-num-new">
+				<span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span>
+			</td>
+			{{end}}
+			<td class="lines-code">
+				<pre><code class="{{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{$section.GetComputedInlineDiffFor $line}}</code></pre>
+			</td>
+		</tr>
+	{{end}}
+{{end}}

templates/repo/editor/diff_preview.tmpl

@@ -1,29 +1,10 @@
-{{$highlightClass := .File.GetHighlightClass}}
+<div class="diff-file-box">
-<div class="diff-file-box diff-box file-content" id="diff-{{.Index}}">
 	<div class="ui attached table segment">
 		<div class="file-body file-code code-view code-diff">
 			<table>
 				<tbody>
-					{{range $j, $section := .File.Sections}}
+					{{with .File}}
-						{{range $k, $line := $section.Lines}}
+						{{template "repo/diff/section_unified" .}}
-							<tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}">
-								{{if eq .GetType 4}}
-								<td colspan="2" class="lines-num">
-									{{/* {{if gt $j 0}}<span class="fold octicon octicon-fold"></span>{{end}} */}}
-								</td>
-								{{else}}
-								<td class="lines-num lines-num-old">
-									<span rel="{{if $line.LeftIdx}}diff-{{Sha1 $.File.Name}}L{{$line.LeftIdx}}{{end}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span>
-								</td>
-								<td class="lines-num lines-num-new">
-									<span rel="{{if $line.RightIdx}}diff-{{Sha1 $.File.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span>
-								</td>
-								{{end}}
-								<td class="lines-code">
-									<pre><code class="{{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{$section.GetComputedInlineDiffFor $line}}</code></pre>
-								</td>
-							</tr>
-						{{end}}
 					{{end}}
 				</tbody>
 			</table>

templates/repo/editor/diff_preview_new.tmpl

@@ -1,12 +0,0 @@
-<div id="file-content" class="ui attached table segment">
-	<div class="file-view code-view has-emoji">
-		<table>
-			<tbody>
-				<tr>
-					<td class="lines-num"></td>
-					<td class="lines-code"><pre><code><ol class="linenums">{{.FileContent}}</ol></code></pre></td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
-</div>

templates/repo/editor/edit.tmpl

@@ -1,9 +1,9 @@
 {{template "base/head" .}}
-<div class="repository file editor">
+<div class="repository file editor edit">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
-		<form class="ui edit form" action="{{EscapePound $.Link}}" method="post">
+		<form class="ui edit form" method="post">
 			{{.CsrfTokenHtml}}
 			<input type="hidden" name="last_commit" value="{{.last_commit}}">
 			<div class="ui secondary menu">
@@ -15,24 +15,23 @@
 						{{range $i, $v := .TreeNames}}
 							<div class="divider"> / </div>
 							{{if eq $i $l}}
-								<input id="file-name" value="{{$v}}" placeholder="{{$.i18n.Tr "repo.name_your_file"}}" required autofocus> 
+								<input id="file-name" value="{{$v}}" placeholder="{{$.i18n.Tr "repo.editor.name_your_file"}}" required autofocus> 
-								<span class="octicon octicon-info poping up" data-content="{{$.i18n.Tr "repo.filename_help"}}" data-position="bottom center" data-variation="tiny"></span>
+								<span class="octicon octicon-info poping up" data-content="{{$.i18n.Tr "repo.editor.filename_help"}}" data-position="bottom center" data-variation="tiny inverted"></span>
 							{{else}}
 								<span class="section"><a href="{{EscapePound $.BranchLink}}/{{EscapePound $v}}">{{$v}}</a></span>
 							{{end}}
 						{{end}}
-						<!-- <button class="clipboard-tree-name octicon octicon-clippy poping up" type="button" data-content="{{.i18n.Tr "repo.copy_file_path_to_clipboard"}}" data-position="bottom center" data-variation="tiny inverted"></button> -->
+						<span>{{.i18n.Tr "repo.editor.or"}} <a href="{{EscapePound $.BranchLink}}{{if not .IsNewFile}}/{{EscapePound .TreePath}}{{end}}">{{.i18n.Tr "repo.editor.cancel_lower"}}</a></span>
-						<span class="repo-edit-file-cancel">{{.i18n.Tr "repo.or"}} <a href="{{EscapePound $.BranchLink}}{{if not .IsNewFile}}/{{EscapePound .TreePath}}{{end}}">{{.i18n.Tr "repo.cancel_lower"}}</a></span>
 						<input type="hidden" id="tree_path" name="tree_path" value="{{.TreePath}}" required>
 					</div>
 				</div>
 			</div>
 			<div class="field">
 				<div class="ui top attached tabular menu" data-write="write" data-preview="preview" data-diff="diff">
-					<a class="active item" data-tab="write"><i class="octicon octicon-code"></i> {{if .IsNewFile}}{{.i18n.Tr "repo.new_file"}}{{else}}{{.i18n.Tr "repo.edit_file"}}{{end}}</a>
+					<a class="active item" data-tab="write"><i class="octicon octicon-code"></i> {{if .IsNewFile}}{{.i18n.Tr "repo.editor.new_file"}}{{else}}{{.i18n.Tr "repo.editor.edit_file"}}{{end}}</a>
 					{{if not .IsNewFile}}
 					<a class="item" data-tab="preview" data-url="{{AppSubUrl}}/api/v1/markdown" data-context="{{.RepoLink}}" data-preview-file-modes="{{.PreviewableFileModes}}"><i class="octicon octicon-eye"></i> {{.i18n.Tr "repo.release.preview"}}</a>
-					<a class="item" data-tab="diff" data-url="{{.RepoLink}}/_preview/{{.BranchName}}/{{.TreePath}}" data-context="{{.BranchLink}}"><i class="octicon octicon-diff"></i> {{.i18n.Tr "repo.preview_changes"}}</a>
+					<a class="item" data-tab="diff" data-url="{{.RepoLink}}/_preview/{{.BranchName}}/{{.TreePath}}" data-context="{{.BranchLink}}"><i class="octicon octicon-diff"></i> {{.i18n.Tr "repo.editor.preview_changes"}}</a>
 					{{end}}
 				</div>
 				<div class="ui bottom attached active tab segment" data-tab="write">

templates/repo/pulls/compare.tmpl

@@ -57,7 +57,7 @@
 			{{else}}
 				{{template "repo/issue/new_form" .}}
 				{{template "repo/commits_table" .}}
-				{{template "repo/diff_box" .}}
+				{{template "repo/diff/box" .}}
 			{{end}}
 		</div>
 

templates/repo/pulls/files.tmpl

@@ -12,7 +12,7 @@
 		{{template "repo/issue/view_title" .}}
 		{{template "repo/pulls/tab_menu" .}}
 		<div class="ui bottom attached tab pull segment active">
-			{{template "repo/diff_box" .}}
+			{{template "repo/diff/box" .}}
 		</div>
 	</div>
 </div>