Changeset - a8373e8fff51
Parent rev.
Child rev.
[Not reviewed]
beta
0 2 0
Mads Kiilerich - 13 years ago 2013-03-26 23:30:20
madski@unity3d.com
merge the two context menu bar stripes - save some vertical space
2 files changed with 6 insertions and 20 deletions:
rhodecode/public/css/contextbar.css
6
16
rhodecode/templates/base/base.html
4
0 comments (0 inline, 0 general)
rhodecode/public/css/contextbar.css
➞
Show inline comments
 
@@ -19,51 +19,54 @@
 
#context-bar a.pull-request { background-image: url("../images/icons/arrow_join.png"); }
 
#context-bar a.branches { background-image: url("../images/icons/arrow_branch.png"); }
 
#context-bar a.tags { background-image: url("../images/icons/tag_blue.png"); }
 
#context-bar a.bookmarks { background-image: url("../images/icons/tag_green.png"); }
 
#context-bar a.settings { background-image: url("../images/icons/cog.png"); }
 
#context-bar a.shortlog { background-image: url("../images/icons/time.png"); }
 
#context-bar a.search { background-image: url("../images/icons/search_16.png"); }
 
#context-bar a.admin { background-image: url("../images/icons/cog_edit.png"); }
 

			




	
	
	
		
 
#context-bar a.journal { background-image: url("../images/icons/book.png"); }

			




	
	
	
		
 
#context-bar a.repos { background-image: url("../images/icons/database_edit.png"); }

			




	
	
	
		
 
#context-bar a.repos_groups { background-image: url("../images/icons/database_link.png"); }

			




	
	
	
		
 
#context-bar a.users { background-image: url("../images/icons/user_edit.png"); }

			




	
	
	
		
 
#context-bar a.groups { background-image: url("../images/icons/group_edit.png"); }

			




	
	
	
		
 
#context-bar a.permissions { background-image: url("../images/icons/key.png"); }

			




	
	
	
		
 
#context-bar a.ldap { background-image: url("../images/icons/server_key.png"); }

			




	
	
	
		
 
#context-bar a.defaults { background-image: url("../images/icons/wrench.png"); }

			




	
	
	
		
 
#context-bar a.settings { background-image: url("../images/icons/cog_edit.png"); }

			




	
	
	
		
 
#context-bar a.compare_request { background-image: url('../images/icons/arrow_inout.png')}

			




	
	
	
		
 
#context-bar a.locking_del { background-image: url('../images/icons/lock_delete.png')}

			




	
	
	
		
 
#context-bar a.locking_add { background-image: url('../images/icons/lock_add.png')}

			




	
	
	
		
 

			




	
	
	
		
 
#content #context-bar {

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
    background-color: #003B76 !important;

			




	
	
	
		
 
    padding: 0px;

			




	
	
	
		
 
    overflow: visible;

			




	
	
	
		
 
    background-color: #336699;

			




	
	
	
		
 
    border-top: 1px solid #517da8;

			




	
	
	
		
 
    border-bottom: 1px solid #003162;

			




	
	
	
		
 
    padding: 0 5px;

			




	
	
	
		
 
    min-height: 36px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick a,

			




	
	
	
		
 
#content #context-bar,

			




	
	
	
		
 
#content #context-bar a {

			




	
	
	
		
 
    color: #FFFFFF;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick a:hover,

			




	
	
	
		
 
#content #context-bar a:hover {

			




	
	
	
		
 
    text-decoration: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content #context-bar .icon {

			




	
	
	
		
 
    display: inline-block;

			




	
	
	
		
 
    width: 16px;

			




	
	
	
		
 
    height: 16px;

			




	
	
	
		
 
    vertical-align: text-bottom;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
ul.horizontal-list {

			




	
	
	
		
 
    display: block;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
		
 
@@ -88,66 +91,59 @@ ul.horizontal-list li:hover > ul {

			




	
	
	
		
 
#header #header-inner #quick li ul li,

			




	
	
	
		
 
ul.horizontal-list ul li {

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
    border-bottom: 1px solid rgba(0,0,0,0.1);

			




	
	
	
		
 
    border-top: 1px solid rgba(255,255,255,0.1);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
ul.horizontal-list > li ul ul {

			




	
	
	
		
 
    position: absolute;

			




	
	
	
		
 
    right: 100%;

			




	
	
	
		
 
    top: -1px;

			




	
	
	
		
 
    min-width: 200px;

			




	
	
	
		
 
    max-height: 400px;

			




	
	
	
		
 
    overflow-x: hidden;

			




	
	
	
		
 
    overflow-y: auto;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick ul a,

			




	
	
	
		
 
ul.horizontal-list li a {

			




	
	
	
		
 
    white-space: nowrap;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#breadcrumbs {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    padding: 5px 0;

			




	
	
	
		
 
    padding: 3px 0 5px 0;

			




	
	
	
		
 
    padding-left: 5px;

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
    font-size: 14px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#breadcrumbs span {

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
    font-size: 1.8em;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#context-top {

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
    border-bottom: 1px solid #003162;

			




	
	
	
		
 
    padding: 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick ul,

			




	
	
	
		
 
#revision-changer,

			




	
	
	
		
 
#context-pages,

			




	
	
	
		
 
#context-pages ul {

			




	
	
	
		
 
    background: #3b6998; /* Old browsers */

			




	
	
	
		
 
    background: -moz-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* FF3.6+ */

			




	
	
	
		
 
    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4574a2), color-stop(100%,#2f5d8b)); /* Chrome,Safari4+ */

			




	
	
	
		
 
    background: -webkit-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* Chrome10+,Safari5.1+ */

			




	
	
	
		
 
    background: -o-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* Opera 11.10+ */

			




	
	
	
		
 
    background: -ms-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* IE10+ */

			




	
	
	
		
 
    background: linear-gradient(to bottom, #4574a2 0%, #2f5d8b 100%); /* W3C */

			




	
	
	
		
 
    /*Filter on IE will also use overflow:hidden implicitly, and that would clip our inner menus.*/

			




	
	
	
		
 
    /*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4574a2', endColorstr='#2f5d8b',GradientType=0 ); /* IE6-9 */*/

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick a,

			




	
	
	
		
 
#context-actions a,

			




	
	
	
		
 
#context-pages a {

			




	
	
	
		
 
    background-repeat: no-repeat;

			




	
	
	
		
 
    background-position: 10px 50%;

			




	
	
	
		
 
    padding-left: 30px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#quick a,

			




	
	
		
 
@@ -205,54 +201,48 @@ ul#context-actions {

			




	
	
	
		
 

			




	
	
	
		
 
#content #context-actions li:first-child {

			




	
	
	
		
 
    border-left: none;

			




	
	
	
		
 
    border-radius: 4px 0 0px 4px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content #context-actions li:last-child {

			




	
	
	
		
 
    border-right: none;

			




	
	
	
		
 
    border-radius: 0 4px 4px 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content #context-actions .icon {

			




	
	
	
		
 
    margin: auto;

			




	
	
	
		
 
    margin-bottom: 5px;

			




	
	
	
		
 
    display: block;

			




	
	
	
		
 
    clear: both;

			




	
	
	
		
 
    float: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content #context-pages .follow .show-following,

			




	
	
	
		
 
#content #context-pages .following .show-follow {

			




	
	
	
		
 
    display: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#context-state {

			




	
	
	
		
 
    background-color: #336699;

			




	
	
	
		
 
    border-top: 1px solid #517da8;

			




	
	
	
		
 
    min-height: 36px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#context-pages {

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    border-left: 1px solid rgba(0,0,0,0.1);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#context-pages li.current {

			




	
	
	
		
 
    background: #535353; /* Old browsers */

			




	
	
	
		
 
    background: -moz-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* FF3.6+ */

			




	
	
	
		
 
    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5d5d5d), color-stop(100%,#484848)); /* Chrome,Safari4+ */

			




	
	
	
		
 
    background: -webkit-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* Chrome10+,Safari5.1+ */

			




	
	
	
		
 
    background: -o-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* Opera 11.10+ */

			




	
	
	
		
 
    background: -ms-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* IE10+ */

			




	
	
	
		
 
    background: linear-gradient(to bottom, #5d5d5d 0%, #484848 100%); /* W3C */

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content #context-pages .icon {

			




	
	
	
		
 
    margin-right: 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick li,

			




	
	
	
		
 
#content #context-pages li {

			




	
	
	
		
 
    border-right: 1px solid rgba(0,0,0,0.1);

			




	
	
	
		
 
    border-left: 1px solid rgba(255,255,255,0.1);

			




	
	
	
		
 
    padding: 0;

			




        

    


    
    

    

        

                

                    rhodecode/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -76,56 +76,53 @@

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="admin_menu_simple()">

			




	
	
	
		
 
  <ul>

			




	
	
	
		
 
      <li>${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>

			




	
	
	
		
 
  </ul>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




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

			




	
	
	
		
 
  <%

			




	
	
	
		
 
      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">

			




	
	
	
		
 
    <div id="context-top">

			




	
	
	
		
 
      <div id="breadcrumbs">

			




	
	
	
		
 
        ${h.link_to(_(u'Repositories'),h.url('home'))}

			




	
	
	
		
 
        &raquo;

			




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

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div id="context-state">

			




	
	
	
		
 
      <ul id="context-pages" class="horizontal-list">

			




	
	
	
		
 
        <li ${is_current('summary')}><a href="${h.url('summary_home', repo_name=c.repo_name)}" class="summary">${_('Summary')}</a></li>

			




	
	
	
		
 
        <li ${is_current('changelog')}><a href="${h.url('changelog_home', repo_name=c.repo_name)}" class="changelogs">${_('Changelog')}</a></li>

			




	
	
	
		
 
        <li ${is_current('files')}><a href="${h.url('files_home', repo_name=c.repo_name)}" class="files"></span>${_('Files')}</a></li>

			




	
	
	
		
 
        <li ${is_current('switch-to')}>

			




	
	
	
		
 
          <a href="#" id="branch_tag_switcher_2" class="dropdown switch-to"></span>${_('Switch To')}</a>

			




	
	
	
		
 
          <ul id="switch_to_list_2" class="switch_to submenu">

			




	
	
	
		
 
            <li><a href="#">${_('loading...')}</a></li>

			




	
	
	
		
 
          </ul>

			




	
	
	
		
 
        </li>

			




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

			




	
	
	
		
 
          <a href="#" class="dropdown options"></span>${_('Options')}</a>

			




	
	
	
		
 
          <ul>

			




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

			




	
	
	
		
 
               %if h.HasPermissionAll('hg.admin')('access settings on repository'):

			




	
	
	
		
 
                   <li>${h.link_to(_('Settings'),h.url('edit_repo',repo_name=c.repo_name),class_='settings')}</li>

			




	
	
	
		
 
               %else:

			




	
	
	
		
 
                   <li>${h.link_to(_('Settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')}</li>

			




	
	
	
		
 
               %endif

			




	
	
	
		
 
             %endif

			




	
	
	
		
 
              %if c.rhodecode_db_repo.fork:

			




	
	
	
		
 
               <li>${h.link_to(_('Compare fork'),h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default'),class_='compare_request')}</li>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              <li>${h.link_to(_('Lightweight changelog'),h.url('shortlog_home',repo_name=c.repo_name),class_='shortlog')}</li>

			




	
	
		
 
@@ -141,49 +138,48 @@

			




	
	
	
		
 
		      ## 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.rhodecode_user.username != 'default':

			




	
	
	
		
 
		          <li>

			




	
	
	
		
 
		           <a class="${follow_class()}" onclick="javascript:toggleFollowingRepo(this,${c.rhodecode_db_repo.repo_id},'${str(h.get_token())}');">

			




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

			




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

			




	
	
	
		
 
		          </a>

			




	
	
	
		
 
		          </li>

			




	
	
	
		
 
		          <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}" class="fork">${_('Fork')}</a></li>

			




	
	
	
		
 
		          %if h.is_hg(c.rhodecode_repo):

			




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

			




	
	
	
		
 
		          %endif

			




	
	
	
		
 
		      %endif

			




	
	
	
		
 
             </ul>

			




	
	
	
		
 
        </li>

			




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

			




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

			




	
	
	
		
 
            %if c.repository_pull_requests:

			




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

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </a>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
      </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
  <script type="text/javascript">

			




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

			




	
	
	
		
 
         var loaded = YUD.hasClass('branch_tag_switcher_2','loaded');

			




	
	
	
		
 
         if(!loaded){

			




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

			




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

			




	
	
	
		
 
                 function(o){},

			




	
	
	
		
 
                 function(o){YUD.removeClass('branch_tag_switcher_2','loaded');}

			




	
	
	
		
 
                 ,null);

			




	
	
	
		
 
         }

			




	
	
	
		
 
         return false;

			




	
	
	
		
 
      });

			




	
	
	
		
 
  </script>

			




	
	
	
		
 
  <!--- END CONTEXT BAR -->

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="usermenu()">

			




	
	
	
		
 
    ## USER MENU

			




	
	
	
		
 
    <li>

			




	
	
	
		
 
      <a class="menu_link childs" id="quick_login_link">

			




	
	
	
		
 
          <span class="icon">

			




	
	
	
		
 
             <img src="${h.gravatar_url(c.rhodecode_user.email,20)}" alt="avatar">

			




	
	
	
		
 
          </span>

			




        

    



    


    



    



      

      





    
    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.