kallithea Changeset - 1c32b72930fa

Changeset - 1c32b72930fa

Parent rev.

Child rev.

[Not reviewed]

beta

0 10 0

leonardo - 13 years ago 2013-03-04 18:30:50

Addding context bar to more repo related pages.
Fixing the base template to work on non-repo related pages.

10 files changed with 176 insertions and 132 deletions:

rhodecode/controllers/summary.py

rhodecode/public/css/contextbar.css

rhodecode/public/css/style.css

rhodecode/templates/base/base.html

102

rhodecode/templates/bookmarks/bookmarks.html

rhodecode/templates/branches/branches.html

rhodecode/templates/followers/followers.html

rhodecode/templates/forks/forks.html

rhodecode/templates/summary/summary.html

rhodecode/templates/tags/tags.html

0 comments (0 inline, 0 general)

rhodecode/controllers/summary.py

➞

Show inline comments

@@ @@ -69,14 +69,12 @@ class SummaryController(BaseRepoControll @@
                                    'repository.admin')
     def __before__(self):
         super(SummaryController, self).__before__()
     def index(self, repo_name):
         c.dbrepo = dbrepo = c.rhodecode_db_repo
         c.following = self.scm_model.is_following_repo(repo_name,
                                                 self.rhodecode_user.user_id)
         def url_generator(**kw):
             return url('shortlog_home', repo_name=repo_name, size=10, **kw)
         c.repo_changesets = RepoPage(c.rhodecode_repo, page=1,
                                      items_per_page=10, url=url_generator)

rhodecode/public/css/contextbar.css

➞

Show inline comments

@@ @@ -56,22 +56,23 @@ @@
 }
 ul.horizontal-list {
 	display: block;
 /*	overflow: hidden;*/
 }
 ul.horizontal-list > li {
 	float: left;
 	padding-right: 5px;
 	position: relative;
 }
 ul.horizontal-list > li ul {
 	position: absolute;
 	display: none;
 	right: 0;
 	z-index: 999;
 }
 ul.horizontal-list li:hover > ul {
 	display: block;
 }
@@ @@ -267,13 +268,13 @@ ul#context-actions { @@
 	border-right:none;
 }
 #context-pages a,
 #context-pages .admin_menu a{
 	display: block;
 	padding: 0px 10px;
+	padding: 0px 10px 1px 30px;
 	padding-left: 30px;
 	line-height: 35px;
 }
 #revision-changer:before,
 #context-pages a.childs:after,

rhodecode/public/css/style.css

➞

Show inline comments

@@ modified file chmod 100755 => 100644 @@
@@ @@ -1087,13 +1087,13 @@ tbody .yui-dt-editable { cursor: pointer @@
 #content #right {
     margin: 0 60px 10px 290px;
+}
 #content div.box {
     clear: both;
     overflow: hidden;
+/*    overflow: hidden;*/
     background: #fff;
     margin: 0 0 10px;
     padding: 0 0 10px;
     -webkit-border-radius: 4px 4px 4px 4px;
     -khtml-border-radius: 4px 4px 4px 4px;
     -moz-border-radius: 4px 4px 4px 4px;
@@ @@ -1858,12 +1858,71 @@ div.form div.fields div.field div.button @@
 #content div.box div.traffic table td.legendLabel {
     padding: 0 3px 2px;
+}
 #summary {
     float: left;
     width: 80%;
+}
 #summary-menu-stats{
     float: left;
     width: 20%;
+}
 #summary-menu-stats ul {
     margin: 0 10px;
     display: block;
     background-color: #f9f9f9;
     border: 1px solid #d1d1d1;
     border-radius: 4px;
+}
 #content #summary-menu-stats li {
     border-top: 1px solid #d1d1d1;
     line-height: 32px;
     padding: 0;
+}
 #content #summary-menu-stats li:hover {
     background: #f0f0f0;
+}
 #content #summary-menu-stats li:first-child {
     border-top: none;
+}
 #summary-menu-stats a.followers { background-image: url('../images/icons/heart.png')}
 #summary-menu-stats a.forks     { background-image: url('../images/icons/arrow_divide.png')}
 #summary-menu-stats a.settings  { background-image: url('../images/icons/cog_edit.png')}
 #summary-menu-stats a.feed      { background-image: url('../images/icons/rss_16.png')}
 #summary-menu-stats a.repo-size { background-image: url('../images/icons/server.png')}
 #summary-menu-stats a {
     display: block;
     color: #000000;
     padding: 0 30px;
     background-repeat: no-repeat;
     background-position: 10px 50%;
+}
 #repo_size_2 {
     margin-left: 25px;
+}
 #summary-menu-stats a:hover {
     text-decoration: none;
+}
 #summary-menu-stats a span{
     background-color: #FFF;
     border: 1px inset #f0f0f0;
     border-radius:7px;
     padding: 1px;
     font-size: 10px;
+}
 #summary .metatag {
     display: inline-block;
     padding: 3px 5px;
     margin-bottom: 3px;

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -64,12 +64,32 @@ @@
 <%def name="context_bar(current=None)">
    %if c.repo_name:
     ${repo_context_bar(current)}
    %endif
 </%def>
 <%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>
 <%def name="admin_menu_simple()">
   <ul>
       <li>${h.link_to(_('repositories 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:
@@ @@ -110,18 +130,17 @@ @@
     </div>
     <div id="context-state">
       <!--button id="revision-changer">
         <span class="branch-name">graphics/shader-move</span>
         <span class="revision">@73318:8d3d6ee94072</span>
       </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>
+        <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')}>
@@ @@ -148,37 +167,20 @@ @@
                 %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>
@@ @@ -299,97 +301,62 @@ @@
               <ul id="repo_switcher_list" class="repo_switcher">
                   <li>
                       <a href="#">${_('loading...')}</a>
                   </li>
               </ul>
           </li>
         ## we render this menu only not for those pages
         %if current not in ['home','admin', 'search', 'journal']:
             ##REGULAR MENU
             <li>
                 <a class="menu_link" title="${_('Followers')}" href="${h.url('repo_followers_home',repo_name=c.repo_name)}">
                 <span class="icon_short">
                     <img src="${h.url('/images/icons/heart.png')}" alt="${_('Followers')}" />
                 </span>
                 <span id="current_followers_count" class="short">${c.repository_followers}</span>
                 </a>
             </li>
             <li>
                 <a class="menu_link" title="${_('Forks')}" href="${h.url('repo_forks_home',repo_name=c.repo_name)}">
                 <span class="icon_short">
                     <img src="${h.url('/images/icons/arrow_divide.png')}" alt="${_('Forks')}" />
                 </span>
                 <span class="short">${c.repository_forks}</span>
                 </a>
           ##ROOT MENU
           %if c.rhodecode_user.username != 'default':
             <li ${is_current('journal')}>
               <a class="menu_link" title="${_('Show recent activity')}"  href="${h.url('journal')}">
               <span class="icon">
                   <img src="${h.url('/images/icons/book.png')}" alt="${_('Journal')}" />
               </span>
               <span>${_('Journal')}</span>
               </a>
             </li>
             ${usermenu()}
             <script type="text/javascript">
                 YUE.on('branch_tag_switcher','mouseover',function(){
                    var loaded = YUD.hasClass('branch_tag_switcher','loaded');
                    if(!loaded){
                        YUD.addClass('branch_tag_switcher','loaded');
                        ypjax("${h.url('branch_tag_switcher',repo_name=c.repo_name)}",'switch_to_list',
                            function(o){},
                            function(o){YUD.removeClass('branch_tag_switcher','loaded');}
                            ,null);
+                   }
                    return false;
                 });
             </script>
         %else:
             ##ROOT MENU
             %if c.rhodecode_user.username != 'default':
              <li ${is_current('journal')}>
                 <a class="menu_link" title="${_('Show recent activity')}"  href="${h.url('journal')}">
                 <span class="icon">
                     <img src="${h.url('/images/icons/book.png')}" alt="${_('Journal')}" />
           %else:
             <li ${is_current('journal')}>
               <a class="menu_link" title="${_('Public journal')}"  href="${h.url('public_journal')}">
               <span class="icon">
                   <img src="${h.url('/images/icons/book.png')}" alt="${_('Public journal')}" />
               </span>
               <span>${_('Public journal')}</span>
               </a>
             </li>
           %endif
           <li ${is_current('search')}>
               <a class="menu_link" title="${_('Search in repositories')}"  href="${h.url('search')}">
               <span class="icon">
                   <img src="${h.url('/images/icons/search_16.png')}" alt="${_('Search')}" />
               </span>
               <span>${_('Search')}</span>
               </a>
           </li>
           % if h.HasPermissionAll('hg.admin')('access admin main page'):
             <li ${is_current('admin')}>
               <a class="menu_link" title="${_('Admin')}" href="${h.url('admin_home')}">
               <span class="icon">
                     <img src="${h.url('/images/icons/cog_edit.png')}" alt="${_('Admin')}" />
                 </span>
                 <span>${_('Journal')}</span>
                 </a>
              </li>
             %else:
              <li ${is_current('journal')}>
                 <a class="menu_link" title="${_('Public journal')}"  href="${h.url('public_journal')}">
                 <span class="icon">
                     <img src="${h.url('/images/icons/book.png')}" alt="${_('Public journal')}" />
                 </span>
                 <span>${_('Public journal')}</span>
                 </a>
              </li>
             %endif
             <li ${is_current('search')}>
                 <a class="menu_link" title="${_('Search in repositories')}"  href="${h.url('search')}">
                 <span class="icon">
                     <img src="${h.url('/images/icons/search_16.png')}" alt="${_('Search')}" />
                 </span>
                 <span>${_('Search')}</span>
                 </a>
                 <span>${_('Admin')}</span>
               </a>
               ${admin_menu()}
             </li>
             % if h.HasPermissionAll('hg.admin')('access admin main page'):
             <li ${is_current('admin')}>
                <a class="menu_link" title="${_('Admin')}" href="${h.url('admin_home')}">
                <span class="icon">
                    <img src="${h.url('/images/icons/cog_edit.png')}" alt="${_('Admin')}" />
                </span>
                <span>${_('Admin')}</span>
                </a>
                 ${admin_menu()}
             </li>
             % elif c.rhodecode_user.groups_admin:
             <li ${is_current('admin')}>
                <a class="menu_link" title="${_('Admin')}" href="${h.url('admin_home')}">
                <span class="icon">
                    <img src="${h.url('/images/icons/cog_edit.png')}" alt="${_('Admin')}" />
                </span>
                <span>${_('Admin')}</span>
                </a>
                 ${admin_menu_simple()}
             </li>
             % endif
             ${usermenu()}
         %endif
           % elif c.rhodecode_user.groups_admin:
           <li ${is_current('admin')}>
               <a class="menu_link" title="${_('Admin')}" href="${h.url('admin_home')}">
                 <span class="icon">
                     <img src="${h.url('/images/icons/cog_edit.png')}" alt="${_('Admin')}" />
                 </span>
                 <span>${_('Admin')}</span>
               </a>
               ${admin_menu_simple()}
           </li>
           % endif
           ${usermenu()}
 <script type="text/javascript">
     YUE.on('repo_switcher','mouseover',function(){
       var target = 'q_filter_rs';
       var qfilter_activate = function(){
           var nodes = YUQ('ul#repo_switcher_list li a.repo_name');
           var func = function(node){

rhodecode/templates/bookmarks/bookmarks.html

➞

Show inline comments

@@ @@ -17,12 +17,13 @@ @@
 <%def name="page_nav()">
     ${self.menu('bookmarks')}
 </%def>
 <%def name="main()">
 <div class="box">
 ${self.context_bar('switch-to')}
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <div class="table">

rhodecode/templates/branches/branches.html

➞

Show inline comments

@@ @@ -16,12 +16,13 @@ @@
 <%def name="page_nav()">
     ${self.menu('branches')}
 </%def>
 <%def name="main()">
 ${self.context_bar('switch-to')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->

rhodecode/templates/followers/followers.html

➞

Show inline comments

@@ @@ -14,12 +14,13 @@ @@
 </%def>
 <%def name="page_nav()">
     ${self.menu('followers')}
 </%def>
 <%def name="main()">
 ${self.context_bar('followers')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->

rhodecode/templates/forks/forks.html

➞

Show inline comments

@@ @@ -14,12 +14,13 @@ @@
 </%def>
 <%def name="page_nav()">
     ${self.menu('forks')}
 </%def>
 <%def name="main()">
 ${self.context_bar('forks')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->

rhodecode/templates/summary/summary.html

➞

Show inline comments

@@ @@ -41,36 +41,12 @@ @@
              <div class="field">
               <div class="label-summary">
                   <label>${_('Name')}:</label>
               </div>
               <div class="input ${summary(c.show_stats)}">
                   <div style="float:right;padding:5px 0px 0px 5px">
                      %if c.rhodecode_user.username != 'default':
                       ${h.link_to(_('ATOM'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key),class_='atom_icon')}
                      %else:
                       ${h.link_to(_('ATOM'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name),class_='atom_icon')}
                      %endif
                   </div>
                   %if c.rhodecode_user.username != 'default':
                       %if c.following:
                       <span id="follow_toggle" class="following tooltip" title="${_('Stop following this repository')}"
                             onclick="javascript:toggleFollowingRepo(this,${c.dbrepo.repo_id},'${str(h.get_token())}')">
                       </span>
                       %else:
                       <span id="follow_toggle" class="follow tooltip" title="${_('Start following this repository')}"
                             onclick="javascript:toggleFollowingRepo(this,${c.dbrepo.repo_id},'${str(h.get_token())}')">
                       </span>
                       %endif
                       <div style="float:right;padding:0px 0px 0px 0px">
                          <span class="reposize tooltip" title="${_('Click to show size of repository')}"
                             onclick="javascript:showRepoSize('repo_size','${c.dbrepo.repo_name}','${str(h.get_token())}')">
                          </span>
                          <span id="repo_size"></span>
                       </div>
                   %endif:
                    ## locking icon
                     %if c.rhodecode_db_repo.enable_locking:
                       %if c.rhodecode_db_repo.locked[0]:
                         <span class="locking_locked tooltip" title="${_('Repository locked by %s') % h.person_by_id(c.rhodecode_db_repo.locked[0])}"></span>
                       %else:
@@ @@ -186,13 +162,51 @@ @@
                         <input id="archive_subrepos" type="checkbox" name="subrepos" />
                         <label for="archive_subrepos" class="tooltip" title="${h.tooltip(_('Check this to download archive with subrepos'))}" >${_('with subrepos')}</label>
                     </span>
                 %endif
               </div>
              </div>
       </div>
         </div>
         <div id="summary-menu-stats">
           <ul>
             <li>
                <a class="followers" title="${_('Followers')}" href="${h.url('repo_followers_home',repo_name=c.repo_name)}">
                 <span id="current_followers_count">${c.repository_followers}</span>
                 ${_('Followes')}
               </a>
             </li>
             <li>
               <a class="forks" title="${_('Forks')}" href="${h.url('repo_forks_home',repo_name=c.repo_name)}">
                 <span>${c.repository_forks}</span>
                 ${_('Forks')}
               </a>
             </li>
             <li>
               %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                %if h.HasPermissionAll('hg.admin')('access settings on repository'):
                    ${h.link_to(_('Settings'),h.url('edit_repo',repo_name=c.repo_name),class_='settings')}
                %else:
                    ${h.link_to(_('Settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')}
                %endif
              %endif
             </li>
             <li>
               %if c.rhodecode_user.username != 'default':
                 ${h.link_to(_('Feed'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key),class_='feed')}
               %else:
                 ${h.link_to(_('Feed'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name),class_='feed')}
               %endif
             </li>
             %if c.rhodecode_user.username != 'default':
             <li>
               <a href="#" class="repo-size" onclick="javascript:showRepoSize('repo_size_2','${c.dbrepo.repo_name}','${str(h.get_token())}')">Repository Size</a>
               <span id="repo_size_2"></span>
             </li>
             %endif
           </ul>
         </div>
     </div>
 </div>
 %if c.show_stats:
 <div class="box box-right"  style="min-height:455px">
     <!-- box / title -->

rhodecode/templates/tags/tags.html

➞

Show inline comments

@@ @@ -16,12 +16,13 @@ @@
 </%def>
 <%def name="page_nav()">
     ${self.menu('tags')}
 </%def>
 <%def name="main()">
 ${self.context_bar('switch-to')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->

0 comments (0 inline, 0 general)