templates: use string content when possible

rhodecode/templates/admin/gists/gist_show.mako

@@ -1,112 +1,112 b''
 <%inherit file="/base/base.mako"/>
 <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
 
 <%def name="robots()">
     %if c.gist.gist_type != 'public':
       <meta name="robots" content="noindex, nofollow">
     %else:
       ${parent.robots()}
     %endif
 </%def>
 
 <%def name="title()">
     ${_('Gist')} &middot; ${c.gist.gist_access_id}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${_('Gist')} &middot; ${c.gist.gist_access_id}
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='gists')}
 </%def>
 
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
 
     <div class="table">
         <div id="files_data">
             <div id="codeblock" class="codeblock">
                 <div class="code-header">
                     <div class="gist_url">
                         <div class="pull-left">
                             <code>
                             ${dt.gist_type(c.gist.gist_type)}
                             <span class="tag disabled">${c.gist.gist_access_id}</span>
                             ${c.gist.gist_url()} <span class="icon-clipboard clipboard-action" data-clipboard-text="${c.gist.gist_url()}" title="${_('Copy the url')}"></span>
                             </code>
                         </div>
 
                         <div class="pull-right buttons">
                           ## only owner should see that
                           <a href="#copySource" onclick="return false;" class="btn btn-mini icon-clipboard no-grey clipboard-action" data-clipboard-text="${c.files[0].content}">${_('Copy content')}</a>
 
                           %if c.is_super_admin or c.gist.gist_owner == c.rhodecode_user.user_id:
                           ${h.link_to(_('Edit'), h.route_path('gist_edit', gist_id=c.gist.gist_access_id), class_="btn btn-mini")}
                           %endif
                           ${h.link_to(_('Show as Raw'), h.route_path('gist_show_formatted', gist_id=c.gist.gist_access_id, revision='tip', format='raw'), class_="btn btn-mini")}
 
                           %if c.is_super_admin or c.gist.gist_owner == c.rhodecode_user.user_id:
                           <div class="pull-right remove_gist">
                             ${h.secure_form(h.route_path('gist_delete', gist_id=c.gist.gist_access_id), request=request)}
                                 <input class="btn btn-mini btn-danger" id="remove_gist" name="remove_gist"
                                        onclick="submitConfirm(event, this, _gettext('Confirm to delete this gist'), _gettext('Delete'), '${c.gist.gist_access_id}')"
                                        type="submit" value="${_('Delete')}"
                                 >
                             ${h.end_form()}
                           </div>
                           %endif
                         </div>
                     </div>
 
                     <div class="gist-desc">
                         <code>${c.gist.gist_description}</code>
                     </div>
 
                     <div class="author">
                         <div title="${h.tooltip(c.file_last_commit.author)}">
                           ${self.gravatar_with_user(c.file_last_commit.author, 16, tooltip=True)} - ${_('created')} ${h.age_component(c.file_last_commit.date)},
                           ${_('expires')}:
                            %if c.gist.gist_expires == -1:
                              ${_('never')}
                            %else:
                               ${h.age_component(h.time_to_utcdatetime(c.gist.gist_expires))}
                           %endif
                           </span>
                         </div>
 
                     </div>
                     <div class="commit">${h.urlify_commit_message(c.file_last_commit.message, None)}</div>
                 </div>
 
                ## iterate over the files
                % for gist_file in c.files:
                 <% renderer = c.render and h.renderer_from_filename(gist_file.path, exclude=['.txt', '.TXT'])%>
                 <!--
                 <div id="${h.FID('G', gist_file.path)}" class="stats" >
                     <a href="${c.gist.gist_url()}">¶</a>
                     <b >${gist_file.path}</b>
                     <div>
                        ${h.link_to(_('Show as raw'), h.route_path('gist_show_formatted_path', gist_id=c.gist.gist_access_id, revision=gist_file.commit.raw_id, format='raw', f_path=gist_file.path), class_="btn btn-mini")}
                     </div>
                 </div>
                 -->
                 <div class="code-body textarea text-area editor">
                     %if renderer:
-                        ${h.render(gist_file.content, renderer=renderer)}
+                        ${h.render(gist_file.str_content, renderer=renderer)}
                     %else:
                         ${h.pygmentize(gist_file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
                     %endif
                 </div>
                %endfor
             </div>
         </div>
     </div>
 
 
 </div>
 </%def>

rhodecode/templates/changeset/diff_block.mako

@@ -1,64 +1,63 b''
-## -*- coding: utf-8 -*-
 ##usage:
 ## <%namespace name="diff_block" file="/changeset/diff_block.mako"/>
 ## ${diff_block.diff_block_changeset_table(change)}
 ##
 <%def name="changeset_message()">
     <h5>${_('The requested commit is too big and content was truncated.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a></h5>
 </%def>
 <%def name="file_message()">
     <h5>${_('The requested file is too big and its content is not shown.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a></h5>
 </%def>
 
 <%def name="diff_block_changeset_table(change)">
  <div class="diff-container" id="${'diff-container-%s' % (id(change))}">
   %for FID,(cs1, cs2, change, filenode_path, diff, stats, file_data) in change.items():
     <div id="${h.FID('',filenode_path)}_target" ></div>
     <div id="${h.FID('',filenode_path)}" class="diffblock margined comm">
       <div class="code-body">
-        <div class="full_f_path" path="${h.safe_unicode(filenode_path)}" style="display: none"></div>
+        <div class="full_f_path" path="${h.safe_str(filenode_path)}" style="display: none"></div>
         ${diff|n}
           % if file_data["is_limited_diff"]:
             % if file_data["exceeds_limit"]:
                 ${self.file_message()}
               % else:
                 <h5>${_('Diff was truncated. File content available only in full diff.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a></h5>
             % endif
           % endif
       </div>
     </div>
   %endfor
   </div>
 </%def>
 
 <%def name="diff_block_simple(change)">
  <div class="diff-container" id="${'diff-container-%s' % (id(change))}">
   %for op,filenode_path,diff,file_data in change:
     <div id="${h.FID('',filenode_path)}_target" ></div>
     <div id="${h.FID('',filenode_path)}" class="diffblock margined comm" >
         <div class="code-body">
-            <div class="full_f_path" path="${h.safe_unicode(filenode_path)}" style="display: none;"></div>
+            <div class="full_f_path" path="${h.safe_str(filenode_path)}" style="display: none;"></div>
             ${diff|n}
            % if file_data["is_limited_diff"]:
               % if file_data["exceeds_limit"]:
                   ${self.file_message()}
                 % else:
                   <h5>${_('Diff was truncated. File content available only in full diff.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a></h5>
                 % endif
               % endif
         </div>
     </div>
   %endfor
   </div>
 </%def>
 
 
 <%def name="diff_summary_text(changed_files, lines_added, lines_deleted, limited_diff=False)">
     % if limited_diff:
         ${_ungettext('%(num)s file changed', '%(num)s files changed', changed_files) % {'num': changed_files}}
     % else:
         ${_ungettext('%(num)s file changed: %(linesadd)s inserted, ''%(linesdel)s deleted',
                     '%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted', changed_files) % {'num': changed_files, 'linesadd': lines_added, 'linesdel': lines_deleted}}
     %endif
 </%def>
 

rhodecode/templates/files/files_edit.mako

@@ -1,128 +1,128 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>
         % 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>
                     ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True, hide_last_item=True, copy_path_icon=False)} /
                 </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>
 
             <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>
+                    <textarea id="editor" name="content" >${h.escape(c.file.str_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);
 
     var commit_id =  "${c.commit.raw_id}";
     var f_path = "${c.f_path}";
 
     checkFileHead($('#eform'), commit_id, f_path, 'edit')
 
 });
 
 
 </script>
 </%def>

rhodecode/templates/files/files_source.mako

@@ -1,189 +1,189 b''
 <%namespace name="sourceblock" file="/codeblocks/source.mako"/>
 
 <%
     at_ref = request.GET.get('at')
     if at_ref:
         query={'at': at_ref}
         default_commit_id = at_ref or c.rhodecode_db_repo.landing_ref_name
     else:
         query=None
         default_commit_id = c.commit.raw_id
 %>
 
 <div id="codeblock" class="browserblock">
     <div class="browser-header">
         <div class="browser-nav">
             <div class="pull-left">
                 ## loads the history for a file
                 ${h.hidden('file_refs_filter')}
             </div>
 
             <div class="pull-right">
 
             ## Download
             % if c.lf_node:
               <a class="btn btn-default" href="${h.route_path('repo_file_download',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path, _query=dict(lf=1))}">
               ${_('Download largefile')}
               </a>
             % else:
               <a  class="btn btn-default" href="${h.route_path('repo_file_download',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
               ${_('Download file')}
               </a>
             % endif
 
             %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
               ## on branch head, can edit files
               %if c.on_branch_head and c.branch_or_raw_id:
                   ## binary files are delete only
                   % if c.file.is_binary:
                     ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing binary files not allowed'))}
                     ${h.link_to(_('Delete'), h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _query=query),class_="btn btn-danger")}
                   % else:
                     <a  class="btn btn-default" href="${h.route_path('repo_files_edit_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _query=query)}">
                         ${_('Edit on branch: ')}<code>${c.branch_name}</code>
                     </a>
 
                     <a class="btn btn-danger" href="${h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _query=query)}">
                         ${_('Delete')}
                     </a>
                   % endif
               ## not on head, forbid all
               % else:
                ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing files allowed only when on branch head commit'))}
                ${h.link_to(_('Delete'), '#Delete', class_="btn btn-default btn-danger disabled tooltip", title=_('Deleting files allowed only when on branch head commit'))}
               % endif
             %endif
 
           </div>
         </div>
         <div id="file_history_container"></div>
 
         </div>
     </div>
 
     <div class="codeblock">
       <div class=" codeblock-header">
         <div class="file-filename">
             <i class="icon-file"></i> ${c.file.name}
         </div>
 
         <div class="file-stats">
 
           <div class="stats-info">
             <span class="stats-first-item">
                 % if c.file_size_too_big:
                     0 ${(_('lines'))}
                 % else:
                     ${c.file.lines()[0]} ${_ungettext('line', 'lines', c.file.lines()[0])}
                 % endif
             </span>
 
             <span> | ${h.format_byte_size_binary(c.file.size)}</span>
             % if c.lf_node:
             <span title="${_('This file is a pointer to large binary file')}"> | ${_('LargeFile')} ${h.format_byte_size_binary(c.lf_node.size)} </span>
             % endif
             <span>
                 | ${c.file.mimetype}
             </span>
 
             % if not c.file_size_too_big:
             <span> |
                 ${h.get_lexer_for_filenode(c.file).__class__.__name__}
             </span>
             % endif
 
           </div>
         </div>
       </div>
 
       <div class="path clear-fix">
           <div class="pull-left">
             ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'))}
           </div>
 
           <div class="pull-right stats">
                 <a id="file_history_overview" href="#loadHistory">
                     ${_('History')}
                 </a>
                  |
                 %if c.annotate:
                   ${h.link_to(_('Source'), h.route_path('repo_files', repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
                 %else:
                   ${h.link_to(_('Annotation'), h.route_path('repo_files:annotated',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
                 %endif
                  | ${h.link_to(_('Raw'), h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
                  % if not c.file.is_binary:
                  |<a href="#copySource" onclick="return false;" class="no-grey clipboard-action" data-clipboard-text="${c.file.content}">${_('Copy content')}</a>
                  |<a href="#copyPermaLink" onclick="return false;" class="no-grey clipboard-action" data-clipboard-text="${h.route_url('repo_files', repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">${_('Copy permalink')}</a>
                  % endif
 
           </div>
           <div class="clear-fix"></div>
       </div>
 
       <div class="code-body clear-fix ">
         %if c.file.is_binary:
              <% rendered_binary = h.render_binary(c.repo_name, c.file)%>
              % if rendered_binary:
                  <div class="text-center">
                  ${rendered_binary}
                  </div>
              % else:
                  <div>
                   ${_('Binary file ({})').format(c.file.mimetype)}
                  </div>
              % endif
         %else:
             % if c.file_size_too_big:
                 ${_('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))}
             % else:
                 %if c.renderer and not c.annotate:
                     ## pick relative url based on renderer
                     <%
                         relative_urls = {
                             'raw': h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path),
                             'standard': h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path),
                         }
                     %>
-                    ${h.render(c.file.content, renderer=c.renderer, relative_urls=relative_urls)}
+                    ${h.render(c.file.str_content, renderer=c.renderer, relative_urls=relative_urls)}
                 %else:
                     <table class="cb codehilite">
                     %if c.annotate:
                       <% color_hasher = h.color_hasher() %>
                       %for annotation, lines in c.annotated_lines:
                         ${sourceblock.render_annotation_lines(annotation, lines, color_hasher)}
                       %endfor
                     %else:
                       %for line_num, tokens in enumerate(c.lines, 1):
                         ${sourceblock.render_line(line_num, tokens)}
                       %endfor
                     %endif
                     </table>
                 %endif
             % endif
         %endif
     </div>
 
     </div>
 
 <script type="text/javascript">
 % if request.GET.get('mark'):
 
 $(function(){
   $(".codehilite").mark(
       "${request.GET.get('mark')}",
           {
               "className": 'match',
               "accuracy": "complementary",
               "ignorePunctuation": ":._(){}[]!'+=".split(""),
               "each": function(el) {
                   // and also highlight lines !
                   $($(el).closest('tr')).find('td.cb-lineno').addClass('cb-line-selected');
               }
           }
   );
 
 });
 % endif
 </script>