Changeset - d39fcf27fa44
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 8 years ago 2017-10-22 04:01:28
mads@kiilerich.com
files: simplify header, making it more like changeset

"Search file list" is moved out of the header to a separate div.

The "Follow current branch" functionality is dropped, and there is thus less
need for passing the current URL around ... but it is generally still used for
browser history navigation.

The removal of branch following is a temporary feature regression - that will
be fixed next.
3 files changed with 9 insertions and 28 deletions:
kallithea/public/js/base.js
1
14
kallithea/templates/files/files.html
2
2
kallithea/templates/files/files_browser.html
6
12
0 comments (0 inline, 0 general)
kallithea/public/js/base.js
➞
Show inline comments
 
@@ -778,62 +778,49 @@ var linkInlineComments = function($first
 
        $firstlinks.html('<a href="#{0}">First comment</a>'.format($comments.prop('id')));
 
    }
 
    if ($comments.length <= 1) {
 
        return;
 
    }
 

			




	
	
	
		
 
    $comments.each(function(i, e){

			




	
	
	
		
 
            var prev = '';

			




	
	
	
		
 
            if (i > 0){

			




	
	
	
		
 
                var prev_anchor = $($comments.get(i-1)).prop('id');

			




	
	
	
		
 
                prev = '<a href="#{0}">Previous comment</a>'.format(prev_anchor);

			




	
	
	
		
 
            }

			




	
	
	
		
 
            var next = '';

			




	
	
	
		
 
            if (i+1 < $comments.length){

			




	
	
	
		
 
                var next_anchor = $($comments.get(i+1)).prop('id');

			




	
	
	
		
 
                next = '<a href="#{0}">Next comment</a>'.format(next_anchor);

			




	
	
	
		
 
            }

			




	
	
	
		
 
            $(this).find('.comment-prev-next-links').html(

			




	
	
	
		
 
                '<div class="prev-comment">{0}</div>'.format(prev) +

			




	
	
	
		
 
                '<div class="next-comment">{0}</div>'.format(next));

			




	
	
	
		
 
        });

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* activate files.html stuff */

			




	
	
	
		
 
var fileBrowserListeners = function(current_url, node_list_url, url_base){

			




	
	
	
		
 
    var current_url_branch = "?branch=__BRANCH__";

			




	
	
	
		
 

			




	
	
	
		
 
    $('#stay_at_branch').on('click',function(e){

			




	
	
	
		
 
        if(e.currentTarget.checked){

			




	
	
	
		
 
            var uri = current_url_branch;

			




	
	
	
		
 
            uri = uri.replace('__BRANCH__',e.currentTarget.value);

			




	
	
	
		
 
            window.location = uri;

			




	
	
	
		
 
        }

			




	
	
	
		
 
        else{

			




	
	
	
		
 
            window.location = current_url;

			




	
	
	
		
 
        }

			




	
	
	
		
 
    });

			




	
	
	
		
 

			




	
	
	
		
 
var fileBrowserListeners = function(node_list_url, url_base){

			




	
	
	
		
 
    var $node_filter = $('#node_filter');

			




	
	
	
		
 

			




	
	
	
		
 
    var filterTimeout = null;

			




	
	
	
		
 
    var nodes = null;

			




	
	
	
		
 

			




	
	
	
		
 
    var initFilter = function(){

			




	
	
	
		
 
        $('#node_filter_box_loading').show();

			




	
	
	
		
 
        $('#search_activate_id').hide();

			




	
	
	
		
 
        $('#add_node_id').hide();

			




	
	
	
		
 
        $.ajax({url: node_list_url, headers: {'X-PARTIAL-XHR': '1'}, cache: false})

			




	
	
	
		
 
            .done(function(json) {

			




	
	
	
		
 
                    nodes = json.nodes;

			




	
	
	
		
 
                    $('#node_filter_box_loading').hide();

			




	
	
	
		
 
                    $('#node_filter_box').show();

			




	
	
	
		
 
                    $node_filter.focus();

			




	
	
	
		
 
                    if($node_filter.hasClass('init')){

			




	
	
	
		
 
                        $node_filter.val('');

			




	
	
	
		
 
                        $node_filter.removeClass('init');

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                })

			




	
	
	
		
 
            .fail(function() {

			




	
	
	
		
 
                    console.log('fileBrowserListeners initFilter failed to load');

			




	
	
	
		
 
                })

			




	
	
	
		
 
        ;

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -79,49 +79,49 @@ var ypjax_links = function(){

			




	
	
	
		
 
        var _node_list_url = node_list_url.replace('__REV__',rev).replace('__FPATH__', f_path);

			




	
	
	
		
 
        var _url_base = url_base.replace('__REV__',rev);

			




	
	
	
		
 

			




	
	
	
		
 
        // Change our States and save some data for handling events

			




	
	
	
		
 
        var data = {url:url,title:title, url_base:_url_base,

			




	
	
	
		
 
                    node_list_url:_node_list_url, rev:rev, f_path:f_path};

			




	
	
	
		
 
        History.pushState(data, title, url);

			




	
	
	
		
 

			




	
	
	
		
 
        //now we're sure that we can do ypjax things

			




	
	
	
		
 
        e.preventDefault();

			




	
	
	
		
 
        return false;

			




	
	
	
		
 
    });

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
// callbacks needed to process the ypjax filebrowser

			




	
	
	
		
 
var callbacks = function(State){

			




	
	
	
		
 
    ypjax_links();

			




	
	
	
		
 
    tooltip_activate();

			




	
	
	
		
 

			




	
	
	
		
 
    if(State !== undefined){

			




	
	
	
		
 
        //initially loaded stuff

			




	
	
	
		
 
        var _f_path = State.data.f_path;

			




	
	
	
		
 
        var _rev = State.data.rev;

			




	
	
	
		
 

			




	
	
	
		
 
        fileBrowserListeners(State.url, State.data.node_list_url, State.data.url_base);

			




	
	
	
		
 
        fileBrowserListeners(State.data.node_list_url, State.data.url_base);

			




	
	
	
		
 
        // Inform Google Analytics of the change

			




	
	
	
		
 
        if ( typeof window.pageTracker !== 'undefined' ) {

			




	
	
	
		
 
            window.pageTracker._trackPageview(State.url);

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    function highlight_lines(lines){

			




	
	
	
		
 
        for(pos in lines){

			




	
	
	
		
 
          $('#L'+lines[pos]).css('background-color','#FFFFBE');

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    page_highlights = location.href.substring(location.href.indexOf('#')+1).split('L');

			




	
	
	
		
 
    if (page_highlights.length == 2){

			




	
	
	
		
 
       highlight_ranges  = page_highlights[1].split(",");

			




	
	
	
		
 

			




	
	
	
		
 
       var h_lines = [];

			




	
	
	
		
 
       for (pos in highlight_ranges){

			




	
	
	
		
 
            var _range = highlight_ranges[pos].split('-');

			




	
	
	
		
 
            if(_range.length == 2){

			




	
	
	
		
 
                var start = parseInt(_range[0]);

			




	
	
	
		
 
                var end = parseInt(_range[1]);

			




	
	
	
		
 
                if (start < end){

			




	
	
	
		
 
                    for(var i=start;i<=end;i++){

			




	
	
	
		
 
                        h_lines.push(i);

			




	
	
		
 
@@ -212,48 +212,48 @@ $(document).ready(function(){

			




	
	
	
		
 
            $files_data.html(_cache_obj[1]);

			




	
	
	
		
 
            $files_data.css('opacity','1.0');

			




	
	
	
		
 
            //callbacks after ypjax call

			




	
	
	
		
 
            callbacks(State);

			




	
	
	
		
 
        }

			




	
	
	
		
 
        else{

			




	
	
	
		
 
            asynchtml(State.url, $files_data, function(){

			




	
	
	
		
 
                    callbacks(State);

			




	
	
	
		
 
                    var expire_on = new Date().getTime() + CACHE_EXPIRE;

			




	
	
	
		
 
                    CACHE[cache_key] = [expire_on, $files_data.html()];

			




	
	
	
		
 
                });

			




	
	
	
		
 
        }

			




	
	
	
		
 
    });

			




	
	
	
		
 

			




	
	
	
		
 
    // init the search filter

			




	
	
	
		
 
    var _State = {

			




	
	
	
		
 
       url: ${h.js(h.url.current())},

			




	
	
	
		
 
       data: {

			




	
	
	
		
 
         node_list_url: node_list_url.replace('__REV__',${h.js(c.changeset.raw_id)}).replace('__FPATH__', ${h.js(h.safe_unicode(c.file.path))}),

			




	
	
	
		
 
         url_base: url_base.replace('__REV__',${h.js(c.changeset.raw_id)}),

			




	
	
	
		
 
         rev:${h.js(c.changeset.raw_id)},

			




	
	
	
		
 
         f_path: ${h.js(h.safe_unicode(c.file.path))}

			




	
	
	
		
 
       }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    fileBrowserListeners(_State.url, _State.data.node_list_url, _State.data.url_base);

			




	
	
	
		
 
    fileBrowserListeners(_State.data.node_list_url, _State.data.url_base);

			




	
	
	
		
 

			




	
	
	
		
 
    // change branch filter

			




	
	
	
		
 
    $("#branch_selector").select2({

			




	
	
	
		
 
        dropdownAutoWidth: true,

			




	
	
	
		
 
        maxResults: 50,

			




	
	
	
		
 
        sortResults: branchSort

			




	
	
	
		
 
        });

			




	
	
	
		
 

			




	
	
	
		
 
    $("#branch_selector").change(function(e){

			




	
	
	
		
 
        var selected = e.currentTarget.options[e.currentTarget.selectedIndex].value;

			




	
	
	
		
 
        if(selected && selected != ${h.js(c.changeset.raw_id)}){

			




	
	
	
		
 
            window.location = pyroutes.url('files_home', {'repo_name': ${h.js(h.safe_unicode(c.repo_name))}, 'revision': selected, 'f_path': ${h.js(h.safe_unicode(c.file.path))}});

			




	
	
	
		
 
            $("#body").hide();

			




	
	
	
		
 
        } else {

			




	
	
	
		
 
            $("#branch_selector").val(${h.js(c.changeset.raw_id)});

			




	
	
	
		
 
        }

			




	
	
	
		
 
    });

			




	
	
	
		
 

			




	
	
	
		
 
});

			




	
	
	
		
 

			




	
	
	
		
 
</script>

			




	
	
	
		
 

			




	
	
	
		
 
</%def>

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_browser.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -5,78 +5,72 @@

			




	
	
	
		
 
        <%return "submodule-dir"%>

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
        <%return "browser-dir"%>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="file_url(node, c)">

			




	
	
	
		
 
    %if node.is_submodule():

			




	
	
	
		
 
        <%return node.url or '#'%>

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
        <%return h.url('files_home', repo_name=c.repo_name, revision=c.changeset.raw_id, f_path=h.safe_unicode(node.path))%>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="file_name(node)">

			




	
	
	
		
 
    <%

			




	
	
	
		
 
        c = "icon-folder-open"

			




	
	
	
		
 
        if node.is_file():

			




	
	
	
		
 
            c = "icon-doc"

			




	
	
	
		
 
        elif node.is_submodule():

			




	
	
	
		
 
            c = "icon-file-submodule"

			




	
	
	
		
 
    %>

			




	
	
	
		
 
    <%return h.literal('<i class="%s"></i><span>%s</span>' % (c, h.escape(node.name)))%>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<div id="body" class="panel panel-default">

			




	
	
	
		
 
    <div class="panel-heading clearfix">

			




	
	
	
		
 
        ${h.form(h.url.current())}

			




	
	
	
		
 
        <span class="browser-nav form-inline">

			




	
	
	
		
 
            <span class="info_box">

			




	
	
	
		
 
              <span class="info_box_elem rev">${_('Revision')}</span>

			




	
	
	
		
 
              <span class="info_box_elem"><a class="btn btn-default btn-xs ypjax-link" href="${c.url_prev}" title="${_('Previous revision')}"><i class="icon-left-open"></i></a></span>

			




	
	
	
		
 
              <span class="info_box_elem">${h.text('at_rev',value=c.changeset.revision,size=5,class_='form-control input-sm')}</span>

			




	
	
	
		
 
              <span class="info_box_elem"><a class="btn btn-default btn-xs ypjax-link" href="${c.url_next}" title="${_('Next revision')}"><i class="icon-right-open"></i></a></span>

			




	
	
	
		
 
            </span>

			




	
	
	
		
 
        </span>

			




	
	
	
		
 
        <span class="browser-branch form-inline">

			




	
	
	
		
 
            <label class="checkbox">

			




	
	
	
		
 
                ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)}

			




	
	
	
		
 
                ${_('Follow current branch')}

			




	
	
	
		
 
            </label>

			




	
	
	
		
 
        </span>

			




	
	
	
		
 
        <span id="search_activate_id" class="search_activate">

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div class="panel-body">

			




	
	
	
		
 
        ${h.form(h.url.current())}

			




	
	
	
		
 
        <div id="search_activate_id" class="search_activate">

			




	
	
	
		
 
            <a class="btn btn-default btn-xs" id="filter_activate" href="#">${_('Search File List')}</a>

			




	
	
	
		
 
        </span>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        ${h.end_form()}

			




	
	
	
		
 
        <div class="browser-search form-inline">

			




	
	
	
		
 
            <div>

			




	
	
	
		
 
                <div id="node_filter_box_loading" style="display:none">${_('Loading file list...')}</div>

			




	
	
	
		
 
                <div id="node_filter_box" style="display:none">

			




	
	
	
		
 
                ${h.files_breadcrumbs(c.repo_name,c.changeset.raw_id,c.file.path)}/<input class="init" type="text" value="type to search..." name="filter" size="25" id="node_filter">

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div class="panel-body">

			




	
	
	
		
 
        <table class="table code-browser">

			




	
	
	
		
 
            <thead>

			




	
	
	
		
 
                <tr>

			




	
	
	
		
 
                    <th>${_('Name')}</th>

			




	
	
	
		
 
                    <th>${_('Size')}</th>

			




	
	
	
		
 
                    <th>${_('Last Revision')}</th>

			




	
	
	
		
 
                    <th>${_('Last Modified')}</th>

			




	
	
	
		
 
                    <th>${_('Last Committer')}</th>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
            </thead>

			




	
	
	
		
 

			




	
	
	
		
 
            <tbody id="tbody">

			




	
	
	
		
 
                %if c.file.parent:

			




	
	
	
		
 
                <tr class="parity0">

			




	
	
	
		
 
                    <td>

			




	
	
	
		
 
                        ${h.link_to(h.literal('<i class="icon-folder-open"></i><span>..</span>'),h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.file.parent.path),class_="browser-dir ypjax-link")}

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                    <td></td>

			




	
	
	
		
 
                    <td></td>

			




	
	
	
		
 
                    <td></td>

			




	
	
	
		
 
                    <td></td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.