files: fixed branch icon for SVN

- added content preview template

rhodecode/templates/files/file_content.mako

@@ -0,0 +1,9 b''
+<%namespace name="sourceblock" file="/codeblocks/source.mako"/>
+
+<%def name="render_lines(lines)">
+<table class="cb codehilite">
+    %for line_num, tokens in enumerate(lines, 1):
+        ${sourceblock.render_line(line_num, tokens)}
+    %endfor
+</table>
+</%def>

rhodecode/templates/files/files_add.mako

@@ -1,110 +1,114 b''
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('{} Files Add').format(c.repo_name)}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='files')}
 </%def>
 
 <%def name="main()">
 
 <div class="box">
 
     <div class="edit-file-title">
         <span class="title-heading">${_('Add new file')} @ <code>${h.show_id(c.commit)}</code></span>
-        <span class="tag branchtag"><i class="icon-branch"></i> ${c.commit.branch}</span>
+        % if c.commit.branch:
+        <span class="tag branchtag">
+            <i class="icon-branch"></i> ${c.commit.branch}
+        </span>
+        % endif
     </div>
 
     ${h.secure_form(h.route_path('repo_files_create_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path), id='eform', request=request)}
     <div class="edit-file-fieldset">
         <div class="path-items">
             <ul>
             <li class="breadcrumb-path">
                 <div>
                     <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> /
                     <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path)}">${c.f_path}</a> ${('/' if c.f_path else '')}
                 </div>
             </li>
             <li class="location-path">
                 <input  class="file-name-input input-small" type="text" value="" name="filename" id="filename" placeholder="${_('Filename e.g example.py, or docs/readme.md')}">
             </li>
             </ul>
         </div>
 
     </div>
 
     <div class="table">
         <div id="files_data">
 
             <div id="codeblock" class="codeblock">
                 <div class="editor-items">
                     <div class="editor-action active show-editor pull-left" onclick="fileEditor.showEditor(); return false">
                         ${_('Edit')}
                     </div>
 
                     <div class="editor-action show-preview pull-left"  onclick="fileEditor.showPreview(); return false">
                         ${_('Preview')}
                     </div>
 
                     <div class="pull-right">
                         ${h.dropdownmenu('line_wrap', 'off', [('on', _('Line wraps on')), ('off', _('line wraps off'))], extra_classes=['last-item'])}
                     </div>
                     <div class="pull-right">
                         ${h.dropdownmenu('set_mode','plain',[('plain', _('plain'))], enable_filter=True)}
                     </div>
                 </div>
 
                 <div id="editor_container">
                     <pre id="editor_pre"></pre>
                     <textarea id="editor" name="content" ></textarea>
                     <div id="editor_preview"></div>
                 </div>
             </div>
         </div>
     </div>
 
     <div class="edit-file-fieldset">
         <div class="fieldset">
             <div class="message">
                 <textarea id="commit" name="message"  placeholder="${c.default_message}"></textarea>
             </div>
         </div>
         <div class="pull-left">
             ${h.submit('commit_btn',_('Commit changes'), class_="btn btn-small btn-success")}
         </div>
     </div>
     ${h.end_form()}
 </div>
 
 <script type="text/javascript">
 
     $(document).ready(function () {
         var modes_select = $('#set_mode');
         var filename_selector = '#filename';
         fillCodeMirrorOptions(modes_select);
 
         fileEditor = new FileEditor('#editor');
 
         // on change of select field set mode
         setCodeMirrorModeFromSelect(modes_select, filename_selector, fileEditor.cm, null);
 
         // on entering the new filename set mode, from given extension
         setCodeMirrorModeFromInput(modes_select, filename_selector, fileEditor.cm, null);
 
         $('#filename').focus();
 
     });
 
 </script>
 </%def>

rhodecode/templates/files/files_delete.mako

@@ -1,85 +1,89 b''
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('{} Files Delete').format(c.repo_name)}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='files')}
 </%def>
 
 <%def name="main()">
 
 <div class="box">
 
     <div class="edit-file-title">
         <span class="title-heading">${_('Delete file')} @ <code>${h.show_id(c.commit)}</code></span>
-        <span class="tag branchtag"><i class="icon-branch"></i> ${c.commit.branch}</span>
+        % if c.commit.branch:
+        <span class="tag branchtag">
+            <i class="icon-branch"></i> ${c.commit.branch}
+        </span>
+        % endif
     </div>
 
     ${h.secure_form(h.route_path('repo_files_delete_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path), id='eform', request=request)}
     <div class="edit-file-fieldset">
         <div class="path-items">
             <li class="breadcrumb-path">
                 <div>
                     <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> /
                     <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.file.dir_path)}">${c.file.dir_path}</a> ${('/' if c.file.dir_path else '')}
                 </div>
             </li>
             <li class="location-path">
                 <input type="hidden" value="${c.f_path}" name="root_path">
                 <input  class="file-name-input input-small" type="text" value="${c.file.name}" name="filename" id="filename" disabled="disabled">
             </li>
         </div>
 
     </div>
 
     <div id="codeblock" class="codeblock delete-file-preview">
         <div class="code-body">
             %if c.file.is_binary:
                 ${_('Binary file (%s)') % c.file.mimetype}
             %else:
                 %if c.file.size < c.visual.cut_off_limit_file:
                     ${h.pygmentize(c.file,linenos=True,anchorlinenos=False,cssclass="code-highlight")}
                 %else:
                     ${_('File size {} is bigger then allowed limit {}. ').format(h.format_byte_size_binary(c.file.size), h.format_byte_size_binary(c.visual.cut_off_limit_file))} ${h.link_to(_('Show as raw'),
                     h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
                 %endif
             %endif
         </div>
     </div>
 
     <div class="edit-file-fieldset">
         <div class="fieldset">
             <div class="message">
                 <textarea id="commit" name="message"  placeholder="${c.default_message}"></textarea>
             </div>
         </div>
         <div class="pull-left">
             ${h.submit('commit',_('Commit changes'),class_="btn btn-small btn-danger-action")}
         </div>
     </div>
     ${h.end_form()}
 </div>
 
 
 <script type="text/javascript">
 
     $(document).ready(function () {
 
         fileEditor = new FileEditor('#editor');
 
     });
 
 </script>
 
 </%def>

rhodecode/templates/files/files_edit.mako

@@ -1,120 +1,124 b''
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('{} Files Edit').format(c.repo_name)}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='files')}
 </%def>
 
 <%def name="main()">
 
 <div class="box">
 
     <div class="edit-file-title">
         <span class="title-heading">${_('Edit file')} @ <code>${h.show_id(c.commit)}</code></span>
-        <span class="tag branchtag"><i class="icon-branch"></i> ${c.commit.branch}</span>
+        % if c.commit.branch:
+        <span class="tag branchtag">
+            <i class="icon-branch"></i> ${c.commit.branch}
+        </span>
+        % endif
     </div>
 
     ${h.secure_form(h.route_path('repo_files_update_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path), id='eform', request=request)}
     <div class="edit-file-fieldset">
         <div class="path-items">
             <ul>
             <li class="breadcrumb-path">
                 <div>
                     <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> /
                     <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.file.dir_path)}">${c.file.dir_path}</a> ${('/' if c.file.dir_path else '')}
                 </div>
             </li>
             <li class="location-path">
                 <input type="hidden" value="${c.f_path}" name="root_path">
                 <input  class="file-name-input input-small" type="text" value="${c.file.name}" name="filename" id="filename" placeholder="${_('Filename e.g example.py, or docs/readme.md')}">
             </li>
             </ul>
         </div>
 
     </div>
 
     <div class="table">
         <div id="files_data">
 
             <div id="codeblock" class="codeblock">
                 <div class="editor-items">
                     <div class="editor-action active show-editor pull-left" onclick="fileEditor.showEditor(); return false">
                         ${_('Edit')}
                     </div>
 
                     <div class="editor-action show-preview pull-left"  onclick="fileEditor.showPreview(); return false">
                         ${_('Preview')}
                     </div>
 
                     <div class="pull-right">
                         ${h.dropdownmenu('line_wrap', 'off', [('on', _('Line wraps on')), ('off', _('line wraps off')),])}
                     </div>
                     <div class="pull-right">
                         ${h.dropdownmenu('set_mode','plain',[('plain', _('plain'))],enable_filter=True)}
                     </div>
                 </div>
 
                 <div id="editor_container">
                     <pre id="editor_pre"></pre>
                     <textarea id="editor" name="content" >${h.escape(c.file.content)|n}</textarea>
                     <div id="editor_preview" ></div>
                 </div>
             </div>
         </div>
     </div>
 
     <div class="edit-file-fieldset">
         <div class="fieldset">
             <div class="message">
                 <textarea id="commit" name="message"  placeholder="${c.default_message}"></textarea>
             </div>
         </div>
         <div class="pull-left">
             ${h.submit('commit_btn',_('Commit changes'), class_="btn btn-small btn-success")}
         </div>
     </div>
     ${h.end_form()}
 </div>
 
 <script type="text/javascript">
 
 $(document).ready(function() {
     var modes_select = $('#set_mode');
     var filename_selector = '#filename';
     fillCodeMirrorOptions(modes_select);
 
     fileEditor = new FileEditor('#editor');
 
     // try to detect the mode based on the file we edit
     var detected_mode = detectCodeMirrorMode("${c.file.name}", "${c.file.mimetype}");
 
     if (detected_mode) {
         setCodeMirrorMode(fileEditor.cm, detected_mode);
 
         var mimetype = $(modes_select).find("option[mode={0}]".format(detected_mode)).val();
         $(modes_select).select2("val", mimetype).trigger('change');
     }
 
     // on change of select field set mode
     setCodeMirrorModeFromSelect(modes_select, filename_selector, fileEditor.cm, null);
 
     // on entering the new filename set mode, from given extension
     setCodeMirrorModeFromInput(modes_select, filename_selector, fileEditor.cm, null);
 
 });
 
 
 </script>
 </%def>

rhodecode/templates/files/files_upload.mako

@@ -1,207 +1,211 b''
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('{} Files Upload').format(c.repo_name)}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='files')}
 </%def>
 
 <%def name="main()">
 
 <div class="box">
     ## Template for uploads
     <div style="display: none" id="tpl-dropzone">
         <div class="dz-preview dz-file-preview">
             <div class="dz-details">
 
                 <div class="dz-filename">
                     <span data-dz-name></span>
                 </div>
                 <div class="dz-filename-size">
                     <span class="dz-size" data-dz-size></span>
 
                 </div>
 
                 <div class="dz-sending" style="display: none">${_('Uploading...')}</div>
                 <div class="dz-response" style="display: none">
                     ${_('Uploaded')} 100%
                 </div>
 
             </div>
             <div class="dz-progress">
                 <span class="dz-upload" data-dz-uploadprogress></span>
             </div>
 
             <div class="dz-error-message">
             </div>
         </div>
     </div>
 
     <div class="edit-file-title">
         <span class="title-heading">${_('Upload new file')} @ <code>${h.show_id(c.commit)}</code></span>
-        <span class="tag branchtag"><i class="icon-branch"></i> ${c.commit.branch}</span>
+        % if c.commit.branch:
+        <span class="tag branchtag">
+            <i class="icon-branch"></i> ${c.commit.branch}
+        </span>
+        % endif
     </div>
 
     <% form_url = h.route_path('repo_files_upload_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path) %>
     ##${h.secure_form(form_url, id='eform', enctype="multipart/form-data", request=request)}
     <div class="edit-file-fieldset">
         <div class="path-items">
             <ul>
             <li class="breadcrumb-path">
                 <div>
                     <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> /
                     <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path)}">${c.f_path}</a> ${('/' if c.f_path else '')}
                 </div>
             </li>
             <li class="location-path">
 
             </li>
             </ul>
         </div>
 
     </div>
 
     <div class="upload-form table">
         <div id="files_data">
 
             <div class="dropzone-wrapper" id="file-uploader">
                 <div class="dropzone-pure">
                     <div class="dz-message">
                     <i class="icon-upload" style="font-size:36px"></i></br>
                     ${_("Drag'n Drop files here or")} <span class="link">${_('Choose your files')}</span>.<br>
                     </div>
                 </div>
 
             </div>
         </div>
 
     </div>
 
     <div class="upload-form edit-file-fieldset">
         <div class="fieldset">
             <div class="message">
                 <textarea id="commit" name="message"  placeholder="${c.default_message}"></textarea>
             </div>
         </div>
         <div class="pull-left">
             ${h.submit('commit_btn',_('Commit changes'), class_="btn btn-small btn-success")}
         </div>
     </div>
     ##${h.end_form()}
 
     <div class="file-upload-transaction-wrapper" style="display: none">
     <div class="file-upload-transaction">
         <h3>${_('Commiting...')}</h3>
         <p>${_('Please wait while the files are being uploaded')}</p>
         <p class="error" style="display: none">
 
         </p>
         <i class="icon-spin animate-spin"></i>
         <p></p>
     </div>
     </div>
 
 </div>
 
 <script type="text/javascript">
 
     $(document).ready(function () {
 
         //see: https://www.dropzonejs.com/#configuration
         myDropzone = new Dropzone("div#file-uploader", {
             url: "${form_url}",
             headers: {"X-CSRF-Token": CSRF_TOKEN},
             paramName: function () {
                 return "files_upload"
             }, // The name that will be used to transfer the file
             parallelUploads: 20,
             maxFiles: 20,
             uploadMultiple: true,
             //chunking: true, // use chunking transfer, not supported at the moment
             //maxFilesize: 2, // in MBs
             autoProcessQueue: false, // if false queue will not be processed automatically.
             createImageThumbnails: false,
             previewTemplate: document.querySelector('#tpl-dropzone').innerHTML,
             accept: function (file, done) {
                 done();
             },
             init: function () {
                 this.on("addedfile", function (file) {
 
                 });
 
                 this.on("sending", function (file, xhr, formData) {
                     formData.append("message", $('#commit').val());
                     $(file.previewElement).find('.dz-sending').show();
                 });
 
                 this.on("success", function (file, response) {
                     $(file.previewElement).find('.dz-sending').hide();
                     $(file.previewElement).find('.dz-response').show();
 
                     if (response.error !== null) {
                         $('.file-upload-transaction-wrapper .error').html('ERROR: {0}'.format(response.error));
                         $('.file-upload-transaction-wrapper .error').show();
                         $('.file-upload-transaction-wrapper i').hide()
                     }
 
                     var redirect_url = response.redirect_url || '/';
                     window.location = redirect_url
 
                 });
 
                 this.on("error", function (file, errorMessage, xhr) {
                     var error = null;
 
                     if (xhr !== undefined){
                         var httpStatus = xhr.status + " " + xhr.statusText;
                         if (xhr.status >= 500) {
                             error = httpStatus;
                         }
                     }
 
                     if (error === null) {
                         error = errorMessage.error || errorMessage || httpStatus;
                     }
 
                     $(file.previewElement).find('.dz-error-message').html('ERROR: {0}'.format(error));
                 });
             }
             });
 
         $('#commit_btn').on('click', function(e) {
             e.preventDefault();
             var button = $(this);
             if (button.hasClass('clicked')) {
                 button.attr('disabled', true);
             } else {
                 button.addClass('clicked');
             }
 
             var files = myDropzone.getQueuedFiles();
             if (files.length === 0) {
                 alert("Missing files");
                 e.preventDefault();
             }
 
             $('.upload-form').hide();
             $('.file-upload-transaction-wrapper').show();
             myDropzone.processQueue();
 
         });
 
     });
 
 </script>
 </%def>