diff --git a/VERSION b/VERSION index f5f172a6..d1747118 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-08-24 09:43:38) dev +Version 2.00.0 (2012-08-24 09:53:17) dev diff --git a/applications/welcome/static/css/bootswatch.css b/applications/welcome/static/css/web2py_bootstrap.css similarity index 100% rename from applications/welcome/static/css/bootswatch.css rename to applications/welcome/static/css/web2py_bootstrap.css diff --git a/applications/welcome/static/css/bootswatch_nojs.css b/applications/welcome/static/css/web2py_bootstrap_nojs.css similarity index 100% rename from applications/welcome/static/css/bootswatch_nojs.css rename to applications/welcome/static/css/web2py_bootstrap_nojs.css diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html index 9fa54881..c072d804 100644 --- a/applications/welcome/views/layout.html +++ b/applications/welcome/views/layout.html @@ -43,11 +43,11 @@ 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/web2py.css')) - response.files.append(URL('static','css/bootswatch.css')) + response.files.append(URL('static','css/web2py_bootsrap.css')) }} {{include 'web2py_ajax.html'}} @@ -64,7 +64,7 @@ uncomment to load jquery-ui //--> - + {{block head}}{{end}}