Changeset - 0ba1736437e0
[Not reviewed]
beta
0 2 0
Leonardo - 13 years ago 2013-03-04 12:18:34
leo@unity3d.com
hiding the unfinished branch/revision changer
2 files changed with 4 insertions and 2 deletions:
0 comments (0 inline, 0 general)
rhodecode/public/css/contextbar.css
Show inline comments
 
@@ -139,192 +139,193 @@ ul#context-actions {
 
}
 

	
 
ul#context-actions {
 
	display: inline-block;
 
	float: right;
 
	border-radius: 4px;
 
	background-color:#3b6998;
 
	background-image: linear-gradient(top, #4574a2 0%, #2f5d8b 100%);
 
	padding: 5px;
 
}
 

	
 
#content ul#context-actions li {
 
	padding: 0px;
 
	border-right: 1px solid rgba(0,0,0,0.1);
 
	border-left: 1px solid rgba(255,255,255,0.1);
 
}
 

	
 
#context-actions button,
 
#context-actions a {
 
	display: block;
 
	cursor: pointer;
 
	background: none;
 
	border: none;
 
	margin: 0px;
 
	height: 13px;
 
	padding: 3px 7px;
 
	background-repeat: no-repeat;
 
	background-position: 50% 3px;
 
	padding-top: 24px;
 
}
 

	
 
#context-actions button{
 
	padding-top: 22px;
 
	height: 40px;
 
}
 

	
 
#revision-changer:hover,
 
#context-pages li:hover,
 
#context-actions li:hover,
 
#content #context-actions li:hover {
 
	/*background: rgba(255,255,255,0.2);*/
 
	background: #6388ad; /* Old browsers */
 
	background: -moz-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); /* FF3.6+ */
 
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0)), color-stop(100%,rgba(255,255,255,0))); /* Chrome,Safari4+ */
 
	background: -webkit-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); /* Chrome10+,Safari5.1+ */
 
	background: -o-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); /* Opera 11.10+ */
 
	background: -ms-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); /* IE10+ */
 
	background: linear-gradient(to bottom, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); /* W3C */
 
	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#88bfe8', endColorstr='#70b0e0',GradientType=0 ); /* IE6-9 */
 

	
 
	background-image: -webkit-gradient(linear, left top, left bottom, rgb(255,255,255) 0%, rgb(255,255,255) 100%);
 
	
 
	/*border-radius: 4px;*/
 
}
 

	
 

	
 
#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-actions button.follow,
 
#content  #context-actions button.following{
 
	width: auto;
 
	float: none;
 
}
 

	
 
#content  #context-actions button .show-following,
 
#content  #context-actions button .show-follow {
 
	display: none;
 
}
 

	
 
#content #context-bar #context-actions button.follow .show-follow {
 
	display: block;
 
}
 

	
 
#content #context-bar #context-actions button.following .show-following {
 
	display: block;
 
}
 

	
 
#context-state {
 
	background-color: #336699;
 
	border-top: 1px solid #517da8;
 
	min-height: 36px;
 
/*	overflow: hidden;*/
 
}
 

	
 
#context-pages {
 
	float: right;
 
	border-left: 1px solid rgba(0,0,0,0.1);
 
/*	overflow: hidden;*/
 
}
 

	
 
#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 */
 
	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#5d5d5d', endColorstr='#484848',GradientType=0 ); /* IE6-9 */
 
}
 

	
 
#content #context-pages .icon {
 
	margin-right:5px;
 
}
 

	
 
#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;
 
}
 

	
 
#content #context-pages li:last-child {
 
	border-right:none;
 
}
 

	
 
#context-pages a, 
 
#context-pages .admin_menu a{
 
	display: block;
 
	padding: 0px 10px;
 
	padding-left: 30px;
 
	line-height: 35px;
 
}
 

	
 
#revision-changer:before,
 
#context-pages a.childs:after,
 
#context-pages a.dropdown:after {
 
	content: ' \25BE';
 
}
 
#context-pages a.childs:after{
 
	float: right;
 
	padding-left: 5px;
 
}
 

	
 
#revision-changer:before {
 
	position: absolute;
 
	top: 0px;
 
	right: 0px;
 
	border-right: 1px solid rgba(0,0,0,0.1);
 
	height: 25px;
 
	padding-top: 10px;
 
	padding-right: 10px;
 
}
 

	
 
#context-pages li:last-child a {
 
	padding-right: 10px;
 
}
 

	
 
#context-bar #revision-changer {
 
	position: relative;
 
	cursor: pointer;
 
	border: none;
 
	padding: 0;
 
	margin: 0;
 
	color: #FFFFFF;
 
	font-size: 0.85em;
 
	padding: 2px 15px;
 
	padding-bottom: 3px;
 
	padding-right: 30px;
 
	border-right: 1px solid rgba(255,255,255,0.1);
 
}
 

	
 
#revision-changer .branch-name,
 
#revision-changer .revision {
 
	display: block;
 
	text-align: center;
 
	line-height: 1.5em;
 
}
 

	
 
#revision-changer .branch-name {
 
	font-weight: bold;
 
}
 

	
 
#revision-changer .revision{
 
	text-transform: uppercase;
 
}
 

	
 

	
rhodecode/templates/base/base.html
Show inline comments
 
@@ -16,196 +16,197 @@
 
</div>
 
<!-- END HEADER -->
 

	
 
<!-- CONTENT -->
 
<div id="content">
 
    <div class="flash_msg">
 
        <% messages = h.flash.pop_messages() %>
 
        % if messages:
 
        <ul id="flash-messages">
 
            % for message in messages:
 
            <li class="${message.category}_msg">${message}</li>
 
            % endfor
 
        </ul>
 
        % endif
 
    </div>
 
    <div id="main">
 
        ${next.main()}
 
    </div>
 
</div>
 
<!-- END CONTENT -->
 

	
 
<!-- FOOTER -->
 
<div id="footer">
 
   <div id="footer-inner" class="title">
 
       <div>
 
           <p class="footer-link">
 
                <a href="${h.url('bugtracker')}">${_('Submit a bug')}</a>
 
           </p>
 
           <p class="footer-link-right">
 
               <a href="${h.url('rhodecode_official')}">RhodeCode${'-%s' % c.rhodecode_instanceid if c.rhodecode_instanceid else ''}</a>
 
               ${c.rhodecode_version} &copy; 2010-${h.datetime.today().year} by Marcin Kuzminski
 
           </p>
 
       </div>
 
   </div>
 
</div>
 
<!-- END FOOTER -->
 

	
 
### MAKO DEFS ###
 
<%def name="page_nav()">
 
    ${self.menu()}
 
</%def>
 

	
 
<%def name="breadcrumbs()">
 
    <div class="breadcrumbs">
 
    ${self.breadcrumbs_links()}
 
    </div>
 
</%def>
 

	
 
<%def name="context_bar(current=None)">
 
   %if c.repo_name:
 
    ${repo_context_bar(current)}
 
   %endif
 
</%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'))}
 
        ยป
 
        ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
 
      </div>
 
      ## 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':
 
        <ul id="context-actions" class="horizontal-list">
 
          <li>
 
           <button class="${follow_class()}" onclick="javascript:toggleFollowingRepo(this,${c.rhodecode_db_repo.repo_id},'${str(h.get_token())}');">
 
            <!--span class="icon show-follow follow"></span>
 
            <span class="icon show-following following"></span-->
 
            <span class="show-follow">${_('Follow')}</span>
 
            <span class="show-following">${_('Unfollow')}</span>
 
          </button>
 
          </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">${_('Pull Request')}</a></li>
 
          %endif
 
        </ul>
 
      %endif
 
    </div>
 
    <div id="context-state">
 
      <button id="revision-changer">
 
      <!--button id="revision-changer">
 
        <span class="branch-name">graphics/shader-move</span>
 
        <span class="revision">@73318:8d3d6ee94072</span>
 
      </button>
 
      </button-->
 
      &nbsp;
 
      <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">${_('Changelogs')}</a></li>
 
        <li ${is_current('files')}><a href="${h.url('files_home', repo_name=c.repo_name)}" class="files"></span>${_('Files')}</a></li>
 
        <li>
 
          <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(_('repository settings'),h.url('edit_repo',repo_name=c.repo_name),class_='settings')}</li>
 
               %else:
 
                   <li>${h.link_to(_('repository 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>
 
              <li>${h.link_to(_('search'),h.url('search_repo',repo_name=c.repo_name),class_='search')}</li>
 

	
 
              %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.rhodecode_db_repo.enable_locking:
 
                %if c.rhodecode_db_repo.locked[0]:
 
                  <li>${h.link_to(_('unlock'), h.url('toggle_locking',repo_name=c.repo_name),class_='locking_del')}</li>
 
                %else:
 
                  <li>${h.link_to(_('lock'), h.url('toggle_locking',repo_name=c.repo_name),class_='locking_add')}</li>
 
                %endif
 
              %endif
 

	
 
              % if h.HasPermissionAll('hg.admin')('access admin main page'):
 
                 <li>
 
                   ${h.link_to(_('admin'),h.url('admin_home'),class_='admin childs')}
 
                    <%def name="admin_menu()">
 
                    <ul class="admin_menu">
 
                        <li>${h.link_to(_('admin journal'),h.url('admin_home'),class_='journal')}</li>
 
                        <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
 
                        <li>${h.link_to(_('repositories groups'),h.url('repos_groups'),class_='repos_groups')}</li>
 
                        <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
 
                        <li>${h.link_to(_('users groups'),h.url('users_groups'),class_='groups')}</li>
 
                        <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
 
                        <li>${h.link_to(_('ldap'),h.url('ldap_home'),class_='ldap')}</li>
 
                        <li>${h.link_to(_('defaults'),h.url('defaults'),class_='defaults')}</li>
 
                        <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>
 
                    </ul>
 
                    </%def>
 
                    ## ADMIN MENU
 
                    ${admin_menu()}
 
                 </li>
 
              ## if you're a admin of any groups, show admin menu for it
 
              % elif c.rhodecode_user.groups_admin:
 
                 <li>
 
                   ${h.link_to(_('admin'),h.url('admin_home'),class_='admin')}
 
                    <%def name="admin_menu_simple()">
 
                    <ul>
 
                        <li>${h.link_to(_('repositories groups'),h.url('repos_groups'),class_='repos_groups')}</li>
 
                    </ul>
 
                    </%def>
 
                    ## ADMIN MENU
 
                    ${admin_menu_simple()}
 
                 </li>
 
              % 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">1</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" id="quick_login_link">
 
          <span class="icon" style="padding:5px 5px 0px 5px">
 
             <img src="${h.gravatar_url(c.rhodecode_user.email,20)}" alt="avatar">
 
          </span>
 
          %if c.rhodecode_user.username != 'default':
0 comments (0 inline, 0 general)