Changeset - e34cf36e024a
Parent rev.
Child rev.
[Not reviewed]
default
0 12 0
Mads Kiilerich (mads) - 9 years ago 2016-12-24 17:26:48
mads@kiilerich.com
style: introduce pull-left and pull-right in more places

Based on work by Dominik Ruf.
12 files changed with 64 insertions and 61 deletions:
kallithea/templates/admin/gists/show.html
5
5
kallithea/templates/admin/notifications/notifications.html
3
5
kallithea/templates/base/base.html
4
4
kallithea/templates/changelog/changelog.html
2
2
kallithea/templates/changeset/changeset.html
7
7
kallithea/templates/changeset/changeset_range.html
2
2
kallithea/templates/data_table/_dt_elements.html
8
8
kallithea/templates/files/files_edit.html
2
2
kallithea/templates/files/files_source.html
4
5
kallithea/templates/journal/journal.html
5
5
kallithea/templates/journal/journal_data.html
19
13
kallithea/templates/pullrequests/pullrequest_show.html
3
3
0 comments (0 inline, 0 general)
kallithea/templates/admin/gists/show.html
➞
Show inline comments
 
@@ -31,17 +31,17 @@
 
            <div id="body" class="codeblock">
 
                <div class="code-header">
 
                    <div class="stats">
 
                        <div class="left" style="margin: -4px 0px 0px 0px">
 
                        <div class="pull-left">
 
                          %if c.gist.gist_type == 'public':
 
                            <div class="label label-success">${_('Public Gist')}</div>
 
                          %else:
 
                            <div class="label label-warning">${_('Private Gist')}</div>
 
                          %endif
 
                        </div>
 
                        <div class="left item">
 
                        <div class="pull-left">
 
                            ${c.gist.gist_description}
 
                        </div>
 
                        <div class="left item last text-muted">
 
                        <div class="pull-left text-muted">
 
                         %if c.gist.gist_expires == -1:
 
                          ${_('Expires')}: ${_('Never')}
 
                         %else:
 
@@ -49,13 +49,13 @@
 
                         %endif
 
                        </div>
 

			




	
	
	
		
 
                       %if h.HasPermissionAny('hg.admin')() or c.gist.owner_id == c.authuser.user_id:

			




	
	
	
		
 
                        %if h.HasPermissionAny('hg.admin')() or c.gist.owner_id == c.authuser.user_id:

			




	
	
	
		
 
                        <div style="float:right">

			




	
	
	
		
 
                            ${h.form(url('gist_delete', gist_id=c.gist.gist_id))}

			




	
	
	
		
 
                                ${h.submit('remove_gist', _('Delete'),class_="btn btn-danger btn-xs",onclick="return confirm('"+_('Confirm to delete this Gist')+"');")}

			




	
	
	
		
 
                            ${h.end_form()}

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                       %endif

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 
                        <div class="buttons">

			




	
	
	
		
 
                          ## only owner should see that

			




	
	
	
		
 
                          %if h.HasPermissionAny('hg.admin')() or c.gist.owner_id == c.authuser.user_id:

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/notifications/notifications.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -19,17 +19,15 @@

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div style="padding:14px 18px;text-align: right;float:left">

			




	
	
	
		
 
    <div class="pull-left">

			




	
	
	
		
 
            <span id='all' class="btn btn-default btn-sm"><a href="${h.url.current()}">${_('All')}</a></span>

			




	
	
	
		
 
            <span id='comment' class="btn btn-default btn-sm"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span>

			




	
	
	
		
 
            <span id='pull_request' class="btn btn-default btn-sm"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull Requests')}</a></span>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %if c.notifications:

			




	
	
	
		
 
        <div style="padding:14px 18px;text-align: right;float:right">

			




	
	
	
		
 
            <span id='mark_all_read' class="btn btn-default btn-sm">${_('Mark All Read')}</span>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <span id='mark_all_read' class="btn btn-default btn-sm pull-right">${_('Mark All Read')}</span>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    <div id='notification_data'>

			




	
	
	
		
 
    <div id="notification_data">

			




	
	
	
		
 
        <%include file='notifications_data.html'/>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




        

    


    
    

    

        

                

                    kallithea/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -14,10 +14,10 @@

			




	
	
	
		
 
<div id="footer">

			




	
	
	
		
 
   <div id="footer-inner" class="title">

			




	
	
	
		
 
       <div>

			




	
	
	
		
 
           <p class="footer-link">

			




	
	
	
		
 
           <p class="footer-link pull-left">

			




	
	
	
		
 
               ${_('Server instance: %s') % c.instance_id if c.instance_id else ''}

			




	
	
	
		
 
           </p>

			




	
	
	
		
 
           <p class="footer-link-right">

			




	
	
	
		
 
           <p class="footer-link pull-right">

			




	
	
	
		
 
               This site is powered by

			




	
	
	
		
 
               %if c.visual.show_version:

			




	
	
	
		
 
                   <a href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a> ${c.kallithea_version},

			




	
	
		
 
@@ -403,12 +403,12 @@

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            ${h.end_form()}

			




	
	
	
		
 
          %else:

			




	
	
	
		
 
            <div class="links_left">

			




	
	
	
		
 
            <div class="pull-left links_left">

			




	
	
	
		
 
                ${h.gravatar_div(c.authuser.email, size=48, div_class="big_gravatar")}

			




	
	
	
		
 
                <div class="full_name">${c.authuser.full_name_or_username}</div>

			




	
	
	
		
 
                <div class="email">${c.authuser.email}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="links_right">

			




	
	
	
		
 
            <div class="pull-right links_right">

			




	
	
	
		
 
            <ol class="links">

			




	
	
	
		
 
              <li><a href="${h.url('notifications')}">${_('Notifications')}: ${c.unread_notifications}</a></li>

			




	
	
	
		
 
              <li>${h.link_to(_('My Account'),h.url('my_account'))}</li>

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -36,7 +36,7 @@ ${self.repo_context_bar('changelog', c.f

			




	
	
	
		
 
            <div>

			




	
	
	
		
 
                <div style="overflow:auto; ${'display:none' if c.changelog_for_path else ''}">

			




	
	
	
		
 
                    <div class="container_header">

			




	
	
	
		
 
                        <div style="float:left; margin-left:20px;">

			




	
	
	
		
 
                        <div class="pull-left">

			




	
	
	
		
 
                            ${h.form(h.url.current(),method='get',class_="form-inline")}

			




	
	
	
		
 
                                ${h.submit('set',_('Show'),class_="btn btn-default btn-sm")}

			




	
	
	
		
 
                                ${h.text('size',size=3,value=c.size,class_='form-control')}

			




	
	
		
 
@@ -47,7 +47,7 @@ ${self.repo_context_bar('changelog', c.f

			




	
	
	
		
 
                            ${h.end_form()}

			




	
	
	
		
 
                            <a href="#" class="btn btn-default btn-sm" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                        <div style="float: right; margin: 0px 0px 0px 4px">

			




	
	
	
		
 
                        <div class="pull-right">

			




	
	
	
		
 
                            <a href="#" class="btn btn-default btn-sm" id="rev_range_container" style="display:none"></a>

			




	
	
	
		
 
                            %if c.revision:

			




	
	
	
		
 
                                <a class="btn btn-default btn-sm" href="${h.url('changelog_home', repo_name=c.repo_name)}">

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -36,20 +36,20 @@ ${self.repo_context_bar('changelog', c.c

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="children">

			




	
	
	
		
 
            <div class="pull-right children">

			




	
	
	
		
 
                <div id="child_link" class="changeset_hash">

			




	
	
	
		
 
                    <a href="#">${_('Child rev.')}</a> <i style="color:#036185" class="icon-right-open"></i>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="code-header banner">

			




	
	
	
		
 
                <div class="changeset-status-container">

			




	
	
	
		
 
                <div class="pull-left changeset-status-container">

			




	
	
	
		
 
                    %if c.statuses:

			




	
	
	
		
 
                        <span class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[0]}"></i></span>

			




	
	
	
		
 
                        <span title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.statuses[0])}]</span>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="diff-actions">

			




	
	
	
		
 
                <div class="diff-actions pull-left">

			




	
	
	
		
 
                  <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" data-toggle="tooltip" title="${_('Raw diff')}">

			




	
	
	
		
 
                      <i class="icon-diff"></i>

			




	
	
	
		
 
                  </a>

			




	
	
		
 
@@ -108,7 +108,7 @@ ${self.repo_context_bar('changelog', c.c

			




	
	
	
		
 
                        % endif

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="left">

			




	
	
	
		
 
                <div class="pull-left">

			




	
	
	
		
 
                     <div class="author">

			




	
	
	
		
 
                         ${h.gravatar_div(h.email_or_none(c.changeset.author), size=20)}

			




	
	
	
		
 
                         <span><b>${h.person(c.changeset.author,'full_name_and_username')}</b> - ${h.age(c.changeset.date,True)} ${h.fmt_date(c.changeset.date)}</span><br/>

			




	
	
		
 
@@ -167,12 +167,12 @@ ${self.repo_context_bar('changelog', c.c

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="cs_files">

			




	
	
	
		
 
                %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:

			




	
	
	
		
 
                    <div class="cs_${op}">

			




	
	
	
		
 
                      <div class="node">

			




	
	
	
		
 
                    <div class="cs_${op} clearfix">

			




	
	
	
		
 
                      <div class="node pull-left">

			




	
	
	
		
 
                          <i class="icon-diff-${op}"></i>

			




	
	
	
		
 
                          ${h.link_to(h.safe_unicode(path), '#%s' % fid)}

			




	
	
	
		
 
                      </div>

			




	
	
	
		
 
                      <div class="changes">${h.fancy_file_stats(stats)}</div>

			




	
	
	
		
 
                      <div class="changes pull-right">${h.fancy_file_stats(stats)}</div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                %if c.limited_diff:

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -60,8 +60,8 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
                        <h6 class="cur_cs">${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</h6>

			




	
	
	
		
 
                        <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>

			




	
	
	
		
 
                        %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:

			




	
	
	
		
 
                            <div class="cs_${op}">

			




	
	
	
		
 
                                <div class="node">

			




	
	
	
		
 
                            <div class="cs_${op} clearfix">

			




	
	
	
		
 
                                <div class="node pull-left">

			




	
	
	
		
 
                                    <i class="icon-diff-${op}"></i>

			




	
	
	
		
 
                                    ${h.link_to(h.safe_unicode(path), '#%s' % fid)}

			




	
	
	
		
 
                                </div>

			




        

    


    
    

    

        

                

                    kallithea/templates/data_table/_dt_elements.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -70,12 +70,12 @@

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_actions(repo_name, super_user=True)">

			




	
	
	
		
 
  <div>

			




	
	
	
		
 
    <div style="float:left; margin-right:5px;" class="grid_edit">

			




	
	
	
		
 
    <div class="grid_edit pull-left">

			




	
	
	
		
 
      <a href="${h.url('edit_repo',repo_name=repo_name)}" title="${_('Edit')}">

			




	
	
	
		
 
        <i class="icon-pencil"></i> ${h.submit('edit_%s' % repo_name,_('Edit'),class_="btn btn-default btn-xs")}

			




	
	
	
		
 
      </a>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div style="float:left" class="grid_delete">

			




	
	
	
		
 
    <div class="grid_delete pull-left">

			




	
	
	
		
 
      ${h.form(h.url('delete_repo', repo_name=repo_name))}

			




	
	
	
		
 
        <i class="icon-minus-circled" style="color:#FF4444"></i>

			




	
	
	
		
 
        ${h.submit('remove_%s' % repo_name,_('Delete'),class_="btn btn-default btn-xs",

			




	
	
		
 
@@ -98,12 +98,12 @@

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="user_actions(user_id, username)">

			




	
	
	
		
 
 <div style="float:left" class="grid_edit">

			




	
	
	
		
 
 <div class="grid_edit pull-left">

			




	
	
	
		
 
   <a href="${h.url('edit_user',id=user_id)}" title="${_('Edit')}">

			




	
	
	
		
 
     <i class="icon-pencil"></i> ${h.submit('edit_%s' % username,_('Edit'),class_="btn btn-default btn-xs")}

			




	
	
	
		
 
   </a>

			




	
	
	
		
 
 </div>

			




	
	
	
		
 
 <div style="float:left" class="grid_delete">

			




	
	
	
		
 
 <div class="grid_delete pull-left">

			




	
	
	
		
 
  ${h.form(h.url('delete_user', id=user_id))}

			




	
	
	
		
 
    <i class="icon-minus-circled" style="color:#FF4444"></i>

			




	
	
	
		
 
    ${h.submit('remove_',_('Delete'),id="remove_user_%s" % user_id, class_="btn btn-default btn-xs",

			




	
	
		
 
@@ -113,12 +113,12 @@

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="user_group_actions(user_group_id, user_group_name)">

			




	
	
	
		
 
 <div style="float:left" class="grid_edit">

			




	
	
	
		
 
 <div class="grid_edit pull-left">

			




	
	
	
		
 
    <a href="${h.url('edit_users_group', id=user_group_id)}" title="${_('Edit')}">

			




	
	
	
		
 
    <i class="icon-pencil"></i> ${h.submit('edit_%s' % user_group_name,_('Edit'),class_="btn btn-default btn-xs", id_="submit_user_group_edit")}

			




	
	
	
		
 
    </a>

			




	
	
	
		
 
 </div>

			




	
	
	
		
 
 <div style="float:left" class="grid_delete">

			




	
	
	
		
 
 <div class="grid_delete pull-left">

			




	
	
	
		
 
    ${h.form(h.url('delete_users_group', id=user_group_id))}

			




	
	
	
		
 
      <i class="icon-minus-circled" style="color:#FF4444"></i>

			




	
	
	
		
 
      ${h.submit('remove_',_('Delete'),id="remove_group_%s" % user_group_id, class_="btn btn-default btn-xs",

			




	
	
		
 
@@ -128,12 +128,12 @@

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_group_actions(repo_group_id, repo_group_name, gr_count)">

			




	
	
	
		
 
 <div style="float:left" class="grid_edit">

			




	
	
	
		
 
 <div class="grid_edit pull-left">

			




	
	
	
		
 
    <a href="${h.url('edit_repo_group',group_name=repo_group_name)}" title="${_('Edit')}">

			




	
	
	
		
 
    <i class="icon-pencil"></i> ${h.submit('edit_%s' % repo_group_name, _('Edit'),class_="btn btn-default btn-xs")}

			




	
	
	
		
 
    </a>

			




	
	
	
		
 
 </div>

			




	
	
	
		
 
 <div style="float:left" class="grid_delete">

			




	
	
	
		
 
 <div class="grid_delete pull-left">

			




	
	
	
		
 
    ${h.form(h.url('delete_repos_group', group_name=repo_group_name))}

			




	
	
	
		
 
        <i class="icon-minus-circled" style="color:#FF4444"></i>

			




	
	
	
		
 
        ${h.submit('remove_%s' % repo_group_name,_('Delete'),class_="btn btn-default btn-xs",

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -38,12 +38,12 @@ ${self.repo_context_bar('files')}

			




	
	
	
		
 
            ${h.form(h.url.current(),method='post',id='eform',class_='form-inline')}

			




	
	
	
		
 
            <div id="body" class="codeblock">

			




	
	
	
		
 
            <div class="code-header">

			




	
	
	
		
 
                <div class="stats">

			




	
	
	
		
 
                <div class="pull-left stats">

			




	
	
	
		
 
                    <div class="left"><i class="icon-doc-inv"></i></div>

			




	
	
	
		
 
                    <div class="left item">${h.link_to(h.show_id(c.file.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</div>

			




	
	
	
		
 
                    <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div>

			




	
	
	
		
 
                    <div class="left item last">${c.file.mimetype}</div>

			




	
	
	
		
 
                    <div class="buttons">

			




	
	
	
		
 
                    <div class="pull-right buttons">

			




	
	
	
		
 
                      ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}

			




	
	
	
		
 
                      ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}

			




	
	
	
		
 
                      ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_source.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
<div id="node_history" style="padding: 0px 0px 10px 0px">

			




	
	
	
		
 
    <div>

			




	
	
	
		
 
        <div style="float:left">

			




	
	
	
		
 
        <div class="pull-left">

			




	
	
	
		
 
        ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}

			




	
	
	
		
 
        ${h.hidden('diff2',c.changeset.raw_id)}

			




	
	
	
		
 
        ${h.hidden('diff1')}

			




	
	
		
 
@@ -9,7 +9,6 @@

			




	
	
	
		
 
        ${h.hidden('annotate', c.annotate)}

			




	
	
	
		
 
        ${h.link_to(_('Show Full History'),h.url('changelog_file_home',repo_name=c.repo_name, revision=c.changeset.raw_id, f_path=c.f_path),class_="btn btn-default btn-sm")}

			




	
	
	
		
 
        ${h.link_to(_('Show Authors'),'#',class_="btn btn-default btn-sm" ,id="show_authors")}

			




	
	
	
		
 

			




	
	
	
		
 
        ${h.end_form()}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="file_authors" class="file_author" style="clear:both; display: none"></div>

			




	
	
		
 
@@ -20,12 +19,13 @@

			




	
	
	
		
 

			




	
	
	
		
 
<div id="body" class="codeblock">

			




	
	
	
		
 
    <div class="code-header">

			




	
	
	
		
 
        <div class="stats">

			




	
	
	
		
 
        <div class="pull-left stats">

			




	
	
	
		
 
            <div class="left img"><i class="icon-doc-inv"></i></div>

			




	
	
	
		
 
            <div class="left item"><pre data-toggle="tooltip" title="${h.fmt_date(c.changeset.date)}">${h.link_to(h.show_id(c.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</pre></div>

			




	
	
	
		
 
            <div class="left item"><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></div>

			




	
	
	
		
 
            <div class="left item last"><pre>${c.file.mimetype}</pre></div>

			




	
	
	
		
 
            <div class="buttons">

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="pull-right buttons">

			




	
	
	
		
 
              %if c.annotate:

			




	
	
	
		
 
                ${h.link_to(_('Show Source'),    h.url('files_home',         repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}

			




	
	
	
		
 
              %else:

			




	
	
		
 
@@ -45,7 +45,6 @@

			




	
	
	
		
 
                ${h.link_to(_('Delete'), '#', class_="btn btn-danger btn-xs disabled tooltip", title=_('Deleting files allowed only when on branch head revision'))}

			




	
	
	
		
 
               %endif

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="author">

			




	
	
	
		
 
            ${h.gravatar_div(h.email_or_none(c.changeset.author), size=16)}

			




        

    


    
    

    

        

                

                    kallithea/templates/journal/journal.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -4,11 +4,11 @@

			




	
	
	
		
 
    ${_('Journal')}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    <form id="filter_form" class="form-inline">

			




	
	
	
		
 
    <input class="form-control q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('quick filter...')}"/>

			




	
	
	
		
 
    <span data-toggle="tooltip" title="${h.journal_filter_help()}">?</span>

			




	
	
	
		
 
    <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/>

			




	
	
	
		
 
    ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)}

			




	
	
	
		
 
    <form id="filter_form" class="pull-left form-inline">

			




	
	
	
		
 
      <input class="form-control q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('quick filter...')}"/>

			




	
	
	
		
 
      <span data-toggle="tooltip" title="${h.journal_filter_help()}">?</span>

			




	
	
	
		
 
      <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/>

			




	
	
	
		
 
      ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)}

			




	
	
	
		
 
    </form>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%block name="header_menu">

			




        

    


    
    

    

        

                

                    kallithea/templates/journal/journal_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -13,20 +13,26 @@

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                <div class="journal_action_container">

			




	
	
	
		
 
                % for entry in entries:

			




	
	
	
		
 
                    <div class="journal_icon"> ${h.action_parser(entry)[2]()}</div>

			




	
	
	
		
 
                    <div class="journal_action">${h.action_parser(entry)[0]()}</div>

			




	
	
	
		
 
                    <div class="journal_repo">

			




	
	
	
		
 
                        <span class="journal_repo_name">

			




	
	
	
		
 
                        %if entry.repository is not None:

			




	
	
	
		
 
                          ${h.link_to(entry.repository.repo_name,

			




	
	
	
		
 
                                      h.url('summary_home',repo_name=entry.repository.repo_name))}

			




	
	
	
		
 
                        %else:

			




	
	
	
		
 
                          ${entry.repository_name}

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 
                        </span>

			




	
	
	
		
 
                  <div class="container-fluid">

			




	
	
	
		
 
                    <div class="pull-left">

			




	
	
	
		
 
                      <div class="journal_icon"> ${h.action_parser(entry)[2]()}</div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                    <div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div>

			




	
	
	
		
 
                    <div class="date"><span data-toggle="tooltip" title="${h.fmt_date(entry.action_date)}">${h.age(entry.action_date)}</span></div>

			




	
	
	
		
 
                    <div class="pull-left">

			




	
	
	
		
 
                      <div class="journal_action">${h.action_parser(entry)[0]()}</div>

			




	
	
	
		
 
                      <div class="journal_repo">

			




	
	
	
		
 
                          <span class="journal_repo_name">

			




	
	
	
		
 
                          %if entry.repository is not None:

			




	
	
	
		
 
                            ${h.link_to(entry.repository.repo_name,

			




	
	
	
		
 
                                        h.url('summary_home',repo_name=entry.repository.repo_name))}

			




	
	
	
		
 
                          %else:

			




	
	
	
		
 
                            ${entry.repository_name}

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                          </span>

			




	
	
	
		
 
                      </div>

			




	
	
	
		
 
                      <div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div>

			




	
	
	
		
 
                      <div class="date"><span data-toggle="tooltip" title="${h.fmt_date(entry.action_date)}">${h.age(entry.action_date)}</span></div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -314,12 +314,12 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
                   <span class="empty_data">${_('No files')}</span>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %for fid, url_fid, op, a_path, path, diff, stats in c.file_diff_data:

			




	
	
	
		
 
                    <div class="cs_${op}">

			




	
	
	
		
 
                      <div class="node">

			




	
	
	
		
 
                    <div class="cs_${op} clearfix">

			




	
	
	
		
 
                      <div class="node pull-left">

			




	
	
	
		
 
                          <i class="icon-diff-${op}"></i>

			




	
	
	
		
 
                          ${h.link_to(h.safe_unicode(path), '#%s' % fid)}

			




	
	
	
		
 
                      </div>

			




	
	
	
		
 
                      <div class="changes">${h.fancy_file_stats(stats)}</div>

			




	
	
	
		
 
                      <div class="changes pull-right">${h.fancy_file_stats(stats)}</div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                %if c.limited_diff:

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-24492
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support