Changeset - 09ba877db6d3
Parent rev.
Child rev.
[Not reviewed]
beta
0 2 0
Mads Kiilerich - 13 years ago 2013-01-31 23:27:21
madski@unity3d.com
user edit and journal: drop "Add repo" - it has a more natural location in the "group"
2 files changed with 0 insertions and 10 deletions:
rhodecode/templates/admin/users/user_edit_my_account.html
5
rhodecode/templates/journal/journal.html
5
0 comments (0 inline, 0 general)
rhodecode/templates/admin/users/user_edit_my_account.html
➞
Show inline comments
 
## -*- coding: utf-8 -*-
 
<%inherit file="/base/base.html"/>
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${_('My account')} ${c.rhodecode_user.username} - ${c.rhodecode_name}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('My Account')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('admin')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 

			




	
	
	
		
 
<div class="box box-left">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <!-- end box / title -->

			




	
	
	
		
 
    ${c.form|n}

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<div class="box box-right">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        <h5>

			




	
	
	
		
 
        <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}" style="display: none"/>

			




	
	
	
		
 
        </h5>

			




	
	
	
		
 
         <ul class="links" style="color:#DADADA">

			




	
	
	
		
 
           <li>

			




	
	
	
		
 
             <span><a id="show_perms" class="link-white current" href="#perms">${_('My permissions')}</a> </span>

			




	
	
	
		
 
           </li>

			




	
	
	
		
 
           <li>

			




	
	
	
		
 
             <span><a id="show_my" class="link-white" href="#my">${_('My repos')}</a> </span>

			




	
	
	
		
 
           </li>

			




	
	
	
		
 
           <li>

			




	
	
	
		
 
             <span><a id="show_pullrequests" class="link-white" href="#pullrequests">${_('My pull requests')}</a> </span>

			




	
	
	
		
 
           </li>

			




	
	
	
		
 
           %if h.HasPermissionAny('hg.admin','hg.create.repository')():

			




	
	
	
		
 
             <li>

			




	
	
	
		
 
               <span>${h.link_to(_('Add repo'),h.url('admin_settings_create_repository'))}</span>

			




	
	
	
		
 
             </li>

			




	
	
	
		
 
           %endif

			




	
	
	
		
 
         </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <!-- end box / title -->

			




	
	
	
		
 
    <div id="perms_container">

			




	
	
	
		
 
        <div id="perms" class="table">

			




	
	
	
		
 
           %for section in sorted(c.rhodecode_user.permissions.keys()):

			




	
	
	
		
 
            <div class="perms_section_head">${section.replace("_"," ").capitalize()}</div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div id='tbl_list_wrap_${section}' class="yui-skin-sam">

			




	
	
	
		
 
            <table id="tbl_list_${section}">

			




	
	
	
		
 
              <thead>

			




	
	
	
		
 
                  <tr>

			




	
	
	
		
 
                  <th class="left">${_('Name')}</th>

			




	
	
	
		
 
                  <th class="left">${_('Permission')}</th>

			




	
	
	
		
 
              </thead>

			




	
	
	
		
 
              <tbody>

			




	
	
	
		
 
            %for k in c.rhodecode_user.permissions[section]:

			




	
	
	
		
 
           <%

			




	
	
	
		
 
           if section != 'global':

			




	
	
	
		
 
               section_perm = c.rhodecode_user.permissions[section].get(k)

			




	
	
	
		
 
               _perm = section_perm.split('.')[-1]

			




	
	
	
		
 
           else:

			




	
	
	
		
 
               _perm = section_perm = None

			




	
	
	
		
 
           %>

			




	
	
	
		
 
            %if _perm not in ['none']:

			




	
	
	
		
 
                <tr>

			




	
	
	
		
 
                    <td>

			




	
	
	
		
 
                        %if section == 'repositories':

			




	
	
	
		
 
                            <a href="${h.url('summary_home',repo_name=k)}">${k}</a>

			




	
	
	
		
 
                        %elif section == 'repositories_groups':

			




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

			




	
	
	
		
 
                        %else:

			




	
	
	
		
 
                            ${k}

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                    <td>

			




	
	
	
		
 
                        %if section == 'global':

			




	
	
	
		
 
                         ${h.bool2icon(True)}

			




	
	
	
		
 
                        %else:

			




	
	
	
		
 
                        <span class="perm_tag ${_perm}">${section_perm}</span>

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 
                     </td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
             %endif

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </tbody>

			




	
	
	
		
 
            </table>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
           %endfor

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




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

			




	
	
	
		
 
        <div class="table yui-skin-sam" id="repos_list_wrap"></div>

			




	
	
	
		
 
        <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div id="pullrequests_container" class="table" style="display:none">

			




	
	
	
		
 
        ## loaded via AJAX

			




	
	
	
		
 
        ${_('Loading...')}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 

			




	
	
	
		
 
var show_perms = function(e){

			




	
	
	
		
 
    YUD.addClass('show_perms', 'current');

			




	
	
	
		
 
    YUD.removeClass('show_my','current');

			




	
	
	
		
 
    YUD.removeClass('show_pullrequests','current');

			




	
	
	
		
 

			




	
	
	
		
 
    YUD.setStyle('my_container','display','none');

			




	
	
	
		
 
    YUD.setStyle('pullrequests_container','display','none');

			




	
	
	
		
 
    YUD.setStyle('perms_container','display','');

			




	
	
	
		
 
    YUD.setStyle('q_filter','display','none');

			




	
	
	
		
 
}

			




	
	
	
		
 
YUE.on('show_perms','click',function(e){

			




	
	
	
		
 
    show_perms();

			




	
	
	
		
 
})

			




	
	
	
		
 

			




	
	
	
		
 
var show_my = function(e){

			




	
	
	
		
 
    YUD.addClass('show_my', 'current');

			




	
	
	
		
 
    YUD.removeClass('show_perms','current');

			




	
	
	
		
 
    YUD.removeClass('show_pullrequests','current');

			




	
	
	
		
 

			




	
	
	
		
 
    YUD.setStyle('perms_container','display','none');

			




	
	
	
		
 
    YUD.setStyle('pullrequests_container','display','none');

			




	
	
	
		
 
    YUD.setStyle('my_container','display','');

			




	
	
	
		
 
    YUD.setStyle('q_filter','display','');

			




	
	
	
		
 
    if(!YUD.hasClass('show_my', 'loaded')){

			




	
	
	
		
 
        table_renderer(${c.data |n});

			




	
	
	
		
 
        YUD.addClass('show_my', 'loaded');

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 
YUE.on('show_my','click',function(e){

			




	
	
	
		
 
    show_my(e);

			




	
	
	
		
 
})

			




	
	
	
		
 

			




	
	
	
		
 
var show_pullrequests = function(e){

			




        

    


    
    

    

        

                

                    rhodecode/templates/journal/journal.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
<%inherit file="/base/base.html"/>

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${_('Journal')} - ${c.rhodecode_name}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="breadcrumbs()">

			




	
	
	
		
 
    <h5>

			




	
	
	
		
 
    <form id="filter_form">

			




	
	
	
		
 
    <input class="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 class="tooltip" title="${h.tooltip(h.journal_filter_help())}">?</span>

			




	
	
	
		
 
    <input type='submit' value="${_('filter')}" class="ui-btn" style="padding:0px 2px 0px 2px;margin:0px"/>

			




	
	
	
		
 
    ${_('journal')} - ${ungettext('%s entry', '%s entries', c.journal_pager.item_count) % (c.journal_pager.item_count)}

			




	
	
	
		
 
    </form>

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 
    </h5>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('journal')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="head_extra()">

			




	
	
	
		
 
<link href="${h.url('journal_atom', api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" />

			




	
	
	
		
 
<link href="${h.url('journal_rss', api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('RSS journal feed')}" type="application/rss+xml" />

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 

			




	
	
	
		
 
    <div class="box box-left">

			




	
	
	
		
 
        <!-- box / title -->

			




	
	
	
		
 
        <div class="title">

			




	
	
	
		
 
         ${self.breadcrumbs()}

			




	
	
	
		
 
         <ul class="links">

			




	
	
	
		
 
           <li>

			




	
	
	
		
 
             <span><a id="refresh" href="${h.url('journal')}"><img class="icon" title="${_('Refresh')}" alt="${_('Refresh')}" src="${h.url('/images/icons/arrow_refresh.png')}"/></a></span>

			




	
	
	
		
 
           </li>

			




	
	
	
		
 
           <li>

			




	
	
	
		
 
             <span><a href="${h.url('journal_rss', api_key=c.rhodecode_user.api_key)}"><img class="icon" title="${_('RSS feed')}" alt="${_('RSS feed')}" src="${h.url('/images/icons/rss_16.png')}"/></a></span>

			




	
	
	
		
 
           </li>

			




	
	
	
		
 
           <li>

			




	
	
	
		
 
             <span><a href="${h.url('journal_atom', api_key=c.rhodecode_user.api_key)}"><img class="icon" title="${_('ATOM feed')}" alt="${_('ATOM feed')}" src="${h.url('/images/icons/atom.png')}"/></a></span>

			




	
	
	
		
 
           </li>

			




	
	
	
		
 
         </ul>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="journal">${c.journal_data}</div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="box box-right">

			




	
	
	
		
 
        <!-- box / title -->

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="title">

			




	
	
	
		
 
            <h5>

			




	
	
	
		
 
            <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}" style="display: none"/>

			




	
	
	
		
 
            <input class="q_filter_box" id="q_filter_watched" size="15" type="text" name="filter" value="${_('quick filter...')}" style="display: none"/>

			




	
	
	
		
 
            </h5>

			




	
	
	
		
 
             <ul class="links" style="color:#DADADA">

			




	
	
	
		
 
               <li>

			




	
	
	
		
 
                 <span><a id="show_watched" class="link-white current" href="#watched">${_('Watched')}</a> </span>

			




	
	
	
		
 
               </li>

			




	
	
	
		
 
               <li>

			




	
	
	
		
 
                 <span><a id="show_my" class="link-white" href="#my">${_('My repos')}</a> </span>

			




	
	
	
		
 
               </li>

			




	
	
	
		
 
               %if h.HasPermissionAny('hg.admin','hg.create.repository')():

			




	
	
	
		
 
                 <li>

			




	
	
	
		
 
                   <span>${h.link_to(_('Add repo'),h.url('admin_settings_create_repository'))}</span>

			




	
	
	
		
 
                 </li>

			




	
	
	
		
 
               %endif

			




	
	
	
		
 
             </ul>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <!-- end box / title -->

			




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

			




	
	
	
		
 
            <div class="table yui-skin-sam" id="repos_list_wrap"></div>

			




	
	
	
		
 
            <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div id="watched_container">

			




	
	
	
		
 
            <div class="table yui-skin-sam" id="watched_repos_list_wrap"></div>

			




	
	
	
		
 
            <div id="watched-user-paginator" style="padding: 0px 0px 0px 20px"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <script type="text/javascript">

			




	
	
	
		
 

			




	
	
	
		
 
    YUE.on('j_filter','click',function(){

			




	
	
	
		
 
        var jfilter = YUD.get('j_filter');

			




	
	
	
		
 
        if(YUD.hasClass(jfilter, 'initial')){

			




	
	
	
		
 
            jfilter.value = '';

			




	
	
	
		
 
        }

			




	
	
	
		
 
    });

			




	
	
	
		
 
    var fix_j_filter_width = function(len){

			




	
	
	
		
 
        YUD.setStyle(YUD.get('j_filter'),'width',Math.max(80, len*6.50)+'px');

			




	
	
	
		
 
    }

			




	
	
	
		
 
    YUE.on('j_filter','keyup',function(){

			




	
	
	
		
 
        fix_j_filter_width(YUD.get('j_filter').value.length);

			




	
	
	
		
 
    });

			




	
	
	
		
 
    YUE.on('filter_form','submit',function(e){

			




	
	
	
		
 
        YUE.preventDefault(e)

			




	
	
	
		
 
        var val = YUD.get('j_filter').value;

			




	
	
	
		
 
        window.location = "${url.current(filter='__FILTER__')}".replace('__FILTER__',val);

			




	
	
	
		
 
    });

			




	
	
	
		
 
    fix_j_filter_width(YUD.get('j_filter').value.length);

			




	
	
	
		
 

			




	
	
	
		
 
    YUE.on('refresh','click',function(e){

			




	
	
	
		
 
        ypjax("${h.url.current(filter=c.search_term)}","journal",function(){

			




	
	
	
		
 
            show_more_event();

			




	
	
	
		
 
            tooltip_activate();

			




	
	
	
		
 
            show_changeset_tooltip();

			




	
	
	
		
 
            });

			




	
	
	
		
 
        YUE.preventDefault(e);

			




	
	
	
		
 
    });

			




	
	
	
		
 

			




	
	
	
		
 
    var show_my = function(e){

			




	
	
	
		
 
        YUD.setStyle('watched_container','display','none');

			




	
	
	
		
 
        YUD.setStyle('my_container','display','');

			




	
	
	
		
 
        YUD.setStyle('q_filter','display','');

			




	
	
	
		
 
        YUD.setStyle('q_filter_watched','display','none');

			




	
	
	
		
 

			




	
	
	
		
 
        YUD.addClass('show_my', 'current');

			




	
	
	
		
 
        YUD.removeClass('show_watched','current');

			




	
	
	
		
 

			




	
	
	
		
 
        if(!YUD.hasClass('show_my', 'loaded')){

			




	
	
	
		
 
            table_renderer(${c.data |n});

			




	
	
	
		
 
            YUD.addClass('show_my', 'loaded');

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    YUE.on('show_my','click',function(e){

			




	
	
	
		
 
        show_my(e);

			




	
	
	
		
 
    })

			




	
	
	
		
 
    var show_watched = function(e){

			




	
	
	
		
 
        YUD.setStyle('my_container','display','none');

			




	
	
	
		
 
        YUD.setStyle('watched_container','display','');

			




	
	
	
		
 
        YUD.setStyle('q_filter_watched','display','');

			




	
	
	
		
 
        YUD.setStyle('q_filter','display','none');

			




	
	
	
		
 

			




	
	
	
		
 
        YUD.addClass('show_watched', 'current');

			




	
	
	
		
 
        YUD.removeClass('show_my','current');

			




	
	
	
		
 
        if(!YUD.hasClass('show_watched', 'loaded')){

			




	
	
	
		
 
            watched_renderer(${c.watched_data |n});

			




	
	
	
		
 
            YUD.addClass('show_watched', 'loaded');

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        return

			




	
	
	
		
 
        var nodes = YUQ('#watched_container .watched_repo a');

			




	
	
	
		
 
        var target = 'q_filter';

			




	
	
	
		
 
        var func = function(node){

			




	
	
	
		
 
            return node.parentNode.parentNode;

			




	
	
	
		
 
        }

			




	
	
	
		
 
        q_filter(target,nodes,func);

			




	
	
	
		
 
    }

			




	
	
	
		
 
    YUE.on('show_watched','click',function(e){

			




	
	
	
		
 
        show_watched(e);

			




	
	
	
		
 
    })

			




	
	
	
		
 
    //init watched

			




	
	
	
		
 
    show_watched();

			




	
	
	
		
 

			




	
	
	
		
 
    var tabs = {

			




	
	
	
		
 
        'watched': show_watched,

			




	
	
	
		
 
        'my': show_my,

			




	
	
	
		
 
    }

			




	
	
	
		
 
    var url = location.href.split('#');

			




	
	
	
		
 
    if (url[1]) {

			




	
	
	
		
 
        //We have a hash

			




        

    



    


    



    



      

      





    
    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.