dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed typos in recent commit, thanks Angelo and Villas

Browse Source
This commit is contained in:
Massimo Di Pierro
2012-08-24 11:04:24 -05:00
parent 0d96a57db7
commit 61d4a99181
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-08-24 10:13:35) dev Version 2.00.0 (2012-08-24 11:04:01) dev
applications/admin/controllers/default.py
+5 -5
View File
@@ -336,7 +336,7 @@ def pack_plugin():
redirect(URL('plugin',args=request.args)) redirect(URL('plugin',args=request.args))
def upgrade_web2py(): def upgrade_web2py():
dialog = FORM.confim(T('Upgrade'), dialog = FORM.confirm(T('Upgrade'),
{T('Cancel'):URL('site')}) {T('Cancel'):URL('site')})
if dialog.accepted: if dialog.accepted:
(success, error) = upgrade(request) (success, error) = upgrade(request)
@@ -350,7 +350,7 @@ def upgrade_web2py():
def uninstall(): def uninstall():
app = get_app() app = get_app()
dialog = FORM.confim(T('Uninstall'), dialog = FORM.confirm(T('Uninstall'),
{T('Cancel'):URL('site')}) {T('Cancel'):URL('site')})
if dialog.accepted: if dialog.accepted:
@@ -433,7 +433,7 @@ def delete():
if isinstance(sender, list): # ## fix a problem with Vista if isinstance(sender, list): # ## fix a problem with Vista
sender = sender[0] sender = sender[0]
dialog = FORM.confim(T('Delete'), dialog = FORM.confirm(T('Delete'),
{T('Cancel'):URL(sender, anchor=request.vars.id)}) {T('Cancel'):URL(sender, anchor=request.vars.id)})
if dialog.accepted: if dialog.accepted:
@@ -1003,7 +1003,7 @@ def delete_plugin():
plugin = request.args(1) plugin = request.args(1)
plugin_name='plugin_'+plugin plugin_name='plugin_'+plugin
dialog = FORM.confim( dialog = FORM.confirm(
T('Delete'), T('Delete'),
{T('Cancel'):URL('design', args=app)}) {T('Cancel'):URL('design', args=app)})
@@ -1652,7 +1652,7 @@ def git_pull():
if not have_git: if not have_git:
session.flash = GIT_MISSING session.flash = GIT_MISSING
redirect(URL('site')) redirect(URL('site'))
dialog = FORM.confim(T('Pull'), dialog = FORM.confirm(T('Pull'),
{T('Cancel'):URL('site')}) {T('Cancel'):URL('site')})
if dialog.accepted: if dialog.accepted:
try: try:
applications/welcome/views/layout.html
+1 -5
View File
@@ -43,12 +43,8 @@
response.files.append(URL('static','css/bootstrap.min.css')) response.files.append(URL('static','css/bootstrap.min.css'))
response.files.append(URL('static','css/bootstrap-responsive.min.css')) response.files.append(URL('static','css/bootstrap-responsive.min.css'))
response.files.append(URL('static','css/web2py.css')) response.files.append(URL('static','css/web2py.css'))
response.files.append(URL('static','css/web2py_bootsrap.css')) response.files.append(URL('static','css/web2py_bootstrap.css'))
}} }}
<!-- Makes bootswatch working on IE 7/8 -->
<!--[if (lt IE 9)]>
<link rel="stylesheet" href="{{=URL('static','css/web2py_bootstrap_ie.css')}}">
<![endif]-->
{{include 'web2py_ajax.html'}} {{include 'web2py_ajax.html'}}