# HG changeset patch # User Marcin Kuzminski # Date 2010-05-09 15:23:11 # Node ID 787689980bcd96a272a26be2c137ac944d5ededb # Parent f7218849798af25738485be2bdbfd8a4693f515c Tempaltes changes for changelog and shortlog, changed menu generation in base diff --git a/pylons_app/templates/base/base.html b/pylons_app/templates/base/base.html --- a/pylons_app/templates/base/base.html +++ b/pylons_app/templates/base/base.html @@ -1,15 +1,16 @@ ## -*- coding: utf-8 -*- - + ${next.title()} + ## ${self.css()} ${self.js()} - +

@@ -83,36 +84,20 @@

-
  • ${h.link_to_unless(current=='summary',_('summary'),h.url('summary_home',repo_name=c.repo_name))}
    • -
  • ${h.link_to_unless(current=='changelog',_('changelog'),h.url('changelog_home',repo_name=c.repo_name))}
    • -
  • ${h.link_to_unless(current=='branches',_('branches'),h.url('branches_home',repo_name=c.repo_name))}
    • -
  • ${h.link_to_unless(current=='tags',_('tags'),h.url('tags_home',repo_name=c.repo_name))}
    • -
  • ${h.link_to_unless(current=='graph',_('graph'),h.url('graph_home',repo_name=c.repo_name))}
    • -
  • ${h.link_to_unless(current=='files',_('files'),h.url('files_home',repo_name=c.repo_name))}
    • + <%def name="is_current(selected)"> + <% + if selected == current: + return 'current' + else: + return '' + %> + +
  • ${h.link_to(_('summary'),h.url('summary_home',repo_name=c.repo_name))}
    • +
  • ${h.link_to(_('shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}
    • +
  • ${h.link_to(_('changelog'),h.url('changelog_home',repo_name=c.repo_name))}
    • +
  • ${h.link_to(_('branches'),h.url('branches_home',repo_name=c.repo_name))}
    • +
  • ${h.link_to(_('tags'),h.url('tags_home',repo_name=c.repo_name))}
    • +
  • ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name))}
    • diff --git a/pylons_app/templates/changelog/changelog.html b/pylons_app/templates/changelog/changelog.html new file mode 100644 --- /dev/null +++ b/pylons_app/templates/changelog/changelog.html @@ -0,0 +1,115 @@ +<%inherit file="/base/base.html"/> + +<%def name="title()"> + ${_('Repository managment')} + +<%def name="breadcrumbs()"> + ${h.link_to(u'Home',h.url('/'))} + / + ${h.link_to(c.repo_name,h.url('changelog_home',repo_name=c.repo_name))} + / + ${_('changelog')} + +<%def name="page_nav()"> +
    +
    +
    +
    +
    +
    + + ${self.menu('changelog')} + + +<%def name="main()"> + +

    ${_('Changelog')} - ${_('showing ')} ${c.size} ${_('revisions')}

    + +
    +${h.form(h.url.current(),method='get')} + ${_('Show')}: ${h.text('size',size=5,value=c.size)} ${_('revisions')} + ${h.submit('','set')} +${h.end_form()} +
    +
    +
    + +
    +
    +
      +
      +
      + + + +
      +

      ${c.pagination.pager('$link_previous ~2~ $link_next')}

      +
      + \ No newline at end of file diff --git a/pylons_app/templates/graph.html b/pylons_app/templates/graph.html deleted file mode 100644 --- a/pylons_app/templates/graph.html +++ /dev/null @@ -1,112 +0,0 @@ -<%inherit file="/base/base.html"/> - -<%def name="title()"> - ${_('Repository managment')} - -<%def name="breadcrumbs()"> - ${h.link_to(u'Home',h.url('/'))} - / - ${h.link_to(c.repo_name,h.url('graph_home',repo_name=c.repo_name))} - / - ${_('graph')} - -<%def name="page_nav()"> -
      -
      -
      -
      -
      -
      - - ${self.menu('graph')} - - -<%def name="main()"> - -

      ${_('Graph')} - ${_('showing ')} ${c.size} ${_('revisions')}

      - -
      -${h.form(h.url.current(),method='get')} - ${_('Show')}: ${h.text('size',size=10,value=c.size)} ${_('revisions')} - ${h.submit('','set')} -${h.end_form()} -
      -
      -
        - -
          -
          - - - -
          -

          ${c.pagination.pager('$link_previous ~2~ $link_next')}

          -
          - \ No newline at end of file diff --git a/pylons_app/templates/shortlog/shortlog.html b/pylons_app/templates/shortlog/shortlog.html --- a/pylons_app/templates/shortlog/shortlog.html +++ b/pylons_app/templates/shortlog/shortlog.html @@ -18,7 +18,7 @@ - ${self.menu('changelog')} + ${self.menu('shortlog')} <%def name="main()">