diff --git a/VERSION b/VERSION index b6e42296..82c0a968 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.2+timestamp.2013.01.20.21.35.15 +Version 2.4.1-alpha.2+timestamp.2013.01.21.08.24.39 diff --git a/applications/admin/models/menu.py b/applications/admin/models/menu.py index 7429def1..eb4b9030 100644 --- a/applications/admin/models/menu.py +++ b/applications/admin/models/menu.py @@ -21,6 +21,12 @@ if request.vars.app or request.args: _c == 'mercurial' and _f == 'commit', URL(_a, 'mercurial', 'commit', args=_t))) +if os.path.exists('applications/examples'): + response.menu.append( + (T('Help'), False, URL('examples', 'default', 'index'))) +else: + response.menu.append((T('Help'), False, 'http://web2py.com/examples')) + if not session.authorized: response.menu = [(T('Login'), True, URL('site'))] else: @@ -29,8 +35,3 @@ else: response.menu.append((T('Debug'), False, URL(_a, 'debug', 'interact'))) -if os.path.exists('applications/examples'): - response.menu.append( - (T('Help'), False, URL('examples', 'default', 'index'))) -else: - response.menu.append((T('Help'), False, 'http://web2py.com/examples')) diff --git a/applications/admin/views/layout.html b/applications/admin/views/layout.html index a837adac..f9c2e84c 100644 --- a/applications/admin/views/layout.html +++ b/applications/admin/views/layout.html @@ -8,9 +8,8 @@ {{=response.title or URL()}} {{ response.files.append(URL('static','css/bootstrap.min.css')) - response.files.append(URL('static','css/styles.css')) response.files.append(URL('static','css/bootstrap_essentials.css')) - response.files.append(URL('static','css/bootstrap_adapters.css')) + # response.files.append(URL('static','css/bootstrap_adapters.css')) response.files.append(URL('static','css/bootstrap-responsive.min.css')) }} {{include 'web2py_ajax.html'}}