From 4ed36cfb1fe960d5c818c53562d920d407e991ae Mon Sep 17 00:00:00 2001 From: mdipierro Date: Tue, 1 May 2018 16:08:40 -0500 Subject: [PATCH] welcome improvements --- applications/welcome/views/appadmin.html | 6 ++ applications/welcome/views/default/index.html | 68 ++++++++++--------- applications/welcome/views/default/user.html | 38 +++++------ applications/welcome/views/layout.html | 10 +-- 4 files changed, 62 insertions(+), 60 deletions(-) diff --git a/applications/welcome/views/appadmin.html b/applications/welcome/views/appadmin.html index ea84529d..2ce42621 100644 --- a/applications/welcome/views/appadmin.html +++ b/applications/welcome/views/appadmin.html @@ -9,6 +9,9 @@ }); //--> +
+
+ {{if request.function=='index':}}

{{=T("Available Databases and Tables")}}

{{if not databases:}}{{=T("No databases in this application")}}{{pass}} @@ -271,3 +274,6 @@ {{pass}}
{{pass}} + +
+ diff --git a/applications/welcome/views/default/index.html b/applications/welcome/views/default/index.html index b96f8ceb..9107d644 100644 --- a/applications/welcome/views/default/index.html +++ b/applications/welcome/views/default/index.html @@ -8,40 +8,44 @@ {{end}} -{{if 'message' in globals():}} -

{{=message}}

-

{{=T('How did you get here?')}}

-
    -
  1. {{=T('You are successfully running web2py')}}
    2. -
  2. {{=XML(T('You visited the url %s', A(request.env.path_info,_href=request.env.path_info)))}}
    3. -
  3. {{=XML(T('Which called the function %s located in the file %s', - (A(request.function+'()',_href='#'), - A('web2py/applications/%(application)s/controllers/%(controller)s.py' % request, - _href=URL('admin','default','peek', args=(request.application,'controllers',request.controller+'.py'))))))}}
    4. -
  4. {{=XML(T('The output of the file is a dictionary that was rendered by the view %s', - A('web2py/applications/%(application)s/views/%(controller)s/index.html' % request, - _href=URL('admin','default','peek',args=(request.application,'views',request.controller,'index.html')))))}}
    5. -
  5. {{=T('You can modify this application and adapt it to your needs')}}
    6. -
-
-
- - - {{=T("admin")}} - - {{=T("Online examples")}} - web2py.com - {{=T('Documentation')}} - {{=T('API Example')}} - {{=T('Grid Example')}} - {{=T('Wiki Example')}} +
+
+ {{if 'message' in globals():}} +

{{=message}}

+

{{=T('How did you get here?')}}

+
    +
  1. {{=T('You are successfully running web2py')}}
    2. +
  2. {{=XML(T('You visited the url %s', A(request.env.path_info,_href=request.env.path_info)))}}
    3. +
  3. {{=XML(T('Which called the function %s located in the file %s', + (A(request.function+'()',_href='#'), + A('web2py/applications/%(application)s/controllers/%(controller)s.py' % request, + _href=URL('admin','default','peek', args=(request.application,'controllers',request.controller+'.py'))))))}}
    4. +
  4. {{=XML(T('The output of the file is a dictionary that was rendered by the view %s', + A('web2py/applications/%(application)s/views/%(controller)s/index.html' % request, + _href=URL('admin','default','peek',args=(request.application,'views',request.controller,'index.html')))))}}
    5. +
  5. {{=T('You can modify this application and adapt it to your needs')}}
    6. +
+
+
+ + + {{=T("admin")}} + + {{=T("Online examples")}} + web2py.com + {{=T('Documentation')}} + {{=T('API Example')}} + {{=T('Grid Example')}} + {{=T('Wiki Example')}} +
+
+ {{elif 'content' in globals():}} + {{=content}} + {{else:}} + {{=BEAUTIFY(response._vars)}} + {{pass}}
-{{elif 'content' in globals():}} -{{=content}} -{{else:}} -{{=BEAUTIFY(response._vars)}} -{{pass}} diff --git a/applications/welcome/views/default/user.html b/applications/welcome/views/default/user.html index 08d64068..00ff6736 100644 --- a/applications/welcome/views/default/user.html +++ b/applications/welcome/views/default/user.html @@ -1,28 +1,26 @@ {{extend 'layout.html'}} -

-{{=T('Sign Up') if request.args(0) == 'register' else T('Log In') if request.args(0) == 'login' else T(request.args(0).replace('_',' ').title())}} -

- -
-
-
- {{ - if request.args(0)=='login': - if not 'register' in auth.settings.actions_disabled: - form.add_button(T('Sign Up'),URL(args='register', vars={'_next': request.vars._next} if request.vars._next else None),_class='btn btn-default btn-secondary') - pass - if not 'request_reset_password' in auth.settings.actions_disabled: - form.add_button(T('Lost Password'),URL(args='request_reset_password'),_class='btn btn-default btn-secondary') - pass - pass - =form - }} -
-
+
+
+

+ {{=T('Sign Up') if request.args(0) == 'register' else T('Log In') if request.args(0) == 'login' else T(request.args(0).replace('_',' ').title())}} +

+ {{=form}} + {{if request.args(0)=='login' and not 'register' in auth.settings.actions_disabled:}} + Register +
+ {{pass}} + {{if request.args(0)=='login' and not 'request_reset_password' in auth.settings.actions_disabled:}} + Lost your password? + {{pass}} + {{if request.args(0)=='register':}} + Login + {{pass}} +
+ {{block page_js}}