Changeset - d2b9788d2760
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 10 years ago 2015-08-26 17:28:58
madski@unity3d.com
follow: various minor cleanup

A debug session gave no other result than this +0.1 cleanup ...
3 files changed with 11 insertions and 19 deletions:
kallithea/public/js/base.js
8
9
kallithea/templates/base/base.html
2
9
kallithea/templates/data_table/_dt_elements.html
1
1
0 comments (0 inline, 0 general)
kallithea/public/js/base.js
➞
Show inline comments
 
@@ -418,60 +418,59 @@ var show_more_event = function(){
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * activate .lazy-cs mouseover for showing changeset tooltip

			




	
	
	
		
 
 */

			




	
	
	
		
 
var show_changeset_tooltip = function(){

			




	
	
	
		
 
    $('.lazy-cs').mouseover(function(e){

			




	
	
	
		
 
        var $target = $(e.currentTarget);

			




	
	
	
		
 
        var rid = $target.attr('raw_id');

			




	
	
	
		
 
        var repo_name = $target.attr('repo_name');

			




	
	
	
		
 
        if(rid && !$target.hasClass('tooltip')){

			




	
	
	
		
 
            _show_tooltip(e, _TM['loading ...']);

			




	
	
	
		
 
            var url = pyroutes.url('changeset_info', {"repo_name": repo_name, "revision": rid});

			




	
	
	
		
 
            ajaxGET(url, function(json){

			




	
	
	
		
 
                    $target.addClass('tooltip');

			




	
	
	
		
 
                    _show_tooltip(e, json['message']);

			




	
	
	
		
 
                    _activate_tooltip($target);

			




	
	
	
		
 
                });

			




	
	
	
		
 
        }

			




	
	
	
		
 
    });

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
var _onSuccessFollow = function(target){

			




	
	
	
		
 
    var $target = $(target);

			




	
	
	
		
 
    var $f_cnt = $('#current_followers_count');

			




	
	
	
		
 
    if($target.hasClass('follow')){

			




	
	
	
		
 
        $target.attr('class', 'following');

			




	
	
	
		
 
        $target.attr('title', _TM['Stop following this repository']);

			




	
	
	
		
 
        if($f_cnt.html()){

			




	
	
	
		
 
    if ($target.hasClass('follow')) {

			




	
	
	
		
 
        $target.removeClass('follow').addClass('following');

			




	
	
	
		
 
        $target.prop('title', _TM['Stop following this repository']);

			




	
	
	
		
 
        if ($f_cnt.html()) {

			




	
	
	
		
 
            var cnt = Number($f_cnt.html())+1;

			




	
	
	
		
 
            $f_cnt.html(cnt);

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else{

			




	
	
	
		
 
        $target.attr('class', 'follow');

			




	
	
	
		
 
        $target.attr('title', _TM['Start following this repository']);

			




	
	
	
		
 
        if($f_cnt.html()){

			




	
	
	
		
 
    } else {

			




	
	
	
		
 
        $target.removeClass('following').addClass('follow');

			




	
	
	
		
 
        $target.prop('title', _TM['Start following this repository']);

			




	
	
	
		
 
        if ($f_cnt.html()) {

			




	
	
	
		
 
            var cnt = Number($f_cnt.html())-1;

			




	
	
	
		
 
            $f_cnt.html(cnt);

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
var toggleFollowingRepo = function(target, follows_repo_id){

			




	
	
	
		
 
    var args = 'follows_repo_id=' + follows_repo_id;

			




	
	
	
		
 
    args += '&_authentication_token=' + _authentication_token;

			




	
	
	
		
 
    $.post(TOGGLE_FOLLOW_URL, args, function(data){

			




	
	
	
		
 
            _onSuccessFollow(target);

			




	
	
	
		
 
        });

			




	
	
	
		
 
    return false;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
var showRepoSize = function(target, repo_name){

			




	
	
	
		
 
    var args = '_authentication_token=' + _authentication_token;

			




	
	
	
		
 

			




	
	
	
		
 
    if(!$("#" + target).hasClass('loaded')){

			




	
	
	
		
 
        $("#" + target).html(_TM['Loading ...']);

			




	
	
	
		
 
        var url = pyroutes.url('repo_size', {"repo_name":repo_name});

			




	
	
	
		
 
        $.post(url, args, function(data) {

			




	
	
	
		
 
            $("#" + target).html(data);

			




	
	
	
		
 
            $("#" + target).addClass('loaded');

			




        

    


    
    

    

        

                

                    kallithea/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -76,55 +76,48 @@

			




	
	
	
		
 
   %if repositories:

			




	
	
	
		
 
      <li><a href="${h.url('repos')}"><i class="icon-database"></i> ${_('Repositories')}</a></li>

			




	
	
	
		
 
   %endif

			




	
	
	
		
 
   %if repository_groups:

			




	
	
	
		
 
      <li><a href="${h.url('repos_groups')}"><i class="icon-folder"></i> ${_('Repository Groups')}</a></li>

			




	
	
	
		
 
   %endif

			




	
	
	
		
 
   %if user_groups:

			




	
	
	
		
 
      <li><a href="${h.url('users_groups')}"><i class="icon-users"></i> ${_('User Groups')}</a></li>

			




	
	
	
		
 
   %endif

			




	
	
	
		
 
  </ul>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repotag(repo)">

			




	
	
	
		
 
  %if h.is_hg(repo):

			




	
	
	
		
 
    <span class="repotag" title="${_('Mercurial repository')}">hg</span>

			




	
	
	
		
 
  %endif

			




	
	
	
		
 
  %if h.is_git(repo):

			




	
	
	
		
 
    <span class="repotag" title="${_('Git repository')}">git</span>

			




	
	
	
		
 
  %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_context_bar(current=None, rev=None)">

			




	
	
	
		
 
  <% rev = None if rev == 'tip' else rev %>

			




	
	
	
		
 
  <%

			




	
	
	
		
 
      def follow_class():

			




	
	
	
		
 
          if c.repository_following:

			




	
	
	
		
 
              return h.literal('following')

			




	
	
	
		
 
          else:

			




	
	
	
		
 
              return h.literal('follow')

			




	
	
	
		
 
  %>

			




	
	
	
		
 
  <%

			




	
	
	
		
 
    def is_current(selected):

			




	
	
	
		
 
        if selected == current:

			




	
	
	
		
 
            return h.literal('class="current"')

			




	
	
	
		
 
    %>

			




	
	
	
		
 

			




	
	
	
		
 
  <!--- CONTEXT BAR -->

			




	
	
	
		
 
  <div id="context-bar" class="box">

			




	
	
	
		
 
      <h2>

			




	
	
	
		
 
        ${repotag(c.db_repo)}

			




	
	
	
		
 

			




	
	
	
		
 
        ## public/private

			




	
	
	
		
 
        %if c.db_repo.private:

			




	
	
	
		
 
          <i class="icon-keyhole-circled"></i>

			




	
	
	
		
 
        %else:

			




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

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        ${h.repo_link(c.db_repo.groups_and_repo)}

			




	
	
	
		
 

			




	
	
	
		
 
        %if current == 'createfork':

			




	
	
	
		
 
         - ${_('Create Fork')}

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      </h2>

			




	
	
	
		
 
      <!--

			




	
	
	
		
 
      <div id="breadcrumbs">

			




	
	
		
 
@@ -155,52 +148,52 @@

			




	
	
	
		
 
             %endif

			




	
	
	
		
 
          <ul>

			




	
	
	
		
 
             %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):

			




	
	
	
		
 
                   <li><a href="${h.url('edit_repo',repo_name=c.repo_name)}"><i class="icon-gear"></i> ${_('Settings')}</a></li>

			




	
	
	
		
 
             %endif

			




	
	
	
		
 
              %if c.db_repo.fork:

			




	
	
	
		
 
               <li><a href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1], other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}">

			




	
	
	
		
 
                   <i class="icon-git-compare"></i> ${_('Compare Fork')}</a></li>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              <li><a href="${h.url('compare_home',repo_name=c.repo_name)}"><i class="icon-git-compare"></i> ${_('Compare')}</a></li>

			




	
	
	
		
 

			




	
	
	
		
 
              <li><a href="${h.url('search_repo',repo_name=c.repo_name)}"><i class="icon-search"></i> ${_('Search')}</a></li>

			




	
	
	
		
 

			




	
	
	
		
 
              %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.db_repo.enable_locking:

			




	
	
	
		
 
                %if c.db_repo.locked[0]:

			




	
	
	
		
 
                  <li><a href="${h.url('toggle_locking', repo_name=c.repo_name)}"><i class="icon-lock"></i> ${_('Unlock')}</a></li>

			




	
	
	
		
 
                %else:

			




	
	
	
		
 
                  <li><a href="${h.url('toggle_locking', repo_name=c.repo_name)}"><i class="icon-lock-open-alt"></i> ${_('Lock')}</li>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              ## TODO: this check feels wrong, it would be better to have a check for permissions

			




	
	
	
		
 
              ## also it feels like a job for the controller

			




	
	
	
		
 
              %if c.authuser.username != 'default':

			




	
	
	
		
 
                  <li>

			




	
	
	
		
 
                   <a class="${follow_class()}" onclick="javascript:toggleFollowingRepo(this,${c.db_repo.repo_id});">

			




	
	
	
		
 
                   <a class="${'following' if c.repository_following else 'follow'}" onclick="toggleFollowingRepo(this, ${c.db_repo.repo_id});">

			




	
	
	
		
 
                    <span class="show-follow"><i class="icon-heart-empty"></i> ${_('Follow')}</span>

			




	
	
	
		
 
                    <span class="show-following"><i class="icon-heart"></i> ${_('Unfollow')}</span>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                   </a>

			




	
	
	
		
 
                  </li>

			




	
	
	
		
 
                  <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i> ${_('Fork')}</a></li>

			




	
	
	
		
 
                  <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i> ${_('Create Pull Request')}</a></li>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
             </ul>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
        <li ${is_current('showpullrequest')}>

			




	
	
	
		
 
          <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests for %s') % c.repo_name}"> <i class="icon-git-pull-request"></i> ${_('Pull Requests')}

			




	
	
	
		
 
            %if c.repository_pull_requests:

			




	
	
	
		
 
              <span>${c.repository_pull_requests}</span>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </a>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
      </ul>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
  <script type="text/javascript">

			




	
	
	
		
 
      YUE.on('branch_tag_switcher_2','mouseover',function(){

			




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

			




	
	
	
		
 
         var loaded = $branch_tag_switcher_2.hasClass('loaded');

			




	
	
	
		
 
         if(!loaded){

			




	
	
	
		
 
             $branch_tag_switcher_2.addClass('loaded');

			




	
	
	
		
 
             asynchtml("${h.url('branch_tag_switcher',repo_name=c.repo_name)}", $('#switch_to_list_2'));

			




	
	
	
		
 
         }

			




	
	
	
		
 
         return false;

			




        

    


    
    

    

        

                

                    kallithea/templates/data_table/_dt_elements.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -191,27 +191,27 @@

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 
 </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




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

			




	
	
	
		
 
    ${h.link_to(username,h.url('edit_user', id=user_id))}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_group_name(repo_group_name, children_groups)">

			




	
	
	
		
 
  <div style="white-space: nowrap">

			




	
	
	
		
 
  <a href="${h.url('repos_group_home',group_name=repo_group_name)}">

			




	
	
	
		
 
    <i class="icon-folder" title="${_('Repository group')}"></i> ${h.literal(' &raquo; '.join(children_groups))}</a>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




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

			




	
	
	
		
 
  <div style="white-space: nowrap">

			




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

			




	
	
	
		
 
    <i class="icon-users" title="${_('User group')}"></i> ${user_group_name}</a>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="toggle_follow(repo_id)">

			




	
	
	
		
 
  <span id="follow_toggle_${repo_id}" class="following" title="${_('Stop following this repository')}"

			




	
	
	
		
 
        onclick="javascript:toggleFollowingRepo(this, ${repo_id})">

			




	
	
	
		
 
        onclick="toggleFollowingRepo(this, ${repo_id})">

			




	
	
	
		
 
  </span>

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    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.