kallithea Changeset - 93d912ea8cb1

Changeset - 93d912ea8cb1

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Marcin Kuzminski - 13 years ago 2013-03-24 20:46:30
marcin@python-works.com

show forks in contextbar

5 files changed with 22 insertions and 8 deletions:

rhodecode/public/css/contextbar.css

rhodecode/public/css/style.css

rhodecode/templates/base/base.html

rhodecode/templates/forks/fork.html

rhodecode/templates/forks/forks.html

0 comments (0 inline, 0 general)

rhodecode/public/css/contextbar.css

➞

Show inline comments

@@ @@ -12,12 +12,13 @@ @@
 #context-bar a.fork { background-image: url("../images/icons/arrow_divide.png"); }
 #context-bar a.summary { background-image: url("../images/icons/clipboard_16.png"); }
 #context-bar a.changelogs { background-image: url("../images/icons/time.png"); }
 #context-bar a.files { background-image: url("../images/icons/file.png"); }
 #context-bar a.switch-to { background-image: url("../images/icons/arrow_switch.png"); }
 #context-bar a.options { background-image: url("../images/icons/table_gear.png"); }
 #context-bar a.forks { background-image: url("../images/icons/arrow_divide.png"); }
 #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"); }

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -4518,12 +4518,23 @@ form.comment-inline-form { @@
     color: #888 !important;
     background-color: #DEDEDE !important;
     border-radius: 4px !important;
     -webkit-border-radius: 4px !important;
+}
 #context-pages .forks span,
 .menu_link_notifications {
     padding: 4px 4px !important;
     text-align: center;
     color: #888 !important;
     background-color: #DEDEDE !important;
     border-radius: 4px !important;
     -webkit-border-radius: 4px !important;
+}
 .notification-header {
     padding-top: 6px;
+}
 .notification-header .desc {
     font-size: 16px;
     height: 24px;

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -161,14 +161,21 @@ @@
                 %else:
                   <li>${h.link_to(_('Lock'), h.url('toggle_locking',repo_name=c.repo_name),class_='locking_add')}</li>
                 %endif
               %endif
              </ul>
         </li>
         <li ${is_current('showforks')}>
           <a href="${h.url('repo_forks_home',repo_name=c.repo_name)}"  title="${_('Show Forks')}" class="forks">${_('Forks')}
             %if c.repository_forks:
               <span>${c.repository_forks}</span>
             %endif
           </a>
         </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
+          <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>

rhodecode/templates/forks/fork.html

➞

Show inline comments

@@ @@ -10,16 +10,14 @@ @@
     &raquo;
     ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
     &raquo;
     ${_('fork')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('')}
 </%def>
 <%def name="main()">
 ${self.context_bar('showforks')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('repo_fork_create_home',repo_name=c.repo_info.repo_name))}

rhodecode/templates/forks/forks.html

➞

Show inline comments

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

0 comments (0 inline, 0 general)