html: fixed found syntax problems

rhodecode/templates/admin/auth/auth_settings.mako

@@ -1,116 +1,116 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('Authentication Settings')}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${_('Authentication Plugins')}
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
 
 <%def name="main()">
 
 <div class="box">
   <div class="title">
     ${self.breadcrumbs()}
   </div>
 
   <div class='sidebar-col-wrapper'>
 
     <div class="sidebar">
         <ul class="nav nav-pills nav-stacked">
           % for item in resource.get_root().get_nav_list():
             <li ${'class=active' if item == resource else ''}>
               <a href="${request.resource_path(item, route_name='auth_home')}">${item.display_name}</a>
             </li>
           % endfor
         </ul>
     </div>
 
     <div class="main-content-full-width">
       ${h.secure_form(request.resource_path(resource, route_name='auth_home'))}
       <div class="form">
 
         <div class="panel panel-default">
 
           <div class="panel-heading">
             <h3 class="panel-title">${_("Enabled and Available Plugins")}</h3>
           </div>
 
           <div class="fields panel-body">
 
             <div class="field">
               <div class="label">${_("Enabled Plugins")}</div>
               <div class="textarea text-area editor">
                   ${h.textarea('auth_plugins',cols=23,rows=5,class_="medium")}
               </div>
               <p class="help-block">
               ${_('Add a list of plugins, separated by commas. '
                   'The order of the plugins is also the order in which '
                   'RhodeCode Enterprise will try to authenticate a user.')}
               </p>
             </div>
 
             <div class="field">
               <div class="label">${_('Available Built-in Plugins')}</div>
               <ul class="auth_plugins">
               %for plugin in available_plugins:
                   <li>
                     <div class="auth_buttons">
                         <span plugin_id="${plugin.get_id()}" class="toggle-plugin btn ${'btn-success' if plugin.get_id() in enabled_plugins else ''}">
                           ${_('enabled') if plugin.get_id() in enabled_plugins else _('disabled')}
                         </span>
                         ${plugin.get_display_name()} (${plugin.get_id()})
                     </div>
                   </li>
               %endfor
               </ul>
             </div>
 
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
             </div>
           </div>
         </div>
       </div>
       ${h.end_form()}
     </div>
   </div>
 </div>
 
 <script>
   $('.toggle-plugin').click(function(e){
     var auth_plugins_input = $('#auth_plugins');
     var notEmpty = function(element, index, array) {
       return (element != "");
-    }
+    };
     var elems = auth_plugins_input.val().split(',').filter(notEmpty);
     var cur_button = e.currentTarget;
     var plugin_id = $(cur_button).attr('plugin_id');
     if($(cur_button).hasClass('btn-success')){
       elems.splice(elems.indexOf(plugin_id), 1);
       auth_plugins_input.val(elems.join(','));
       $(cur_button).removeClass('btn-success');
       cur_button.innerHTML = _gettext('disabled');
     }
     else{
       if(elems.indexOf(plugin_id) == -1){
         elems.push(plugin_id);
       }
       auth_plugins_input.val(elems.join(','));
       $(cur_button).addClass('btn-success');
       cur_button.innerHTML = _gettext('enabled');
     }
   });
 </script>
 </%def>

rhodecode/templates/admin/integrations/list.mako

@@ -1,252 +1,252 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
 <%def name="breadcrumbs_links()">
   %if c.repo:
     ${h.link_to('Settings',h.url('edit_repo', repo_name=c.repo.repo_name))}
   %elif c.repo_group:
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repository Groups'),h.url('repo_groups'))}
     &raquo;
     ${h.link_to(c.repo_group.group_name,h.url('edit_repo_group', group_name=c.repo_group.group_name))}
   %else:
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Settings'),h.url('admin_settings'))}
   %endif
   %if current_IntegrationType:
     &raquo;
     %if c.repo:
     ${h.link_to(_('Integrations'),
       request.route_url(route_name='repo_integrations_home',
                         repo_name=c.repo.repo_name))}
     %elif c.repo_group:
     ${h.link_to(_('Integrations'),
       request.route_url(route_name='repo_group_integrations_home',
                         repo_group_name=c.repo_group.group_name))}
     %else:
     ${h.link_to(_('Integrations'),
       request.route_url(route_name='global_integrations_home'))}
     %endif
     &raquo;
     ${current_IntegrationType.display_name}
   %else:
     &raquo;
     ${_('Integrations')}
   %endif
 </%def>
 
 <div class="panel panel-default">
   <div class="panel-heading">
     <h3 class="panel-title">
       %if c.repo:
         ${_('Current Integrations for Repository: {repo_name}').format(repo_name=c.repo.repo_name)}
       %elif c.repo_group:
         ${_('Current Integrations for repository group: {repo_group_name}').format(repo_group_name=c.repo_group.group_name)}
       %else:
           ${_('Current Integrations')}
       %endif
       </h3>
   </div>
   <div class="panel-body">
     <%
     if c.repo:
       home_url = request.route_path('repo_integrations_home',
                                     repo_name=c.repo.repo_name)
     elif c.repo_group:
       home_url = request.route_path('repo_group_integrations_home',
                                     repo_group_name=c.repo_group.group_name)
     else:
       home_url = request.route_path('global_integrations_home')
     %>
 
     <a href="${home_url}" class="btn ${not current_IntegrationType and 'btn-primary' or ''}">${_('All')}</a>
 
     %for integration_key, IntegrationType in available_integrations.items():
         <%
         if c.repo:
           list_url = request.route_path('repo_integrations_list',
                                         repo_name=c.repo.repo_name,
                                         integration=integration_key)
         elif c.repo_group:
           list_url = request.route_path('repo_group_integrations_list',
                                         repo_group_name=c.repo_group.group_name,
                                         integration=integration_key)
         else:
           list_url = request.route_path('global_integrations_list',
                                        integration=integration_key)
         %>
       <a href="${list_url}"
          class="btn ${current_IntegrationType and integration_key == current_IntegrationType.key and 'btn-primary' or ''}">
         ${IntegrationType.display_name}
       </a>
     %endfor
 
     <%
     if c.repo:
       create_url = h.route_path('repo_integrations_new', repo_name=c.repo.repo_name)
     elif c.repo_group:
       create_url = h.route_path('repo_group_integrations_new', repo_group_name=c.repo_group.group_name)
     else:
       create_url = h.route_path('global_integrations_new')
     %>
     <p class="pull-right">
       <a href="${create_url}" class="btn btn-small btn-success">${_(u'Create new integration')}</a>
     </p>
 
     <table class="rctable integrations">
       <thead>
         <tr>
             <th><a href="?sort=enabled:${rev_sort_dir}">${_('Enabled')}</a></th>
             <th><a href="?sort=name:${rev_sort_dir}">${_('Name')}</a></th>
             <th colspan="2"><a href="?sort=integration_type:${rev_sort_dir}">${_('Type')}</a></th>
             <th><a href="?sort=scope:${rev_sort_dir}">${_('Scope')}</a></th>
             <th>${_('Actions')}</th>
             <th></th>
         </tr>
       </thead>
       <tbody>
   %if not integrations_list:
         <tr>
           <td colspan="7">
           <% integration_type = current_IntegrationType and current_IntegrationType.display_name or '' %>
             %if c.repo:
               ${_('No {type} integrations for repo {repo} exist yet.').format(type=integration_type, repo=c.repo.repo_name)}
             %elif c.repo_group:
               ${_('No {type} integrations for repogroup {repogroup} exist yet.').format(type=integration_type, repogroup=c.repo_group.group_name)}
             %else:
               ${_('No {type} integrations exist yet.').format(type=integration_type)}
             %endif
 
             %if current_IntegrationType:
             <%
             if c.repo:
               create_url = h.route_path('repo_integrations_create', repo_name=c.repo.repo_name, integration=current_IntegrationType.key)
             elif c.repo_group:
               create_url = h.route_path('repo_group_integrations_create', repo_group_name=c.repo_group.group_name, integration=current_IntegrationType.key)
             else:
               create_url = h.route_path('global_integrations_create', integration=current_IntegrationType.key)
             %>
             %endif
 
             <a href="${create_url}">${_(u'Create one')}</a>
           </td>
         </tr>
   %endif
   %for IntegrationType, integration in integrations_list:
         <tr id="integration_${integration.integration_id}">
           <td class="td-enabled">
             %if integration.enabled:
             <div class="flag_status approved pull-left"></div>
             %else:
             <div class="flag_status rejected pull-left"></div>
             %endif
           </td>
           <td class="td-description">
             ${integration.name}
           </td>
           <td class="td-icon">
             %if integration.integration_type in available_integrations:
             <div class="integration-icon">
               ${available_integrations[integration.integration_type].icon|n}
             </div>
             %else:
               ?
             %endif
           </td>
           <td class="td-type">
             ${integration.integration_type}
           </td>
           <td class="td-scope">
             %if integration.repo:
             <a href="${h.url('summary_home', repo_name=integration.repo.repo_name)}">
               ${_('repo')}:${integration.repo.repo_name}
             </a>
             %elif integration.repo_group:
             <a href="${h.url('repo_group_home', group_name=integration.repo_group.group_name)}">
               ${_('repogroup')}:${integration.repo_group.group_name}
               %if integration.child_repos_only:
               ${_('child repos only')}
               %else:
               ${_('cascade to all')}
               %endif
             </a>
             %else:
               %if integration.child_repos_only:
               ${_('top level repos only')}
               %else:
               ${_('global')}
               %endif
           </td>
           %endif
           <td class="td-action">
           %if not IntegrationType:
           ${_('unknown integration')}
           %else:
             <%
             if c.repo:
               edit_url = request.route_path('repo_integrations_edit',
                                             repo_name=c.repo.repo_name,
                                             integration=integration.integration_type,
                                             integration_id=integration.integration_id)
             elif c.repo_group:
               edit_url = request.route_path('repo_group_integrations_edit',
                                             repo_group_name=c.repo_group.group_name,
                                             integration=integration.integration_type,
                                             integration_id=integration.integration_id)
             else:
               edit_url = request.route_path('global_integrations_edit',
                                            integration=integration.integration_type,
                                            integration_id=integration.integration_id)
             %>
             <div class="grid_edit">
               <a href="${edit_url}">${_('Edit')}</a>
             </div>
             <div class="grid_delete">
               <a href="${edit_url}"
                  class="btn btn-link btn-danger delete_integration_entry"
                  data-desc="${integration.name}"
                  data-uid="${integration.integration_id}">
                   ${_('Delete')}
               </a>
             </div>
           %endif
           </td>
         </tr>
     %endfor
       <tr id="last-row"></tr>
       </tbody>
     </table>
     <div class="integrations-paginator">
       <div class="pagination-wh pagination-left">
       ${integrations_list.pager('$link_previous ~2~ $link_next')}
       </div>
     </div>
   </div>
 </div>
 <script type="text/javascript">
   var delete_integration = function(entry) {
     if (confirm("Confirm to remove this integration: "+$(entry).data('desc'))) {
       var request = $.ajax({
         type: "POST",
         url: $(entry).attr('href'),
         data: {
           'delete': 'delete',
           'csrf_token': CSRF_TOKEN
         },
         success: function(){
           location.reload();
         },
         error: function(data, textStatus, errorThrown){
           alert("Error while deleting entry.\nError code {0} ({1}). URL: {2}".format(data.status,data.statusText,$(entry)[0].url));
         }
       });
     };
-  }
+  };
 
   $('.delete_integration_entry').on('click', function(e){
     e.preventDefault();
     delete_integration(this);
   });
 </script>
  No newline at end of file

rhodecode/templates/admin/notifications/notifications.mako

@@ -1,78 +1,78 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('My Notifications')} ${c.rhodecode_user.username}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${_('My Notifications')}
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
 
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         ##<ul class="links">
         ##    <li>
         ##      <span ><a href="#">${_('Compose message')}</a></span>
         ##    </li>
         ##</ul>
 
       <div class="notifications_buttons">
       <span id='all' class="action-link first ${'active' if c.current_filter=='all' else ''}"><a href="${h.url.current()}">${_('All')}</a></span>
       <span id='comment' class="action-link ${'active' if c.current_filter=='comment' else ''}"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span>
       <span id='pull_request' class="action-link last ${'active' if c.current_filter=='pull_request' else ''}"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull Requests')}</a></span>
       
       %if c.notifications:
 
       <span id='mark_all_read' class="btn btn-default">${_('Mark all as read')}</span>
 
       %endif
       </div>
     </div>
   <div id='notification_data' class='main-content-full'>
     <%include file='notifications_data.mako'/>
   </div>
 </div>
 <script type="text/javascript">
 var url_action = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
 var run = function(){
   $('#notification_data').on('click','.delete-notification',function(e){
     var notification_id = e.currentTarget.id;
     deleteNotification(url_action,notification_id)
-  })
+  });
   $('#notification_data').on('click','.read-notification',function(e){
     var notification_id = e.currentTarget.id;
     readNotification(url_action,notification_id)
   })
-}
+};
 run();
 $('#mark_all_read').on('click',function(e){
     //set notifications as read
     var url = "${h.url('notifications_mark_all_read', **request.GET.mixed())}";
     $.post(url, {'csrf_token': CSRF_TOKEN}).
       done(function(data){
           // hide notifications counter
           $('#quick_login_link > .menu_link_notifications').hide();
           $('#notification_data').html(data);
         })
         .fail(function(data, textStatus, errorThrown){
             alert("Error while saving notifications.\nError code {0} ({1}). URL: {2}".format(data.status,data.statusText,$(this)[0].url));
         });
-})
+});
 
 var current_filter = $("${c.current_filter}");
 if (current_filter.length){
     current_filter.addClass('active');
 }
 </script>
 </%def>

rhodecode/templates/admin/settings/settings_global.mako

@@ -1,296 +1,295 b''
 ${h.secure_form(url('admin_settings_global'), method='post')}
 
 <div class="panel panel-default">
     <div class="panel-heading" id="branding-options">
         <h3 class="panel-title">${_('Branding')} <a class="permalink" href="#branding-options"> ¶</a></h3>
     </div>
     <div class="panel-body">
         <div class="label">
             <label for="rhodecode_title">${_('Title')}</label>
         </div>
         <div class="field input">
             ${h.text('rhodecode_title',size=60)}
         </div>
         <div class="field">
             <span class="help-block">
                 ${_('Set a custom title for your RhodeCode instance (limited to 40 characters).')}
             </span>
         </div>
         <div class="label">
             <label for="rhodecode_realm">${_('HTTP[S] authentication realm')}</label>
         </div>
         <div class="field input">
             ${h.text('rhodecode_realm',size=60)}
         </div>
         <div class="field">
             <span class="help-block">
                 ${_('Set a custom text that is shown as authentication message to clients trying to connect.')}
             </span>
         </div>
     </div>
 </div>
 
 
 <div class="panel panel-default">
     <div class="panel-heading" id="personal-group-options">
         <h3 class="panel-title">${_('Personal Repository Group')} <a class="permalink" href="#personal-group-options"> ¶</a></h3>
     </div>
     <div class="panel-body">
         <div class="checkbox">
             ${h.checkbox('rhodecode_create_personal_repo_group','True')}
             <label for="rhodecode_create_personal_repo_group">${_('Create Personal Repository Group')}</label>
         </div>
         <span class="help-block">
             ${_('Always create Personal Repository Groups for new users.')} <br/>
             ${_('When creating new users from add user form or API you can still turn this off via a checkbox or flag')}
         </span>
 
         <div class="label">
             <label for="rhodecode_personal_repo_group_pattern">${_('Personal Repo Group Pattern')}</label>
         </div>
         <div class="field input">
             ${h.text('rhodecode_personal_repo_group_pattern',size=60, placeholder=c.personal_repo_group_default_pattern)}
         </div>
         <span class="help-block">
             ${_('Pattern used to create Personal Repository Groups. Prefix can be other existing repository group path[s], eg. /u/${username}')} <br/>
             ${_('Available variables are currently ${username} and ${user_id}')}
         </span>
     </div>
 </div>
 
 
 <div class="panel panel-default">
     <div class="panel-heading" id="captcha-options">
         <h3 class="panel-title">${_('Registration Captcha')} <a class="permalink" href="#captcha-options"> ¶</a></h3>
     </div>
     <div class="panel-body">
         <div class="label">
             <label for="rhodecode_captcha_public_key">${_('Google ReCaptcha public key')}</label>
         </div>
         <div class="field input">
             ${h.text('rhodecode_captcha_public_key',size=60)}
         </div>
         <div class="field">
             <span class="help-block">
                 ${_('Public key for reCaptcha system.')}
             </span>
         </div>
 
         <div class="label">
             <label for="rhodecode_captcha_private_key">${_('Google ReCaptcha private key')}</label>
         </div>
         <div class="field input">
             ${h.text('rhodecode_captcha_private_key',size=60)}
         </div>
         <div class="field">
             <span class="help-block">
                 ${_('Private key for reCaptcha system. Setting this value will enable captcha on registration')}
             </span>
         </div>
     </div>
 </div>
 
 <div class="panel panel-default">
     <div class="panel-heading" id="header-code-options">
         <h3 class="panel-title">${_('Custom Header Code')} <a class="permalink" href="#header-code-options"> ¶</a></h3>
     </div>
     <div class="panel-body">
         <div class="select">
             <select id="pre_template" >
                 <option value="#">${_('Templates...')}</option>
                 <option value="ga">Google Analytics</option>
                 <option value="clicky">Clicky</option>
                 <option value="server_announce">${_('Server Announcement')}</option>
                 <option value="flash_filtering">${_('Flash message filtering')}</option>
             </select>
         </div>
         <div style="padding: 10px 0px"></div>
         <div class="textarea text-area">
             ${h.textarea('rhodecode_pre_code',cols=23,rows=5,class_="medium")}
             <span class="help-block">${_('Custom js/css code added at the end of the <header/> tag.')}
                          ${_('Use <script/> or <css/> tags to define custom styling or scripting')}</span>
         </div>
     </div>
 </div>
 
 <div class="panel panel-default">
     <div class="panel-heading" id="footer-code-options">
         <h3 class="panel-title">${_('Custom Footer Code')} <a class="permalink" href="#footer-code-options"> ¶</a></h3>
     </div>
     <div class="panel-body">
         <div class="select">
             <select id="post_template" >
                 <option value="#">${_('Templates...')}</option>
                 <option value="ga">Google Analytics</option>
                 <option value="clicky">Clicky</option>
                 <option value="server_announce">${_('Server Announcement')}</option>
             </select>
         </div>
         <div style="padding: 10px 0px"></div>
         <div class="textarea text-area">
             ${h.textarea('rhodecode_post_code',cols=23,rows=5, class_="medium")}
             <span class="help-block">${_('Custom js/css code added at the end of the <body> tag.')}
                         ${_('Use <script> or <css> tags to define custom styling or scripting')}</span>
         </div>
     </div>
 </div>
 
 <div class="buttons">
     ${h.submit('save',_('Save settings'),class_="btn")}
     ${h.reset('reset',_('Reset'),class_="btn")}
 </div>
 ${h.end_form()}
 
 
 
 ## TEMPLATES ##
 ###############
 
 <script id="ga_tmpl" type="text/x-template">
 <%text filter="h">
 <script>
  // Google Analytics
  // Put your Google Analytics code instead of _GACODE_
  var _gaq_code = '_GACODE_';
  var _gaq = _gaq || [];
  _gaq.push(['_setAccount', _gaq_code]);
  _gaq.push(['_trackPageview']);
 
  (function() {
   var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
   ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
   var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
  })();
 
  rhodecode_statechange_callback = function(url, data){
   // ANALYTICS callback on html5 history state changed
   // triggered by file browser, url is the new url,
   // data is extra info passed from the State object
   if (typeof window._gaq !== 'undefined') {
     _gaq.push(['_trackPageview', url]);
   }
  };
 </script>
 </%text>
 </script>
 
 
 
 <script id="clicky_tmpl" type="text/x-template">
 <%text filter="h">
 <script src="//static.getclicky.com/js" type="text/javascript"></script>
 <script type="text/javascript">
  // Clicky Analytics - should be used in the footer code section.
  // Put your Clicky code instead of _CLICKYCODE_ here,
  // and below in the <img> tag.
  var _cl_code = _CLICKYCODE_;
  try{clicky.init(_cl_code);}catch(e){}
 
  rhodecode_statechange_callback = function(url, data){
   // ANALYTICS callback on html5 history state changed
   // triggered by file browser, url is the new url,
   // data is extra info passed from the State object
   if (typeof window.clicky !== 'undefined') {
    clicky.log(url);
   }
 }
 </script>
 <noscript>
 // Put your clicky code in the src file.
 <p><img alt="Clicky" width="1" height="1"
         src="//in.getclicky.com/_CLICKYCODE_ns.gif" /></p>
 </noscript>
 </%text>
 </script>
 
 
 
 <script id="server_announce_tmpl" type='text/x-template'>
 <%text filter="h">
 <script>
 // Server announcement displayed on the top of the page.
 // This can be used to send a global maintainance messages or other
 // important messages to all users of the RhodeCode Enterprise system.
 
 $(document).ready(function(e){
 
  // EDIT - put your message below
  var message = "TYPE YOUR MESSAGE HERE";
 
  // EDIT - choose "info"/"warning"/"error"/"success"/"neutral" as appropriate
  var alert_level = "info";
 
  $("#body").prepend(
   ("<div id='server-announcement' class='"+alert_level+"'>_MSG_"+"</div>").replace("_MSG_", message)
  )
 })
 </script>
 </%text>
 </script>
 
 <script id="flash_filtering_tmpl" type='text/x-template'>
 <%text filter="h">
 <script>
     // This filters out some flash messages before they are presented to user
     // based on their contents. Could be used to filter out warnings/errors
     // of license messages
 
     var filteredMessages = [];
     for(var i =0; i< alertMessagePayloads.length; i++){
         if (typeof alertMessagePayloads[i].message.subdata.subtype !== 'undefined' &&
                 alertMessagePayloads[i].message.subdata.subtype.indexOf('rc_license') !== -1){
             continue
         }
         filteredMessages.push(alertMessagePayloads[i]);
     }
     alertMessagePayloads = filteredMessages;
 </script>
 </%text>
 </script>
 
 <script>
 var pre_cm = initCodeMirror('rhodecode_pre_code', '', false);
 var pre_old = pre_cm.getValue();
 
 var post_cm = initCodeMirror('rhodecode_post_code', '', false);
 var post_old = post_cm.getValue();
 
 var get_data = function(type, old){
     var get_tmpl = function(tmpl_name){
         // unescape some stuff
-        var html = htmlEnDeCode.htmlDecode($('#'+tmpl_name+'_tmpl').html());
-        return html;
+        return htmlEnDeCode.htmlDecode($('#'+tmpl_name+'_tmpl').html());
     };
     return {
         '#': old,
         'ga': get_tmpl('ga'),
         'clicky': get_tmpl('clicky'),
         'server_announce': get_tmpl('server_announce'),
         'flash_filtering': get_tmpl('flash_filtering')
     }[type]
 };
 
 $('#pre_template').select2({
     containerCssClass: 'drop-menu',
     dropdownCssClass: 'drop-menu-dropdown',
     dropdownAutoWidth: true,
     minimumResultsForSearch: -1
 });
 
 $('#post_template').select2({
     containerCssClass: 'drop-menu',
     dropdownCssClass: 'drop-menu-dropdown',
     dropdownAutoWidth: true,
     minimumResultsForSearch: -1
 });
 
 $('#post_template').on('change', function(e){
     var sel = this.value;
     post_cm.setValue(get_data(sel, post_old))
 });
 
 $('#pre_template').on('change', function(e){
     var sel = this.value;
     pre_cm.setValue(get_data(sel, pre_old))
 })
 </script>

rhodecode/templates/admin/users/user_add.mako

@@ -1,147 +1,147 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('Add user')}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Users'),h.url('users'))}
     &raquo;
     ${_('Add User')}
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
 
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.secure_form(url('users'))}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="username">${_('Username')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('username', class_='medium')}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="password">${_('Password')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('password', class_='medium')}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="password_confirmation">${_('Password confirmation')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('password_confirmation',autocomplete="off", class_='medium')}
                     <div class="info-block">
                         <a id="generate_password" href="#">
                             <i class="icon-lock"></i> ${_('Generate password')}
                         </a>
                         <span id="generate_password_preview"></span>
                     </div>
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="firstname">${_('First Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('firstname', class_='medium')}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="lastname">${_('Last Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('lastname', class_='medium')}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="email">${_('Email')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('email', class_='medium')}
                     ${h.hidden('extern_name', c.default_extern_type)}
                     ${h.hidden('extern_type', c.default_extern_type)}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="active">${_('Active')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('active',value=True,checked='checked')}
                 </div>
              </div>
 
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="password_change">${_('Password change')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('password_change',value=True)}
                     <span class="help-block">${_('Force user to change his password on the next login')}</span>
                 </div>
              </div>
 
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="create_repo_group">${_('Add personal repository group')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('create_repo_group',value=True, checked=c.default_create_repo_group)}
                     <span class="help-block">
                         ${_('New group will be created at: `/%(path)s`') % {'path': c.personal_repo_group_name}}<br/>
                         ${_('User will be automatically set as this group owner.')}
                     </span>
                 </div>
              </div>
 
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>
     $(document).ready(function(){
         $('#username').focus();
 
         $('#generate_password').on('click', function(e){
-            var tmpl = "(${_('generated password:')} {0})"
-            var new_passwd = generatePassword(12)
-            $('#generate_password_preview').html(tmpl.format(new_passwd))
+            var tmpl = "(${_('generated password:')} {0})";
+            var new_passwd = generatePassword(12);
+            $('#generate_password_preview').html(tmpl.format(new_passwd));
             $('#password').val(new_passwd);
             $('#password_confirmation').val(new_passwd);
         })
     })
 </script>
 </%def>

rhodecode/templates/admin/users/user_edit_emails.mako

@@ -1,71 +1,71 b''
 <%namespace name="base" file="/base/base.mako"/>
 
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Additional Email Addresses')}</h3>
     </div>
     <div class="panel-body">
         <div class="emails_wrap">
           <table class="rctable account_emails useremails">
             <tr>
             <td class="td-user">
                 ${base.gravatar(c.user.email, 16)}
-                <span class="user email">${c.user.email}
+                <span class="user email">${c.user.email}</span>
             </td>
             <td class="td-tags">
                 <span class="tag">${_('Primary')}</span>
             </td>
             </tr>
             %if c.user_email_map:
                 %for em in c.user_email_map:
                   <tr>
                     <td class="td-user">
                         ${base.gravatar(em.email, 16)}
                         <span class="user email">${em.email}</span>
                     </td>
                     <td class="td-action">
                         ${h.secure_form(url('edit_user_emails', user_id=c.user.user_id),method='delete')}
                             ${h.hidden('del_email_id',em.email_id)}
                             <button class="btn btn-link btn-danger" type="submit"
                                     onclick="return confirm('${_('Confirm to delete this email: %s') % em.email}');">
                                 ${_('Delete')}
                             </button>
                         ${h.end_form()}
                     </td>
                   </tr>
                 %endfor
             %else:
             <tr class="noborder">
                 <td colspan="3">
                     <div class="td-email">
                         ${_('No additional emails specified')}
                     </div>
                 </td>
             </tr>
             %endif
           </table>
         </div>
 
         ${h.secure_form(url('edit_user_emails', user_id=c.user.user_id),method='put')}
         <div class="form">
             <!-- fields -->
             <div class="fields">
                  <div class="field">
                     <div class="label">
                         <label for="new_email">${_('New email address')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('new_email', class_='medium')}
                     </div>
                  </div>
                 <div class="buttons">
                   ${h.submit('save',_('Add'),class_="btn btn-small")}
                   ${h.reset('reset',_('Reset'),class_="btn btn-small")}
                 </div>
             </div>
         </div>
         ${h.end_form()}
     </div>
 </div>
 
 

rhodecode/templates/changelog/changelog.mako

@@ -1,418 +1,418 b''
 ## -*- coding: utf-8 -*-
 
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('%s Changelog') % c.repo_name}
     %if c.changelog_for_path:
       /${c.changelog_for_path}
     %endif
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
     %if c.changelog_for_path:
      /${c.changelog_for_path}
     %endif
       ${ungettext('showing %d out of %d commit', 'showing %d out of %d commits', c.showing_commits) % (c.showing_commits, c.total_cs)}
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='changelog')}
 </%def>
 
 <%def name="main()">
 
 <div class="box">
     <div class="title">
         ${self.repo_page_title(c.rhodecode_db_repo)}
         <ul class="links">
             <li>
                 <a href="#" class="btn btn-small" id="rev_range_container" style="display:none;"></a>
                 %if c.rhodecode_db_repo.fork:
                     <span>
                         <a  id="compare_fork_button"
                             title="${_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}"
                             class="btn btn-small"
                             href="${h.url('compare_url',
                                 repo_name=c.rhodecode_db_repo.fork.repo_name,
                                 source_ref_type=c.rhodecode_db_repo.landing_rev[0],
                                 source_ref=c.rhodecode_db_repo.landing_rev[1],
                                 target_repo=c.repo_name,
                                 target_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_rev[0],
                                 target_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_rev[1],
-                                merge=1)
-                            }">
+                                merge=1)}"
+                        >
                                 <i class="icon-loop"></i>
                                 ${_('Compare fork with Parent (%s)' % c.rhodecode_db_repo.fork.repo_name)}
                         </a>
                     </span>
                 %endif
 
                 ## pr open link
                 %if h.is_hg(c.rhodecode_repo) or h.is_git(c.rhodecode_repo):
                     <span>
                         <a id="open_new_pull_request" class="btn btn-small btn-success" href="${h.url('pullrequest_home',repo_name=c.repo_name)}">
                             ${_('Open new pull request')}
                         </a>
                     </span>
                 %endif
 
                 ## clear selection
                 <div title="${_('Clear selection')}" class="btn" id="rev_range_clear" style="display:none">
                     ${_('Clear selection')}
                 </div>
 
             </li>
         </ul>
     </div>
 
     % if c.pagination:
 
         <div class="graph-header">
             <div id="filter_changelog">
                 ${h.hidden('branch_filter')}
                  %if c.selected_name:
                  <div class="btn btn-default" id="clear_filter" >
                      ${_('Clear filter')}
                  </div>
                 %endif
             </div>
             ${self.breadcrumbs('breadcrumbs_light')}
         </div>
 
     <div id="graph">
         <div class="graph-col-wrapper">
           <div id="graph_nodes">
             <div id="graph_canvas" data-graph='${c.jsdata|n}'></div>
         </div>
         <div id="graph_content" class="main-content graph_full_width">
 
           <div class="table">
             <table id="changesets" class="rctable">
                 <tr>
                   ## checkbox
                   <th></th>
                   <th colspan="2"></th>
 
                   <th>${_('Commit')}</th>
                   ## commit message expand arrow
                   <th></th>
                   <th>${_('Commit Message')}</th>
 
                   <th>${_('Age')}</th>
                   <th>${_('Author')}</th>
 
                   <th>${_('Refs')}</th>
                 </tr>
               <tbody>
               %for cnt,commit in enumerate(c.pagination):
                 <tr id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">
 
                     <td class="td-checkbox">
                         ${h.checkbox(commit.raw_id,class_="commit-range")}
                     </td>
                     <td class="td-status">
 
                     %if c.statuses.get(commit.raw_id):
                       <div class="changeset-status-ico">
                         %if c.statuses.get(commit.raw_id)[2]:
                           <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (h.commit_status_lbl(c.statuses.get(commit.raw_id)[0]), c.statuses.get(commit.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(commit.raw_id)[3],pull_request_id=c.statuses.get(commit.raw_id)[2])}">
                             <div class="${'flag_status %s' % c.statuses.get(commit.raw_id)[0]}"></div>
                           </a>
                         %else:
                           <a class="tooltip" title="${_('Commit status: %s') % h.commit_status_lbl(c.statuses.get(commit.raw_id)[0])}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id,anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}">
                             <div class="${'flag_status %s' % c.statuses.get(commit.raw_id)[0]}"></div>
                           </a>
                         %endif
                       </div>
                     %else:
                         <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div>
                     %endif
                     </td>
                     <td class="td-comments comments-col">
                     %if c.comments.get(commit.raw_id):
                       <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id,anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}">
                           <i class="icon-comment"></i> ${len(c.comments[commit.raw_id])}
                       </a>
                     %endif
                     </td>
                     <td class="td-hash">
                     <code>
                       <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id)}">
                         <span class="commit_hash">${h.show_id(commit)}</span>
                       </a>
                     </code>
                     </td>
                     <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}">
                       <div class="show_more_col">
                         <i class="show_more"></i>&nbsp;
                       </div>
                     </td>
                     <td class="td-description mid">
                       <div class="log-container truncate-wrap">
                           <div class="message truncate" id="c-${commit.raw_id}">${h.urlify_commit_message(commit.message, c.repo_name)}</div>
                       </div>
                     </td>
 
                     <td class="td-time">
                         ${h.age_component(commit.date)}
                     </td>
                     <td class="td-user">
                         ${self.gravatar_with_user(commit.author)}
                     </td>
 
                     <td class="td-tags tags-col">
                     <div id="t-${commit.raw_id}">
                         ## branch
                         %if commit.branch:
                           <span class="branchtag tag" title="${_('Branch %s') % commit.branch}">
                              <a href="${h.url('changelog_home',repo_name=c.repo_name,branch=commit.branch)}"><i class="icon-code-fork"></i>${h.shorter(commit.branch)}</a>
                           </span>
                         %endif
 
                         ## bookmarks
                         %if h.is_hg(c.rhodecode_repo):
                             %for book in commit.bookmarks:
                                 <span class="tag booktag" title="${_('Bookmark %s') % book}">
                                   <a href="${h.url('files_home',repo_name=c.repo_name,revision=commit.raw_id)}"><i class="icon-bookmark"></i>${h.shorter(book)}</a>
                                 </span>
                             %endfor
                         %endif
 
                         ## tags
                         %for tag in commit.tags:
                           <span class="tagtag tag"  title="${_('Tag %s') % tag}">
                             <a href="${h.url('files_home',repo_name=c.repo_name,revision=commit.raw_id)}"><i class="icon-tag"></i>${h.shorter(tag)}</a>
                           </span>
                         %endfor
 
                       </div>
                     </td>
                 </tr>
               %endfor
               </tbody>
             </table>
           </div>
         </div>
     </div>
     <div class="pagination-wh pagination-left">
         ${c.pagination.pager('$link_previous ~2~ $link_next')}
     </div>
 
     <script type="text/javascript" src="${h.asset('js/jquery.commits-graph.js')}"></script>
     <script type="text/javascript">
         var cache = {};
         $(function(){
 
             // Create links to commit ranges when range checkboxes are selected
              var $commitCheckboxes = $('.commit-range');
             // cache elements
             var $commitRangeContainer = $('#rev_range_container');
             var $commitRangeClear = $('#rev_range_clear');
 
             var checkboxRangeSelector = function(e){
                 var selectedCheckboxes = [];
                 for (pos in $commitCheckboxes){
                     if($commitCheckboxes[pos].checked){
                         selectedCheckboxes.push($commitCheckboxes[pos]);
                     }
                 }
                 var open_new_pull_request = $('#open_new_pull_request');
                 if(open_new_pull_request){
                       var selected_changes = selectedCheckboxes.length;
                       if (selected_changes > 1 || selected_changes == 1 && templateContext.repo_type != 'hg') {
                           open_new_pull_request.hide();
                       } else {
                           if (selected_changes == 1) {
                              open_new_pull_request.html(_gettext('Open new pull request for selected commit'));
                           } else if (selected_changes == 0) {
                              open_new_pull_request.html(_gettext('Open new pull request'));
                           }
                           open_new_pull_request.show();
                       }
                 }
 
                 if (selectedCheckboxes.length>0){
                     var revEnd = selectedCheckboxes[0].name;
                     var revStart = selectedCheckboxes[selectedCheckboxes.length-1].name;
                     var url = pyroutes.url('changeset_home',
                             {'repo_name': '${c.repo_name}',
                              'revision': revStart+'...'+revEnd});
 
                     var link = (revStart == revEnd)
                         ? _gettext('Show selected commit __S')
                         : _gettext('Show selected commits __S ... __E');
 
                     link = link.replace('__S', revStart.substr(0,6));
                     link = link.replace('__E', revEnd.substr(0,6));
 
                     $commitRangeContainer
                         .attr('href',url)
                         .html(link)
                         .show();
 
                     $commitRangeClear.show();
                     var _url = pyroutes.url('pullrequest_home',
                                     {'repo_name': '${c.repo_name}',
                                      'commit': revEnd});
                     open_new_pull_request.attr('href', _url);
                     $('#compare_fork_button').hide();
                 } else {
                     $commitRangeContainer.hide();
                     $commitRangeClear.hide();
 
                     %if c.branch_name:
                         var _url = pyroutes.url('pullrequest_home',
                                         {'repo_name': '${c.repo_name}',
                                          'branch':'${c.branch_name}'});
                         open_new_pull_request.attr('href', _url);
                     %else:
                         var _url = pyroutes.url('pullrequest_home',
                                         {'repo_name': '${c.repo_name}'});
                         open_new_pull_request.attr('href', _url);
                     %endif
                     $('#compare_fork_button').show();
                 }
             };
 
             $commitCheckboxes.on('click', checkboxRangeSelector);
 
             $commitRangeClear.on('click',function(e) {
-                $commitCheckboxes.attr('checked', false)
+                $commitCheckboxes.attr('checked', false);
                 checkboxRangeSelector();
                 e.preventDefault();
             });
 
             // make sure the buttons are consistent when navigate back and forth
             checkboxRangeSelector();
 
 
             var msgs = $('.message');
             // get first element height
             var el = $('#graph_content .container')[0];
             var row_h = el.clientHeight;
             for (var i=0; i < msgs.length; i++) {
                 var m = msgs[i];
 
                 var h = m.clientHeight;
                 var pad = $(m).css('padding');
                 if (h > row_h) {
                     var offset = row_h - (h+12);
                     $(m.nextElementSibling).css('display','block');
                     $(m.nextElementSibling).css('margin-top',offset+'px');
                 }
             }
 
             $('.expand_commit').on('click',function(e){
               var target_expand = $(this);
               var cid = target_expand.data('commitId');
 
               if (target_expand.hasClass('open')){
                 $('#c-'+cid).css({'height': '1.5em', 'white-space': 'nowrap', 'text-overflow': 'ellipsis', 'overflow':'hidden'});
                 $('#t-'+cid).css({'height': 'auto', 'line-height': '.9em', 'text-overflow': 'ellipsis', 'overflow':'hidden', 'white-space':'nowrap'});
                 target_expand.removeClass('open');
               }
               else {
                 $('#c-'+cid).css({'height': 'auto', 'white-space': 'pre-line', 'text-overflow': 'initial', 'overflow':'visible'});
                 $('#t-'+cid).css({'height': 'auto', 'max-height': 'none', 'text-overflow': 'initial', 'overflow':'visible', 'white-space':'normal'});
                 target_expand.addClass('open');
               }
                 // redraw the graph
                 graph_options.height = $("#changesets").height();
                 $("canvas").remove();
                 $("[data-graph]").commits(graph_options);
             });
 
             $("#clear_filter").on("click", function() {
                 var filter = {'repo_name': '${c.repo_name}'};
                 window.location = pyroutes.url('changelog_home', filter);
             });
 
             $("#branch_filter").select2({
                 'dropdownAutoWidth': true,
                 'width': 'resolve',
                 'placeholder': "${c.selected_name or _('Filter changelog')}",
                 containerCssClass: "drop-menu",
                 dropdownCssClass: "drop-menu-dropdown",
                 query: function(query){
                   var key = 'cache';
                   var cached = cache[key] ;
                   if(cached) {
                     var data = {results: []};
                     //filter results
                     $.each(cached.results, function(){
                         var section = this.text;
                         var children = [];
                         $.each(this.children, function(){
                             if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){
                                 children.push({'id': this.id, 'text': this.text, 'type': this.type})
                             }
                         });
                         data.results.push({'text': section, 'children': children});
                         query.callback({results: data.results});
                     });
                   }else{
                       $.ajax({
                         url: pyroutes.url('repo_refs_changelog_data', {'repo_name': '${c.repo_name}'}),
                         data: {},
                         dataType: 'json',
                         type: 'GET',
                         success: function(data) {
                           cache[key] = data;
                           query.callback({results: data.results});
                         }
                       })
                   }
                 }
             });
 
             $('#branch_filter').on('change', function(e){
                 var data = $('#branch_filter').select2('data');
                 var selected = data.text;
                 var filter = {'repo_name': '${c.repo_name}'};
                 if(data.type == 'branch' || data.type == 'branch_closed'){
                     filter["branch"] = selected;
                 }
                 else if (data.type == 'book'){
                     filter["bookmark"] = selected;
                 }
                 window.location = pyroutes.url('changelog_home', filter);
             });
 
             // Determine max number of edges per row in graph
             var jsdata = $.parseJSON($("[data-graph]").attr('data-graph'));
             var edgeCount = 1;
             $.each(jsdata, function(i, item){
                 $.each(item[2], function(key, value) {
                     if (value[1] > edgeCount){
                         edgeCount = value[1];
                     }
                 });
             });
             var x_step = Math.min(18, Math.floor(86 / edgeCount));
             var graph_options = {
                 width: 100,
                 height: $("#changesets").height(),
                 x_step: x_step,
                 y_step: 42,
                 dotRadius: 3.5,
                 lineWidth: 2.5
             };
             $("[data-graph]").commits(graph_options);
 
         });
 
     </script>
     %else:
         ${_('There are no changes yet')}
     %endif
     </div>
 </div>
 </%def>

rhodecode/templates/changeset/changeset.mako

@@ -1,314 +1,314 b''
 ## -*- coding: utf-8 -*-
 
 <%inherit file="/base/base.mako"/>
 <%namespace name="diff_block" file="/changeset/diff_block.mako"/>
 
 <%def name="title()">
     ${_('%s Commit') % c.repo_name} - ${h.show_id(c.commit)}
     %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="menu_bar_subnav()">
     ${self.repo_menu(active='changelog')}
 </%def>
 
 <%def name="main()">
 <script>
     // TODO: marcink switch this to pyroutes
     AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";
     templateContext.commit_data.commit_id = "${c.commit.raw_id}";
 </script>
 <div class="box">
     <div class="title">
         ${self.repo_page_title(c.rhodecode_db_repo)}
     </div>
 
   <div id="changeset_compare_view_content"  class="summary changeset">
     <div class="summary-detail">
       <div class="summary-detail-header">
           <span class="breadcrumbs files_location">
             <h4>${_('Commit')}
               <code>
                 ${h.show_id(c.commit)}
               </code>
             </h4>
           </span>
           <span id="parent_link">
             <a href="#" title="${_('Parent Commit')}">${_('Parent')}</a>
           </span>
            |
           <span id="child_link">
             <a href="#" title="${_('Child Commit')}">${_('Child')}</a>
           </span>
       </div>
 
       <div class="fieldset">
         <div class="left-label">
           ${_('Description')}:
         </div>
         <div class="right-content">
           <div id="trimmed_message_box" class="commit">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
           <div id="message_expand" style="display:none;">
             ${_('Expand')}
           </div>
         </div>
       </div>
 
       %if c.statuses:
       <div class="fieldset">
         <div class="left-label">
           ${_('Commit status')}:
         </div>
         <div class="right-content">
           <div class="changeset-status-ico">
             <div class="${'flag_status %s' % c.statuses[0]} pull-left"></div>
           </div>
           <div title="${_('Commit status')}" class="changeset-status-lbl">[${h.commit_status_lbl(c.statuses[0])}]</div>
         </div>
       </div>
       %endif
 
       <div class="fieldset">
         <div class="left-label">
           ${_('References')}:
         </div>
         <div class="right-content">
           <div class="tags">
 
             %if c.commit.merge:
               <span class="mergetag tag">
                <i class="icon-merge"></i>${_('merge')}
               </span>
             %endif
 
             %if h.is_hg(c.rhodecode_repo):
               %for book in c.commit.bookmarks:
               <span class="booktag tag" title="${_('Bookmark %s') % book}">
                 <a href="${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id)}"><i class="icon-bookmark"></i>${h.shorter(book)}</a>
               </span>
               %endfor
             %endif
 
             %for tag in c.commit.tags:
              <span class="tagtag tag"  title="${_('Tag %s') % tag}">
               <a href="${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id)}"><i class="icon-tag"></i>${tag}</a>
              </span>
             %endfor
 
             %if c.commit.branch:
               <span class="branchtag tag" title="${_('Branch %s') % c.commit.branch}">
                 <a href="${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id)}"><i class="icon-code-fork"></i>${h.shorter(c.commit.branch)}</a>
               </span>
             %endif
             </div>
           </div>
         </div>
 
       <div class="fieldset">
         <div class="left-label">
           ${_('Diff options')}:
         </div>
         <div class="right-content">
             <div class="diff-actions">
               <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.commit.raw_id)}"  class="tooltip" title="${h.tooltip(_('Raw diff'))}">
                 ${_('Raw Diff')}
               </a>
                |
               <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.commit.raw_id)}"  class="tooltip" title="${h.tooltip(_('Patch diff'))}">
                 ${_('Patch Diff')}
               </a>
                |
               <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.commit.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}">
                 ${_('Download Diff')}
               </a>
                |
               ${c.ignorews_url(request.GET)}
                |
               ${c.context_url(request.GET)}
             </div>
         </div>
       </div>
 
       <div class="fieldset">
         <div class="left-label">
           ${_('Comments')}:
         </div>
         <div class="right-content">
             <div class="comments-number">
                 %if c.comments:
                     <a href="#comments">${ungettext("%d Commit comment", "%d Commit comments", len(c.comments)) % len(c.comments)}</a>,
                 %else:
                     ${ungettext("%d Commit comment", "%d Commit comments", len(c.comments)) % len(c.comments)}
                 %endif
                 %if c.inline_cnt:
                     <a href="#" onclick="return Rhodecode.comments.nextComment();" id="inline-comments-counter">${ungettext("%d Inline Comment", "%d Inline Comments", c.inline_cnt) % c.inline_cnt}</a>
                 %else:
                     ${ungettext("%d Inline Comment", "%d Inline Comments", c.inline_cnt) % c.inline_cnt}
                 %endif
             </div>
         </div>
       </div>
 
     </div> <!-- end summary-detail -->
 
     <div id="commit-stats" class="sidebar-right">
       <div class="summary-detail-header">
         <h4 class="item">
           ${_('Author')}
         </h4>
       </div>
         <div class="sidebar-right-content">
             ${self.gravatar_with_user(c.commit.author)}
             <div class="user-inline-data">- ${h.age_component(c.commit.date)}</div>
         </div>
     </div><!-- end sidebar -->
   </div> <!-- end summary -->
   <div class="cs_files">
     <%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
     ${cbdiffs.render_diffset_menu()}
     ${cbdiffs.render_diffset(
       c.changes[c.commit.raw_id], commit=c.commit, use_comments=True)}
   </div>
 
     ## template for inline comment form
     <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
 
     ## render comments
     ${comment.generate_comments()}
 
     ## main comment form and it status
     ${comment.comments(h.url('changeset_comment', repo_name=c.repo_name, revision=c.commit.raw_id),
                        h.commit_status(c.rhodecode_db_repo, c.commit.raw_id))}
 </div>
 
     ## FORM FOR MAKING JS ACTION AS CHANGESET COMMENTS
     <script type="text/javascript">
 
       $(document).ready(function() {
 
           var boxmax = parseInt($('#trimmed_message_box').css('max-height'), 10);
           if($('#trimmed_message_box').height() === boxmax){
               $('#message_expand').show();
           }
 
           $('#message_expand').on('click', function(e){
               $('#trimmed_message_box').css('max-height', 'none');
               $(this).hide();
           });
 
           $('.show-inline-comments').on('click', function(e){
               var boxid = $(this).attr('data-comment-id');
               var button = $(this);
 
               if(button.hasClass("comments-visible")) {
                 $('#{0} .inline-comments'.format(boxid)).each(function(index){
                   $(this).hide();
                 });
                 button.removeClass("comments-visible");
               } else {
                 $('#{0} .inline-comments'.format(boxid)).each(function(index){
                   $(this).show();
                 });
                 button.addClass("comments-visible");
               }
           });
 
 
           // next links
           $('#child_link').on('click', function(e){
               // fetch via ajax what is going to be the next link, if we have
               // >1 links show them to user to choose
               if(!$('#child_link').hasClass('disabled')){
                   $.ajax({
                     url: '${h.url('changeset_children',repo_name=c.repo_name, revision=c.commit.raw_id)}',
                     success: function(data) {
                       if(data.results.length === 0){
                           $('#child_link').html("${_('No Child Commits')}").addClass('disabled');
                       }
                       if(data.results.length === 1){
                           var commit = data.results[0];
                           window.location = pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': commit.raw_id});
                       }
                       else if(data.results.length === 2){
                           $('#child_link').addClass('disabled');
                           $('#child_link').addClass('double');
                           var _html = '';
                           _html +='<a title="__title__" href="__url__">__rev__</a> '
                                   .replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6)))
                                   .replace('__title__', data.results[0].message)
                                   .replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[0].raw_id}));
-                          _html +=' | '
+                          _html +=' | ';
                           _html +='<a title="__title__" href="__url__">__rev__</a> '
                                   .replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6)))
                                   .replace('__title__', data.results[1].message)
                                   .replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[1].raw_id}));
                           $('#child_link').html(_html);
                       }
                     }
                   });
                   e.preventDefault();
               }
           });
 
           // prev links
           $('#parent_link').on('click', function(e){
               // fetch via ajax what is going to be the next link, if we have
               // >1 links show them to user to choose
               if(!$('#parent_link').hasClass('disabled')){
                   $.ajax({
                     url: '${h.url("changeset_parents",repo_name=c.repo_name, revision=c.commit.raw_id)}',
                     success: function(data) {
                       if(data.results.length === 0){
                           $('#parent_link').html('${_('No Parent Commits')}').addClass('disabled');
                       }
                       if(data.results.length === 1){
                           var commit = data.results[0];
                           window.location = pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': commit.raw_id});
                       }
                       else if(data.results.length === 2){
                           $('#parent_link').addClass('disabled');
                           $('#parent_link').addClass('double');
                           var _html = '';
                           _html +='<a title="__title__" href="__url__">Parent __rev__</a>'
                                   .replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6)))
                                   .replace('__title__', data.results[0].message)
                                   .replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[0].raw_id}));
-                          _html +=' | '
+                          _html +=' | ';
                           _html +='<a title="__title__" href="__url__">Parent __rev__</a>'
                                   .replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6)))
                                   .replace('__title__', data.results[1].message)
                                   .replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[1].raw_id}));
                           $('#parent_link').html(_html);
                       }
                     }
                   });
                   e.preventDefault();
               }
           });
 
           if (location.hash) {
             var result = splitDelimitedHash(location.hash);
             var line = $('html').find(result.loc);
               if (line.length > 0){
                   offsetScroll(line, 70);
               }
           }
 
           // browse tree @ revision
           $('#files_link').on('click', function(e){
               window.location = '${h.url('files_home',repo_name=c.repo_name, revision=c.commit.raw_id, f_path='')}';
               e.preventDefault();
           });
 
           // inject comments into their proper positions
           var file_comments = $('.inline-comment-placeholder');
       })
     </script>
 
 </%def>

rhodecode/templates/changeset/changeset_file_comment.mako

@@ -1,264 +1,263 b''
 ## -*- coding: utf-8 -*-
 ## usage:
 ## <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
 ## ${comment.comment_block(comment)}
 ##
 <%namespace name="base" file="/base/base.mako"/>
 
 <%def name="comment_block(comment, inline=False)">
   <% outdated_at_ver = comment.outdated_at_version(getattr(c, 'at_version', None)) %>
 
   <div class="comment
              ${'comment-inline' if inline else ''}
              ${'comment-outdated' if outdated_at_ver else 'comment-current'}"
        id="comment-${comment.comment_id}"
        line="${comment.line_no}"
        data-comment-id="${comment.comment_id}"
        style="${'display: none;' if outdated_at_ver else ''}">
 
       <div class="meta">
           <div class="author">
               ${base.gravatar_with_user(comment.author.email, 16)}
           </div>
           <div class="date">
               ${h.age_component(comment.modified_at, time_is_local=True)}
           </div>
           <div class="status-change">
               % if comment.pull_request:
                   % if comment.outdated:
                       <a href="?version=${comment.pull_request_version_id}#comment-${comment.comment_id}">
                         ${_('Outdated comment from pull request version {}').format(comment.pull_request_version_id)}
                       </a>
                   % else:
                       <a href="${h.url('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}">
                           %if comment.status_change:
                               ${_('Vote on pull request #%s') % comment.pull_request.pull_request_id}:
                           %else:
                               ${_('Comment on pull request #%s') % comment.pull_request.pull_request_id}
                           %endif
                       </a>
                   % endif
               % else:
                   % if comment.status_change:
                       ${_('Status change on commit')}:
                   % else:
                       ${_('Comment on commit')}
                   % endif
               % endif
           </div>
           %if comment.status_change:
             <div class="${'flag_status %s' % comment.status_change[0].status}"></div>
             <div title="${_('Commit status')}" class="changeset-status-lbl">
                  ${comment.status_change[0].status_lbl}
             </div>
           %endif
           <a class="permalink" href="#comment-${comment.comment_id}"> &para;</a>
 
           <div class="comment-links-block">
             ## show delete comment if it's not a PR (regular comments) or it's PR that is not closed
             ## only super-admin, repo admin OR comment owner can delete, also hide delete if currently viewed comment is outdated
             %if not outdated_at_ver and (not comment.pull_request or (comment.pull_request and not comment.pull_request.is_closed())):
                ## permissions to delete
                %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or comment.author.user_id == c.rhodecode_user.user_id:
                   ## TODO: dan: add edit comment here
                   <a onclick="return Rhodecode.comments.deleteComment(this);" class="delete-comment"> ${_('Delete')}</a>
                %else:
                   <button class="btn-link" disabled="disabled"> ${_('Delete')}</button>
                %endif
             %else:
                <button class="btn-link" disabled="disabled"> ${_('Delete')}</button>
             %endif
 
             %if not outdated_at_ver:
                | <a onclick="return Rhodecode.comments.prevComment(this);" class="prev-comment"> ${_('Prev')}</a>
                | <a onclick="return Rhodecode.comments.nextComment(this);" class="next-comment"> ${_('Next')}</a>
             %endif
 
           </div>
       </div>
       <div class="text">
           ${comment.render(mentions=True)|n}
       </div>
 
   </div>
 </%def>
 ## generate main comments
 <%def name="generate_comments(include_pull_request=False, is_pull_request=False)">
   <div id="comments">
     %for comment in c.comments:
         <div id="comment-tr-${comment.comment_id}">
           ## only render comments that are not from pull request, or from
           ## pull request and a status change
           %if not comment.pull_request or (comment.pull_request and comment.status_change) or include_pull_request:
           ${comment_block(comment)}
           %endif
         </div>
     %endfor
     ## to anchor ajax comments
     <div id="injected_page_comments"></div>
   </div>
 </%def>
 
 ## MAIN COMMENT FORM
 <%def name="comments(post_url, cur_status, is_pull_request=False, is_compare=False, change_status=True, form_extras=None)">
 
 %if is_compare:
   <% form_id = "comments_form_compare" %>
 %else:
   <% form_id = "comments_form" %>
 %endif
 
 
 %if is_pull_request:
 <div class="pull-request-merge">
     %if c.allowed_to_merge:
     <div class="pull-request-wrap">
         <div class="pull-right">
           ${h.secure_form(url('pullrequest_merge', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), id='merge_pull_request_form')}
           <span data-role="merge-message">${c.pr_merge_msg} ${c.approval_msg if c.approval_msg else ''}</span>
           <% merge_disabled = ' disabled' if c.pr_merge_status is False else '' %>
           <input type="submit" id="merge_pull_request" value="${_('Merge Pull Request')}" class="btn${merge_disabled}"${merge_disabled}>
           ${h.end_form()}
         </div>
     </div>
     %else:
     <div class="pull-request-wrap">
         <div class="pull-right">
           <span>${c.pr_merge_msg} ${c.approval_msg if c.approval_msg else ''}</span>
         </div>
     </div>
     %endif
 </div>
 %endif
 <div class="comments">
     <%
       if is_pull_request:
         placeholder = _('Leave a comment on this Pull Request.')
       elif is_compare:
         placeholder = _('Leave a comment on all commits in this range.')
       else:
         placeholder = _('Leave a comment on this Commit.')
     %>
     % if c.rhodecode_user.username != h.DEFAULT_USER:
     <div class="comment-form ac">
         ${h.secure_form(post_url, id_=form_id)}
         <div class="comment-area">
             <div class="comment-area-header">
                 <ul class="nav-links clearfix">
                     <li class="active">
                         <a href="#edit-btn" tabindex="-1" id="edit-btn">${_('Write')}</a>
                     </li>
                     <li class="">
                         <a href="#preview-btn" tabindex="-1" id="preview-btn">${_('Preview')}</a>
                     </li>
                 </ul>
             </div>
 
             <div class="comment-area-write" style="display: block;">
                 <div id="edit-container">
                     <textarea id="text" name="text" class="comment-block-ta ac-input"></textarea>
                 </div>
                 <div id="preview-container" class="clearfix" style="display: none;">
                     <div id="preview-box" class="preview-box"></div>
                 </div>
             </div>
 
             <div class="comment-area-footer">
                 <div class="toolbar">
                     <div class="toolbar-text">
                       ${(_('Comments parsed using %s syntax with %s support.') % (
                              ('<a href="%s">%s</a>' % (h.url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper())),
                                ('<span  class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))
                            )
-                        )|n
-                       }
+                        )|n}
                     </div>
                 </div>
             </div>
         </div>
 
         <div id="comment_form_extras">
         %if form_extras and isinstance(form_extras, (list, tuple)):
             % for form_ex_el in form_extras:
                 ${form_ex_el|n}
             % endfor
         %endif
         </div>
         <div class="comment-footer">
           %if change_status:
           <div class="status_box">
               <select id="change_status" name="changeset_status">
                   <option></option> # Placeholder
                   %for status,lbl in c.commit_statuses:
                   <option value="${status}" data-status="${status}">${lbl}</option>
                       %if is_pull_request and change_status and status in ('approved', 'rejected'):
                           <option value="${status}_closed" data-status="${status}">${lbl} & ${_('Closed')}</option>
                       %endif
                   %endfor
               </select>
           </div>
           %endif
           <div class="action-buttons">
               <div class="comment-button">${h.submit('save', _('Comment'), class_="btn btn-success comment-button-input")}</div>
           </div>
         </div>
           ${h.end_form()}
     </div>
     % else:
     <div class="comment-form ac">
 
         <div class="comment-area">
             <div class="comment-area-header">
                 <ul class="nav-links clearfix">
                     <li class="active">
                         <a class="disabled" href="#edit-btn" disabled="disabled" onclick="return false">${_('Write')}</a>
                     </li>
                     <li class="">
                         <a class="disabled" href="#preview-btn" disabled="disabled" onclick="return false">${_('Preview')}</a>
                     </li>
                 </ul>
             </div>
 
             <div class="comment-area-write" style="display: block;">
                 <div id="edit-container">
                     <div style="padding: 40px 0">
                       ${_('You need to be logged in to leave comments.')}
                       <a href="${h.route_path('login', _query={'came_from': h.url.current()})}">${_('Login now')}</a>
                     </div>
                 </div>
                 <div id="preview-container" class="clearfix" style="display: none;">
                     <div id="preview-box" class="preview-box"></div>
                 </div>
             </div>
 
             <div class="comment-area-footer">
                 <div class="toolbar">
                     <div class="toolbar-text">
                     </div>
                 </div>
             </div>
         </div>
 
         <div class="comment-footer">
         </div>
 
     </div>
     % endif
 
 </div>
 
 <script>
     // init active elements of commentForm
     var commitId = templateContext.commit_data.commit_id;
     var pullRequestId = templateContext.pull_request_data.pull_request_id;
     var lineNo;
 
     var mainCommentForm = new CommentForm(
             "#${form_id}", commitId, pullRequestId, lineNo, true);
 
     mainCommentForm.cm.setOption('placeholder', "${placeholder}");
 
     mainCommentForm.initStatusChangeSelector();
     bindToggleButtons();
 </script>
 </%def>

rhodecode/templates/changeset/diff_block.mako

@@ -1,64 +1,64 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.url.current(fulldiff=1, **request.GET.mixed())}" 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.url.current(fulldiff=1, **request.GET.mixed())}" 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) in change.iteritems():
+  %for FID,(cs1, cs2, change, filenode_path, diff, stats, file_data) in change.iteritems():
     <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>
         ${diff|n}
-          % if file["is_limited_diff"]:
-            % if file["exceeds_limit"]:
+          % 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.url.current(fulldiff=1, **request.GET.mixed())}" 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 in 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>
             ${diff|n}
-           % if file["is_limited_diff"]:
-              % if file["exceeds_limit"]:
+           % 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.url.current(fulldiff=1, **request.GET.mixed())}" 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/codeblocks/diffs.mako

@@ -1,705 +1,711 b''
 <%def name="diff_line_anchor(filename, line, type)"><%
 return '%s_%s_%i' % (h.safeid(filename), type, line)
 %></%def>
 
-<%def name="action_class(action)"><%
+<%def name="action_class(action)">
+<%
     return {
         '-': 'cb-deletion',
         '+': 'cb-addition',
         ' ': 'cb-context',
         }.get(action, 'cb-empty')
-%></%def>
+%>
+</%def>
 
-<%def name="op_class(op_id)"><%
+<%def name="op_class(op_id)">
+<%
     return {
         DEL_FILENODE: 'deletion', # file deleted
         BIN_FILENODE: 'warning' # binary diff hidden
     }.get(op_id, 'addition')
-%></%def>
+%>
+</%def>
 
-<%def name="link_for(**kw)"><%
+<%def name="link_for(**kw)">
+<%
 new_args = request.GET.mixed()
 new_args.update(kw)
 return h.url('', **new_args)
-%></%def>
+%>
+</%def>
 
 <%def name="render_diffset(diffset, commit=None,
 
     # collapse all file diff entries when there are more than this amount of files in the diff
     collapse_when_files_over=20,
 
     # collapse lines in the diff when more than this amount of lines changed in the file diff
     lines_changed_limit=500,
 
     # add a ruler at to the output
     ruler_at_chars=0,
 
     # show inline comments
     use_comments=False,
 
     # disable new comments
     disable_new_comments=False,
 
     # special file-comments that were deleted in previous versions
     # it's used for showing outdated comments for deleted files in a PR
     deleted_files_comments=None
 
 )">
 
 %if use_comments:
 <div id="cb-comments-inline-container-template" class="js-template">
   ${inline_comments_container([])}
 </div>
 <div class="js-template" id="cb-comment-inline-form-template">
     <div class="comment-inline-form ac">
 
     %if c.rhodecode_user.username != h.DEFAULT_USER:
         ${h.form('#', method='get')}
         <div class="comment-area">
             <div class="comment-area-header">
                 <ul class="nav-links clearfix">
                     <li class="active">
                         <a href="#edit-btn" tabindex="-1" id="edit-btn_{1}">${_('Write')}</a>
                     </li>
                     <li class="">
                         <a href="#preview-btn" tabindex="-1" id="preview-btn_{1}">${_('Preview')}</a>
                     </li>
                 </ul>
             </div>
 
             <div class="comment-area-write" style="display: block;">
                 <div id="edit-container_{1}">
                     <textarea id="text_{1}" name="text" class="comment-block-ta ac-input"></textarea>
                 </div>
                 <div id="preview-container_{1}" class="clearfix" style="display: none;">
                     <div id="preview-box_{1}" class="preview-box"></div>
                 </div>
             </div>
 
             <div class="comment-area-footer">
                 <div class="toolbar">
                     <div class="toolbar-text">
                       ${(_('Comments parsed using %s syntax with %s support.') % (
                              ('<a href="%s">%s</a>' % (h.url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper())),
                                ('<span  class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))
                            )
-                        )|n
-                       }
+                        )|n}
                     </div>
                 </div>
             </div>
         </div>
 
         <div class="comment-footer">
           <div class="action-buttons">
             <input type="hidden" name="f_path" value="{0}">
             <input type="hidden" name="line" value="{1}">
                <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);">
                 ${_('Cancel')}
                </button>
                ${h.submit('save', _('Comment'), class_='btn btn-success save-inline-form')}
           </div>
         ${h.end_form()}
       </div>
     %else:
         ${h.form('', class_='inline-form comment-form-login', method='get')}
         <div class="pull-left">
             <div class="comment-help pull-right">
               ${_('You need to be logged in to leave comments.')} <a href="${h.route_path('login', _query={'came_from': h.url.current()})}">${_('Login now')}</a>
             </div>
         </div>
         <div class="comment-button pull-right">
          <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);">
           ${_('Cancel')}
          </button>
         </div>
         <div class="clearfix"></div>
         ${h.end_form()}
     %endif
     </div>
 </div>
 
 %endif
 <%
 collapse_all = len(diffset.files) > collapse_when_files_over
 %>
 
 %if c.diffmode == 'sideside':
 <style>
 .wrapper {
     max-width: 1600px !important;
 }
 </style>
 %endif
 
 %if ruler_at_chars:
 <style>
 .diff table.cb .cb-content:after {
     content: "";
     border-left: 1px solid blue;
     position: absolute;
     top: 0;
     height: 18px;
     opacity: .2;
     z-index: 10;
     //## +5 to account for diff action (+/-)
     left: ${ruler_at_chars + 5}ch;
 </style>
 %endif
 
 <div class="diffset ${disable_new_comments and 'diffset-comments-disabled'}">
     <div class="diffset-heading ${diffset.limited_diff and 'diffset-heading-warning' or ''}">
         %if commit:
             <div class="pull-right">
                 <a class="btn tooltip" title="${_('Browse Files at revision {}').format(commit.raw_id)}" href="${h.url('files_home',repo_name=diffset.repo_name, revision=commit.raw_id, f_path='')}">
                     ${_('Browse Files')}
                 </a>
             </div>
         %endif
         <h2 class="clearinner">
         %if commit:
             <a class="tooltip revision" title="${h.tooltip(commit.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id)}">${'r%s:%s' % (commit.revision,h.short_id(commit.raw_id))}</a> -
             ${h.age_component(commit.date)} -
         %endif
     %if diffset.limited_diff:
         ${_('The requested commit is too big and content was truncated.')}
 
         ${ungettext('%(num)s file changed.', '%(num)s files changed.', diffset.changed_files) % {'num': diffset.changed_files}}
         <a href="${link_for(fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
     %else:
         ${ungettext('%(num)s file changed: %(linesadd)s inserted, ''%(linesdel)s deleted',
                     '%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted', diffset.changed_files) % {'num': diffset.changed_files, 'linesadd': diffset.lines_added, 'linesdel': diffset.lines_deleted}}
     %endif
 
         <% at_ver = getattr(c, 'at_version_num', None) %>
         % if at_ver:
             <div class="pull-right">
             ${_('Changes at version %d') % at_ver}
             </div>
         % endif
 
         </h2>
     </div>
 
     %if not diffset.files:
         <p class="empty_data">${_('No files')}</p>
     %endif
 
     <div class="filediffs">
     %for i, filediff in enumerate(diffset.files):
 
         <%
         lines_changed = filediff['patch']['stats']['added'] + filediff['patch']['stats']['deleted']
         over_lines_changed_limit = lines_changed > lines_changed_limit
         %>
         <input ${collapse_all and 'checked' or ''} class="filediff-collapse-state" id="filediff-collapse-${id(filediff)}" type="checkbox">
         <div
             class="filediff"
             data-f-path="${filediff['patch']['filename']}"
             id="a_${h.FID('', filediff['patch']['filename'])}">
             <label for="filediff-collapse-${id(filediff)}" class="filediff-heading">
                 <div class="filediff-collapse-indicator"></div>
                 ${diff_ops(filediff)}
             </label>
             ${diff_menu(filediff, use_comments=use_comments)}
             <table class="cb cb-diff-${c.diffmode} code-highlight ${over_lines_changed_limit and 'cb-collapsed' or ''}">
         %if not filediff.hunks:
             %for op_id, op_text in filediff['patch']['stats']['ops'].items():
                 <tr>
                     <td class="cb-text cb-${op_class(op_id)}" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
                         %if op_id == DEL_FILENODE:
                         ${_('File was deleted')}
                         %elif op_id == BIN_FILENODE:
                         ${_('Binary file hidden')}
                         %else:
                         ${op_text}
                         %endif
                     </td>
                 </tr>
             %endfor
         %endif
         %if filediff.patch['is_limited_diff']:
                 <tr class="cb-warning cb-collapser">
                     <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
                         ${_('The requested commit is too big and content was truncated.')} <a href="${link_for(fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
                     </td>
                 </tr>
         %else:
             %if over_lines_changed_limit:
                     <tr class="cb-warning cb-collapser">
                         <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
                             ${_('This diff has been collapsed as it changes many lines, (%i lines changed)' % lines_changed)}
                             <a href="#" class="cb-expand"
                                onclick="$(this).closest('table').removeClass('cb-collapsed'); return false;">${_('Show them')}
                             </a>
                             <a href="#" class="cb-collapse"
                                onclick="$(this).closest('table').addClass('cb-collapsed'); return false;">${_('Hide them')}
                             </a>
                         </td>
                     </tr>
             %endif
         %endif
 
         %for hunk in filediff.hunks:
                 <tr class="cb-hunk">
                     <td ${c.diffmode == 'unified' and 'colspan=3' or ''}>
                         ## TODO: dan: add ajax loading of more context here
                         ## <a href="#">
                             <i class="icon-more"></i>
                         ## </a>
                     </td>
                     <td ${c.diffmode == 'sideside' and 'colspan=5' or ''}>
                         @@
                         -${hunk.source_start},${hunk.source_length}
                         +${hunk.target_start},${hunk.target_length}
                         ${hunk.section_header}
                     </td>
                 </tr>
             %if c.diffmode == 'unified':
                     ${render_hunk_lines_unified(hunk, use_comments=use_comments)}
             %elif c.diffmode == 'sideside':
                     ${render_hunk_lines_sideside(hunk, use_comments=use_comments)}
             %else:
                 <tr class="cb-line">
                     <td>unknown diff mode</td>
                 </tr>
             %endif
         %endfor
 
         ## outdated comments that do not fit into currently displayed lines
         % for lineno, comments in filediff.left_comments.items():
 
         %if c.diffmode == 'unified':
             <tr class="cb-line">
                 <td class="cb-data cb-context"></td>
                 <td class="cb-lineno cb-context"></td>
                 <td class="cb-lineno cb-context"></td>
                 <td class="cb-content cb-context">
                     ${inline_comments_container(comments)}
                 </td>
             </tr>
         %elif c.diffmode == 'sideside':
             <tr class="cb-line">
                 <td class="cb-data cb-context"></td>
                 <td class="cb-lineno cb-context"></td>
                 <td class="cb-content cb-context"></td>
 
                 <td class="cb-data cb-context"></td>
                 <td class="cb-lineno cb-context"></td>
                 <td class="cb-content cb-context">
                     ${inline_comments_container(comments)}
                 </td>
             </tr>
         %endif
 
         % endfor
 
             </table>
         </div>
     %endfor
 
     ## outdated comments that are made for a file that has been deleted
     % for filename, comments_dict in (deleted_files_comments or {}).items():
 
         <div class="filediffs filediff-outdated" style="display: none">
             <input ${collapse_all and 'checked' or ''} class="filediff-collapse-state" id="filediff-collapse-${id(filename)}" type="checkbox">
             <div class="filediff" data-f-path="${filename}"  id="a_${h.FID('', filename)}">
                 <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
                     <div class="filediff-collapse-indicator"></div>
                     <span class="pill">
                         ## file was deleted
                         <strong>${filename}</strong>
                     </span>
                     <span class="pill-group" style="float: left">
                         ## file op, doesn't need translation
                         <span class="pill" op="removed">removed in this version</span>
                     </span>
                     <a class="pill filediff-anchor" href="#a_${h.FID('', filename)}">¶</a>
                     <span class="pill-group" style="float: right">
                         <span class="pill" op="deleted">-${comments_dict['stats']}</span>
                     </span>
                 </label>
 
                 <table class="cb cb-diff-${c.diffmode} code-highlight ${over_lines_changed_limit and 'cb-collapsed' or ''}">
                     <tr>
                         % if c.diffmode == 'unified':
                         <td></td>
                         %endif
 
                         <td></td>
                         <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=5'}>
                         ${_('File was deleted in this version, and outdated comments were made on it')}
                         </td>
                     </tr>
                     %if c.diffmode == 'unified':
                     <tr class="cb-line">
                         <td class="cb-data cb-context"></td>
                         <td class="cb-lineno cb-context"></td>
                         <td class="cb-lineno cb-context"></td>
                         <td class="cb-content cb-context">
                             ${inline_comments_container(comments_dict['comments'])}
                         </td>
                     </tr>
                     %elif c.diffmode == 'sideside':
                     <tr class="cb-line">
                         <td class="cb-data cb-context"></td>
                         <td class="cb-lineno cb-context"></td>
                         <td class="cb-content cb-context"></td>
 
                         <td class="cb-data cb-context"></td>
                         <td class="cb-lineno cb-context"></td>
                         <td class="cb-content cb-context">
                             ${inline_comments_container(comments_dict['comments'])}
                         </td>
                     </tr>
                     %endif
                 </table>
             </div>
         </div>
     % endfor
 
 </div>
 </div>
 </%def>
 
 <%def name="diff_ops(filediff)">
 <%
 stats = filediff['patch']['stats']
 from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
     MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE
 %>
     <span class="pill">
         %if filediff.source_file_path and filediff.target_file_path:
-            %if filediff.source_file_path != filediff.target_file_path: # file was renamed
+            %if filediff.source_file_path != filediff.target_file_path:
+                 ## file was renamed
                   <strong>${filediff.target_file_path}</strong> ⬅ <del>${filediff.source_file_path}</del>
             %else:
                 ## file was modified
                 <strong>${filediff.source_file_path}</strong>
             %endif
         %else:
             %if filediff.source_file_path:
                 ## file was deleted
                 <strong>${filediff.source_file_path}</strong>
             %else:
                 ## file was added
                 <strong>${filediff.target_file_path}</strong>
             %endif
         %endif
     </span>
     <span class="pill-group" style="float: left">
         %if filediff.patch['is_limited_diff']:
         <span class="pill tooltip" op="limited" title="The stats for this diff are not complete">limited diff</span>
         %endif
         %if RENAMED_FILENODE in stats['ops']:
         <span class="pill" op="renamed">renamed</span>
         %endif
 
         %if NEW_FILENODE in stats['ops']:
         <span class="pill" op="created">created</span>
             %if filediff['target_mode'].startswith('120'):
         <span class="pill" op="symlink">symlink</span>
             %else:
         <span class="pill" op="mode">${nice_mode(filediff['target_mode'])}</span>
             %endif
         %endif
 
         %if DEL_FILENODE in stats['ops']:
         <span class="pill" op="removed">removed</span>
         %endif
 
         %if CHMOD_FILENODE in stats['ops']:
         <span class="pill" op="mode">
             ${nice_mode(filediff['source_mode'])} ➡ ${nice_mode(filediff['target_mode'])}
         </span>
         %endif
     </span>
 
     <a class="pill filediff-anchor" href="#a_${h.FID('', filediff.patch['filename'])}">¶</a>
 
     <span class="pill-group" style="float: right">
         %if BIN_FILENODE in stats['ops']:
         <span class="pill" op="binary">binary</span>
             %if MOD_FILENODE in stats['ops']:
             <span class="pill" op="modified">modified</span>
             %endif
         %endif
         %if stats['added']:
         <span class="pill" op="added">+${stats['added']}</span>
         %endif
         %if stats['deleted']:
         <span class="pill" op="deleted">-${stats['deleted']}</span>
         %endif
     </span>
 
 </%def>
 
 <%def name="nice_mode(filemode)">
     ${filemode.startswith('100') and filemode[3:] or filemode}
 </%def>
 
 <%def name="diff_menu(filediff, use_comments=False)">
     <div class="filediff-menu">
 %if filediff.diffset.source_ref:
     %if filediff.patch['operation'] in ['D', 'M']:
         <a
             class="tooltip"
             href="${h.url('files_home',repo_name=filediff.diffset.repo_name,f_path=filediff.source_file_path,revision=filediff.diffset.source_ref)}"
             title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
         >
             ${_('Show file before')}
         </a> |
     %else:
         <span
             class="tooltip"
             title="${h.tooltip(_('File no longer present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
         >
             ${_('Show file before')}
         </span> |
     %endif
     %if filediff.patch['operation'] in ['A', 'M']:
         <a
             class="tooltip"
             href="${h.url('files_home',repo_name=filediff.diffset.source_repo_name,f_path=filediff.target_file_path,revision=filediff.diffset.target_ref)}"
             title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
         >
             ${_('Show file after')}
         </a> |
     %else:
         <span
             class="tooltip"
             title="${h.tooltip(_('File no longer present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
             >
                 ${_('Show file after')}
         </span> |
     %endif
         <a
             class="tooltip"
             title="${h.tooltip(_('Raw diff'))}"
             href="${h.url('files_diff_home',repo_name=filediff.diffset.repo_name,f_path=filediff.target_file_path,diff2=filediff.diffset.target_ref,diff1=filediff.diffset.source_ref,diff='raw')}"
         >
             ${_('Raw diff')}
         </a> |
         <a
             class="tooltip"
             title="${h.tooltip(_('Download diff'))}"
             href="${h.url('files_diff_home',repo_name=filediff.diffset.repo_name,f_path=filediff.target_file_path,diff2=filediff.diffset.target_ref,diff1=filediff.diffset.source_ref,diff='download')}"
         >
             ${_('Download diff')}
         </a>
         % if use_comments:
             |
         % endif
 
         ## TODO: dan: refactor ignorews_url and context_url into the diff renderer same as diffmode=unified/sideside. Also use ajax to load more context (by clicking hunks)
         %if hasattr(c, 'ignorews_url'):
         ${c.ignorews_url(request.GET, h.FID('', filediff['patch']['filename']))}
         %endif
         %if hasattr(c, 'context_url'):
         ${c.context_url(request.GET, h.FID('', filediff['patch']['filename']))}
         %endif
 
         %if use_comments:
         <a href="#" onclick="return Rhodecode.comments.toggleComments(this);">
             <span class="show-comment-button">${_('Show comments')}</span><span class="hide-comment-button">${_('Hide comments')}</span>
         </a>
         %endif
 %endif
     </div>
 </%def>
 
 
 <%namespace name="commentblock" file="/changeset/changeset_file_comment.mako"/>
 <%def name="inline_comments_container(comments)">
 <div class="inline-comments">
     %for comment in comments:
     ${commentblock.comment_block(comment, inline=True)}
     %endfor
 
     % if comments and comments[-1].outdated:
     <span class="btn btn-secondary cb-comment-add-button comment-outdated}"
           style="display: none;}">
         ${_('Add another comment')}
     </span>
     % else:
     <span onclick="return Rhodecode.comments.createComment(this)"
           class="btn btn-secondary cb-comment-add-button">
         ${_('Add another comment')}
     </span>
     % endif
 
 </div>
 </%def>
 
 
 <%def name="render_hunk_lines_sideside(hunk, use_comments=False)">
     %for i, line in enumerate(hunk.sideside):
     <%
     old_line_anchor, new_line_anchor = None, None
     if line.original.lineno:
         old_line_anchor = diff_line_anchor(hunk.filediff.source_file_path, line.original.lineno, 'o')
     if line.modified.lineno:
         new_line_anchor = diff_line_anchor(hunk.filediff.target_file_path, line.modified.lineno, 'n')
     %>
 
     <tr class="cb-line">
         <td class="cb-data ${action_class(line.original.action)}"
             data-line-number="${line.original.lineno}"
             >
             <div>
             %if line.original.comments:
             <i class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
             %endif
             </div>
         </td>
         <td class="cb-lineno ${action_class(line.original.action)}"
             data-line-number="${line.original.lineno}"
             %if old_line_anchor:
             id="${old_line_anchor}"
             %endif
         >
             %if line.original.lineno:
             <a name="${old_line_anchor}" href="#${old_line_anchor}">${line.original.lineno}</a>
             %endif
         </td>
         <td class="cb-content ${action_class(line.original.action)}"
             data-line-number="o${line.original.lineno}"
             >
             %if use_comments and line.original.lineno:
             ${render_add_comment_button()}
             %endif
             <span class="cb-code">${line.original.action} ${line.original.content or '' | n}</span>
             %if use_comments and line.original.lineno and line.original.comments:
             ${inline_comments_container(line.original.comments)}
             %endif
         </td>
         <td class="cb-data ${action_class(line.modified.action)}"
             data-line-number="${line.modified.lineno}"
             >
             <div>
             %if line.modified.comments:
             <i class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
             %endif
             </div>
         </td>
         <td class="cb-lineno ${action_class(line.modified.action)}"
             data-line-number="${line.modified.lineno}"
             %if new_line_anchor:
             id="${new_line_anchor}"
             %endif
             >
             %if line.modified.lineno:
                 <a name="${new_line_anchor}" href="#${new_line_anchor}">${line.modified.lineno}</a>
             %endif
         </td>
         <td class="cb-content ${action_class(line.modified.action)}"
             data-line-number="n${line.modified.lineno}"
             >
             %if use_comments and line.modified.lineno:
             ${render_add_comment_button()}
             %endif
             <span class="cb-code">${line.modified.action} ${line.modified.content or '' | n}</span>
             %if use_comments and line.modified.lineno and line.modified.comments:
             ${inline_comments_container(line.modified.comments)}
             %endif
         </td>
     </tr>
     %endfor
 </%def>
 
 
 <%def name="render_hunk_lines_unified(hunk, use_comments=False)">
     %for old_line_no, new_line_no, action, content, comments in hunk.unified:
     <%
     old_line_anchor, new_line_anchor = None, None
     if old_line_no:
         old_line_anchor = diff_line_anchor(hunk.filediff.source_file_path, old_line_no, 'o')
     if new_line_no:
         new_line_anchor = diff_line_anchor(hunk.filediff.target_file_path, new_line_no, 'n')
     %>
     <tr class="cb-line">
         <td class="cb-data ${action_class(action)}">
             <div>
             %if comments:
             <i class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
             %endif
             </div>
         </td>
         <td class="cb-lineno ${action_class(action)}"
             data-line-number="${old_line_no}"
             %if old_line_anchor:
             id="${old_line_anchor}"
             %endif
         >
             %if old_line_anchor:
             <a name="${old_line_anchor}" href="#${old_line_anchor}">${old_line_no}</a>
             %endif
         </td>
         <td class="cb-lineno ${action_class(action)}"
             data-line-number="${new_line_no}"
             %if new_line_anchor:
             id="${new_line_anchor}"
             %endif
         >
             %if new_line_anchor:
             <a name="${new_line_anchor}" href="#${new_line_anchor}">${new_line_no}</a>
             %endif
         </td>
         <td class="cb-content ${action_class(action)}"
             data-line-number="${new_line_no and 'n' or 'o'}${new_line_no or old_line_no}"
             >
             %if use_comments:
             ${render_add_comment_button()}
             %endif
             <span class="cb-code">${action} ${content or '' | n}</span>
             %if use_comments and comments:
             ${inline_comments_container(comments)}
             %endif
         </td>
     </tr>
     %endfor
 </%def>
 
 <%def name="render_add_comment_button()">
 <button class="btn btn-small btn-primary cb-comment-box-opener" onclick="return Rhodecode.comments.createComment(this)">
     <span><i class="icon-comment"></i></span>
 </button>
 </%def>
 
 <%def name="render_diffset_menu()">
 
     <div class="diffset-menu clearinner">
         <div class="pull-right">
             <div class="btn-group">
 
                 <a
                   class="btn ${c.diffmode == 'sideside' and 'btn-primary'} tooltip"
                   title="${_('View side by side')}"
                   href="${h.url_replace(diffmode='sideside')}">
                     <span>${_('Side by Side')}</span>
                 </a>
                 <a
                   class="btn ${c.diffmode == 'unified' and 'btn-primary'} tooltip"
                   title="${_('View unified')}" href="${h.url_replace(diffmode='unified')}">
                     <span>${_('Unified')}</span>
                 </a>
             </div>
         </div>
 
         <div class="pull-left">
           <div class="btn-group">
               <a
                   class="btn"
                   href="#"
                   onclick="$('input[class=filediff-collapse-state]').prop('checked', false); return false">${_('Expand All Files')}</a>
               <a
                   class="btn"
                   href="#"
                   onclick="$('input[class=filediff-collapse-state]').prop('checked', true); return false">${_('Collapse All Files')}</a>
               <a
                   class="btn"
                   href="#"
                   onclick="return Rhodecode.comments.toggleWideMode(this)">${_('Wide Mode Diff')}</a>
           </div>
         </div>
     </div>
 </%def>

rhodecode/templates/codeblocks/source.mako

@@ -1,68 +1,66 b''
 <%def name="render_line(line_num, tokens,
                         annotation=None,
                         bgcolor=None)">
     <%
     from rhodecode.lib.codeblocks import render_tokenstream
     # avoid module lookup for performance
     html_escape = h.html_escape
     %>
     <tr class="cb-line cb-line-fresh"
     %if annotation:
     data-revision="${annotation.revision}"
     %endif
     >
     <td class="cb-lineno" id="L${line_num}">
       <a data-line-no="${line_num}" href="#L${line_num}"></a>
     </td>
     <td class="cb-content cb-content-fresh"
     %if bgcolor:
     style="background: ${bgcolor}"
     %endif
     >
     ## newline at end is necessary for highlight to work when line is empty
     ## and for copy pasting code to work as expected
       <span class="cb-code">${render_tokenstream(tokens)|n}${'\n'}</span>
     </td>
   </tr>
 </%def>
 
 <%def name="render_annotation_lines(annotation, lines, color_hasher)">
   <%
   rowspan = len(lines) + 1 # span the line's <tr> and annotation <tr>
   %>
   %if not annotation:
   <tr class="cb-annotate">
     <td class="cb-annotate-message" rowspan="${rowspan}"></td>
     <td class="cb-annotate-revision" rowspan="${rowspan}"></td>
   </tr>
   %else:
   <tr class="cb-annotate">
     <td class="cb-annotate-info tooltip"
         rowspan="${rowspan}"
         title="Author: ${annotation.author | entity}<br>Date: ${annotation.date}<br>Message: ${annotation.message | entity}"
     >
       ${h.gravatar_with_user(annotation.author, 16) | n}
-      <strong class="cb-annotate-message">${
-          h.truncate(annotation.message, len(lines) * 30)
-      }</strong>
+      <strong class="cb-annotate-message">${h.truncate(annotation.message, len(lines) * 30)}</strong>
     </td>
     <td
       class="cb-annotate-revision"
       rowspan="${rowspan}"
       data-revision="${annotation.revision}"
       onclick="$('[data-revision=${annotation.revision}]').toggleClass('cb-line-fresh')"
       style="background: ${color_hasher(annotation.raw_id)}">
     <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=annotation.raw_id)}">
       r${annotation.revision}
     </a>
     </td>
   </tr>
   %endif
 
   %for line_num, tokens in lines:
     ${render_line(line_num, tokens,
       bgcolor=color_hasher(annotation and annotation.raw_id or ''),
       annotation=annotation,
       )}
   %endfor
 </%def>

rhodecode/templates/debug_style/code-block.html

@@ -1,1160 +1,1160 b''
 ## -*- coding: utf-8 -*-
 <%namespace name="base" file="/base/base.mako"/>
 <%inherit file="/debug_style/index.html"/>
 
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Style'), h.url('debug_style_home'))}
     &raquo;
     ${c.active}
 </%def>
 
 <%def name="js_extra()">
 </%def>
 
 <%def name="css_extra()">
 </%def>
 
 
 <%def name="real_main()">
 <div class="box">
     <div class="title">
         ${self.breadcrumbs()}
     </div>
 
     ##main
     <div class='sidebar-col-wrapper'>
     ${self.sidebar()}
 
     <div class="main-content">
 
 
 
       <h2>Code Blocks</h2>
 
       <dl class="dl-horizontal">
         <dt><code>.codeblock</code></dt>
         <dd>Used as a wrapping element around <code>.code-header</code> and
           <code>.code-body</code>. Used to show the content of a file or a
           Gist.</dd>
 
         <dt><code>.diffblock</code></dt>
         <dd>Used as a wrapping element to show a diff in a Commit or Pull
           Request page. Contains usually <code>.code-header</code>,
           <code>.code-body</code> and in the edit case a <code>.message</code>.
           </dd>
       </dl>
 
 
       <p>Code Blocks are used in the following areas:</p>
 
       <ul>
         <li>Commit: Showing the Diff (still called Changeset in a few
           places).</li>
         <li>File: Display a file, annotations, and edit a file.</li>
         <li>Gist: Show the Gist and edit it.</li>
         <li>Pull Request: Display the Diff of a Pull Request.</li>
       </ul>
 
 
 
 <!--
   Compare Commits
  -->
       <h2>Compare Commits</h2>
 
       <div id="c-e589e34d6be8-5ab783e6d81b" class="diffblock margined comm">
         <div class="code-header">
             <div title="Go back to changed files overview">
                 <a href="#changes_box">
                     <i class="icon-circle-arrow-up"></i>
                 </a>
             </div>
             <div class="changeset_header">
                 <div class="changeset_file">
                     <i class="icon-file"></i>
                     <a href="/example/files/e589e34d6be8ec2b44017f6c2e0bbe782f1aba6d/rhodecode/public/css/code-block.less">rhodecode/public/css/code-block.less</a>
                 </div>
                 <div class="diff-actions">
                   <a href="/example/diff/rhodecode/public/css/code-block.less?fulldiff=1&amp;diff1=d12301bafcc0aea15c9283d3af018daee2b04cd9&amp;diff=diff&amp;diff2=e589e34d6be8ec2b44017f6c2e0bbe782f1aba6d" class="tooltip" title="Show full diff for this file">
                       <img class="icon" src="/images/icons/page_white_go.png">
                   </a>
                   <a href="/example/diff-2way/rhodecode/public/css/code-block.less?fulldiff=1&amp;diff1=d12301bafcc0aea15c9283d3af018daee2b04cd9&amp;diff=diff&amp;diff2=e589e34d6be8ec2b44017f6c2e0bbe782f1aba6d" class="tooltip" title="Show full side-by-side diff for this file">
                       <img class="icon" src="/images/icons/application_double.png">
                   </a>
                   <a href="/example/diff/rhodecode/public/css/code-block.less?diff1=d12301bafcc0aea15c9283d3af018daee2b04cd9&amp;diff=raw&amp;diff2=e589e34d6be8ec2b44017f6c2e0bbe782f1aba6d" class="tooltip" title="Raw diff" tt_title="Raw diff">
                       <img class="icon" src="/images/icons/page_white.png">
                   </a>
                   <a href="/example/diff/rhodecode/public/css/code-block.less?diff1=d12301bafcc0aea15c9283d3af018daee2b04cd9&amp;diff=download&amp;diff2=e589e34d6be8ec2b44017f6c2e0bbe782f1aba6d" class="tooltip" title="Download diff">
                       <img class="icon" src="/images/icons/page_save.png">
                   </a>
                   <a class="tooltip" href="/example/changeset/d12301bafcc0aea15c9283d3af018daee2b04cd9...80ead1899f50a894889e19ffeb49c9cebf5bf045?c-e589e34d6be8-5ab783e6d81b=WS%3A1&amp;c-e589e34d6be8-5ab783e6d81b=C%3A3#c-e589e34d6be8-5ab783e6d81b" title="Ignore white space"><img alt="Ignore white space" class="icon" src="/images/icons/text_strikethrough.png"></a>
                   <a class="tooltip" href="/example/changeset/d12301bafcc0aea15c9283d3af018daee2b04cd9...80ead1899f50a894889e19ffeb49c9cebf5bf045?c-e589e34d6be8-5ab783e6d81b=C%3A6#c-e589e34d6be8-5ab783e6d81b" title="increase diff context to 6 lines"><img alt="increase diff context to 6 lines" class="icon" src="/images/icons/table_add.png"></a>
                 </div>
                 <span>
                   <label>
                   Show inline comments
                   <input checked="checked" class="show-inline-comments" id="" id_for="c-e589e34d6be8-5ab783e6d81b" name="" type="checkbox" value="1">
                   </label>
                 </span>
             </div>
         </div>
         <div class="code-body">
             <div class="full_f_path" path="rhodecode/public/css/code-block.less"></div>
             <table class="code-difftable">
 <tbody><tr class="line context">
   <td class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o...">...</a></td>
   <td class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n...">...</a></td>
   <td class="code no-comment">
     <pre>@@ -391,7 +391,7 @@
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccsscode-blockless_o391" class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o391">391</a></td>
   <td id="rhodecodepubliccsscode-blockless_n391" class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n391">391</a></td>
   <td class="code no-comment">
     <pre>}  /* Existing line, it might have a quite long content actually and in this case we might need some horizontal scrolling. The remaining text here is just used to make this line very long.
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccsscode-blockless_o392" class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o392">392</a></td>
   <td id="rhodecodepubliccsscode-blockless_n392" class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n392">392</a></td>
   <td class="code no-comment">
     <pre></pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccsscode-blockless_o393" class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o393">393</a></td>
   <td id="rhodecodepubliccsscode-blockless_n393" class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n393">393</a></td>
   <td class="code no-comment">
     <pre>.code-body.textarea.editor,
 </pre>
   </td>
 </tr>
 <tr class="line del">
   <td id="rhodecodepubliccsscode-blockless_o394" class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o394">394</a></td>
   <td class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n"></a></td>
   <td class="code no-comment">
     <pre>div.code-body{
 </pre>
   </td>
 </tr>
 <tr class="line add">
   <td class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o"></a></td>
   <td id="rhodecodepubliccsscode-blockless_n394" class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n394">394</a></td>
   <td class="code no-comment">
     <pre>div.code-body<ins> </ins>{
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccsscode-blockless_o395" class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o395">395</a></td>
   <td id="rhodecodepubliccsscode-blockless_n395" class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n395">395</a></td>
   <td class="code no-comment">
     <pre>    float: left;
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccsscode-blockless_o396" class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o396">396</a></td>
   <td id="rhodecodepubliccsscode-blockless_n396" class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n396">396</a></td>
   <td class="code no-comment">
     <pre>    position: relative;
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccsscode-blockless_o397" class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o397">397</a></td>
   <td id="rhodecodepubliccsscode-blockless_n397" class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n397">397</a></td>
   <td class="code no-comment">
     <pre>    max-width: none;
 </pre>
   </td>
 </tr>
 <tr class="line context">
   <td class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o...">...</a></td>
   <td class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n...">...</a></td>
   <td class="code no-comment">
     <pre>@@ -399,3 +399,6 @@
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccsscode-blockless_o399" class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o399">399</a></td>
   <td id="rhodecodepubliccsscode-blockless_n399" class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n399">399</a></td>
   <td class="code no-comment">
     <pre>    box-sizing: border-box;
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccsscode-blockless_o400" class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o400">400</a></td>
   <td id="rhodecodepubliccsscode-blockless_n400" class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n400">400</a></td>
   <td class="code no-comment">
     <pre>}
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccsscode-blockless_o401" class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o401">401</a></td>
   <td id="rhodecodepubliccsscode-blockless_n401" class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n401">401</a></td>
   <td class="code no-comment">
     <pre></pre>
   </td>
 </tr>
 <tr class="line add">
   <td class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o"></a></td>
   <td id="rhodecodepubliccsscode-blockless_n402" class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n402">402</a></td>
   <td class="code no-comment">
     <pre>.code-body td{
 </pre>
   </td>
 </tr>
 <tr class="line add">
   <td class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o"></a></td>
   <td id="rhodecodepubliccsscode-blockless_n403" class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n403">403</a></td>
   <td class="code no-comment">
     <pre>    line-height: 1.2em;
 </pre>
   </td>
 </tr>
 <tr class="line add">
   <td class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o"></a></td>
   <td id="rhodecodepubliccsscode-blockless_n404" class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n404">404</a></td>
   <td class="code no-comment">
     <pre>}
 </pre>
   </td>
 </tr>
 <tr class="line context">
   <td class="lineno old"><a href="#rhodecodepubliccsscode-blockless_o...">...</a></td>
   <td class="lineno new"><a href="#rhodecodepubliccsscode-blockless_n...">...</a></td>
   <td class="code no-comment">
     <pre> No newline at end of file
 </pre>
   </td>
 </tr>
 </tbody></table>
         </div>
     </div>
 
 
 
 
 
 
 <!--
  Pull Request
  -->
 
     <h2>Pull Request</h2>
 
 <div class="cs_files">
               <table class="compare_view_files">
 
                   <tbody><tr class="cs_M collapse_file" fid="c--5f1d017cf13b">
                       <td class="cs_icon_td">
                           <span class="collapse_file_icon" fid="c--5f1d017cf13b"></span>
                       </td>
                       <td class="cs_icon_td">
                           <div class="flag_status not_reviewed hidden"></div>
                       </td>
                       <td id="a_c--5f1d017cf13b">
                           <a class="compare_view_filepath" href="#a_c--5f1d017cf13b">
                               rhodecode/public/css/main.less
                           </a>
                           <span id="diff_c--5f1d017cf13b" class="diff_links" style="">
                             <a href="/example/diff/rhodecode/public/css/main.less?fulldiff=1&amp;diff1=f73e9946825c8a7ef2c1178cd1e67986d5831f8f&amp;diff=diff&amp;diff2=27eb56cf467ca849112536d62decb2ed020b3ebc">
                                 Unified Diff
                             </a>
                             |
                             <a href="/example/diff-2way/rhodecode/public/css/main.less?fulldiff=1&amp;diff1=f73e9946825c8a7ef2c1178cd1e67986d5831f8f&amp;diff=diff&amp;diff2=27eb56cf467ca849112536d62decb2ed020b3ebc">
                                 Side-by-side Diff
                             </a>
                           </span>
                       </td>
                       <td>
                           <div class="changes pull-right"><div style="width:100px"><div class="added top-left-rounded-corner-mid bottom-left-rounded-corner-mid" style="width:33.3333333333%">1</div><div class="deleted top-right-rounded-corner-mid bottom-right-rounded-corner-mid" style="width:66.6666666667%">2</div></div></div>
                           <div class="comment-bubble pull-right" data-path="rhodecode/public/css/main.less">
                             <i class="icon-comment"></i>
                           </div>
                       </td>
                   </tr>
                   <tr id="tr_c--5f1d017cf13b">
                     <td></td>
                     <td></td>
                     <td class="injected_diff" colspan="2">
 
  <div class="diff-container" id="diff-container-140360026534904">
     <div id="c--5f1d017cf13b_target"></div>
     <div id="c--5f1d017cf13b" class="diffblock margined comm">
         <div class="code-body">
             <div class="full_f_path" path="rhodecode/public/css/main.less" style="display: none;"></div>
             <table class="code-difftable">
 <tbody><tr class="line context">
   <td class="lineno old"><a href="#rhodecodepubliccssmainless_o...">...</a></td>
   <td class="lineno new"><a href="#rhodecodepubliccssmainless_n...">...</a></td>
   <td class="code ">
     <pre>@@ -2110,7 +2110,6 @@
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccssmainless_o2110" class="lineno old"><a href="#rhodecodepubliccssmainless_o2110">2110</a></td>
   <td id="rhodecodepubliccssmainless_n2110" class="lineno new"><a href="#rhodecodepubliccssmainless_n2110">2110</a></td>
   <td class="code ">
     <pre><span class="tab-escape">  </span>width: auto !important;
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccssmainless_o2111" class="lineno old"><a href="#rhodecodepubliccssmainless_o2111">2111</a></td>
   <td id="rhodecodepubliccssmainless_n2111" class="lineno new"><a href="#rhodecodepubliccssmainless_n2111">2111</a></td>
   <td class="code ">
     <pre><span class="tab-escape">  </span>min-width: 160px;
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccssmainless_o2112" class="lineno old"><a href="#rhodecodepubliccssmainless_o2112">2112</a></td>
   <td id="rhodecodepubliccssmainless_n2112" class="lineno new"><a href="#rhodecodepubliccssmainless_n2112">2112</a></td>
   <td class="code ">
     <pre><span class="tab-escape">  </span>margin: @padding @padding @padding 0;
 </pre>
   </td>
 </tr>
 <tr class="line del">
   <td id="rhodecodepubliccssmainless_o2113" class="lineno old"><a href="#rhodecodepubliccssmainless_o2113">2113</a></td>
   <td class="lineno new"><a href="#rhodecodepubliccssmainless_n"></a></td>
   <td class="code ">
     <pre><span class="tab-escape">  </span>padding: .9em;  /* Old comment which was making this line a very long line so that we might have to deal with it by either adding horizontal scrolling or some smart way of breaking this line. */
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccssmainless_o2114" class="lineno old"><a href="#rhodecodepubliccssmainless_o2114">2114</a></td>
   <td id="rhodecodepubliccssmainless_n2113" class="lineno new"><a href="#rhodecodepubliccssmainless_n2113">2113</a></td>
   <td class="code ">
     <pre>    line-height: 1em;
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccssmainless_o2115" class="lineno old"><a href="#rhodecodepubliccssmainless_o2115">2115</a></td>
   <td id="rhodecodepubliccssmainless_n2114" class="lineno new"><a href="#rhodecodepubliccssmainless_n2114">2114</a></td>
   <td class="code ">
     <pre><span class="tab-escape">  </span>z-index: 100;//js sets the menu below it to 9999
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccssmainless_o2116" class="lineno old"><a href="#rhodecodepubliccssmainless_o2116">2116</a></td>
   <td id="rhodecodepubliccssmainless_n2115" class="lineno new"><a href="#rhodecodepubliccssmainless_n2115">2115</a></td>
   <td class="code ">
     <pre><span class="tab-escape">  </span>background-color: white;
 </pre>
   </td>
 </tr>
 <tr class="line context">
   <td class="lineno old"><a href="#rhodecodepubliccssmainless_o...">...</a></td>
   <td class="lineno new"><a href="#rhodecodepubliccssmainless_n...">...</a></td>
   <td class="code ">
     <pre>@@ -2118,7 +2117,7 @@
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccssmainless_o2118" class="lineno old"><a href="#rhodecodepubliccssmainless_o2118">2118</a></td>
   <td id="rhodecodepubliccssmainless_n2117" class="lineno new"><a href="#rhodecodepubliccssmainless_n2117">2117</a></td>
   <td class="code ">
     <pre></pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccssmainless_o2119" class="lineno old"><a href="#rhodecodepubliccssmainless_o2119">2119</a></td>
   <td id="rhodecodepubliccssmainless_n2118" class="lineno new"><a href="#rhodecodepubliccssmainless_n2118">2118</a></td>
   <td class="code ">
     <pre><span class="tab-escape">  </span>a {
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccssmainless_o2120" class="lineno old"><a href="#rhodecodepubliccssmainless_o2120">2120</a></td>
   <td id="rhodecodepubliccssmainless_n2119" class="lineno new"><a href="#rhodecodepubliccssmainless_n2119">2119</a></td>
   <td class="code ">
     <pre><span class="tab-escape">  </span><span class="tab-escape">  </span>display:block;
 </pre>
   </td>
 </tr>
 <tr class="line del">
   <td id="rhodecodepubliccssmainless_o2121" class="lineno old"><a href="#rhodecodepubliccssmainless_o2121">2121</a></td>
   <td class="lineno new"><a href="#rhodecodepubliccssmainless_n"></a></td>
   <td class="code ">
     <pre><span class="tab-escape">  </span><del><span< del=""> <del>class=</del><del>"tab-escape"</del><del>&gt;  </del>padding: <del>0</del>;
 </span<></del></pre>
   </td>
 </tr>
 <tr class="line add">
   <td class="lineno old"><a href="#rhodecodepubliccssmainless_o"></a></td>
   <td id="rhodecodepubliccssmainless_n2120" class="lineno new"><a href="#rhodecodepubliccssmainless_n2120">2120</a></td>
   <td class="code ">
     <pre><span class="tab-escape">  </span><ins> </ins> <ins> </ins><ins> </ins>padding: <ins>.9em</ins>;
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccssmainless_o2122" class="lineno old"><a href="#rhodecodepubliccssmainless_o2122">2122</a></td>
   <td id="rhodecodepubliccssmainless_n2121" class="lineno new"><a href="#rhodecodepubliccssmainless_n2121">2121</a></td>
   <td class="code ">
     <pre></pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccssmainless_o2123" class="lineno old"><a href="#rhodecodepubliccssmainless_o2123">2123</a></td>
   <td id="rhodecodepubliccssmainless_n2122" class="lineno new"><a href="#rhodecodepubliccssmainless_n2122">2122</a></td>
   <td class="code ">
     <pre><span class="tab-escape">  </span><span class="tab-escape">  </span>&amp;:after {
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodepubliccssmainless_o2124" class="lineno old"><a href="#rhodecodepubliccssmainless_o2124">2124</a></td>
   <td id="rhodecodepubliccssmainless_n2123" class="lineno new"><a href="#rhodecodepubliccssmainless_n2123">2123</a></td>
   <td class="code ">
     <pre><span class="tab-escape">  </span><span class="tab-escape">  </span><span class="tab-escape">  </span>content: "\00A0\25BE";
 </pre>
   </td>
 </tr>
 </tbody></table>
         </div>
     </div>
   </div>
 
                     </td>
                   </tr>
               </tbody></table>
               </div>
 
 
 
 
 
 
 
 
 
 <!--
  File View
  -->
 
 ##TODO: lisa: I believe this needs to be updated as the layout has changed.
 <h2>File View</h2>
 
 <div class="codeblock">
     <div class="code-header">
         <div class="stats">
             <div class="img">
               <i class="icon-file"></i>
               <span class="revision_id item"><a href="/example/changeset/fc252256eb0fcb4f2613e66f0126ea27967ae28c">r5487:fc252256eb0f</a></span>
                <span>1.2 KiB</span>
                <span class="item last">text/x-python</span>
               <div class="buttons">
 
                 <a id="file_history_overview" class="btn btn-mini" href="#">
                     <i class="icon-time"></i> history
                 </a>
                 <a id="file_history_overview_full" class="btn btn-mini" style="display: none" href="/example/changelog/fc252256eb0fcb4f2613e66f0126ea27967ae28c/rhodecode/websetup.py">
                     <i class="icon-time"></i> show full history
                 </a>
                   <a class="btn btn-mini" href="/example/annotate/fc252256eb0fcb4f2613e66f0126ea27967ae28c/rhodecode/websetup.py">annotation</a>
                 <a class="btn btn-mini" href="/example/raw/fc252256eb0fcb4f2613e66f0126ea27967ae28c/rhodecode/websetup.py">raw</a>
                 <a class="btn btn-mini" href="/example/rawfile/fc252256eb0fcb4f2613e66f0126ea27967ae28c/rhodecode/websetup.py">
                     <i class="icon-archive"></i> download
                 </a>
 
                   <a class="btn btn-mini disabled tooltip" href="#" title="Editing files allowed only when on branch head commit">edit</a>
                   <a class="btn btn-mini btn-danger disabled tooltip" href="#" title="Deleting files allowed only when on branch head commit">delete</a>
               </div>
             </div>
         </div>
         <div id="file_history_container"></div>
         <div class="author">
             <div class="gravatar">
                 <img alt="gravatar" src="https://secure.gravatar.com/avatar/99e27b99c64003ca8c9875c9e3843495?d=identicon&amp;s=32" height="16" width="16">
             </div>
             <div title="Marcin Kuzminski <[e-mail]>" class="user">Marcin Kuzminski - <span class="tooltip" title="Wed, 02 Jul 2014 08:48:15">6m and 12d ago</span></div>
         </div>
         <div id="trimmed_message_box" class="commit">License changes</div>
         <div id="message_expand" style="display: none;">
             <i class="icon-resize-vertical"></i>
             expand
             <i class="icon-resize-vertical"></i>
         </div>
     </div>
     <div class="code-body">
               <table class="code-highlighttable"><tbody><tr><td class="linenos"><div class="linenodiv"><pre><a href="#L1"> 1</a>
 <a href="#L2"> 2</a>
 <a href="#L3"> 3</a>
 <a href="#L4"> 4</a>
 <a href="#L5"> 5</a>
 <a href="#L6"> 6</a>
 <a href="#L7"> 7</a>
 <a href="#L8"> 8</a>
 <a href="#L9"> 9</a>
 <a href="#L10">10</a>
 <a href="#L11">11</a>
 <a href="#L12">12</a>
 <a href="#L13">13</a>
 <a href="#L14">14</a>
 <a href="#L15">15</a>
 <a href="#L16">16</a>
 <a href="#L17">17</a>
 <a href="#L18">18</a>
 <a href="#L19">19</a>
 <a href="#L20">20</a>
 <a href="#L21">21</a>
 <a href="#L22">22</a>
 <a href="#L23">23</a>
 <a href="#L24">24</a>
 <a href="#L25">25</a>
 <a href="#L26">26</a>
 <a href="#L27">27</a>
 <a href="#L28">28</a>
 <a href="#L29">29</a>
 <a href="#L30">30</a>
 <a href="#L31">31</a>
 <a href="#L32">32</a>
 <a href="#L33">33</a>
 <a href="#L34">34</a>
 <a href="#L35">35</a>
 <a href="#L36">36</a>
 <a href="#L37">37</a>
 <a href="#L38">38</a>
 <a href="#L39">39</a>
 <a href="#L40">40</a>
 <a href="#L41">41</a>
 <a href="#L42">42</a></pre></div></td><td id="hlcode" class="code"><div class="code-highlight"><pre><div id="L1"><a name="L-1"></a><span class="c"># -*- coding: utf-8 -*-</span>
 </div><div id="L2"><a name="L-2"></a>
 </div><div id="L3"><a name="L-3"></a><span class="c"># Published under Business Source License.</span>
 </div><div id="L4"><a name="L-4"></a><span class="c"># Read the full license text at https://rhodecode.com/licenses.</span>
 </div><div id="L5"><a name="L-5"></a><span class="sd">"""</span>
 </div><div id="L6"><a name="L-6"></a><span class="sd">rhodecode.websetup</span>
 </div><div id="L7"><a name="L-7"></a><span class="sd">~~~~~~~~~~~~~~~~~~</span>
 </div><div id="L8"><a name="L-8"></a>
 </div><div id="L9"><a name="L-9"></a><span class="sd">Weboperations and setup for rhodecode. Intentionally long line to show what will happen if this line does not fit onto the screen. It might have some horizontal scrolling applied or some other fancy mechanism to deal with it.</span>
 </div><div id="L10"><a name="L-10"></a>
 </div><div id="L11"><a name="L-11"></a><span class="sd">:created_on: Dec 11, 2010</span>
 </div><div id="L12"><a name="L-12"></a><span class="sd">:author: marcink</span>
 </div><div id="L13"><a name="L-13"></a><span class="sd">:copyright: (c) 2013-2015 RhodeCode GmbH.</span>
 </div><div id="L14"><a name="L-14"></a><span class="sd">:license: Business Source License, see LICENSE for more details.</span>
 </div><div id="L15"><a name="L-15"></a><span class="sd">"""</span>
 </div><div id="L16"><a name="L-16"></a>
 </div><div id="L17"><a name="L-17"></a><span class="kn">import</span> <span class="nn">logging</span>
 </div><div id="L18"><a name="L-18"></a>
 </div><div id="L19"><a name="L-19"></a><span class="kn">from</span> <span class="nn">rhodecode.config.environment</span> <span class="kn">import</span> <span class="n">load_environment</span>
 </div><div id="L20"><a name="L-20"></a><span class="kn">from</span> <span class="nn">rhodecode.lib.db_manage</span> <span class="kn">import</span> <span class="n">DbManage</span>
 </div><div id="L21"><a name="L-21"></a><span class="kn">from</span> <span class="nn">rhodecode.model.meta</span> <span class="kn">import</span> <span class="n">Session</span>
 </div><div id="L22"><a name="L-22"></a>
 </div><div id="L23"><a name="L-23"></a>
 </div><div id="L24"><a name="L-24"></a><span class="n">log</span> <span class="o">=</span> <span class="n">logging</span><span class="o">.</span><span class="n">getLogger</span><span class="p">(</span><span class="n">__name__</span><span class="p">)</span>
 </div><div id="L25"><a name="L-25"></a>
 </div><div id="L26"><a name="L-26"></a>
 </div><div id="L27"><a name="L-27"></a><span class="k">def</span> <span class="nf">setup_app</span><span class="p">(</span><span class="n">command</span><span class="p">,</span> <span class="n">conf</span><span class="p">,</span> <span class="nb">vars</span><span class="p">):</span>
 </div><div id="L28"><a name="L-28"></a>    <span class="sd">"""Place any commands to setup rhodecode here"""</span>
 </div><div id="L29"><a name="L-29"></a>    <span class="n">dbconf</span> <span class="o">=</span> <span class="n">conf</span><span class="p">[</span><span class="s">'sqlalchemy.db1.url'</span><span class="p">]</span>
 </div><div id="L30"><a name="L-30"></a>    <span class="n">dbmanage</span> <span class="o">=</span> <span class="n">DbManage</span><span class="p">(</span><span class="n">log_sql</span><span class="o">=</span><span class="bp">True</span><span class="p">,</span> <span class="n">dbconf</span><span class="o">=</span><span class="n">dbconf</span><span class="p">,</span> <span class="n">root</span><span class="o">=</span><span class="n">conf</span><span class="p">[</span><span class="s">'here'</span><span class="p">],</span>
 </div><div id="L31"><a name="L-31"></a>                        <span class="n">tests</span><span class="o">=</span><span class="bp">False</span><span class="p">,</span> <span class="n">cli_args</span><span class="o">=</span><span class="n">command</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">__dict__</span><span class="p">)</span>
 </div><div id="L32"><a name="L-32"></a>    <span class="n">dbmanage</span><span class="o">.</span><span class="n">create_tables</span><span class="p">(</span><span class="n">override</span><span class="o">=</span><span class="bp">True</span><span class="p">)</span>
 </div><div id="L33"><a name="L-33"></a>    <span class="n">dbmanage</span><span class="o">.</span><span class="n">set_db_version</span><span class="p">()</span>
 </div><div id="L34"><a name="L-34"></a>    <span class="n">opts</span> <span class="o">=</span> <span class="n">dbmanage</span><span class="o">.</span><span class="n">config_prompt</span><span class="p">(</span><span class="bp">None</span><span class="p">)</span>
 </div><div id="L35"><a name="L-35"></a>    <span class="n">dbmanage</span><span class="o">.</span><span class="n">create_settings</span><span class="p">(</span><span class="n">opts</span><span class="p">)</span>
 </div><div id="L36"><a name="L-36"></a>    <span class="n">dbmanage</span><span class="o">.</span><span class="n">create_default_user</span><span class="p">()</span>
 </div><div id="L37"><a name="L-37"></a>    <span class="n">dbmanage</span><span class="o">.</span><span class="n">admin_prompt</span><span class="p">()</span>
 </div><div id="L38"><a name="L-38"></a>    <span class="n">dbmanage</span><span class="o">.</span><span class="n">create_permissions</span><span class="p">()</span>
 </div><div id="L39"><a name="L-39"></a>    <span class="n">dbmanage</span><span class="o">.</span><span class="n">populate_default_permissions</span><span class="p">()</span>
 </div><div id="L40"><a name="L-40"></a>    <span class="n">Session</span><span class="p">()</span><span class="o">.</span><span class="n">commit</span><span class="p">()</span>
 </div><div id="L41"><a name="L-41"></a>    <span class="n">load_environment</span><span class="p">(</span><span class="n">conf</span><span class="o">.</span><span class="n">global_conf</span><span class="p">,</span> <span class="n">conf</span><span class="o">.</span><span class="n">local_conf</span><span class="p">,</span> <span class="n">initial</span><span class="o">=</span><span class="bp">True</span><span class="p">)</span>
 </div><div id="L42"><a name="L-42"></a>    <span class="n">DbManage</span><span class="o">.</span><span class="n">check_waitress</span><span class="p">()</span>
 </div></pre></div>
 </td></tr></tbody></table>
     </div>
 </div>
 
 
 
 
 
 
 
 
 
 <!--
 Gist Edit
 -->
 
 
 <h2>Gist Edit</h2>
 
 <div class="codeblock">
                 <div class="code-header">
                     <div class="form">
                         <div class="fields">
                             <input id="filename" name="filename" placeholder="name this file..." size="30" type="text">
                             <div class="select2-container drop-menu" id="s2id_mimetype"><a href="javascript:void(0)" class="select2-choice" tabindex="-1">   <span class="select2-chosen" id="select2-chosen-3">Python</span><abbr class="select2-search-choice-close"></abbr>   <span class="select2-arrow" role="presentation"><b role="presentation"></b></span></a><label for="s2id_autogen3" class="select2-offscreen"></label><input class="select2-focusser select2-offscreen" type="text" aria-haspopup="true" role="button" aria-labelledby="select2-chosen-3" id="s2id_autogen3"><div class="select2-drop select2-display-none drop-menu-dropdown select2-with-searchbox">   <div class="select2-search">       <label for="s2id_autogen3_search" class="select2-offscreen"></label>       <input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" class="select2-input" role="combobox" aria-expanded="true" aria-autocomplete="list" aria-owns="select2-results-3" id="s2id_autogen3_search" placeholder="">   </div>   <ul class="select2-results" role="listbox" id="select2-results-3">   </ul></div></div><select id="mimetype" name="mimetype" tabindex="-1" title="" style="display: none;">
 <option selected="selected" value="plain">plain</option>
 <option value="text/apl" mode="apl">APL</option><option value="text/x-asterisk" mode="asterisk">Asterisk</option><option value="text/x-csrc" mode="clike">C</option><option value="text/x-c++src" mode="clike">C++</option><option value="text/x-cobol" mode="cobol">Cobol</option><option value="text/x-java" mode="clike">Java</option><option value="text/x-csharp" mode="clike">C#</option><option value="text/x-scala" mode="clike">Scala</option><option value="text/x-clojure" mode="clojure">Clojure</option><option value="text/x-coffeescript" mode="coffeescript">CoffeeScript</option><option value="text/x-common-lisp" mode="commonlisp">Common Lisp</option><option value="text/css" mode="css">CSS</option><option value="text/x-d" mode="d">D</option><option value="text/x-diff" mode="diff">diff</option><option value="application/xml-dtd" mode="dtd">DTD</option><option value="text/x-dylan" mode="dylan">Dylan</option><option value="text/x-ecl" mode="ecl">ECL</option><option value="text/x-eiffel" mode="eiffel">Eiffel</option><option value="text/x-erlang" mode="erlang">Erlang</option><option value="text/x-fortran" mode="fortran">Fortran</option><option value="text/x-fsharp" mode="mllike">F#</option><option value="text/x-gas" mode="gas">Gas</option><option value="text/x-go" mode="go">GO</option><option value="text/x-feature" mode="gherkin">Gherkin</option><option value="text/x-go" mode="go">Go</option><option value="text/x-groovy" mode="groovy">Groovy</option><option value="text/x-haml" mode="haml">HAML</option><option value="text/x-haskell" mode="haskell">Haskell</option><option value="text/x-haxe" mode="haxe">Haxe</option><option value="application/x-aspx" mode="htmlembedded">ASP.NET</option><option value="application/x-ejs" mode="htmlembedded">Embedded Javascript</option><option value="application/x-jsp" mode="htmlembedded">JavaServer Pages</option><option value="text/html" mode="htmlmixed">HTML</option><option value="message/http" mode="http">HTTP</option><option value="text/x-jade" mode="jade">Jade</option><option value="text/javascript" mode="javascript">JavaScript</option><option value="application/json" mode="javascript">JSON</option><option value="application/typescript" mode="javascript">TypeScript</option><option value="jinja2" mode="jinja2">Jinja2</option><option value="text/x-julia" mode="julia">Julia</option><option value="text/x-less" mode="less">LESS</option><option value="text/x-livescript" mode="livescript">LiveScript</option><option value="text/x-lua" mode="lua">Lua</option><option value="text/x-markdown" mode="markdown">Markdown (GitHub-flavour)</option><option value="text/mirc" mode="mirc">mIRC</option><option value="text/x-nginx-conf" mode="nginx">Nginx</option><option value="text/n-triples" mode="ntriples">NTriples</option><option value="text/x-ocaml" mode="ocaml">OCaml</option><option value="text/x-ocaml" mode="mllike">OCaml</option><option value="text/x-octave" mode="octave">Octave</option><option value="text/x-pascal" mode="pascal">Pascal</option><option value="null" mode="pegjs">PEG.js</option><option value="text/x-perl" mode="perl">Perl</option><option value="text/x-php" mode="php">PHP</option><option value="text/x-pig" mode="pig">Pig</option><option value="text/plain" mode="null">Plain Text</option><option value="text/x-properties" mode="properties">Properties files</option><option value="text/x-python" mode="python">Python</option><option value="text/x-puppet" mode="puppet">Puppet</option><option value="text/x-rsrc" mode="r">R</option><option value="text/x-rst" mode="rst">reStructuredText</option><option value="text/x-ruby" mode="ruby">Ruby</option><option value="text/x-rustsrc" mode="rust">Rust</option><option value="text/x-sass" mode="sass">Sass</option><option value="text/x-scheme" mode="scheme">Scheme</option><option value="text/x-scss" mode="css">SCSS</option><option value="text/x-sh" mode="shell">Shell</option><option value="application/sieve" mode="sieve">Sieve</option><option value="text/x-stsrc" mode="smalltalk">Smalltalk</option><option value="text/x-smarty" mode="smarty">Smarty</option><option value="text/x-smarty" mode="smartymixed">SmartyMixed</option><option value="text/x-solr" mode="solr">Solr</option><option value="application/x-sparql-query" mode="sparql">SPARQL</option><option value="text/x-sql" mode="sql">SQL</option><option value="text/x-mariadb" mode="sql">MariaDB</option><option value="text/x-stex" mode="stex">sTeX</option><option value="text/x-latex" mode="stex">LaTeX</option><option value="text/x-systemverilog" mode="verilog">SystemVerilog</option><option value="text/x-tcl" mode="tcl">Tcl</option><option value="text/x-tiddlywiki" mode="tiddlywiki">TiddlyWiki </option><option value="text/tiki" mode="tiki">Tiki wiki</option><option value="text/x-toml" mode="toml">TOML</option><option value="text/turtle" mode="turtle">Turtle</option><option value="text/x-vb" mode="vb">VB.NET</option><option value="text/vbscript" mode="vbscript">VBScript</option><option value="text/velocity" mode="velocity">Velocity</option><option value="text/x-verilog" mode="verilog">Verilog</option><option value="application/xml" mode="xml">XML</option><option value="text/html" mode="xml">HTML</option><option value="application/xquery" mode="xquery">XQuery</option><option value="text/x-yaml" mode="yaml">YAML</option><option value="text/x-z80" mode="z80">Z80</option></select>
         <script>
             $(document).ready(function() {
                   $('#mimetype').select2({
                       containerCssClass: 'drop-menu',
                       dropdownCssClass: 'drop-menu-dropdown',
                       dropdownAutoWidth: true
                   });
             });
         </script>
 
                         </div>
                     </div>
                 </div>
                 <div id="editor_container">
                     <div id="editor_pre"></div>
                     <textarea id="editor" name="content" style="display: none;"></textarea><div class="CodeMirror cm-s-default"><div style="overflow: hidden; position: relative; width: 3px; height: 0px; top: 484px; left: 219.4091796875px;"><textarea autocorrect="off" autocapitalize="off" spellcheck="false" style="position: absolute; padding: 0px; width: 1000px; height: 1em; outline: none;" tabindex="0"></textarea></div><div class="CodeMirror-hscrollbar" style="left: 29px; min-height: 18px;"><div style="height: 100%; min-height: 1px; width: 0px;"></div></div><div class="CodeMirror-vscrollbar" style="min-width: 18px; display: block; bottom: 0px;"><div style="min-width: 1px; height: 619px;"></div></div><div class="CodeMirror-scrollbar-filler"></div><div class="CodeMirror-gutter-filler"></div><div class="CodeMirror-scroll" tabindex="-1"><div class="CodeMirror-sizer" style="min-width: 700.269653320313px; margin-left: 29px; min-height: 619px;"><div style="position: relative; top: 0px;"><div class="CodeMirror-lines"><div style="position: relative; outline: none;"><div class="CodeMirror-measure"><div class="CodeMirror-linenumber CodeMirror-gutter-elt"><div>47</div></div></div><div style="position: relative; z-index: 1; display: none;"></div><div class="CodeMirror-code"><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">1</div></div><pre><span class="cm-keyword">import</span> <span class="cm-variable">re</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">2</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">3</div></div><pre><span class="cm-keyword">from</span> <span class="cm-variable">django</span>.<span class="cm-variable">utils</span>.<span class="cm-variable">text</span> <span class="cm-keyword">import</span> <span class="cm-variable">compress_sequence</span>, <span class="cm-variable">compress_string</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">4</div></div><pre><span class="cm-keyword">from</span> <span class="cm-variable">django</span>.<span class="cm-variable">utils</span>.<span class="cm-variable">cache</span> <span class="cm-keyword">import</span> <span class="cm-variable">patch_vary_headers</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">5</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">6</div></div><pre><span class="cm-variable">re_accepts_gzip</span> = <span class="cm-variable">re</span>.<span class="cm-builtin">compile</span>(<span class="cm-string">r'\bgzip\b'</span>)</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">7</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">8</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">9</div></div><pre><span class="cm-keyword">class</span> <span class="cm-def">GZipMiddleware</span>(<span class="cm-builtin">object</span>): # Intentionally long line to show what will happen if this line does not fit onto the screen. It might have some horizontal scrolling applied or some other fancy mechanism to deal with it.</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">10</div></div><pre>    <span class="cm-string">"""</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">11</div></div><pre><span class="cm-string">    This middleware compresses content if the browser allows gzip compression.</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">12</div></div><pre><span class="cm-string">    It sets the Vary header accordingly, so that caches will base their storage</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">13</div></div><pre><span class="cm-string">    on the Accept-Encoding header.</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">14</div></div><pre><span class="cm-string">    """</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">15</div></div><pre>    <span class="cm-keyword">def</span> <span class="cm-def">process_response</span>(<span class="cm-variable-2">self</span>, <span class="cm-variable">request</span>, <span class="cm-variable">response</span>):</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">16</div></div><pre>        <span class="cm-comment"># It's not worth attempting to compress really short responses.</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">17</div></div><pre>        <span class="cm-keyword">if</span> <span class="cm-operator">not</span> <span class="cm-variable">response</span>.<span class="cm-variable">streaming</span> <span class="cm-operator">and</span> <span class="cm-builtin">len</span>(<span class="cm-variable">response</span>.<span class="cm-variable">content</span>) <span class="cm-operator">&lt;</span> <span class="cm-number">200</span>:</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">18</div></div><pre>            <span class="cm-keyword">return</span> <span class="cm-variable">response</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">19</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">20</div></div><pre>        <span class="cm-comment"># Avoid gzipping if we've already got a content-encoding.</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">21</div></div><pre>        <span class="cm-keyword">if</span> <span class="cm-variable">response</span>.<span class="cm-variable">has_header</span>(<span class="cm-string">'Content-Encoding'</span>):</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">22</div></div><pre>            <span class="cm-keyword">return</span> <span class="cm-variable">response</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">23</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">24</div></div><pre>        <span class="cm-variable">patch_vary_headers</span>(<span class="cm-variable">response</span>, (<span class="cm-string">'Accept-Encoding'</span>,))</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">25</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">26</div></div><pre>        <span class="cm-variable">ae</span> = <span class="cm-variable">request</span>.<span class="cm-variable">META</span>.<span class="cm-variable">get</span>(<span class="cm-string">'HTTP_ACCEPT_ENCODING'</span>, <span class="cm-string">''</span>)</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">27</div></div><pre>        <span class="cm-keyword">if</span> <span class="cm-operator">not</span> <span class="cm-variable">re_accepts_gzip</span>.<span class="cm-variable">search</span>(<span class="cm-variable">ae</span>):</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">28</div></div><pre>            <span class="cm-keyword">return</span> <span class="cm-variable">response</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">29</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">30</div></div><pre>        <span class="cm-keyword">if</span> <span class="cm-variable">response</span>.<span class="cm-variable">streaming</span>:</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">31</div></div><pre>            <span class="cm-comment"># Delete the `Content-Length` header for streaming content, because</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">32</div></div><pre>            <span class="cm-comment"># we won't know the compressed size until we stream it.</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">33</div></div><pre>            <span class="cm-variable">response</span>.<span class="cm-variable">streaming_content</span> = <span class="cm-variable">compress_sequence</span>(<span class="cm-variable">response</span>.<span class="cm-variable">streaming_content</span>)</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">34</div></div><pre>            <span class="cm-keyword">del</span> <span class="cm-variable">response</span>[<span class="cm-string">'Content-Length'</span>]</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">35</div></div><pre>        <span class="cm-keyword">else</span>:</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">36</div></div><pre>            <span class="cm-comment"># Return the compressed content only if it's actually shorter.</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">37</div></div><pre>            <span class="cm-variable">compressed_content</span> = <span class="cm-variable">compress_string</span>(<span class="cm-variable">response</span>.<span class="cm-variable">content</span>)</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">38</div></div><pre>            <span class="cm-keyword">if</span> <span class="cm-builtin">len</span>(<span class="cm-variable">compressed_content</span>) <span class="cm-operator">&gt;=</span> <span class="cm-builtin">len</span>(<span class="cm-variable">response</span>.<span class="cm-variable">content</span>):</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">39</div></div><pre>                <span class="cm-keyword">return</span> <span class="cm-variable">response</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">40</div></div><pre>            <span class="cm-variable">response</span>.<span class="cm-variable">content</span> = <span class="cm-variable">compressed_content</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">41</div></div><pre>            <span class="cm-variable">response</span>[<span class="cm-string">'Content-Length'</span>] = <span class="cm-builtin">str</span>(<span class="cm-builtin">len</span>(<span class="cm-variable">response</span>.<span class="cm-variable">content</span>))</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">42</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">43</div></div><pre>        <span class="cm-keyword">if</span> <span class="cm-variable">response</span>.<span class="cm-variable">has_header</span>(<span class="cm-string">'ETag'</span>):</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">44</div></div><pre>            <span class="cm-variable">response</span>[<span class="cm-string">'ETag'</span>] = <span class="cm-variable">re</span>.<span class="cm-variable">sub</span>(<span class="cm-string">'"$'</span>, <span class="cm-string">';gzip"'</span>, <span class="cm-variable">response</span>[<span class="cm-string">'ETag'</span>])</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">45</div></div><pre>        <span class="cm-variable">response</span>[<span class="cm-string">'Content-Encoding'</span>] = <span class="cm-string">'gzip'</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">46</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">47</div></div><pre>        <span class="cm-keyword">return</span> <span class="cm-variable">response</span></pre></div></div><div class="CodeMirror-cursor" style="left: 189.4091796875px; top: 598px; height: 13px;">&nbsp;</div><div class="CodeMirror-cursor CodeMirror-secondarycursor" style="display: none;">&nbsp;</div></div></div></div></div><div style="position: absolute; height: 30px; width: 1px; top: 619px;"></div><div class="CodeMirror-gutters" style="height: 619px;"><div class="CodeMirror-gutter CodeMirror-linenumbers" style="width: 28px;"></div></div></div></div>
                 </div>
             </div>
 
 
 
 
 
 <!--
 File Edit
 -->
 
 <h2>File Edit</h2>
 
 <div class="codeblock">
         <div class="code-header">
             <div class="stats">
                 <i class="icon-file"></i>
                 <span class="item"><a href="/example/changeset/80ead1899f50a894889e19ffeb49c9cebf5bf045">r8248:80ead1899f50</a></span>
                 <span class="item">1.2 KiB</span>
                 <span class="item last">text/x-python</span>
                 <div class="buttons">
                   <a class="btn btn-mini" href="/example/changelog/80ead1899f50a894889e19ffeb49c9cebf5bf045/rhodecode/websetup.py">
                       <i class="icon-time"></i> history
                   </a>
 
                         <a class="btn btn-mini" href="/example/files/80ead1899f50a894889e19ffeb49c9cebf5bf045/rhodecode/websetup.py">source</a>
                       <a class="btn btn-mini" href="/example/raw/80ead1899f50a894889e19ffeb49c9cebf5bf045/rhodecode/websetup.py">raw</a>
                       <a class="btn btn-mini" href="/example/rawfile/80ead1899f50a894889e19ffeb49c9cebf5bf045/rhodecode/websetup.py">
                           <i class="icon-archive"></i> download
                       </a>
                 </div>
             </div>
             <div class="form">
                 <label for="set_mode">Editing file:</label>
                 rhodecode /
                 <input type="text" name="filename" value="websetup.py">
 
                 <div class="select2-container drop-menu" id="s2id_set_mode"><a href="javascript:void(0)" class="select2-choice" tabindex="-1">   <span class="select2-chosen" id="select2-chosen-2">plain</span><abbr class="select2-search-choice-close"></abbr>   <span class="select2-arrow" role="presentation"><b role="presentation"></b></span></a><label for="s2id_autogen2" class="select2-offscreen">Editing file:</label><input class="select2-focusser select2-offscreen" type="text" aria-haspopup="true" role="button" aria-labelledby="select2-chosen-2" id="s2id_autogen2"><div class="select2-drop select2-display-none drop-menu-dropdown select2-with-searchbox">   <div class="select2-search">       <label for="s2id_autogen2_search" class="select2-offscreen">Editing file:</label>       <input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" class="select2-input" role="combobox" aria-expanded="true" aria-autocomplete="list" aria-owns="select2-results-2" id="s2id_autogen2_search" placeholder="">   </div>   <ul class="select2-results" role="listbox" id="select2-results-2">   </ul></div></div><select id="set_mode" name="set_mode" tabindex="-1" title="Editing file:" style="display: none;">
 <option selected="selected" value="plain">plain</option>
 <option value="apl">APL</option><option value="asterisk">Asterisk</option><option value="clike">C</option><option value="clike">C++</option><option value="cobol">Cobol</option><option value="clike">Java</option><option value="clike">C#</option><option value="clike">Scala</option><option value="clojure">Clojure</option><option value="coffeescript">CoffeeScript</option><option value="commonlisp">Common Lisp</option><option value="css">CSS</option><option value="d">D</option><option value="diff">diff</option><option value="dtd">DTD</option><option value="dylan">Dylan</option><option value="ecl">ECL</option><option value="eiffel">Eiffel</option><option value="erlang">Erlang</option><option value="fortran">Fortran</option><option value="mllike">F#</option><option value="gas">Gas</option><option value="go">GO</option><option value="gherkin">Gherkin</option><option value="go">Go</option><option value="groovy">Groovy</option><option value="haml">HAML</option><option value="haskell">Haskell</option><option value="haxe">Haxe</option><option value="htmlembedded">ASP.NET</option><option value="htmlembedded">Embedded Javascript</option><option value="htmlembedded">JavaServer Pages</option><option value="htmlmixed">HTML</option><option value="http">HTTP</option><option value="jade">Jade</option><option value="javascript">JavaScript</option><option value="javascript">JSON</option><option value="javascript">TypeScript</option><option value="jinja2">Jinja2</option><option value="julia">Julia</option><option value="less">LESS</option><option value="livescript">LiveScript</option><option value="lua">Lua</option><option value="markdown">Markdown (GitHub-flavour)</option><option value="mirc">mIRC</option><option value="nginx">Nginx</option><option value="ntriples">NTriples</option><option value="ocaml">OCaml</option><option value="mllike">OCaml</option><option value="octave">Octave</option><option value="pascal">Pascal</option><option value="pegjs">PEG.js</option><option value="perl">Perl</option><option value="php">PHP</option><option value="pig">Pig</option><option value="null">Plain Text</option><option value="properties">Properties files</option><option value="python" selected="selected">Python</option><option value="puppet">Puppet</option><option value="r">R</option><option value="rst">reStructuredText</option><option value="ruby">Ruby</option><option value="rust">Rust</option><option value="sass">Sass</option><option value="scheme">Scheme</option><option value="css">SCSS</option><option value="shell">Shell</option><option value="sieve">Sieve</option><option value="smalltalk">Smalltalk</option><option value="smarty">Smarty</option><option value="smartymixed">SmartyMixed</option><option value="solr">Solr</option><option value="sparql">SPARQL</option><option value="sql">SQL</option><option value="sql">MariaDB</option><option value="stex">sTeX</option><option value="stex">LaTeX</option><option value="verilog">SystemVerilog</option><option value="tcl">Tcl</option><option value="tiddlywiki">TiddlyWiki </option><option value="tiki">Tiki wiki</option><option value="toml">TOML</option><option value="turtle">Turtle</option><option value="vb">VB.NET</option><option value="vbscript">VBScript</option><option value="velocity">Velocity</option><option value="verilog">Verilog</option><option value="xml">XML</option><option value="xml">HTML</option><option value="xquery">XQuery</option><option value="yaml">YAML</option><option value="z80">Z80</option></select>
         <script>
             $(document).ready(function() {
                   $('#set_mode').select2({
                       containerCssClass: 'drop-menu',
                       dropdownCssClass: 'drop-menu-dropdown',
                       dropdownAutoWidth: true
                   });
             });
         </script>
 
                 <label for="line_wrap">line wraps</label>
                 <div class="select2-container drop-menu" id="s2id_line_wrap"><a href="javascript:void(0)" class="select2-choice" tabindex="-1">   <span class="select2-chosen" id="select2-chosen-3">off</span><abbr class="select2-search-choice-close"></abbr>   <span class="select2-arrow" role="presentation"><b role="presentation"></b></span></a><label for="s2id_autogen3" class="select2-offscreen">line wraps</label><input class="select2-focusser select2-offscreen" type="text" aria-haspopup="true" role="button" aria-labelledby="select2-chosen-3" id="s2id_autogen3"><div class="select2-drop select2-display-none drop-menu-dropdown">   <div class="select2-search select2-search-hidden select2-offscreen">       <label for="s2id_autogen3_search" class="select2-offscreen">line wraps</label>       <input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" class="select2-input" role="combobox" aria-expanded="true" aria-autocomplete="list" aria-owns="select2-results-3" id="s2id_autogen3_search" placeholder="">   </div>   <ul class="select2-results" role="listbox" id="select2-results-3">   </ul></div></div><select id="line_wrap" name="line_wrap" tabindex="-1" title="line wraps" style="display: none;">
 <option value="on">on</option>
 <option selected="selected" value="off">off</option>
 </select>
         <script>
             $(document).ready(function() {
                   $('#line_wrap').select2({
                       containerCssClass: 'drop-menu',
                       dropdownCssClass: 'drop-menu-dropdown',
                       dropdownAutoWidth: true,
                         minimumResultsForSearch: -1
 
                   });
             });
         </script>
 
                 <div id="render_preview" class="btn btn-mini hidden disabled">Preview</div>
             </div>
         </div>
             <div id="editor_container">
                 <pre id="editor_pre"></pre>
                 <textarea id="editor" name="content" style="display: none;"># -*- coding: utf-8 -*-
 
 # Published under Commercial License.
 # Read the full license text at https://rhodecode.com/licenses.
 """
 rhodecode.websetup
 ~~~~~~~~~~~~~~~~~~
 
 Weboperations and setup for rhodecode
 
 :created_on: Dec 11, 2010
 :author: marcink
 :copyright: (c) 2013-2015 RhodeCode GmbH.
 :license: Commercial License, see LICENSE for more details.
 """
 
 import logging
 
 from rhodecode.config.environment import load_environment
 from rhodecode.lib.db_manage import DbManage
 from rhodecode.model.meta import Session
 
 
 log = logging.getLogger(__name__)
 
 
 def setup_app(command, conf, vars):
     """Place any commands to setup rhodecode here"""
     dbconf = conf['sqlalchemy.db1.url']
     dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=conf['here'],
                         tests=False, cli_args=command.options.__dict__)
     dbmanage.create_tables(override=True)
     dbmanage.set_db_version()
     opts = dbmanage.config_prompt(None)
     dbmanage.create_settings(opts)
     dbmanage.create_default_user()
     dbmanage.admin_prompt()
     dbmanage.create_permissions()
     dbmanage.populate_default_permissions()
     Session().commit()
     load_environment(conf.global_conf, conf.local_conf, initial=True)
 </textarea><div class="CodeMirror cm-s-default CodeMirror-focused"><div style="overflow: hidden; position: relative; width: 3px; height: 0px; top: 5px; left: 34px;"><textarea autocorrect="off" autocapitalize="off" spellcheck="false" style="position: absolute; padding: 0px; width: 1000px; height: 1em; outline: none;" tabindex="0"></textarea></div><div class="CodeMirror-hscrollbar" style="left: 29px; min-height: 18px;"><div style="height: 100%; min-height: 1px; width: 0px;"></div></div><div class="CodeMirror-vscrollbar" style="display: block; bottom: 0px; min-width: 18px;"><div style="min-width: 1px; height: 554px;"></div></div><div class="CodeMirror-scrollbar-filler"></div><div class="CodeMirror-gutter-filler"></div><div class="CodeMirror-scroll" tabindex="-1"><div class="CodeMirror-sizer" style="min-width: 579.350463867188px; margin-left: 29px; min-height: 554px;"><div style="position: relative; top: 0px;"><div class="CodeMirror-lines"><div style="position: relative; outline: none;"><div class="CodeMirror-measure"><div style="width: 50px; height: 50px; overflow-x: scroll;"></div></div><div style="position: relative; z-index: 1; display: none;"></div><div class="CodeMirror-code"><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">1</div></div><pre><span class="cm-comment"># -*- coding: utf-8 -*-</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">2</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">3</div></div><pre><span class="cm-comment"># Published under Commercial License.</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">4</div></div><pre><span class="cm-comment"># Read the full license text at https://rhodecode.com/licenses.</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">5</div></div><pre><span class="cm-string">"""</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">6</div></div><pre><span class="cm-string">rhodecode.websetup</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">7</div></div><pre><span class="cm-string">~~~~~~~~~~~~~~~~~~</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">8</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">9</div></div><pre><span class="cm-string">Weboperations and setup for rhodecode</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">10</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">11</div></div><pre><span class="cm-string">:created_on: Dec 11, 2010</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">12</div></div><pre><span class="cm-string">:author: marcink</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">13</div></div><pre><span class="cm-string">:copyright: (c) 2013-2015 RhodeCode GmbH.</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">14</div></div><pre><span class="cm-string">:license: Commercial License, see LICENSE for more details.</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">15</div></div><pre><span class="cm-string">"""</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">16</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">17</div></div><pre><span class="cm-keyword">import</span> <span class="cm-variable">logging</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">18</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">19</div></div><pre><span class="cm-keyword">from</span> <span class="cm-variable">rhodecode</span>.<span class="cm-variable">config</span>.<span class="cm-variable">environment</span> <span class="cm-keyword">import</span> <span class="cm-variable">load_environment</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">20</div></div><pre><span class="cm-keyword">from</span> <span class="cm-variable">rhodecode</span>.<span class="cm-variable">lib</span>.<span class="cm-variable">db_manage</span> <span class="cm-keyword">import</span> <span class="cm-variable">DbManage</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">21</div></div><pre><span class="cm-keyword">from</span> <span class="cm-variable">rhodecode</span>.<span class="cm-variable">model</span>.<span class="cm-variable">meta</span> <span class="cm-keyword">import</span> <span class="cm-variable">Session</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">22</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">23</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">24</div></div><pre><span class="cm-variable">log</span> = <span class="cm-variable">logging</span>.<span class="cm-variable">getLogger</span>(<span class="cm-variable">__name__</span>)  # Intentionally long line to show what will happen if this line does not fit onto the screen. It might have some horizontal scrolling applied or some other fancy mechanism to deal with it.</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">25</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">26</div></div><pre>&nbsp;</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">27</div></div><pre><span class="cm-keyword">def</span> <span class="cm-def">setup_app</span>(<span class="cm-variable">command</span>, <span class="cm-variable">conf</span>, <span class="cm-builtin">vars</span>):</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">28</div></div><pre>    <span class="cm-string">"""Place any commands to setup rhodecode here"""</span></pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">29</div></div><pre>    <span class="cm-variable">dbconf</span> = <span class="cm-variable">conf</span>[<span class="cm-string">'sqlalchemy.db1.url'</span>]</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">30</div></div><pre>    <span class="cm-variable">dbmanage</span> = <span class="cm-variable">DbManage</span>(<span class="cm-variable">log_sql</span>=<span class="cm-builtin">True</span>, <span class="cm-variable">dbconf</span>=<span class="cm-variable">dbconf</span>, <span class="cm-variable">root</span>=<span class="cm-variable">conf</span>[<span class="cm-string">'here'</span>],</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">31</div></div><pre>                        <span class="cm-variable">tests</span>=<span class="cm-builtin">False</span>, <span class="cm-variable">cli_args</span>=<span class="cm-variable">command</span>.<span class="cm-variable">options</span>.<span class="cm-variable">__dict__</span>)</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">32</div></div><pre>    <span class="cm-variable">dbmanage</span>.<span class="cm-variable">create_tables</span>(<span class="cm-variable">override</span>=<span class="cm-builtin">True</span>)</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">33</div></div><pre>    <span class="cm-variable">dbmanage</span>.<span class="cm-variable">set_db_version</span>()</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">34</div></div><pre>    <span class="cm-variable">opts</span> = <span class="cm-variable">dbmanage</span>.<span class="cm-variable">config_prompt</span>(<span class="cm-builtin">None</span>)</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">35</div></div><pre>    <span class="cm-variable">dbmanage</span>.<span class="cm-variable">create_settings</span>(<span class="cm-variable">opts</span>)</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">36</div></div><pre>    <span class="cm-variable">dbmanage</span>.<span class="cm-variable">create_default_user</span>()</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">37</div></div><pre>    <span class="cm-variable">dbmanage</span>.<span class="cm-variable">admin_prompt</span>()</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">38</div></div><pre>    <span class="cm-variable">dbmanage</span>.<span class="cm-variable">create_permissions</span>()</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">39</div></div><pre>    <span class="cm-variable">dbmanage</span>.<span class="cm-variable">populate_default_permissions</span>()</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">40</div></div><pre>    <span class="cm-variable">Session</span>().<span class="cm-variable">commit</span>()</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">41</div></div><pre>    <span class="cm-variable">load_environment</span>(<span class="cm-variable">conf</span>.<span class="cm-variable">global_conf</span>, <span class="cm-variable">conf</span>.<span class="cm-variable">local_conf</span>, <span class="cm-variable">initial</span>=<span class="cm-builtin">True</span>)</pre></div><div style="position: relative;"><div class="CodeMirror-gutter-wrapper" style="position: absolute; left: -29px;"><div class="CodeMirror-linenumber CodeMirror-gutter-elt" style="left: 0px; width: 20px;">42</div></div><pre>&nbsp;</pre></div></div><div class="CodeMirror-cursor" style="left: 4px; top: 0px; height: 13px;">&nbsp;</div><div class="CodeMirror-cursor CodeMirror-secondarycursor" style="display: none;">&nbsp;</div></div></div></div></div><div style="position: absolute; height: 30px; width: 1px; top: 554px;"></div><div class="CodeMirror-gutters" style="height: 554px;"><div class="CodeMirror-gutter CodeMirror-linenumbers" style="width: 28px;"></div></div></div></div>
                 <div id="editor_preview"></div>
             </div>
             <div class="message">
                 <label class="codeblock-label">Commit Message</label>
                 <textarea id="commit" name="message" placeholder="Edited file rhodecode/websetup.py via RhodeCode"></textarea>
             </div>
         </div>
 
 
 
 
 
 
 <!--
   Commit with comments
 -->
 
 <h2>Commit with comments</h2>
 
 <div class="diff-container" id="diff-container-140360037209920">
     <div id="c-4e5ee86997c6-7046e4320b26_target"></div>
     <div id="c-4e5ee86997c6-7046e4320b26" class="diffblock margined comm">
         <div class="code-header">
             <div title="Go back to changed files overview">
                 <a href="#changes_box">
                     <i class="icon-circle-arrow-up"></i>
                 </a>
             </div>
             <div class="changeset_header">
                 <div class="changeset_file">
                     <i class="icon-file"></i>
                     <a href="/andersonsantos/rhodecode-dev-fork/files/4e5ee86997c64981d85cf62283af448624e26929/rhodecode/tests/functional/test_compare_local.py">rhodecode/tests/functional/test_compare_local.py</a>
                 </div>
                 <div class="diff-actions">
                   <a href="/andersonsantos/rhodecode-dev-fork/diff/rhodecode/tests/functional/test_compare_local.py?fulldiff=1&amp;diff1=682135c2e3958d7c84db06d716efe482bd3ce7c6&amp;diff=diff&amp;diff2=4e5ee86997c64981d85cf62283af448624e26929" class="tooltip" title="Show full diff for this file">
                       <img class="icon" src="/images/icons/page_white_go.png">
                   </a>
                   <a href="/andersonsantos/rhodecode-dev-fork/diff-2way/rhodecode/tests/functional/test_compare_local.py?fulldiff=1&amp;diff1=682135c2e3958d7c84db06d716efe482bd3ce7c6&amp;diff=diff&amp;diff2=4e5ee86997c64981d85cf62283af448624e26929" class="tooltip" title="Show full side-by-side diff for this file">
                       <img class="icon" src="/images/icons/application_double.png">
                   </a>
                   <a href="/andersonsantos/rhodecode-dev-fork/diff/rhodecode/tests/functional/test_compare_local.py?diff1=682135c2e3958d7c84db06d716efe482bd3ce7c6&amp;diff=raw&amp;diff2=4e5ee86997c64981d85cf62283af448624e26929" class="tooltip" title="Raw diff">
                       <img class="icon" src="/images/icons/page_white.png">
                   </a>
                   <a href="/andersonsantos/rhodecode-dev-fork/diff/rhodecode/tests/functional/test_compare_local.py?diff1=682135c2e3958d7c84db06d716efe482bd3ce7c6&amp;diff=download&amp;diff2=4e5ee86997c64981d85cf62283af448624e26929" class="tooltip" title="Download diff">
                       <img class="icon" src="/images/icons/page_save.png">
                   </a>
                   <a class="tooltip" href="/andersonsantos/rhodecode-dev-fork/changeset/4e5ee86997c64981d85cf62283af448624e26929?c-4e5ee86997c6-7046e4320b26=WS%3A1&amp;c-4e5ee86997c6-7046e4320b26=C%3A3#c-4e5ee86997c6-7046e4320b26" title="Ignore white space"><img alt="Ignore white space" class="icon" src="/images/icons/text_strikethrough.png"></a>
                   <a class="tooltip" href="/andersonsantos/rhodecode-dev-fork/changeset/4e5ee86997c64981d85cf62283af448624e26929?c-4e5ee86997c6-7046e4320b26=C%3A6#c-4e5ee86997c6-7046e4320b26" title="increase diff context to 6 lines"><img alt="increase diff context to 6 lines" class="icon" src="/images/icons/table_add.png"></a>
                 </div>
                 <span>
                   <label>
                   Show inline comments
                   <input checked="checked" class="show-inline-comments" id="" id_for="c-4e5ee86997c6-7046e4320b26" name="" type="checkbox" value="1">
                   </label>
                 </span>
             </div>
         </div>
         <div class="code-body">
             <div class="full_f_path" path="rhodecode/tests/functional/test_compare_local.py"></div>
             <table class="code-difftable">
 <tbody><tr class="line context">
   <td class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o...">...</a></td>
   <td class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n...">...</a></td>
   <td class="code ">
     <pre>@@ -59,7 +59,7 @@
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o59" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o59">59</a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n59" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n59">59</a></td>
   <td class="code ">
     <pre>                'tag': 'v0.2.0',
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o60" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o60">60</a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n60" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n60">60</a></td>
   <td class="code ">
     <pre>                'branch': 'default',
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o61" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o61">61</a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n61" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n61">61</a></td>
   <td class="code ">
     <pre>                'response':  # Intentionally long line to show what will happen if this line does not fit onto the screen. It might have some horizontal scrolling applied or some other fancy mechanism to deal with it.
 </pre>
   </td>
 </tr>
 <tr class="line del">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o62" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o62">62</a></td>
   <td class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n"></a></td>
   <td class="code ">
     <pre>                   '147 files changed: 5700 inserted, 10176 deleted'
 </pre>
   </td>
 </tr>
 <tr class="line add">
   <td class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o"></a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n62" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n62">62</a></td>
   <td class="code ">
     <pre><ins> </ins>                   '147 files changed: 5700 inserted, 10176 deleted'
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o63" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o63">63</a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n63" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n63">63</a></td>
   <td class="code ">
     <pre>            },
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o64" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o64">64</a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n64" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n64">64</a></td>
   <td class="code ">
     <pre>            'git': {
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o65" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o65">65</a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n65" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n65">65</a></td>
   <td class="code ">
     <pre>                'tag': 'v0.2.2',
 </pre>
   </td>
 </tr>
 <tr class="line context">
   <td class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o...">...</a></td>
   <td class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n...">...</a></td>
   <td class="code ">
     <pre>@@ -77,9 +77,11 @@
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o77" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o77">77</a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n77" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n77">77</a></td>
   <td class="code ">
     <pre>            target_ref=revisions[backend.alias]['tag'],
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o78" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o78">78</a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n78" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n78">78</a></td>
   <td class="code ">
     <pre>            ))
 </pre>
   </td>
 </tr><tr id="comment-tr-3754" class="inline-comments"><td></td><td></td><td>
 
   <div class="comment" id="comment-3754" line="n78">
     <div class="comment-wrapp">
       <div class="meta">
         <span class="gravatar">
             <img src="https://secure.gravatar.com/avatar/72706ebd30734451af9ff3fb59f05ff1?d=identicon&amp;s=40" height="20" width="20">
         </span>
         <span class="user">
             anderson
         </span>
         <span class="date">
             just now |
         </span>
         <span class="status-change">
               Comment on commit
         </span>
          <a class="permalink" href="#comment-3754">¶</a>
       </div>
       <div class="text">
           <div class="rst-block"><p>commented line
 with multiple lines</p>
 </div>
       </div>
     </div>
   </div><div class="add-comment"><span class="btn btn-default">Add another comment</span></div>
 
 </td></tr>
 <tr class="line unmod">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o79" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o79">79</a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n79" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n79">79</a></td>
   <td class="code ">
     <pre></pre>
   </td>
 </tr>
 <tr class="line del form-open hl-comment">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o80" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o80">80</a></td>
   <td class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n"></a></td>
   <td class="code ">
     <pre>        response.mustcontain('%s@%s' % (<del>backend.repo_name,</del>
 </pre>
   </td>
 </tr><tr id="comment-tr-undefined" class="comment-form-inline"><td></td><td></td><td>
   <div class="comment-inline-form ac">
     <div class="overlay"><div class="overlay-text">Submitting...</div></div>
       <form action="#" class="inline-form" method="get">
       <div id="edit-container_o80" class="clearfix">
         <div class="comment-title pull-left">
           Commenting on line o80.
         </div>
         <div class="comment-help pull-right">
           Comments parsed using <a href="http://docutils.sourceforge.net/docs/user/rst/quickref.html">RST</a> syntax with <span class="tooltip" title="Use @username inside this text to send notification to this RhodeCode user">@mention</span> support.
         </div>
             <div style="clear: both"></div>
             <textarea id="text_o80" name="text" class="comment-block-ta ac-input" autocomplete="off"></textarea>
       </div>
       <div id="preview-container_o80" class="clearfix" style="display: none;">
          <div class="comment-help">
               Comment preview
           </div>
           <div id="preview-box_o80" class="preview-box"></div>
       </div>
       <div class="comment-button pull-right">
         <input type="hidden" name="f_path" value="rhodecode/tests/functional/test_compare_local.py">
         <input type="hidden" name="line" value="o80">
         <div id="preview-btn_o80" class="btn btn-default">Preview</div>
         <div id="edit-btn_o80" class="btn" style="display: none;">Edit</div>
         <input class="btn btn-success save-inline-form" id="save" name="save" type="submit" value="Comment">
       </div>
       <div class="comment-button hide-inline-form-button">
       <input class="btn hide-inline-form" id="hide-inline-form" name="hide-inline-form" type="reset" value="Cancel">
       </div>
       </form>
   </div>
 </td></tr>
 <tr class="line add">
   <td class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o"></a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n80" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n80">80</a></td>
   <td class="code ">
     <pre>        response.mustcontain('%s@%s' % (
 </pre>
   </td>
 </tr>
 <tr class="line add">
   <td class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o"></a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n81" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n81">81</a></td>
   <td class="code ">
     <pre>            backend.repo_name,
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o81" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o81">81</a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n82" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n82">82</a></td>
   <td class="code ">
     <pre>            revisions[backend.alias]['branch']))
 </pre>
   </td>
 </tr>
 <tr class="line del">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o82" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o82">82</a></td>
   <td class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n"></a></td>
   <td class="code ">
     <pre>        response.mustcontain('%s@%s' % (<del>backend.repo_name,</del>
 </pre>
   </td>
 </tr>
 <tr class="line add">
   <td class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o"></a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n83" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n83">83</a></td>
   <td class="code ">
     <pre>        response.mustcontain('%s@%s' % (
 </pre>
   </td>
 </tr>
 <tr class="line add">
   <td class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o"></a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n84" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n84">84</a></td>
   <td class="code ">
     <pre>            backend.repo_name,
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o83" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o83">83</a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n85" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n85">85</a></td>
   <td class="code ">
     <pre>            revisions[backend.alias]['tag']))
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o84" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o84">84</a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n86" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n86">86</a></td>
   <td class="code ">
     <pre>        response.mustcontain(revisions[backend.alias]['response'])
 </pre>
   </td>
 </tr>
 <tr class="line unmod">
   <td id="rhodecodetestsfunctionaltest_compare_localpy_o85" class="lineno old"><a href="#rhodecodetestsfunctionaltest_compare_localpy_o85">85</a></td>
   <td id="rhodecodetestsfunctionaltest_compare_localpy_n87" class="lineno new"><a href="#rhodecodetestsfunctionaltest_compare_localpy_n87">87</a></td>
   <td class="code ">
     <pre></pre>
   </td>
 </tr>
 </tbody></table>
         </div>
     </div>
 </div>
 
 
 
 <!--
  Side-by-side diff
  -->
 
  <h2>Side-by-side diff</h2>
 
 <div class="box">
     <div class="diff-container" style="overflow-x: hidden">
         <div class="diffblock comm" style="margin:3px; padding:1px">
             <div class="code-header">
                 <div class="changeset_header">
                     <div class="changeset_file">
                         <i class="icon-file"></i>
                         <a href="/pygments/files/ea295cfb622620f5ba13e226ec531e3fe5296399/tests/test_basic_api.py">tests/test_basic_api.py</a>
                          [mode: <span id="selected_mode">python</span>]
                     </div>
                     <div class="diff-actions">
                       <a href="/pygments/diff/tests/test_basic_api.py?diff2=ea295cfb622620f5ba13e226ec531e3fe5296399&amp;diff=diff&amp;diff1=de45f950b669e2d991c4ba512fa6fe450c6616db&amp;fulldiff=1" class="tooltip" title="Show full diff for this file">
                           <img class="icon" src="/images/icons/page_white_go.png">
                       </a>
                       <a href="/pygments/diff-2way/tests/test_basic_api.py?diff2=ea295cfb622620f5ba13e226ec531e3fe5296399&amp;diff=diff&amp;diff1=de45f950b669e2d991c4ba512fa6fe450c6616db&amp;fulldiff=1" class="tooltip" title="Show full side-by-side diff for this file" tt_title="Show full side-by-side diff for this file">
                           <img class="icon" src="/images/icons/application_double.png">
                       </a>
                       <a href="/pygments/diff/tests/test_basic_api.py?diff2=ea295cfb622620f5ba13e226ec531e3fe5296399&amp;diff1=de45f950b669e2d991c4ba512fa6fe450c6616db&amp;diff=raw" class="tooltip" title="Raw diff">
                           <img class="icon" src="/images/icons/page_white.png">
                       </a>
                       <a href="/pygments/diff/tests/test_basic_api.py?diff2=ea295cfb622620f5ba13e226ec531e3fe5296399&amp;diff1=de45f950b669e2d991c4ba512fa6fe450c6616db&amp;diff=download" class="tooltip" title="Download diff">
                           <img class="icon" src="/images/icons/page_save.png">
                       </a>
                       <label><input id="ignorews" name="ignorews" type="checkbox" value="1">ignore white space</label>
                       <label><input id="edit_mode" name="edit_mode" type="checkbox" value="1">turn on edit mode</label>
 
                     </div>
                     <div style="float: right; padding: 0px 10px 0px 0px">
     r1538:de45f950b669 ... r1539:ea295cfb6226
 </div>
                 </div>
             </div>
             <div id="compare"></div>
         </div>
     </div>
 
 <script>
 $(document).ready(function () {
     var example_lines = '1\n2\n3\n4\n5\n6\n7\n8\n9\n \n';
 
     $('#compare').mergely({
         width: 'auto',
         height: '600',
         fgcolor: {a:'#ddffdd',c:'#cccccc',d:'#ffdddd'},
         bgcolor: '#fff',
         viewport: true,
         cmsettings: {mode: 'text/plain', readOnly: true, lineWrapping: false, lineNumbers: true},
         lhs: function(setValue) {
             if("False" == "True"){
                 setValue('Binary file')
             }
             else if("MercurialCommit" == "EmptyCommit"){
                 setValue('');
             }
             else{
                 var left_value = example_lines.slice(0, 10) +
                     '123456789 '.repeat(10) +
                     '\n'+
                     example_lines.slice(10, 20);
                 setValue(left_value + example_lines.repeat(9));
             }
 
         },
         rhs: function(setValue) {
             if("False" == "True"){
                 setValue('Binary file')
             }
             else if("MercurialCommit" == "EmptyCommit"){
                 setValue('');
             }
             else{
                 var right_value = example_lines +
                     example_lines.slice(0, 8) +
                     'abcdefghi '.repeat(10) +
                     '\n'+
                     example_lines.slice(8, 20);
                 setValue(right_value + example_lines.repeat(9));
             }
         },
     });
 
     var detected_mode = detectCodeMirrorModeFromExt('test_basic_api.py', true);
     if(detected_mode){
         setCodeMirrorMode($('#compare').mergely('cm', 'lhs'), detected_mode);
         setCodeMirrorMode($('#compare').mergely('cm', 'rhs'), detected_mode);
         $('#selected_mode').html(detected_mode);
     }
 
     $('#ignorews').change(function(e){
         var val = e.currentTarget.checked;
         $('#compare').mergely('options', {ignorews: val});
         $('#compare').mergely('update');
-    })
+    });
     $('#edit_mode').change(function(e){
         var val = !e.currentTarget.checked;
         $('#compare').mergely('cm', 'lhs').setOption('readOnly', val);
         $('#compare').mergely('cm', 'rhs').setOption('readOnly', val);
         $('#compare').mergely('update');
     })
 });
 </script>
 
 </div>
 
 <!-- end examples -->
 
     </div>
   </div>
 </div>
 </%def>

rhodecode/templates/debug_style/tables.html

@@ -1,545 +1,545 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/debug_style/index.html"/>
 
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Style'), h.url('debug_style_home'))}
     &raquo;
     ${c.active}
 </%def>
 
 
 <%def name="real_main()">
 <div class="box">
     <div class="title">
         ${self.breadcrumbs()}
     </div>
 
     <div class='sidebar-col-wrapper'>
       ##main
       ${self.sidebar()}
 
       <div class="main-content">
 
       <div style="opacity:.5">
 
         <h2>Simple tables</h2>
 
         <p>These styles will be adjusted later to provide a baseline style
             for all tables without classes added, whether part of the
             application or not. Currently, some of the
             application-specific styles are applied to this table.</p>
         <p>This is a baseline style for all tables, whether part of the
             application or not. It has no class applied for styling. Use
             the "rctable" class as outlined before for tables which are
             part of the RhodeCode application.</p>
         <table>
           <tbody>
             <tr>
               <th>Header A</th>
               <th>Header B</th>
               <th>Header C</th>
               <th>Header D</th>
             </tr>
             <tr>
               <td>Content of col A</td>
               <td>Content of col B</td>
               <td>Content of col C</td>
               <td>Content of col D</td>
             </tr>
             <tr>
               <td>Content of col A</td>
               <td>Content of col B</td>
               <td>Content of col C</td>
               <td>Content of col D</td>
             </tr>
             <tr>
               <td>Content of col A</td>
               <td>Content of col B</td>
               <td>Content of col C</td>
               <td>Content of col D</td>
             </tr>
             <tr>
               <td>Content of col A</td>
               <td>Content of col B</td>
               <td>Content of col C</td>
               <td>Content of col D</td>
             </tr>
           </tbody>
         </table>
       </div>
 
 
 
 
       <h2>RC application table with examples</h2>
 
       <p>This is a standard table which applies the rhodecode-specific styling to be used
           throughout the application; it has <code>&lt;table class="rctable"&gt;</code>.
           <br/>
           By default, table data is not truncated, and wraps inside of the <code>&lt;td&gt
           ;</code>. To prevent wrapping and contain data on one line, use the <code>&lt;
           class="truncate-wrap"&gt;</code> on the <code>&lt;td&gt;</code>, and <code>span
           class="truncate"</code> around the specific data to be truncated.
       </p>
       <p>
           Ellipsis is added via CSS. Please always add a row of headers using <code>&lt;th
           &gt;</code> to the top of a table.
       </p>
 
       ## TODO: johbo: in case we have more tables with examples, we should
       ## create a generic class here.
       <table class="rctable issuetracker">
         <thead>
           <tr>
             <th>Header A</th>
             <th>Header B</th>
             <th>Header C</th>
             <th>Header D</th>
           </tr>
         </thead>
         <tbody>
           <tr>
             <td class="issue-tracker-example">
               Example of col A
             </td>
             <td class="issue-tracker-example">
               Example of col B
             </td>
             <td class="issue-tracker-example">
               Example of col C
             </td>
             <td class="issue-tracker-example">
               Example of col D
             </td>
           </tr>
           <tr>
             <td>Content of col A</td>
             <td>Content of col B</td>
             <td>Content of col C which is very long and will not be
               truncated because sometimes people just want to write
               really, really long commit messages which explain what
               they did in excruciating detail and you really, really
               want to read them.</td>
             <td>Content of col D</td>
           </tr>
           <tr>
             <td>Content of col A</td>
             <td>Content of col B</td>
             <td>Content of col C</td>
             <td class="truncate-wrap"><span class="truncate">Truncated
                 content of column D truncate truncate truncatetruncate
                 truncate truncate</span></td>
           </tr>
         </tbody>
       </table>
 
       <h2>RC application table data classes</h2>
 
       <p>The following tables contain documentation of all existing table data classes.
          Please update when new classes are made.
       </p>
       <table class="rctable examples">
         <thead>
           <tr>
             <th>Class</th>
             <th>Description</th>
             <th>Example</th>
           </tr>
         </thead>
         <tbody>
             <td>td-user</td>
             <td>Any username/gravatar combination (see also Icons style).</td>
             <td class="td-user author">
               <img class="gravatar" alt="gravatar" src="https://secure.gravatar.com/avatar/0c9a7e6674b6f0b35d98dbe073e3f0ab?d=identicon&amp;s=32" height="16" width="16">
               <span title="Oliver Strobel <[e-mail]>" class="user">ostrobel (Oliver Strobel)</span>
             </td>
           </tr>
           <tr>
             <td>td-hash</td>
             <td>Any hash; a commit, revision, etc. Use <code>&lt;pre&gt;</code> and header 'Commit'</td>
             <td class="td-commit">
               <pre><a href="/anothercpythonforkkkk/files/8d6b27837c6979983b037693fe975cdbb761b500/">r93699:8d6b27837c69</a></pre>
             </td>
           </tr>
           <tr>
             <td>td-rss</td>
             <td>RSS feed link icon</td>
             <td class="td-rss">
               <a title="Subscribe to rss feed" href="/feed/rss"><i class="icon-rss-sign"></i></a>
             </td>
           </tr>
           <tr>
             <td>td-componentname</td>
             <td>Any group, file, gist, or directory name.</td>
             <td class="td-componentname">
               <a href="/cpythonfork">
                 <span title="Mercurial repository"><i class="icon-hg"></i></span>
                 <i class="icon-unlock-alt" title="Public repository"></i>
                 rhodecode-dev-restyle-fork
               </a>
             </td>
           </tr>
           <tr>
             <td>td-tags</td>
             <td>Any cell containing tags, including branches and bookmarks.</td>
             <td class="td-tags">
               <span class="branchtag tag" title="Branch default">
                 <a href="/rhodecode-dev-restyle-  fork/changelog?branch=default"><i class="icon-code-fork"></i>default</a>
              </span>
             </td>
           </tr>
           <tr>
             <td>tags-truncate</td>
             <td>Used to truncate a cell containing tags; avoid if possible.</td>
             <td class="td-tags truncate-wrap">
               <div class="truncate tags-truncate">
                 <div class="autoexpand">
                   <span class="tagtag tag" title="Tag tip">
                     <a href="/rhodecode-dev-restyle-fork/files/e519d5a0e71466d27257ddff921c4a13c540408e/"><i class="icon-tag"></i>tip</a>
                   </span>
                   <span class="branchtag tag" title="Branch default">
                    <a href="/rhodecode-dev-restyle-fork/changelog?branch=default"><i class="icon-code-fork"></i>default</a>
                   </span>
                   <span class="branchtag tag" title="Branch default">
                    <a href="/rhodecode-dev-restyle-fork/changelog?branch=default"><i class="icon-code-fork"></i>default</a>
                   </span>
                 </div>
               </div>
             </td>
           </tr>
           <tr>
             <td>td-ip</td>
             <td>Any ip address.</td>
             <td class="td-ip">
               172.16.115.168
             </td>
           </tr>
           <tr>
             <td>td-type</td>
             <td>A state or an auth type.</td>
             <td class="td-type">
               rhodecode
             </td>
           </tr>
           <tr>
             <td>td-authtoken</td>
             <td>For auth tokens. Use truncate classes for hover expand; see html.</td>
             <td class="truncate-wrap td-authtoken">
               <div class="truncate autoexpand">
                 <code>688df65b87d3ad16ae9f8fc6338a551d40f41c7a</code>
               </div>
             </td>
           </tr>
           <tr>
             <td>td-action</td>
             <td>Buttons which perform an action.</td>
             <td class="td-action">
               <div class="grid_edit">
                 <a href="/_admin/users/2/edit" title="edit">
                   <i class="icon-pencil"></i>Edit</a>
               </div>
               <div class="grid_delete">
               <form action="/_admin/users/2" method="post">
                 <i class="icon-remove-sign"></i>
                 <input class="btn btn-danger btn-link" id="remove_user_2" name="remove_"  type="submit" value="delete">
               </form>
              </div>
             </td>
           </tr>
           <tr>
             <td>td-radio</td>
             <td>Radio buttons for a form. Centers element.</td>
             <td class="td-radio">
               <input type="radio" checked="checked" value="" name="1" id="read"></td>
           </tr>
           <tr>
             <td>td-checkbox</td>
             <td>Checkbox for a form. Centers element.</td>
             <td class="td-checkbox">
               <input type="checkbox" checked="checked" value="" name="1" id="read"></td>
           </tr>
           <tr>
           <tr>
             <td>td-buttons</td>
             <td>Buttons.</td>
             <td class="td-buttons">
                 <span class="btn btn-mini btn-primary">feed access</span>
             </td>
           </tr>
           <tr>
             <td>td-compare</td>
             <td>Radio buttons to compare commits.</td>
             <td class=" td-compare">
                 <input class="compare-radio-button" type="radio" name="compare_source" value="2.0">
                 <input class="compare-radio-button" type="radio" name="compare_target" value="2.0">
             </td>
           </tr>
           <tr>
             <td>td-comments</td>
             <td>Comments indicator icon.</td>
             <td>
               <i class="icon-comment"></i> 0
             </td>
           </tr>
           <tr>
             <td>td-status</td>
             <td>Status indicator icon.</td>
             <td class="td-description">
               <div class="flag_status under_review pull-left"></div>
             </td>
           </tr>
         </tbody>
       </table>
       <table class="dataTable rctable examples">
         <tbody>
           <tr>
             <td>quick_repo_menu</td>
             <td>Hidden menu generated by dataTable.</td>
             <td class="quick_repo_menu">
               <i class="pointer icon-more"></i>
               <div class="menu_items_container" style="display: none;">
                 <ul class="menu_items">
                   <li>
                      <a title="Summary" href="/anothercpythonforkkkk-fork">
                      <span>Summary</span>
                      </a>
                   </li>
                   <li>
                      <a title="Changelog" href="/anothercpythonforkkkk-fork/changelog">
                      <span>Changelog</span>
                      </a>
                   </li>
                   <li>
                      <a title="Files" href="/anothercpythonforkkkk-fork/files/tip/">
                      <span>Files</span>
                      </a>
                   </li>
                   <li>
                      <a title="Fork" href="/anothercpythonforkkkk-fork/fork">
                      <span>Fork</span>
                      </a>
                   </li>
                 </ul>
               </div>
             </td>
             <td></td>
           </tr>
         </tbody>
       </table>
       <script>quick_repo_menu();</script>
       <table class="rctable examples">
         <tbody>
           <tr>
             <td>td-description</td>
             <td>Any description. They may be rather long, and using the expand_commit outlined below is recommended.</td>
             <td class="td-description">
               Ultrices mattis! Enim pellentesque lacus, sit magna natoque risus turpis ut, auctor ultrices facilisis dapibus odio? Parturient! Porta egestas nascetur, quis, elementum dolor, in magna ac dis sit etiam turpis, scelerisque! Integer tristique aliquam.
             </td>
           </tr>
         </tbody>
       </table>
       <table id="changesets" class="rctable examples end">
         <tbody>
           <tr>
             <td>expand_commit</td>
             <td>Expands a long message; see html+js.</td>
             <td class="expand_commit" data-commit-id="2ffc6faabc7a9c790b1b452943a3f0c047b8b436" title="Expand commit message">
                 <div class="show_more_col">
                 <i class="show_more"></i>
                 </div>
             </td>
             <td class="mid td-description">
                 <div class="log-container truncate-wrap">
                     <div id="c-2ffc6faabc7a9c790b1b452943a3f0c047b8b436" class="message truncate" data-message-raw="tests: Test echo method on the server object
 
             This only works for Pyro4 so far, have to extend it still for HTTP to work.">tests: Test echo method on the server object
 
             This only works for Pyro4 so far, have to extend it still for HTTP to work.</div>
                 </div>
             </td>
           </tr>
         </tbody>
       </table>
         <script type="text/javascript">
-            var cache = {}
+            var cache = {};
             $('.expand_commit').on('click',function(e){
               var target_expand = $(this);
               var cid = target_expand.data('commitId');
 
               if (target_expand.hasClass('open')){
                 $('#c-'+cid).css({'height': '1.5em', 'white-space': 'nowrap', 'text-overflow': 'ellipsis', 'overflow':'hidden'});
                 $('#t-'+cid).css({'height': '1.5em', 'max-height': '1.5em', 'text-overflow': 'ellipsis', 'overflow':'hidden', 'white-space':'nowrap'});
                 target_expand.removeClass('open');
               }
               else {
                 $('#c-'+cid).css({'height': 'auto', 'white-space': 'pre-line', 'text-overflow': 'initial', 'overflow':'visible'});
                 $('#t-'+cid).css({'height': 'auto', 'max-height': 'none', 'text-overflow': 'initial', 'overflow':'visible', 'white-space':'normal'});
                 target_expand.addClass('open');
               }
             });
 
         </script>
         <p>The following classes currently do not have unique styles applied.</p>
         <table class="rctable examples end">
           <tbody>
             <tr>
               <td>td-regex</td>
               <td>Regex patterns</td>
               <td class="td-regex">(?:#)(?P<issue_id>\d+)</td>
             </tr>
             <tr>
               <td>td-url</td>
               <td>Any URL.</td>
               <td class="td-url">https://rhodecode.com</td>
             </tr>
             <tr>
               <td>td-journalaction</td>
               <td>Action listed in a journal</td>
               <td class="td-journalaction">started following repository supervisor-fork-4</td>
             </tr>
             <tr>
               <td>td-iprange</td>
               <td>Any ip address.</td>
               <td class="td-ip">127.0.0.1-127.0.0.10</td>
             </tr>
             <tr>
               <td>td-exp</td>
               <td>Expiration time.</td>
               <td class="td-exp">never</td>
             </tr>
             <tr>
               <td>td-prefix</td>
               <td>Prefixes outlined in settings.</td>
               <td class="td-prefix">ubuntu-92539</td>
             </tr>
             <tr>
               <td>td-cachekey</td>
               <td>Cache key value.</td>
               <td class="td-cachekey">ubuntu-92539supervisor</td>
             </tr>
             <tr>
               <td>td-email</td>
               <td>Any email address.</td>
               <td class="td-email">[e-mail]</td>
             </tr>
             <tr>
               <td>td-active</td>
               <td>Shows active state with icon-true/icon-false.</td>
               <td class="td-active"><i class="icon-false"></i></td>
             </tr>
             <tr>
               <td>td-size</td>
               <td>File, repo, or directory size.</td>
               <td class="td-size">89 MB</td>
             </tr>
             <tr>
               <td>td-number</td>
               <td>Any numerical data.</td>
               <td class="td-number">42</td>
             </tr>
             <tr>
               <td>td-message</td>
               <td>Any commit message. Often treated with the truncate class used for descriptions as well.</td>
               <td class="td-message">Updated the files</td>
             </tr>
           </tbody>
         </table>
 
 
       <h2>Permissions table</h2>
 
       <p>
         This is a special-case table; it has
         <code>table class="rctable permissions"</code>
         where "rctable" applies the rhodecode styling as above, and
         "permissions" adds an extra layer of customization specific to
         permissions tables. Other special-case tables may exist or be
         created if necessary.
       </p>
 
       <table class="rctable permissions">
         <tr>
           <th class="td-radio">none</th>
           <th class="td-radio">read</th>
           <th class="td-radio">write</th>
           <th class="td-radio">admin</th>
           <th>user/user group</th>
           <th></th>
         </tr>
         <tr class="perm_admin_row">
           <td class="td-radio"><input type="radio" value="repository.none"
             name="admin_perm_2" id="admin_perm_2_repositorynone"
             disabled="disabled"></td>
           <td class="td-radio"><input type="radio" value="repository.read"
             name="admin_perm_2" id="admin_perm_2_repositoryread"
             disabled="disabled"></td>
           <td class="td-radio"><input type="radio" value="repository.write"
             name="admin_perm_2" id="admin_perm_2_repositorywrite"
             disabled="disabled"></td>
           <td class="td-radio"><input type="radio" value="repository.admin"
             name="admin_perm_2" id="admin_perm_2_repositoryadmin"
             disabled="disabled" checked="checked"></td>
           <td>
             <img class="gravatar" src="https://secure.gravatar.com/avatar/be9d18f611892a738e54f2a3a171e2f9?d=identicon&amp;s=32" height="16" width="16">
             <span class="user">dev (super admin) (owner)</span>
           </td>
           <td></td>
         </tr>
         <tr>
           <td colspan="4">
               <span class="private_repo_msg">
               private repository
               </span>
           </td>
           <td class="private_repo_msg">
               <i class="icon-user"></i>
               default - only people explicitly added here will have access</td>
           <td></td>
         </tr>
         <tr>
           <td class="td-radio"><input type="radio" value="repository.none"
             name="u_perm_1" id="u_perm_1_repositorynone"></td>
           <td class="td-radio"><input type="radio" checked="checked"
             value="repository.read" name="u_perm_1"
             id="u_perm_1_repositoryread"></td>
           <td class="td-radio"><input type="radio" value="repository.write"
             name="u_perm_1" id="u_perm_1_repositorywrite"></td>
           <td class="td-radio"><input type="radio" value="repository.admin"
             name="u_perm_1" id="u_perm_1_repositoryadmin"></td>
           <td>
             <img class="gravatar" src="/_static/rhodecode/images/user30.png" height="16" width="16">
             <span class="user">default</span>
           </td>
           <td></td>
         </tr>
         <tr>
           <td class="td-radio"><input type="radio" value="repository.none"
             name="u_perm_2" id="u_perm_2_repositorynone"></td>
           <td class="td-radio"><input type="radio" checked="checked"
             value="repository.read" name="u_perm_2"
             id="u_perm_2_repositoryread"></td>
           <td class="td-radio"><input type="radio" value="repository.write"
             name="u_perm_2" id="u_perm_2_repositorywrite"></td>
           <td class="td-radio"><input type="radio" value="repository.admin"
             name="u_perm_2" id="u_perm_2_repositoryadmin"></td>
           <td>
             <img class="gravatar" src="https://secure.gravatar.com/avatar/be9d18f611892a738e54f2a3a171e2f9?d=identicon&amp;s=32" height="16" width="16">
             <a class="user" href="/_admin/users/2/edit">dev</a>
           </td>
           <td>
             <span member_type="user" member="2"
                   class="btn action_button btn-link btn-danger">revoke</span>
           </td>
         </tr>
         </tbody>
       </table>
       <div class="link" id="add_perm">
         Add new
       </div>
 
 
 
     </div>
   </div>
 </div>
 </%def>

rhodecode/templates/email_templates/main.mako

@@ -1,21 +1,21 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
 <%def name="subject()" filter="n,trim">
 </%def>
 
 
 ## plain text version of the email. Empty by default
 <%def name="body_plaintext()" filter="n,trim">
 ${body}
 
 ${self.plaintext_footer()}
 </%def>
 
 ## BODY GOES BELOW
 <table style="text-align:left;vertical-align:top;">
     <tr><td style="padding-right:20px;padding-top:15px;white-space:pre-wrap">${body}</td></tr>
-</table
+</table>
 <p><a style="margin-top:15px;margin-left:1%;font-family:sans-serif;font-weight:100;font-size:11px;display:block;color:#666666;text-decoration:none;" href="${instance_url}">
     ${self.plaintext_footer()}
 </a></p>
  No newline at end of file

rhodecode/templates/email_templates/user_registration.mako

@@ -1,27 +1,27 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
 <%def name="subject()" filter="n,trim">
 RhodeCode new user registration: ${user.username}
 </%def>
 
 <%def name="body_plaintext()" filter="n,trim">
 
 A new user `${user.username}` has registered on ${h.format_date(date)}
 
 - Username: ${user.username}
 - Full Name: ${user.firstname} ${user.lastname}
 - Email: ${user.email}
 - Profile link: ${h.url('user_profile', username=user.username, qualified=True)}
 
 ${self.plaintext_footer()}
 </%def>
 
 ## BODY GOES BELOW
 <table style="text-align:left;vertical-align:middle;">
-    <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;"><h4><a href="${h.url('user_profile', username=user.username, qualified=True)}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('New user %(user)s has registered on %(date)s') % {'user': user.username, 'date': h.format_date(date)}}</h4></td></tr>
+    <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;"><h4><a href="${h.url('user_profile', username=user.username, qualified=True)}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('New user %(user)s has registered on %(date)s') % {'user': user.username, 'date': h.format_date(date)}}</a></h4></td></tr>
     <tr><td style="padding-right:20px;padding-top:20px;">${_('Username')}</td><td style="line-height:1;padding-top:20px;"><img style="margin-bottom:-5px;text-align:left;border:1px solid #dbd9da" src="${h.gravatar_url(user.email, 16)}" height="16" width="16">&nbsp;${user.username}</td></tr>
     <tr><td style="padding-right:20px;">${_('Full Name')}</td><td>${user.firstname} ${user.lastname}</td></tr>
     <tr><td style="padding-right:20px;">${_('Email')}</td><td>${user.email}</td></tr>
     <tr><td style="padding-right:20px;">${_('Profile')}</td><td><a href="${h.url('user_profile', username=user.username, qualified=True)}">${h.url('user_profile', username=user.username, qualified=True)}</a></td></tr>
 </table>
  No newline at end of file

rhodecode/templates/password_reset.mako

@@ -1,90 +1,90 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.mako"/>
 
 <%def name="title()">
     ${_('Reset Password')}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 <style>body{background-color:#eeeeee;}</style>
 
 <div class="loginbox">
     <div class="header">
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
                     <a href="${h.url('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
                 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
                 %endif
             </div>
         </div>
     </div>
 
     <div class="loginwrapper">
         <div class="left-column">
             <img class="sign-in-image" src="${h.asset('images/sign-in.png')}" alt="RhodeCode"/>
         </div>
 
         %if h.HasPermissionAny('hg.password_reset.disabled')():
             <div class="right-column">
                 <p>
                     ${_('Password reset is disabled. Please contact ')}
                     % if c.visual.rhodecode_support_url:
                         <a href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support')}</a>
                         ${_('or')}
                     % endif
                     ${_('an administrator if you need help.')}
                 </p>
             </div>
         %else:
             <div id="register" class="right-column">
                 <!-- login -->
                 <div class="sign-in-title">
                     <h1>${_('Reset your Password')}</h1>
                     <h4>${h.link_to(_("Go to the login page to sign in."), request.route_path('login'))}</h4>
                 </div>
                 <div class="inner form">
                     ${h.form(request.route_path('reset_password'), needs_csrf_token=False)}
                         <label for="email">${_('Email Address')}:</label>
                         ${h.text('email', defaults.get('email'))}
                         %if 'email' in errors:
                           <span class="error-message">${errors.get('email')}</span>
                           <br />
                         %endif
     
                         %if captcha_active:
-                        <div class="login-captcha"
+                        <div class="login-captcha">
                             <label for="email">${_('Captcha')}:</label>
                             ${h.hidden('recaptcha_field')}
                             <div id="recaptcha"></div>
                             %if 'recaptcha_field' in errors:
                               <span class="error-message">${errors.get('recaptcha_field')}</span>
                               <br />
                             %endif
                         </div>
                         %endif
     
                         ${h.submit('send', _('Send password reset email'), class_="btn sign-in")}
                         <div class="activation_msg">${_('Password reset link will be sent to matching email address')}</div>
     
                     ${h.end_form()}
                 </div>
             </div>
         %endif
     </div>
 </div>
 
 %if captcha_active:
 <script type="text/javascript" src="https://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
 %endif
 <script type="text/javascript">
  $(document).ready(function(){
     $('#email').focus();
     %if captcha_active:
       Recaptcha.create("${captcha_public_key}", "recaptcha", {theme: "white"});
     %endif
  });
 </script>

rhodecode/templates/pullrequests/pullrequest_show.mako

@@ -1,637 +1,638 b''
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
     <span id="pr-title">
     ${c.pull_request.title}
     %if c.pull_request.is_closed():
         (${_('Closed')})
     %endif
     </span>
     <div id="pr-title-edit" class="input" style="display: none;">
         ${h.text('pullrequest_title', id_="pr-title-input", class_="large", value=c.pull_request.title)}
     </div>
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='showpullrequest')}
 </%def>
 
 <%def name="main()">
+
 <script type="text/javascript">
     // TODO: marcink switch this to pyroutes
     AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";
     templateContext.pull_request_data.pull_request_id = ${c.pull_request.pull_request_id};
 </script>
 <div class="box">
   <div class="title">
     ${self.repo_page_title(c.rhodecode_db_repo)}
   </div>
 
   ${self.breadcrumbs()}
 
-
   <div class="box pr-summary">
       <div class="summary-details block-left">
         <%summary = lambda n:{False:'summary-short'}.get(n)%>
         <div class="pr-details-title">
             <a href="${h.url('pull_requests_global', pull_request_id=c.pull_request.pull_request_id)}">${_('Pull request #%s') % c.pull_request.pull_request_id}</a> ${_('From')} ${h.format_date(c.pull_request.created_on)}
             %if c.allowed_to_update:
               <div id="delete_pullrequest" class="pull-right action_button ${'' if c.allowed_to_delete else 'disabled' }" style="clear:inherit;padding: 0">
                   % if c.allowed_to_delete:
                       ${h.secure_form(url('pullrequest_delete', repo_name=c.pull_request.target_repo.repo_name, pull_request_id=c.pull_request.pull_request_id),method='delete')}
                           ${h.submit('remove_%s' % c.pull_request.pull_request_id, _('Delete'),
                         class_="btn btn-link btn-danger",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}
                       ${h.end_form()}
                   % else:
                     ${_('Delete')}
                   % endif
               </div>
               <div id="open_edit_pullrequest" class="pull-right action_button">${_('Edit')}</div>
               <div id="close_edit_pullrequest" class="pull-right action_button" style="display: none;padding: 0">${_('Cancel')}</div>
             %endif
         </div>
 
         <div id="summary" class="fields pr-details-content">
            <div class="field">
             <div class="label-summary">
                 <label>${_('Origin')}:</label>
             </div>
             <div class="input">
                 <div class="pr-origininfo">
                     ## branch link is only valid if it is a branch
                     <span class="tag">
                       %if c.pull_request.source_ref_parts.type == 'branch':
                         <a href="${h.url('changelog_home', repo_name=c.pull_request.source_repo.repo_name, branch=c.pull_request.source_ref_parts.name)}">${c.pull_request.source_ref_parts.type}: ${c.pull_request.source_ref_parts.name}</a>
                       %else:
                         ${c.pull_request.source_ref_parts.type}: ${c.pull_request.source_ref_parts.name}
                       %endif
                     </span>
                     <span class="clone-url">
                         <a href="${h.url('summary_home', repo_name=c.pull_request.source_repo.repo_name)}">${c.pull_request.source_repo.clone_url()}</a>
                     </span>
                 </div>
                 <div class="pr-pullinfo">
                      %if h.is_hg(c.pull_request.source_repo):
                         <input type="text"  value="hg pull -r ${h.short_id(c.source_ref)} ${c.pull_request.source_repo.clone_url()}" readonly="readonly">
                      %elif h.is_git(c.pull_request.source_repo):
                         <input type="text"  value="git pull ${c.pull_request.source_repo.clone_url()} ${c.pull_request.source_ref_parts.name}" readonly="readonly">
                      %endif
                 </div>
             </div>
            </div>
            <div class="field">
             <div class="label-summary">
                 <label>${_('Target')}:</label>
             </div>
             <div class="input">
                 <div class="pr-targetinfo">
                     ## branch link is only valid if it is a branch
                     <span class="tag">
                       %if c.pull_request.target_ref_parts.type == 'branch':
                         <a href="${h.url('changelog_home', repo_name=c.pull_request.target_repo.repo_name, branch=c.pull_request.target_ref_parts.name)}">${c.pull_request.target_ref_parts.type}: ${c.pull_request.target_ref_parts.name}</a>
                       %else:
                         ${c.pull_request.target_ref_parts.type}: ${c.pull_request.target_ref_parts.name}
                       %endif
                     </span>
                     <span class="clone-url">
                         <a href="${h.url('summary_home', repo_name=c.pull_request.target_repo.repo_name)}">${c.pull_request.target_repo.clone_url()}</a>
                     </span>
                 </div>
             </div>
            </div>
 
             ## Link to the shadow repository.
             <div class="field">
                 <div class="label-summary">
                     <label>${_('Merge')}:</label>
                 </div>
                 <div class="input">
                     % if not c.pull_request.is_closed() and c.pull_request.shadow_merge_ref:
                     <div class="pr-mergeinfo">
                         %if h.is_hg(c.pull_request.target_repo):
                             <input type="text"  value="hg clone -u ${c.pull_request.shadow_merge_ref.name} ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
                         %elif h.is_git(c.pull_request.target_repo):
                             <input type="text"  value="git clone --branch ${c.pull_request.shadow_merge_ref.name} ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
                         %endif
                     </div>
                     % else:
                     <div class="">
                         ${_('Shadow repository data not available')}.
                     </div>
                     % endif
                 </div>
             </div>
 
            <div class="field">
             <div class="label-summary">
                 <label>${_('Review')}:</label>
             </div>
             <div class="input">
               %if c.pull_request_review_status:
                 <div class="${'flag_status %s' % c.pull_request_review_status} tooltip pull-left"></div>
                 <span class="changeset-status-lbl tooltip">
                   %if c.pull_request.is_closed():
                       ${_('Closed')},
                   %endif
                   ${h.commit_status_lbl(c.pull_request_review_status)}
                 </span>
                 - ${ungettext('calculated based on %s reviewer vote', 'calculated based on %s reviewers votes', len(c.pull_request_reviewers)) % len(c.pull_request_reviewers)}
               %endif
             </div>
            </div>
            <div class="field">
             <div class="pr-description-label label-summary">
                 <label>${_('Description')}:</label>
             </div>
             <div id="pr-desc" class="input">
                 <div class="pr-description">${h.urlify_commit_message(c.pull_request.description, c.repo_name)}</div>
             </div>
             <div id="pr-desc-edit" class="input textarea editor" style="display: none;">
                 <textarea id="pr-description-input" size="30">${c.pull_request.description}</textarea>
             </div>
            </div>
 
            <div class="field">
                 <div class="label-summary">
                     <label>${_('Versions')} (${len(c.versions)+1}):</label>
                 </div>
 
                <div class="pr-versions">
                % if c.show_version_changes:
                    <table>
                        ## CURRENTLY SELECT PR VERSION
                        <tr class="version-pr" style="display: ${'' if c.at_version_num is None else 'none'}">
                            <td>
                                % if c.at_version in [None, 'latest']:
                                 <i class="icon-ok link"></i>
                                % else:
                                 <i class="icon-comment"></i> <code>${len(c.inline_versions[None])}</code>
                                % endif
                            </td>
                            <td>
                                <code>
                                % if c.versions:
                                 <a href="${h.url.current(version='latest')}">${_('latest')}</a>
                                % else:
                                 ${_('initial')}
                                % endif
                                </code>
                            </td>
                            <td>
                                <code>${c.pull_request_latest.source_ref_parts.commit_id[:6]}</code>
                            </td>
                            <td>
                                ${_('created')} ${h.age_component(c.pull_request_latest.updated_on)}
                            </td>
                            <td align="right">
                                % if c.versions and c.at_version_num in [None, 'latest']:
                                <span id="show-pr-versions" class="btn btn-link" onclick="$('.version-pr').show(); $(this).hide(); return false">${_('Show all versions')}</span>
                                % endif
                            </td>
                        </tr>
 
                        ## SHOW ALL VERSIONS OF PR
                        <% ver_pr = None %>
                        % for ver in reversed(c.pull_request.versions()):
                        <% ver_pr = ver.pull_request_version_id %>
                        <tr class="version-pr" style="display: ${'' if c.at_version == ver_pr else 'none'}">
                            <td>
                                % if c.at_version == ver_pr:
                                 <i class="icon-ok link"></i>
                                % else:
                                 <i class="icon-comment"></i> <code>${len(c.inline_versions[ver_pr])}</code>
                                % endif
                            </td>
                            <td>
                                <code><a href="${h.url.current(version=ver_pr)}">version ${ver_pr}</a></code>
                            </td>
                            <td>
                                <code>${ver.source_ref_parts.commit_id[:6]}</code>
                            </td>
                            <td>
                                ${_('created')} ${h.age_component(ver.updated_on)}
                            </td>
                            <td align="right">
                                % if c.at_version == ver_pr:
                                <span id="show-pr-versions" class="btn btn-link" onclick="$('.version-pr').show(); $(this).hide(); return false">${_('Show all versions')}</span>
                                % endif
                            </td>
                        </tr>
                        % endfor
 
                        ## show comment/inline comments summary
                        <tr>
                            <td>
                            </td>
 
                            <% inline_comm_count_ver = len(c.inline_versions[ver_pr])%>
                            <td colspan="4" style="border-top: 1px dashed #dbd9da">
                             ${_('Comments for this version')}:
                             %if c.comments:
                                 <a href="#comments">${_("%d General ") % len(c.comments)}</a>
                             %else:
                                 ${_("%d General ") % len(c.comments)}
                             %endif
 
                             <% inline_comm_count_ver = len(c.inline_versions[c.at_version_num])%>
                             %if inline_comm_count_ver:
                                , <a href="#" onclick="return Rhodecode.comments.nextComment();" id="inline-comments-counter">${_("%d Inline") % inline_comm_count_ver}</a>
                             %else:
                                , ${_("%d Inline") % inline_comm_count_ver}
                             %endif
 
                             %if c.outdated_cnt:
                               , <a href="#" onclick="showOutdated(); Rhodecode.comments.nextOutdatedComment(); return false;">${_("%d Outdated") % c.outdated_cnt}</a>
                                 <a href="#" class="showOutdatedComments" onclick="showOutdated(this); return false;"> | ${_('show outdated comments')}</a>
                                 <a href="#" class="hideOutdatedComments" style="display: none" onclick="hideOutdated(this); return false;"> | ${_('hide outdated comments')}</a>
                             %else:
                               , ${_("%d Outdated") % c.outdated_cnt}
                             %endif
                            </td>
                        </tr>
 
                        <tr>
                            <td></td>
                            <td colspan="4">
                            % if c.at_version:
 <pre>
 Changed commits:
  * added: ${len(c.changes.added)}
  * removed: ${len(c.changes.removed)}
 
 % if not (c.file_changes.added+c.file_changes.modified+c.file_changes.removed):
 No file changes found
 % else:
 Changed files:
  %for file_name in c.file_changes.added:
  * A <a href="#${'a_' + h.FID('', file_name)}">${file_name}</a>
  %endfor
  %for file_name in c.file_changes.modified:
  * M <a href="#${'a_' + h.FID('', file_name)}">${file_name}</a>
  %endfor
  %for file_name in c.file_changes.removed:
  * R ${file_name}
  %endfor
 % endif
 </pre>
                            % endif
                            </td>
                        </tr>
                    </table>
                % else:
                    ${_('Pull request versions not available')}.
                % endif
                </div>
            </div>
 
            <div id="pr-save" class="field" style="display: none;">
             <div class="label-summary"></div>
             <div class="input">
               <span id="edit_pull_request" class="btn btn-small">${_('Save Changes')}</span>
             </div>
            </div>
         </div>
       </div>
       <div>
         ## AUTHOR
         <div class="reviewers-title block-right">
           <div class="pr-details-title">
               ${_('Author')}
           </div>
         </div>
         <div class="block-right pr-details-content reviewers">
             <ul class="group_members">
               <li>
                 ${self.gravatar_with_user(c.pull_request.author.email, 16)}
               </li>
             </ul>
         </div>
         ## REVIEWERS
         <div class="reviewers-title block-right">
           <div class="pr-details-title">
               ${_('Pull request reviewers')}
               %if c.allowed_to_update:
                 <span id="open_edit_reviewers" class="block-right action_button">${_('Edit')}</span>
                 <span id="close_edit_reviewers" class="block-right action_button" style="display: none;">${_('Close')}</span>
               %endif
           </div>
         </div>
         <div id="reviewers" class="block-right pr-details-content reviewers">
           ## members goes here !
             <input type="hidden" name="__start__" value="review_members:sequence">
             <ul id="review_members" class="group_members">
             %for member,reasons,status in c.pull_request_reviewers:
               <li id="reviewer_${member.user_id}">
                 <div class="reviewers_member">
                     <div class="reviewer_status tooltip" title="${h.tooltip(h.commit_status_lbl(status[0][1].status if status else 'not_reviewed'))}">
                       <div class="${'flag_status %s' % (status[0][1].status if status else 'not_reviewed')} pull-left reviewer_member_status"></div>
                     </div>
                   <div id="reviewer_${member.user_id}_name" class="reviewer_name">
                     ${self.gravatar_with_user(member.email, 16)}
                   </div>
                   <input type="hidden" name="__start__" value="reviewer:mapping">
                   <input type="hidden" name="__start__" value="reasons:sequence">
                   %for reason in reasons:
                   <div class="reviewer_reason">- ${reason}</div>
                   <input type="hidden" name="reason" value="${reason}">
 
                   %endfor
                   <input type="hidden" name="__end__" value="reasons:sequence">
                   <input id="reviewer_${member.user_id}_input" type="hidden" value="${member.user_id}" name="user_id" />
                   <input type="hidden" name="__end__" value="reviewer:mapping">
                   %if c.allowed_to_update:
                   <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id}, true)" style="visibility: hidden;">
                       <i class="icon-remove-sign" ></i>
                   </div>
                   %endif
                 </div>
               </li>
             %endfor
             </ul>
             <input type="hidden" name="__end__" value="review_members:sequence">
           %if not c.pull_request.is_closed():
           <div id="add_reviewer_input" class='ac' style="display: none;">
             %if c.allowed_to_update:
             <div class="reviewer_ac">
                ${h.text('user', class_='ac-input', placeholder=_('Add reviewer'))}
                <div id="reviewers_container"></div>
             </div>
             <div>
              <span id="update_pull_request" class="btn btn-small">${_('Save Changes')}</span>
             </div>
             %endif
           </div>
           %endif
         </div>
       </div>
   </div>
   <div class="box">
       ##DIFF
       <div class="table" >
           <div id="changeset_compare_view_content">
               ##CS
               % if c.missing_requirements:
                 <div class="box">
                   <div class="alert alert-warning">
                     <div>
                       <strong>${_('Missing requirements:')}</strong>
                       ${_('These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled.')}
                     </div>
                   </div>
                 </div>
               % elif c.missing_commits:
                 <div class="box">
                   <div class="alert alert-warning">
                     <div>
                       <strong>${_('Missing commits')}:</strong>
                         ${_('This pull request cannot be displayed, because one or more commits no longer exist in the source repository.')}
                         ${_('Please update this pull request, push the commits back into the source repository, or consider closing this pull request.')}
                     </div>
                   </div>
                 </div>
               % endif
                 <div class="compare_view_commits_title">
 
                     <div class="pull-left">
                       <div class="btn-group">
                           <a
                               class="btn"
                               href="#"
                               onclick="$('.compare_select').show();$('.compare_select_hidden').hide(); return false">
                               ${ungettext('Expand %s commit','Expand %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
                           </a>
                           <a
                               class="btn"
                               href="#"
                               onclick="$('.compare_select').hide();$('.compare_select_hidden').show(); return false">
                               ${ungettext('Collapse %s commit','Collapse %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
                           </a>
                       </div>
                     </div>
 
                     <div class="pull-right">
                         % if c.allowed_to_update and not c.pull_request.is_closed():
                           <a id="update_commits" class="btn btn-primary pull-right">${_('Update commits')}</a>
                         % else:
                           <a class="tooltip btn disabled pull-right" disabled="disabled" title="${_('Update is disabled for current view')}">${_('Update commits')}</a>
                         % endif
 
                     </div>
 
                 </div>
               % if not c.missing_commits:
                 <%include file="/compare/compare_commits.mako" />
               <div class="cs_files">
                 <%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
                 ${cbdiffs.render_diffset_menu()}
                 ${cbdiffs.render_diffset(
                   c.diffset, use_comments=True,
                   collapse_when_files_over=30,
                   disable_new_comments=not c.allowed_to_comment,
                   deleted_files_comments=c.deleted_files_comments)}
 
           </div>
               % endif
       </div>
+      </div>
 
       ## template for inline comment form
       <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
 
       ## render general comments
       ${comment.generate_comments(include_pull_request=True, is_pull_request=True)}
 
       % if not c.pull_request.is_closed():
         ## main comment form and it status
         ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,
                                   pull_request_id=c.pull_request.pull_request_id),
                            c.pull_request_review_status,
                            is_pull_request=True, change_status=c.allowed_to_change_status)}
       %endif
 
       <script type="text/javascript">
         if (location.hash) {
           var result = splitDelimitedHash(location.hash);
           var line = $('html').find(result.loc);
             if (line.length > 0){
                 offsetScroll(line, 70);
             }
         }
         $(function(){
             ReviewerAutoComplete('user');
             // custom code mirror
             var codeMirrorInstance = initPullRequestsCodeMirror('#pr-description-input');
 
             var PRDetails = {
               editButton: $('#open_edit_pullrequest'),
               closeButton: $('#close_edit_pullrequest'),
               deleteButton: $('#delete_pullrequest'),
               viewFields: $('#pr-desc, #pr-title'),
               editFields: $('#pr-desc-edit, #pr-title-edit, #pr-save'),
 
               init: function() {
                 var that = this;
                 this.editButton.on('click', function(e) { that.edit(); });
                 this.closeButton.on('click', function(e) { that.view(); });
               },
 
               edit: function(event) {
                 this.viewFields.hide();
                 this.editButton.hide();
                 this.deleteButton.hide();
                 this.closeButton.show();
                 this.editFields.show();
                 codeMirrorInstance.refresh();
               },
 
               view: function(event) {
                 this.editButton.show();
                 this.deleteButton.show();
                 this.editFields.hide();
                 this.closeButton.hide();
                 this.viewFields.show();
               }
             };
 
             var ReviewersPanel = {
               editButton: $('#open_edit_reviewers'),
               closeButton: $('#close_edit_reviewers'),
               addButton: $('#add_reviewer_input'),
               removeButtons: $('.reviewer_member_remove'),
 
               init: function() {
                 var that = this;
                 this.editButton.on('click', function(e) { that.edit(); });
                 this.closeButton.on('click', function(e) { that.close(); });
               },
 
               edit: function(event) {
                 this.editButton.hide();
                 this.closeButton.show();
                 this.addButton.show();
                 this.removeButtons.css('visibility', 'visible');
               },
 
               close: function(event) {
                 this.editButton.show();
                 this.closeButton.hide();
                 this.addButton.hide();
                 this.removeButtons.css('visibility', 'hidden');
               }
             };
 
             PRDetails.init();
             ReviewersPanel.init();
 
             showOutdated = function(self){
                 $('.comment-outdated').show();
                 $('.filediff-outdated').show();
                 $('.showOutdatedComments').hide();
                 $('.hideOutdatedComments').show();
 
             };
 
             hideOutdated = function(self){
                 $('.comment-outdated').hide();
                 $('.filediff-outdated').hide();
                 $('.hideOutdatedComments').hide();
                 $('.showOutdatedComments').show();
             };
 
             $('#show-outdated-comments').on('click', function(e){
                 var button = $(this);
                 var outdated = $('.comment-outdated');
 
                 if (button.html() === "(Show)") {
                   button.html("(Hide)");
                   outdated.show();
                 } else {
                   button.html("(Show)");
                   outdated.hide();
                 }
             });
 
             $('.show-inline-comments').on('change', function(e){
                 var show = 'none';
                 var target = e.currentTarget;
                 if(target.checked){
                     show = ''
                 }
                 var boxid = $(target).attr('id_for');
                 var comments = $('#{0} .inline-comments'.format(boxid));
                 var fn_display = function(idx){
                    $(this).css('display', show);
                 };
                 $(comments).each(fn_display);
                 var btns = $('#{0} .inline-comments-button'.format(boxid));
                 $(btns).each(fn_display);
             });
 
             $('#merge_pull_request_form').submit(function() {
                 if (!$('#merge_pull_request').attr('disabled')) {
                     $('#merge_pull_request').attr('disabled', 'disabled');
                 }
                 return true;
             });
 
             $('#edit_pull_request').on('click', function(e){
                 var title = $('#pr-title-input').val();
                 var description = codeMirrorInstance.getValue();
                 editPullRequest(
                     "${c.repo_name}", "${c.pull_request.pull_request_id}",
                     title, description);
             });
 
             $('#update_pull_request').on('click', function(e){
                 updateReviewers(undefined, "${c.repo_name}", "${c.pull_request.pull_request_id}");
             });
 
             $('#update_commits').on('click', function(e){
                 var isDisabled = !$(e.currentTarget).attr('disabled');
                 $(e.currentTarget).text(_gettext('Updating...'));
                 $(e.currentTarget).attr('disabled', 'disabled');
                 if(isDisabled){
                     updateCommits("${c.repo_name}", "${c.pull_request.pull_request_id}");
                 }
 
             });
             // fixing issue with caches on firefox
             $('#update_commits').removeAttr("disabled");
 
             $('#close_pull_request').on('click', function(e){
                 closePullRequest("${c.repo_name}", "${c.pull_request.pull_request_id}");
             });
 
             $('.show-inline-comments').on('click', function(e){
                 var boxid = $(this).attr('data-comment-id');
                 var button = $(this);
 
                 if(button.hasClass("comments-visible")) {
                   $('#{0} .inline-comments'.format(boxid)).each(function(index){
                     $(this).hide();
                   });
                   button.removeClass("comments-visible");
                 } else {
                   $('#{0} .inline-comments'.format(boxid)).each(function(index){
                     $(this).show();
                   });
                   button.addClass("comments-visible");
                 }
             });
         })
       </script>
 
   </div>
 </div>
 
 </%def>

rhodecode/templates/search/search_content.mako

@@ -1,101 +1,101 b''
 <%def name="highlight_text_file(terms, text, url, line_context=3,
                                 max_lines=10,
                                 mimetype=None, filepath=None)">
 <%
 lines = text.split('\n')
 lines_of_interest = set()
 matching_lines = h.get_matching_line_offsets(lines, terms)
 shown_matching_lines = 0
 
 for line_number in matching_lines:
     if len(lines_of_interest) < max_lines:
         lines_of_interest |= set(range(
             max(line_number - line_context, 0),
             min(line_number + line_context, len(lines) + 1)))
         shown_matching_lines += 1
 
 %>
 ${h.code_highlight(
     text,
     h.get_lexer_safe(
         mimetype=mimetype,
         filepath=filepath,
     ),
     h.SearchContentCodeHtmlFormatter(
         linenos=True,
         cssclass="code-highlight",
         url=url,
         query_terms=terms,
         only_line_numbers=lines_of_interest
 ))|n}
 %if len(matching_lines) > shown_matching_lines:
 <a href="${url}">
   ${len(matching_lines) - shown_matching_lines} ${_('more matches in this file')}
-</p>
+</a>
 %endif
 </%def>
 
 <div class="search-results">
 %for entry in c.formatted_results:
   ## search results are additionally filtered, and this check is just a safe gate
   % if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(entry['repository'], 'search results content check'):
       <div id="codeblock" class="codeblock">
         <div class="codeblock-header">
           <h2>
             %if h.get_repo_type_by_name(entry.get('repository')) == 'hg':
                 <i class="icon-hg"></i>
             %elif h.get_repo_type_by_name(entry.get('repository')) == 'git':
                 <i class="icon-git"></i>
             %elif h.get_repo_type_by_name(entry.get('repository')) == 'svn':
                 <i class="icon-svn"></i>
             %endif
             ${h.link_to(entry['repository'], h.url('summary_home',repo_name=entry['repository']))}
           </h2>
           <div class="stats">
             ${h.link_to(h.literal(entry['f_path']), h.url('files_home',repo_name=entry['repository'],revision=entry.get('commit_id', 'tip'),f_path=entry['f_path']))}
             %if entry.get('lines'):
               | ${entry.get('lines', 0.)} ${ungettext('line', 'lines', entry.get('lines', 0.))}
             %endif
             %if entry.get('size'):
               | ${h.format_byte_size_binary(entry['size'])}
             %endif
             %if entry.get('mimetype'):
               | ${entry.get('mimetype', "unknown mimetype")}
             %endif
           </div>
           <div class="buttons">
             <a id="file_history_overview_full" href="${h.url('changelog_file_home',repo_name=entry.get('repository',''),revision=entry.get('commit_id', 'tip'),f_path=entry.get('f_path',''))}">
                ${_('Show Full History')}
             </a> |
               ${h.link_to(_('Annotation'), h.url('files_annotate_home', repo_name=entry.get('repository',''),revision=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
              | ${h.link_to(_('Raw'), h.url('files_raw_home', repo_name=entry.get('repository',''),revision=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
              | <a href="${h.url('files_rawfile_home',repo_name=entry.get('repository',''),revision=entry.get('commit_id', 'tip'),f_path=entry.get('f_path',''))}">
                 ${_('Download')}
                </a>
           </div>
         </div>
         <div class="code-body search-code-body">
             ${highlight_text_file(c.cur_query, entry['content'],
             url=h.url('files_home',repo_name=entry['repository'],revision=entry.get('commit_id', 'tip'),f_path=entry['f_path']),
             mimetype=entry.get('mimetype'), filepath=entry.get('path'))}
         </div>
       </div>
     % endif
 %endfor
 </div>
 %if c.cur_query and c.formatted_results:
 <div class="pagination-wh pagination-left" >
     ${c.formatted_results.pager('$link_previous ~2~ $link_next')}
 </div>
 %endif
 
 %if c.cur_query:
 <script type="text/javascript">
 $(function(){
   $(".code").mark(
     '${' '.join(h.normalize_text_for_matching(c.cur_query).split())}',
     {"className": 'match',
   });
 })
 </script>
 %endif
  No newline at end of file

rhodecode/templates/summary/summary.mako

@@ -1,130 +1,129 b''
 <%inherit file="/summary/base.mako"/>
 
 <%namespace name="components" file="/summary/components.mako"/>
 
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='summary')}
 </%def>
 
 <%def name="main()">
 
 <div class="title">
     ${self.repo_page_title(c.rhodecode_db_repo)}
     <ul class="links icon-only-links block-right">
       <li>
      %if c.rhodecode_user.username != h.DEFAULT_USER:
-       <a href="${h.url('atom_feed_home',repo_name=c.rhodecode_db_repo.repo_name,auth_token=c.rhodecode_user.feed_token)}" title="${_('RSS Feed')}">
+       <a href="${h.url('atom_feed_home',repo_name=c.rhodecode_db_repo.repo_name,auth_token=c.rhodecode_user.feed_token)}" title="${_('RSS Feed')}"><i class="icon-rss-sign"></i></a>
      %else:
-       <a href="${h.url('atom_feed_home',repo_name=c.rhodecode_db_repo.repo_name)}" title="${_('RSS Feed')}">
+       <a href="${h.url('atom_feed_home',repo_name=c.rhodecode_db_repo.repo_name)}" title="${_('RSS Feed')}"><i class="icon-rss-sign"></i></a>
      %endif
-       <i class="icon-rss-sign"></i></a>
       </li>
     </ul>
 </div>
 
 <div id="repo-summary" class="summary">
     ${components.summary_detail(breadcrumbs_links=self.breadcrumbs_links(), show_downloads=True)}
     ${components.summary_stats(gravatar_function=self.gravatar_with_user)}
 </div><!--end repo-summary-->
 
 
 <div class="box" >
     %if not c.repo_commits:
         <div class="title">
           <h3>${_('Quick start')}</h3>
         </div>
      %endif
     <div class="table">
         <div id="shortlog_data">
             <%include file='../changelog/changelog_summary_data.mako'/>
         </div>
     </div>
 </div>
 
 %if c.readme_data:
 <div id="readme" class="anchor">
 <div class="box" >
     <div class="title" title="${_('Readme file from commit %s:%s') % (c.rhodecode_db_repo.landing_rev[0], c.rhodecode_db_repo.landing_rev[1])}">
         <h3 class="breadcrumbs">
             <a href="${h.url('files_home',repo_name=c.repo_name,revision='tip',f_path=c.readme_file)}">${c.readme_file}</a>
         </h3>
     </div>
     <div class="readme codeblock">
       <div class="readme_box markdown-block">
         ${c.readme_data|n}
       </div>
     </div>
 </div>
 </div>
 %endif
 
 <script type="text/javascript">
 $(document).ready(function(){
     $('#clone_by_name').on('click',function(e){
         // show url by name and hide name button
         $('#clone_url').show();
         $('#clone_by_name').hide();
 
         // hide url by id and show name button
         $('#clone_by_id').show();
         $('#clone_url_id').hide();
 
     });
     $('#clone_by_id').on('click',function(e){
 
         // show url by id and hide id button
         $('#clone_by_id').hide();
         $('#clone_url_id').show();
 
         // hide url by name and show id button
         $('#clone_by_name').show();
         $('#clone_url').hide();
     });
 
     var initialCommitData = {
         id: null,
         text: 'tip',
         type: 'tag',
         raw_id: null,
         files_url: null
     };
 
     select2RefSwitcher('#download_options', initialCommitData);
 
     // on change of download options
     $('#download_options').on('change', function(e) {
         // format of Object {text: "v0.0.3", type: "tag", id: "rev"}
         var selected_cs = e.added;
         var fname= e.added.raw_id + ".zip";
-        var href = pyroutes.url('files_archive_home', {'repo_name': templateContext.repo_name, 'fname':fname})
+        var href = pyroutes.url('files_archive_home', {'repo_name': templateContext.repo_name, 'fname':fname});
         // set new label
-        $('#archive_link').html('<i class="icon-archive"></i> '+ e.added.text+".zip")
+        $('#archive_link').html('<i class="icon-archive"></i> '+ e.added.text+".zip");
 
         // set new url to button,
         $('#archive_link').attr('href', href)
     });
 
 
     // load details on summary page expand
     $('#summary_details_expand').on('click', function() {
 
         var callback = function (data) {
             % if c.show_stats:
                 showRepoStats(
                     'lang_stats', data);
             % endif
         };
 
         showRepoSize(
             'repo_size_container',
             templateContext.repo_name,
             templateContext.repo_landing_commit,
             callback);
 
     })
 
 })
 </script>
 
 </%def>