Mercurial > kallithea
changeset 48:8e250e86a670
Css fixes, implemented removal of users, and display draft
| author | Marcin Kuzminski <marcin@python-blog.com> |
|---|---|
| date | Wed, 07 Apr 2010 21:10:43 +0200 |
| parents | f6ac79182600 |
| children | 3ada2f409c1c |
| files | pylons_app/controllers/repos.py pylons_app/controllers/users.py pylons_app/lib/auth.py pylons_app/public/hg_static/style-monoblue.css pylons_app/templates/base/base.html pylons_app/templates/repos.html pylons_app/templates/repos_manage.html pylons_app/templates/repos_show.html pylons_app/templates/users.html pylons_app/templates/users_manage.html pylons_app/templates/users_show.html |
| diffstat | 11 files changed, 172 insertions(+), 86 deletions(-) [+] |
line wrap: on
line diff
--- a/pylons_app/controllers/repos.py Wed Apr 07 20:19:25 2010 +0200 +++ b/pylons_app/controllers/repos.py Wed Apr 07 21:10:43 2010 +0200 @@ -20,7 +20,7 @@ def index(self, format='html'): """GET /repos: All items in the collection""" # url('repos') - return render('/repos_manage.html') + return render('/repos.html') def create(self): """POST /repos: Create a new item""" @@ -51,7 +51,7 @@ def show(self, id, format='html'): """GET /repos/id: Show a specific item""" # url('repo', id=ID) - + return render('/repos_show.html') def edit(self, id, format='html'): """GET /repos/id/edit: Form to edit an existing item""" # url('edit_repo', id=ID)
--- a/pylons_app/controllers/users.py Wed Apr 07 20:19:25 2010 +0200 +++ b/pylons_app/controllers/users.py Wed Apr 07 21:10:43 2010 +0200 @@ -16,14 +16,15 @@ c.staticurl = g.statics c.admin_user = session.get('admin_user') c.admin_username = session.get('admin_username') + self.conn, self.cur = auth.get_sqlite_conn_cur() def index(self, format='html'): """GET /users: All items in the collection""" # url('users') - conn, cur = auth.get_sqlite_conn_cur() - cur.execute('SELECT * FROM users') - c.users_list = cur.fetchall() - return render('/users_manage.html') + + self.cur.execute('SELECT * FROM users') + c.users_list = self.cur.fetchall() + return render('/users.html') def create(self): """POST /users: Create a new item""" @@ -50,11 +51,22 @@ # h.form(url('user', id=ID), # method='delete') # url('user', id=ID) - + try: + self.cur.execute("DELETE FROM users WHERE user_id=?", (id,)) + self.conn.commit() + except: + self.conn.rollback() + raise + return redirect(url('users')) + def show(self, id, format='html'): """GET /users/id: Show a specific item""" # url('user', id=ID) - + self.cur.execute("SELECT * FROM users WHERE user_id=?", (id,)) + ret = self.cur.fetchone() + c.user_name = ret[1] + return render('/users_show.html') + def edit(self, id, format='html'): """GET /users/id/edit: Form to edit an existing item""" # url('edit_user', id=ID)
--- a/pylons_app/lib/auth.py Wed Apr 07 20:19:25 2010 +0200 +++ b/pylons_app/lib/auth.py Wed Apr 07 21:10:43 2010 +0200 @@ -84,7 +84,7 @@ log.info('creating table %s', 'users') cur.execute('''DROP TABLE IF EXISTS users ''') cur.execute('''CREATE TABLE users - (id INTEGER PRIMARY KEY AUTOINCREMENT, + (user_id INTEGER PRIMARY KEY AUTOINCREMENT, username TEXT, password TEXT, active INTEGER,
--- a/pylons_app/public/hg_static/style-monoblue.css Wed Apr 07 20:19:25 2010 +0200 +++ b/pylons_app/public/hg_static/style-monoblue.css Wed Apr 07 21:10:43 2010 +0200 @@ -64,7 +64,21 @@ div.rss_logo a:hover { background-color:#ee5500; } - +input.submit{ + background-color:#FF6600; + border-color:#FCC7A5 #7D3302 #3E1A01 #FF954E; + border-style:solid; + border-width:1px; + color:#FFFFFF; + font-family:sans-serif; + font-size:10px; + font-weight:bold; + line-height:8px; + padding:1px 2px; + text-align:center; + text-decoration:none; + cursor: pointer; +} td.indexlinks { white-space: nowrap; }
--- a/pylons_app/templates/base/base.html Wed Apr 07 20:19:25 2010 +0200 +++ b/pylons_app/templates/base/base.html Wed Apr 07 21:10:43 2010 +0200 @@ -20,7 +20,7 @@ </div> ${next.main()} <div class="page-footer"> - Mercurial Repository: ${c.repo_name} + Mercurial </div> <div id="powered-by">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/repos.html Wed Apr 07 21:10:43 2010 +0200 @@ -0,0 +1,28 @@ +<%inherit file="base/base.html"/> +<%def name="title()"> + ${_('Repository managment')} +</%def> +<%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> +<%def name="page_nav()"> + <li>${h.link_to(u'Home',h.url('/'))}</li> + <li class="current">${_('Admin')}</li> +</%def> +<%def name="main()"> + <ul class="submenu"> + <li class="current_submenu"> + ${h.link_to(u'Repos',h.url('repos'))} + </li> + <li> + ${h.link_to(u'Users',h.url('users'))} + </li> + </ul> + <div> + <h2>${_('Mercurial repos')}</h2> + </div> +</%def> \ No newline at end of file
--- a/pylons_app/templates/repos_manage.html Wed Apr 07 20:19:25 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> -<%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> -<%def name="page_nav()"> - <li>${h.link_to(u'Home',h.url('/'))}</li> - <li class="current">${_('Admin')}</li> -</%def> -<%def name="main()"> - <ul class="submenu"> - <li class="current_submenu"> - ${h.link_to(u'Repos',h.url('repos'))} - </li> - <li> - ${h.link_to(u'Users',h.url('users'))} - </li> - </ul> - <div> - <h2>${_('Mercurial repos')}</h2> - </div> -</%def> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/repos_show.html Wed Apr 07 21:10:43 2010 +0200 @@ -0,0 +1,28 @@ +<%inherit file="base/base.html"/> +<%def name="title()"> + ${_('Repository managment')} +</%def> +<%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> +<%def name="page_nav()"> + <li>${h.link_to(u'Home',h.url('/'))}</li> + <li class="current">${_('Admin')}</li> +</%def> +<%def name="main()"> + <ul class="submenu"> + <li class="current_submenu"> + ${h.link_to(u'Repos',h.url('repos'))} + </li> + <li> + ${h.link_to(u'Users',h.url('users'))} + </li> + </ul> + <div> + <h2>${_('Mercurial repos')}</h2> + </div> +</%def> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/users.html Wed Apr 07 21:10:43 2010 +0200 @@ -0,0 +1,51 @@ +<%inherit file="base/base.html"/> +<%def name="title()"> + ${_('Repository managment')} +</%def> +<%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> +<%def name="page_nav()"> + <li>${h.link_to(u'Home',h.url('/'))}</li> + <li class="current">${_('Admin')}</li> +</%def> +<%def name="main()"> + <ul class="submenu"> + <li> + ${h.link_to(u'Repos',h.url('repos'))} + </li> + <li class="current_submenu"> + ${h.link_to(u'Users',h.url('users'))} + </li> + </ul> + <div> + <h2>${_('Mercurial users')}</h2> + <table> + <tr> + <th>Id</th> + <th>Username</th> + <th>Active</th> + <th>Admin</th> + <th>Action</th> + </tr> + %for i in c.users_list: + <tr> + <td>${i[0]}</td> + <td>${h.link_to(i[1],h.url('user', id=i[0]))}</td> + <td>${i[3]}</td> + <td>${i[4]}</td> + <td> + ${h.form(url('user', id=i[0]),method='delete')} + ${h.submit('remove','remove',class_="submit")} + ${h.end_form()} + </td> + </tr> + %endfor + </table> + </div> + +</%def> \ No newline at end of file
--- a/pylons_app/templates/users_manage.html Wed Apr 07 20:19:25 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -<%inherit file="base/base.html"/> -<%def name="title()"> - ${_('Repository managment')} -</%def> -<%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> -<%def name="page_nav()"> - <li>${h.link_to(u'Home',h.url('/'))}</li> - <li class="current">${_('Admin')}</li> -</%def> -<%def name="main()"> - <ul class="submenu"> - <li> - ${h.link_to(u'Repos',h.url('repos'))} - </li> - <li class="current_submenu"> - ${h.link_to(u'Users',h.url('users'))} - </li> - </ul> - <div> - <h2>${_('Mercurial users')}</h2> - <table cellspacing="0"> - <tr> - <th>Id</th> - <th>Username</th> - <th>Password</th> - <th>Active</th> - <th>Admin</th> - </tr> - %for i in c.users_list: - <tr> - <td>${i[0]}</td> - <td>${i[1]}</td> - <td>${i[2]}</td> - <td>${i[3]}</td> - <td>${i[4]}</td> - </tr> - %endfor - </table> - </div> - -</%def> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pylons_app/templates/users_show.html Wed Apr 07 21:10:43 2010 +0200 @@ -0,0 +1,28 @@ +<%inherit file="base/base.html"/> +<%def name="title()"> + ${_('User c.user_name')} +</%def> +<%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> +<%def name="page_nav()"> + <li>${h.link_to(u'Home',h.url('/'))}</li> + <li class="current">${_('Admin')}</li> +</%def> +<%def name="main()"> + <ul class="submenu"> + <li> + ${h.link_to(u'Repos',h.url('repos'))} + </li> + <li class="current_submenu"> + ${h.link_to(u'Users',h.url('users'))} + </li> + </ul> + <div> + <h2>${_('User')} - ${c.user_name}</h2> + </div> +</%def> \ No newline at end of file