# HG changeset patch # User Marcin Kuzminski # Date 1272906474 -7200 # Node ID 20dc7a5eb7482b698382d387351e99d958c4c3f6 # Parent cfddee9d3693c77aa200730eeb98b738a06fbc9b Html changes and cleanups, made folders for html templates, implemented tags and branches pages diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/controllers/admin.py --- a/pylons_app/controllers/admin.py Mon May 03 18:31:00 2010 +0200 +++ b/pylons_app/controllers/admin.py Mon May 03 19:07:54 2010 +0200 @@ -43,7 +43,7 @@ except formencode.Invalid, error: c.form_result = error.value c.form_errors = error.error_dict or {} - html = render('/admin.html') + html = render('admin/admin.html') return htmlfill.render( html, @@ -57,10 +57,10 @@ .order_by(UserLogs.action_date.desc()) p = int(request.params.get('page', 1)) c.users_log = Page(users_log, page=p, items_per_page=10) - c.log_data = render('admin_log.html') + c.log_data = render('admin/admin_log.html') if request.params.get('partial'): return c.log_data - return render('/admin.html') + return render('admin/admin.html') def hgrc(self, dirname): filename = os.path.join(dirname, '.hg', 'hgrc') diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/controllers/branches.py --- a/pylons_app/controllers/branches.py Mon May 03 18:31:00 2010 +0200 +++ b/pylons_app/controllers/branches.py Mon May 03 19:07:54 2010 +0200 @@ -1,16 +1,22 @@ import logging -from pylons import request, response, session, tmpl_context as c, url +from pylons import tmpl_context as c, app_globals as g, session, request, config, url from pylons.controllers.util import abort, redirect from pylons_app.lib.base import BaseController, render +from pylons_app.lib.utils import get_repo_slug +from pylons_app.model.hg_model import HgModel +log = logging.getLogger(__name__) -log = logging.getLogger(__name__) class BranchesController(BaseController): + def __before__(self): + c.repos_prefix = config['repos_name'] + c.repo_name = get_repo_slug(request) def index(self): - # Return a rendered template - #return render('/branches.mako') - # or, return a string - return 'Hello World' + hg_model = HgModel() + c.repo_info = hg_model.get_repo(c.repo_name) + c.repo_branches = c.repo_info.branches + + return render('branches/branches.html') diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/controllers/changelog.py --- a/pylons_app/controllers/changelog.py Mon May 03 18:31:00 2010 +0200 +++ b/pylons_app/controllers/changelog.py Mon May 03 19:07:54 2010 +0200 @@ -13,17 +13,15 @@ class ChangelogController(BaseController): def __before__(self): c.repos_prefix = config['repos_name'] - c.repo_name = get_repo_slug(request) - def index(self): hg_model = HgModel() p = int(request.params.get('page', 1)) repo = hg_model.get_repo(c.repo_name) c.repo_changesets = Page(repo, page=p, items_per_page=20) - c.shortlog_data = render('shortlog_data.html') + c.shortlog_data = render('shortlog/shortlog_data.html') if request.params.get('partial'): return c.shortlog_data - r = render('/shortlog.html') + r = render('shortlog/shortlog.html') return r diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/controllers/repos.py --- a/pylons_app/controllers/repos.py Mon May 03 18:31:00 2010 +0200 +++ b/pylons_app/controllers/repos.py Mon May 03 19:07:54 2010 +0200 @@ -31,7 +31,7 @@ hg_model = HgModel() c.repos_list = list(hg_model.get_repos()) c.repos_list.sort(key=itemgetter('name')) - return render('/repos.html') + return render('admin/repos/repos.html') def create(self): """POST /repos: Create a new item""" diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/controllers/shortlog.py --- a/pylons_app/controllers/shortlog.py Mon May 03 18:31:00 2010 +0200 +++ b/pylons_app/controllers/shortlog.py Mon May 03 19:07:54 2010 +0200 @@ -13,17 +13,15 @@ class ShortlogController(BaseController): def __before__(self): c.repos_prefix = config['repos_name'] - c.repo_name = get_repo_slug(request) - def index(self): hg_model = HgModel() p = int(request.params.get('page', 1)) repo = hg_model.get_repo(c.repo_name) c.repo_changesets = Page(repo, page=p, items_per_page=20) - c.shortlog_data = render('shortlog_data.html') + c.shortlog_data = render('shortlog/shortlog_data.html') if request.params.get('partial'): return c.shortlog_data - r = render('/shortlog.html') + r = render('shortlog/shortlog.html') return r diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/controllers/summary.py --- a/pylons_app/controllers/summary.py Mon May 03 18:31:00 2010 +0200 +++ b/pylons_app/controllers/summary.py Mon May 03 19:07:54 2010 +0200 @@ -11,7 +11,6 @@ class SummaryController(BaseController): def __before__(self): c.repos_prefix = config['repos_name'] - c.repo_name = get_repo_slug(request) def index(self): diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/controllers/tags.py --- a/pylons_app/controllers/tags.py Mon May 03 18:31:00 2010 +0200 +++ b/pylons_app/controllers/tags.py Mon May 03 19:07:54 2010 +0200 @@ -1,16 +1,22 @@ import logging -from pylons import request, response, session, tmpl_context as c, url +from pylons import tmpl_context as c, app_globals as g, session, request, config, url from pylons.controllers.util import abort, redirect from pylons_app.lib.base import BaseController, render +from pylons_app.lib.utils import get_repo_slug +from pylons_app.model.hg_model import HgModel +log = logging.getLogger(__name__) -log = logging.getLogger(__name__) class TagsController(BaseController): - + def __before__(self): + c.repos_prefix = config['repos_name'] + c.repo_name = get_repo_slug(request) + def index(self): - # Return a rendered template - #return render('/tags.mako') - # or, return a string - return 'Hello World' + hg_model = HgModel() + c.repo_info = hg_model.get_repo(c.repo_name) + c.repo_tags = c.repo_info.tags + + return render('tags/tags.html') diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/controllers/users.py --- a/pylons_app/controllers/users.py Mon May 03 18:31:00 2010 +0200 +++ b/pylons_app/controllers/users.py Mon May 03 19:07:54 2010 +0200 @@ -30,7 +30,7 @@ # url('users') c.users_list = self.sa.query(Users).all() - return render('/users.html') + return render('admin/users/users.html') def create(self): """POST /users: Create a new item""" @@ -54,7 +54,7 @@ def new(self, format='html'): """GET /users/new: Form to create a new item""" # url('new_user') - return render('/user_add.html') + return render('admin/users/user_add.html') def update(self, id): """PUT /users/id: Update an existing item""" @@ -107,7 +107,7 @@ c.user = self.sa.query(Users).get(id) defaults = c.user.__dict__ return htmlfill.render( - render('/user_edit.html'), + render('admin/users/user_edit.html'), defaults=defaults, encoding="UTF-8", force_defaults=False diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/add.html --- a/pylons_app/templates/add.html Mon May 03 18:31:00 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -## -*- coding: utf-8 -*- - - - - - - - Mercurial repositories add - - - -
-
-

Home / Admin

-
    -
-
- - - - - - - -

${c.msg}

${c.new_repo}

-
- Mercurial Repository: admin -
- -
-

- - mercurial -

-
- -
-
-
-
- -
- - - \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/admin.html --- a/pylons_app/templates/admin.html Mon May 03 18:31:00 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ -## -*- coding: utf-8 -*- -<%inherit file="base/base.html"/> - <%def name="get_form_error(element)"> - %if hasattr(c,'form_errors'): - %if type(c.form_errors) == dict: - %if c.form_errors.get(element,False): - - ${c.form_errors.get(element,'')} - - %endif - %endif - %endif - -<%def name="title()"> - ${_('Repository managment')} - -<%def name="breadcrumbs()"> - ${h.link_to(u'Home',h.url('/'))} - / - ${h.link_to(u'Admin',h.url('admin_home'))} - -<%def name="page_nav()"> -
  • ${h.link_to(u'Home',h.url('/'))}
    • -
  • ${_('Admin')}
    • - -<%def name="main()"> - %if c.admin_user: - -
    -
    -

    Welcome ${c.admin_username}

    -
    - ${c.log_data} -
    -
    - %else: -
    -
    -

    ${_('Login')}

    - ${h.form(h.url.current())} - - - - - - - - - - - - - - - -
    ${_('Username')}${h.text('username')}${get_form_error('username')}
    ${_('Password')}${h.password('password')}${get_form_error('password')}
    ${h.submit('login','login')}
    - ${h.end_form()} -
    - %endif - - \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/admin/add.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/admin/add.html Mon May 03 19:07:54 2010 +0200 @@ -0,0 +1,45 @@ +## -*- coding: utf-8 -*- + + + + + + + Mercurial repositories add + + + +
    +
    +

    Home / Admin

    +
      +
    +
    + + + + + + + +

    ${c.msg}

    ${c.new_repo}

    +
    + Mercurial Repository: admin +
    + +
    +

    + + mercurial +

    +
    + +
    +
    +
    +
    + +
    + + + \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/admin/admin.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/admin/admin.html Mon May 03 19:07:54 2010 +0200 @@ -0,0 +1,68 @@ +## -*- coding: utf-8 -*- +<%inherit file="/base/base.html"/> + <%def name="get_form_error(element)"> + %if hasattr(c,'form_errors'): + %if type(c.form_errors) == dict: + %if c.form_errors.get(element,False): + + ${c.form_errors.get(element,'')} + + %endif + %endif + %endif + +<%def name="title()"> + ${_('Repository managment')} + +<%def name="breadcrumbs()"> + ${h.link_to(u'Home',h.url('/'))} + / + ${h.link_to(u'Admin',h.url('admin_home'))} + +<%def name="page_nav()"> +
  • ${h.link_to(u'Home',h.url('/'))}
    • +
  • ${_('Admin')}
    • + +<%def name="main()"> + %if c.admin_user: + +
    +
    +

    Welcome ${c.admin_username}

    +
    + ${c.log_data} +
    +
    + %else: +
    +
    +

    ${_('Login')}

    + ${h.form(h.url.current())} + + + + + + + + + + + + + + + +
    ${_('Username')}${h.text('username')}${get_form_error('username')}
    ${_('Password')}${h.password('password')}${get_form_error('password')}
    ${h.submit('login','login')}
    + ${h.end_form()} +
    + %endif + + \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/admin/admin_log.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/admin/admin_log.html Mon May 03 19:07:54 2010 +0200 @@ -0,0 +1,38 @@ +## -*- coding: utf-8 -*- +%if c.users_log: + + + + + + + + + %for cnt,l in enumerate(c.users_log): + + + + + + + %endfor + +
    ${_('Username')}${_('Repository')}${_('Action')}${_('Date')}
    ${l.user.username}${l.repository}${l.action}${l.action_date}
    +
    + +

    ${c.users_log.pager('$link_previous ~2~ $link_next', + onclick="""YAHOO.util.Connect.asyncRequest('GET','$partial_url',{ + success:function(o){YAHOO.util.Dom.get(data_div).innerHTML=o.responseText; + YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){ + YAHOO.util.Dom.setStyle(data_div,'opacity','0.3');}); + YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")} +

    +
    +%else: + ${_('No actions yet')} +%endif diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/admin/repos/repo_edit.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/admin/repos/repo_edit.html Mon May 03 19:07:54 2010 +0200 @@ -0,0 +1,28 @@ +<%inherit file="base/base.html"/> +<%def name="title()"> + ${_('Repository managment')} + +<%def name="breadcrumbs()"> + ${h.link_to(u'Home',h.url('/'))} + / + ${h.link_to(u'Admin',h.url('admin_home'))} + / + ${h.link_to(u'Repos managment',h.url('repos'))} + +<%def name="page_nav()"> +
  • ${h.link_to(u'Home',h.url('/'))}
    • +
  • ${_('Admin')}
    • + +<%def name="main()"> + +
    +

    ${_('Mercurial repos')}

    +
    + \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/admin/repos/repos.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/admin/repos/repos.html Mon May 03 19:07:54 2010 +0200 @@ -0,0 +1,41 @@ +<%inherit file="/base/base.html"/> +<%def name="title()"> + ${_('Repository managment')} + +<%def name="breadcrumbs()"> + ${h.link_to(u'Home',h.url('/'))} + / + ${h.link_to(u'Admin',h.url('admin_home'))} + / + ${h.link_to(u'Repos managment',h.url('repos'))} + +<%def name="page_nav()"> +
  • ${h.link_to(u'Home',h.url('/'))}
    • +
  • ${_('Admin')}
    • + +<%def name="main()"> + +
    +

    ${_('Mercurial repos')}

    + + %for cnt,repo in enumerate(c.repos_list): + + + + + + %endfor +
    ${h.link_to(repo['name'],h.url('summary_home',repo_name=repo['name']))}r${repo['rev']}:${repo['tip']} + ${h.form(url('repo', id=repo['name']),method='delete')} + ${h.submit('remove','remove',class_="submit",onclick="return confirm('Confirm to delete this repository');")} + ${h.end_form()} +
    +
    + \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/admin/users/user_add.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/admin/users/user_add.html Mon May 03 19:07:54 2010 +0200 @@ -0,0 +1,50 @@ +<%inherit file="/base/base.html"/> +<%def name="title()"> + ${_('User')} - ${_('add new')} + +<%def name="breadcrumbs()"> + ${h.link_to(u'Home',h.url('/'))} + / + ${h.link_to(u'Admin',h.url('admin_home'))} + / + ${h.link_to(u'Users',h.url('users'))} + +<%def name="page_nav()"> +
  • ${h.link_to(u'Home',h.url('/'))}
    • +
  • ${_('Admin')}
    • + +<%def name="main()"> + +
    +

    ${_('User')} - ${_('add new')}

    + ${h.form(url('users'))} + + + + + + + + + + + + + + + + + + +
    ${_('Username')}${h.text('username')}
    ${_('password')}${h.text('password')}
    ${_('Active')}${h.checkbox('active')}
    ${h.submit('add','add')}
    + + ${h.end_form()} +
    + \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/admin/users/user_edit.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/admin/users/user_edit.html Mon May 03 19:07:54 2010 +0200 @@ -0,0 +1,50 @@ +<%inherit file="/base/base.html"/> +<%def name="title()"> + ${_('User')} - ${c.user.username} + +<%def name="breadcrumbs()"> + ${h.link_to(u'Home',h.url('/'))} + / + ${h.link_to(u'Admin',h.url('admin_home'))} + / + ${h.link_to(u'Users',h.url('users'))} + +<%def name="page_nav()"> +
  • ${h.link_to(u'Home',h.url('/'))}
    • +
  • ${_('Admin')}
    • + +<%def name="main()"> + +
    +

    ${_('User')} - ${c.user.username}

    + ${h.form(url('user', id=c.user.user_id),method='put')} + + + + + + + + + + + + + + + + + + +
    ${_('Username')}${h.text('username')}
    ${_('New password')}${h.text('new_password')}
    ${_('Active')}${h.checkbox('active',value=True)}
    ${h.submit('save','save')}
    + + ${h.end_form()} +
    + \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/admin/users/users.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/admin/users/users.html Mon May 03 19:07:54 2010 +0200 @@ -0,0 +1,52 @@ +<%inherit file="/base/base.html"/> +<%def name="title()"> + ${_('Repository managment')} + +<%def name="breadcrumbs()"> + ${h.link_to(u'Home',h.url('/'))} + / + ${h.link_to(u'Admin',h.url('admin_home'))} + / + ${h.link_to(u'Users managment',h.url('users'))} + +<%def name="page_nav()"> +
  • ${h.link_to(u'Home',h.url('/'))}
    • +
  • ${_('Admin')}
    • + +<%def name="main()"> + +
    +

    ${_('Mercurial users')}

    + + + + + + + + + %for user in c.users_list: + + + + + + + + %endfor +
    IdUsernameActiveAdminAction
    ${user.user_id}${h.link_to(user.username,h.url('edit_user', id=user.user_id))}${user.active}${user.admin} + ${h.form(url('user', id=user.user_id),method='delete')} + ${h.submit('remove','remove',class_="submit")} + ${h.end_form()} +
    +

    ${h.link_to(u'Add user',h.url('new_user'))}

    +
    + + \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/admin_log.html --- a/pylons_app/templates/admin_log.html Mon May 03 18:31:00 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -## -*- coding: utf-8 -*- -%if c.users_log: - - - - - - - - - %for cnt,l in enumerate(c.users_log): - - - - - - - %endfor - -
    ${_('Username')}${_('Repository')}${_('Action')}${_('Date')}
    ${l.user.username}${l.repository}${l.action}${l.action_date}
    -
    - -

    ${c.users_log.pager('$link_previous ~2~ $link_next', - onclick="""YAHOO.util.Connect.asyncRequest('GET','$partial_url',{ - success:function(o){YAHOO.util.Dom.get(data_div).innerHTML=o.responseText; - YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){ - YAHOO.util.Dom.setStyle(data_div,'opacity','0.3');}); - YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")} -

    -
    -%else: - ${_('No actions yet')} -%endif diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/branches/branches.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/branches/branches.html Mon May 03 19:07:54 2010 +0200 @@ -0,0 +1,46 @@ +<%inherit file="/base/base.html"/> +<%! from pylons_app.lib import filters %> +<%def name="title()"> + ${_('Branches')} + +<%def name="breadcrumbs()"> + ${h.link_to(u'Home',h.url('/'))} + / + ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} + / + ${_('branches')} + +<%def name="page_nav()"> +
    +
    +
    +
    +
    +
    + + ${self.menu('branches')} + +<%def name="main()"> + +

    ${_('Branches')}

    + + + %for cnt,branch in enumerate(c.repo_branches): + + + + + + + %endfor +
    ${branch._ctx.date()|n,filters.age} + + ${h.link_to(branch.branch,h.url('changeset_home',repo_name=c.repo_name,revision=branch._short))} + + + ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch._short))} + | + ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch._short))} +
    + + \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/graph.html --- a/pylons_app/templates/graph.html Mon May 03 18:31:00 2010 +0200 +++ b/pylons_app/templates/graph.html Mon May 03 19:07:54 2010 +0200 @@ -1,4 +1,4 @@ -<%inherit file="base/base.html"/> +<%inherit file="/base/base.html"/> <%def name="title()"> ${_('Repository managment')} diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/repo_edit.html --- a/pylons_app/templates/repo_edit.html Mon May 03 18:31:00 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +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(u'Admin',h.url('admin_home'))} - / - ${h.link_to(u'Repos managment',h.url('repos'))} - -<%def name="page_nav()"> -
  • ${h.link_to(u'Home',h.url('/'))}
    • -
  • ${_('Admin')}
    • - -<%def name="main()"> - -
    -

    ${_('Mercurial repos')}

    -
    - \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/repos.html --- a/pylons_app/templates/repos.html Mon May 03 18:31:00 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +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(u'Admin',h.url('admin_home'))} - / - ${h.link_to(u'Repos managment',h.url('repos'))} - -<%def name="page_nav()"> -
  • ${h.link_to(u'Home',h.url('/'))}
    • -
  • ${_('Admin')}
    • - -<%def name="main()"> - -
    -

    ${_('Mercurial repos')}

    - - %for cnt,repo in enumerate(c.repos_list): - - - - - - %endfor -
    ${repo['name']}r${repo['rev']}:${repo['tip']} - ${h.form(url('repo', id=repo['name']),method='delete')} - ${h.submit('remove','remove',class_="submit",onclick="return confirm('Confirm to delete this repository');")} - ${h.end_form()} -
    -
    - \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/shortlog.html --- a/pylons_app/templates/shortlog.html Mon May 03 18:31:00 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +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('shortlog_home',repo_name=c.repo_name))} - / - ${_('shortlog')} - -<%def name="page_nav()"> -
    -
    -
    -
    -
    -
    - - ${self.menu('changelog')} - -<%def name="main()"> - -

    ${_('Shortlog')}

    - -
    - ${c.shortlog_data} -
    - \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/shortlog/shortlog.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/shortlog/shortlog.html Mon May 03 19:07:54 2010 +0200 @@ -0,0 +1,30 @@ +<%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('shortlog_home',repo_name=c.repo_name))} + / + ${_('shortlog')} + +<%def name="page_nav()"> +
    +
    +
    +
    +
    +
    + + ${self.menu('changelog')} + +<%def name="main()"> + +

    ${_('Shortlog')}

    + +
    + ${c.shortlog_data} +
    + \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/shortlog/shortlog_data.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/shortlog/shortlog_data.html Mon May 03 19:07:54 2010 +0200 @@ -0,0 +1,42 @@ +## -*- coding: utf-8 -*- +<%! +from pylons_app.lib import filters +%> + +%for cnt,cs in enumerate(c.repo_changesets): + + + + + + +%endfor + +
    ${cs._ctx.date()|n,filters.age}${cs.author|n,filters.person}${h.link_to(cs.message,h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))} + + ${cs.branch} + %for tag in cs.tags: + ${tag} + %endfor + + + ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))} + | + ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs._short))} +
    +
    + +

    + ${c.repo_changesets.pager('$link_previous ~2~ $link_next', + onclick="""YAHOO.util.Connect.asyncRequest('GET','$partial_url',{ + success:function(o){YAHOO.util.Dom.get(data_div).innerHTML=o.responseText; + YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){ + YAHOO.util.Dom.setStyle(data_div,'opacity','0.3');}); + YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")} +

    +
    \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/shortlog_data.html --- a/pylons_app/templates/shortlog_data.html Mon May 03 18:31:00 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -## -*- coding: utf-8 -*- -<%! -from pylons_app.lib import filters -%> - -%for cnt,cs in enumerate(c.repo_changesets): - - - - - - -%endfor - -
    ${cs._ctx.date()|n,filters.age}${cs.author|n,filters.person}${h.link_to(cs.message,h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))} - - ${cs.branch} - %for tag in cs.tags: - ${tag} - %endfor - - - ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))} - | - ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs._short))} -
    -
    - -

    - ${c.repo_changesets.pager('$link_previous ~2~ $link_next', - onclick="""YAHOO.util.Connect.asyncRequest('GET','$partial_url',{ - success:function(o){YAHOO.util.Dom.get(data_div).innerHTML=o.responseText; - YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){ - YAHOO.util.Dom.setStyle(data_div,'opacity','0.3');}); - YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")} -

    -
    \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/summary.html --- a/pylons_app/templates/summary.html Mon May 03 18:31:00 2010 +0200 +++ b/pylons_app/templates/summary.html Mon May 03 19:07:54 2010 +0200 @@ -1,4 +1,4 @@ -<%inherit file="base/base.html"/> +<%inherit file="/base/base.html"/> <%! from pylons_app.lib import filters %> diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/tags/tags.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/tags/tags.html Mon May 03 19:07:54 2010 +0200 @@ -0,0 +1,48 @@ +<%inherit file="/base/base.html"/> +<%! +from pylons_app.lib import filters +%> +<%def name="title()"> + ${_('Tags')} + +<%def name="breadcrumbs()"> + ${h.link_to(u'Home',h.url('/'))} + / + ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} + / + ${_('tags')} + +<%def name="page_nav()"> +
    +
    +
    +
    +
    +
    + + ${self.menu('tags')} + +<%def name="main()"> + +

    ${_('Tags')}

    + + + %for cnt,tag in enumerate(c.repo_tags): + + + + + + + %endfor +
    ${tag._ctx.date()|n,filters.age} + + ${h.link_to(tag.tags[-1],h.url('changeset_home',repo_name=c.repo_name,revision=tag._short))} + + + ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=tag._short))} + | + ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=tag._short))} +
    + + \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/user_add.html --- a/pylons_app/templates/user_add.html Mon May 03 18:31:00 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -<%inherit file="base/base.html"/> -<%def name="title()"> - ${_('User')} - ${_('add new')} - -<%def name="breadcrumbs()"> - ${h.link_to(u'Home',h.url('/'))} - / - ${h.link_to(u'Admin',h.url('admin_home'))} - / - ${h.link_to(u'Users',h.url('users'))} - -<%def name="page_nav()"> -
  • ${h.link_to(u'Home',h.url('/'))}
    • -
  • ${_('Admin')}
    • - -<%def name="main()"> - -
    -

    ${_('User')} - ${_('add new')}

    - ${h.form(url('users'))} - - - - - - - - - - - - - - - - - - -
    ${_('Username')}${h.text('username')}
    ${_('password')}${h.text('password')}
    ${_('Active')}${h.checkbox('active')}
    ${h.submit('add','add')}
    - - ${h.end_form()} -
    - \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/user_edit.html --- a/pylons_app/templates/user_edit.html Mon May 03 18:31:00 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -<%inherit file="base/base.html"/> -<%def name="title()"> - ${_('User')} - ${c.user.username} - -<%def name="breadcrumbs()"> - ${h.link_to(u'Home',h.url('/'))} - / - ${h.link_to(u'Admin',h.url('admin_home'))} - / - ${h.link_to(u'Users',h.url('users'))} - -<%def name="page_nav()"> -
  • ${h.link_to(u'Home',h.url('/'))}
    • -
  • ${_('Admin')}
    • - -<%def name="main()"> - -
    -

    ${_('User')} - ${c.user.username}

    - ${h.form(url('user', id=c.user.user_id),method='put')} - - - - - - - - - - - - - - - - - - -
    ${_('Username')}${h.text('username')}
    ${_('New password')}${h.text('new_password')}
    ${_('Active')}${h.checkbox('active',value=True)}
    ${h.submit('save','save')}
    - - ${h.end_form()} -
    - \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 pylons_app/templates/users.html --- a/pylons_app/templates/users.html Mon May 03 18:31:00 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +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(u'Admin',h.url('admin_home'))} - / - ${h.link_to(u'Users managment',h.url('users'))} - -<%def name="page_nav()"> -
  • ${h.link_to(u'Home',h.url('/'))}
    • -
  • ${_('Admin')}
    • - -<%def name="main()"> - -
    -

    ${_('Mercurial users')}

    - - - - - - - - - %for user in c.users_list: - - - - - - - - %endfor -
    IdUsernameActiveAdminAction
    ${user.user_id}${h.link_to(user.username,h.url('edit_user', id=user.user_id))}${user.active}${user.admin} - ${h.form(url('user', id=user.user_id),method='delete')} - ${h.submit('remove','remove',class_="submit")} - ${h.end_form()} -
    -

    ${h.link_to(u'Add user',h.url('new_user'))}

    -
    - - \ No newline at end of file diff -r cfddee9d3693 -r 20dc7a5eb748 setup.py --- a/setup.py Mon May 03 18:31:00 2010 +0200 +++ b/setup.py Mon May 03 19:07:54 2010 +0200 @@ -6,29 +6,29 @@ from setuptools import setup, find_packages setup( - name = 'pylons_app', - version = '1.0', - description = '', - author = 'marcin kuzminski', - author_email = 'marcin@python-blog.com', - url = '', - install_requires = [ - "Pylons>=0.9.7,<=0.9.7.99", - "SQLAlchemy>=0.5,<=0.5.99", - "Mako>=0.2.2,<=0.2.99", + name='pylons_app', + version='1.0', + description='', + author='marcin kuzminski', + author_email='marcin@python-blog.com', + url='', + install_requires=[ + "Pylons>=1.0.0", + "SQLAlchemy>=0.6", + "Mako>=0.3.2", ], - setup_requires = ["PasteScript>=1.6.3"], - packages = find_packages(exclude = ['ez_setup']), - include_package_data = True, - test_suite = 'nose.collector', - package_data = {'pylons_app': ['i18n/*/LC_MESSAGES/*.mo']}, - message_extractors = {'pylons_app': [ + setup_requires=["PasteScript>=1.6.3"], + packages=find_packages(exclude=['ez_setup']), + include_package_data=True, + test_suite='nose.collector', + package_data={'pylons_app': ['i18n/*/LC_MESSAGES/*.mo']}, + message_extractors={'pylons_app': [ ('**.py', 'python', None), ('templates/**.mako', 'mako', {'input_encoding': 'utf-8'}), ('public/**', 'ignore', None)]}, - zip_safe = False, - paster_plugins = ['PasteScript', 'Pylons'], - entry_points = """ + zip_safe=False, + paster_plugins=['PasteScript', 'Pylons'], + entry_points=""" [paste.app_factory] main = pylons_app.config.middleware:make_app