From 7650e6de95b689045b34650eb2358a150deba287 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 28 Jul 2012 00:56:06 -0500 Subject: [PATCH] using FORM.dialog --- VERSION | 2 +- applications/admin/controllers/default.py | 30 +++++++++++-------- applications/admin/views/default/delete.html | 4 +-- .../admin/views/default/delete_plugin.html | 5 ++-- .../admin/views/default/downgrade_web2py.html | 14 --------- .../admin/views/default/uninstall.html | 9 ++---- .../admin/views/default/upgrade_web2py.html | 3 +- 7 files changed, 26 insertions(+), 41 deletions(-) delete mode 100644 applications/admin/views/default/downgrade_web2py.html diff --git a/VERSION b/VERSION index 43e5d27d..e31700df 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-07-27 17:25:26) dev +Version 2.00.0 (2012-07-28 00:56:00) dev diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py index 341f1ddc..8929034d 100644 --- a/applications/admin/controllers/default.py +++ b/applications/admin/controllers/default.py @@ -317,20 +317,24 @@ def pack_plugin(): redirect(URL('plugin',args=request.args)) def upgrade_web2py(): - if 'upgrade' in request.vars: + dialog = FORM.dialog(T('Upgrade'), + {T('Cancel'):URL('site')}) + if dialog.accepted: (success, error) = upgrade(request) if success: session.flash = T('web2py upgraded; please restart it') else: session.flash = T('unable to upgrade because "%s"', error) redirect(URL('site')) - elif 'noupgrade' in request.vars: - redirect(URL('site')) - return dict() + return dict(dialog=dialog) def uninstall(): app = get_app() - if 'delete' in request.vars: + + dialog = FORM.dialog(T('Uninstall'), + {T('Cancel'):URL('site')}) + + if dialog.accepted: if MULTI_USER_MODE: if is_manager() and db(db.app.name==app).delete(): pass @@ -344,9 +348,7 @@ def uninstall(): else: session.flash = T('unable to uninstall "%s"', app) redirect(URL('site')) - elif 'nodelete' in request.vars: - redirect(URL('site')) - return dict(app=app) + return dict(app=app, dialog=dialog) def cleanup(): @@ -978,9 +980,12 @@ def delete_plugin(): app=request.args(0) plugin = request.args(1) plugin_name='plugin_'+plugin - if 'nodelete' in request.vars: - redirect(URL('design', args=app, anchor=request.vars.id)) - elif 'delete' in request.vars: + + dialog = FORM.dialog( + T('Delete'), + {T('Cancel'):URL('design', args=app)}) + + if dialog.accepted: try: for folder in ['models','views','controllers','static','modules', 'private']: path=os.path.join(apath(app,r=request),folder) @@ -997,7 +1002,7 @@ def delete_plugin(): session.flash = T('unable to delete file plugin "%(plugin)s"', dict(plugin=plugin)) redirect(URL('design', args=request.args(0), anchor=request.vars.id2)) - return dict(plugin=plugin) + return dict(dialog=dialog,plugin=plugin) def plugin(): """ Application design handler """ @@ -1586,7 +1591,6 @@ def reload_routes(): gluon.rewrite.load() redirect(URL('site')) - def manage_students(): if not (MULTI_USER_MODE and is_manager()): session.flash = T('Not Authorized') diff --git a/applications/admin/views/default/delete.html b/applications/admin/views/default/delete.html index d0f86f44..d3e406ef 100644 --- a/applications/admin/views/default/delete.html +++ b/applications/admin/views/default/delete.html @@ -2,8 +2,8 @@ {{block sectionclass}}delete{{end}} -

{{=T('Are you sure you want to delete file "%s"?', filename)}}

-

{{=dialog}}

+
+{{=dialog}}
diff --git a/applications/admin/views/default/delete_plugin.html b/applications/admin/views/default/delete_plugin.html index 1e96be2a..e48f5db9 100644 --- a/applications/admin/views/default/delete_plugin.html +++ b/applications/admin/views/default/delete_plugin.html @@ -2,9 +2,8 @@ {{block sectionclass}}delete_plugin{{end}} -

{{=T('Are you sure you want to delete plugin "%s"?', plugin)}}

-

{{=FORM(INPUT(_type='submit',_name='nodelete',_value=T('NO')))}}

-

{{=FORM(INPUT(_type='submit',_name='delete',_value=T('YES')))}}

+
+{{=dialog}}
diff --git a/applications/admin/views/default/downgrade_web2py.html b/applications/admin/views/default/downgrade_web2py.html deleted file mode 100644 index 0078e60c..00000000 --- a/applications/admin/views/default/downgrade_web2py.html +++ /dev/null @@ -1,14 +0,0 @@ -{{extend 'layout.html'}} - -{{block sectionclass}}upgrade{{end}} - -

{{=T('web2py downgrade')}}

- -

{{=T('ATTENTION:')}} {{=T('This is an experimental feature and it needs more testing. If you decide to downgrade you do it at your own risk')}}
-{{=T('If start the downgrade, be patient, it may take a while to rollback')}}

- -
-{{=FORM(INPUT(_type='submit',_name='nodowngrade',_value=T('Cancel')), _class='inline')}} -{{=FORM(INPUT(_type='submit',_name='downgrade',_value=T('Downgrade')), _class='inline')}} -
- diff --git a/applications/admin/views/default/uninstall.html b/applications/admin/views/default/uninstall.html index b2d9b4f0..72920aba 100644 --- a/applications/admin/views/default/uninstall.html +++ b/applications/admin/views/default/uninstall.html @@ -1,10 +1,7 @@ {{extend 'layout.html'}} -

{{=T('Are you sure you want to uninstall application "%s"?', app)}}

- - - -
{{=FORM(INPUT(_type='submit',_name='nodelete',_value=T('Abort')))}}{{=FORM(INPUT(_type='submit',_name='delete',_value=T('Uninstall')))}}
-
+
+{{=dialog}} +
diff --git a/applications/admin/views/default/upgrade_web2py.html b/applications/admin/views/default/upgrade_web2py.html index c9974570..34bf06cd 100644 --- a/applications/admin/views/default/upgrade_web2py.html +++ b/applications/admin/views/default/upgrade_web2py.html @@ -8,7 +8,6 @@ {{=T('If start the upgrade, be patient, it may take a while to download')}}

-{{=FORM(INPUT(_type='submit',_name='noupgrade',_value=T('Cancel')), _class='inline')}} -{{=FORM(INPUT(_type='submit',_name='upgrade',_value=T('Upgrade')), _class='inline')}} +{{=dialog}}