Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

reverted some bs3 changes

  • Loading branch information...
commit ae0749d6b8b9d0bf111c395674f629f3a1e48cfc 1 parent 666a389
@mdipierro mdipierro authored
View
4 applications/admin/static/js/web2py.js
@@ -75,8 +75,8 @@
* this over and over... all will be bound to the document
*/
/*adds btn class to buttons*/
- $('button', target).addClass('btn').addClass('btn-default');
- $('form input[type="submit"], form input[type="button"]', target).addClass('btn').addClass('btn-default');
+ $('button', target).addClass('btn');
+ $('form input[type="submit"], form input[type="button"]', target).addClass('btn');
/* javascript for PasswordWidget*/
$('input[type=password][data-w2p_entropy]', target).each(function () {
web2py.validate_entropy($(this));
View
4 applications/examples/static/js/web2py.js
@@ -75,8 +75,8 @@
* this over and over... all will be bound to the document
*/
/*adds btn class to buttons*/
- $('button', target).addClass('btn').addClass('btn-default');
- $('form input[type="submit"], form input[type="button"]', target).addClass('btn').addClass('btn-default');
+ $('button', target).addClass('btn');
+ $('form input[type="submit"], form input[type="button"]', target).addClass('btn');
/* javascript for PasswordWidget*/
$('input[type=password][data-w2p_entropy]', target).each(function () {
web2py.validate_entropy($(this));
View
85 applications/welcome/views/default/index.html
@@ -1,50 +1,35 @@
-{{left_sidebar_enabled,right_sidebar_enabled=False,('message' in globals())}}
-{{extend 'layout.html'}}
-
-{{block head}}
-<style>
-#w2padmin-btn {margin:30px 0 30px 0;}
-</style>
-{{end head}}
-
-{{if 'message' in globals():}}
-<h2>{{=message}}</h2>
-<p class="lead">{{=T('How did you get here?')}}</p>
-<ol>
- <li>{{=T('You are successfully running web2py')}}</li>
- <li>{{=XML(T('You visited the url %s', A(request.env.path_info,_href=request.env.path_info)))}}</li>
- <li>{{=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'))))))}}</li>
- <li>{{=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')))))}}</li>
- <li>{{=T('You can modify this application and adapt it to your needs')}}</li>
-</ol>
-{{elif 'content' in globals():}}
-{{=content}}
-{{else:}}
-{{=BEAUTIFY(response._vars)}}
-{{pass}}
-
-{{block right_sidebar}}
-<button id="w2padmin-btn" class="btn btn-primary btn-lg btn-block">
- <i class="glyphicon glyphicon-cog"></i> {{=T("Administrative Interface")}}</button>
-<div class="panel panel-info">
- <div class="panel-heading">{{=T("Don't know what to do?")}}</div>
- <ul class="list-group">
- <li class="list-group-item">{{=A(T("Online examples"), _href=URL('examples','default','index'))}}</li>
- <li class="list-group-item"><a href="http://web2py.com">web2py.com</a></li>
- <li class="list-group-item"><a href="http://web2py.com/book">{{=T('Documentation')}}</a></li>
- </ul>
-</div>
-{{end}}
-
-{{block page_js}}
-<script>
- $('#w2padmin-btn').click(function() {
- window.location = "{{=URL('admin','default','index')}}";
- });
-</script>
-{{end}}
+{{left_sidebar_enabled,right_sidebar_enabled=False,('message' in globals())}}
+{{extend 'layout.html'}}
+
+{{if 'message' in globals():}}
+<h3>{{=message}}</h3>
+
+<h4>{{=T('How did you get here?')}}</h4>
+<ol>
+ <li>{{=T('You are successfully running web2py')}}</li>
+ <li>{{=XML(T('You visited the url %s', A(request.env.path_info,_href=request.env.path_info)))}}</li>
+ <li>{{=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'))))))}}</li>
+ <li>{{=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')))))}}</li>
+ <li>{{=T('You can modify this application and adapt it to your needs')}}</li>
+</ol>
+{{elif 'content' in globals():}}
+{{=content}}
+{{else:}}
+{{=BEAUTIFY(response._vars)}}
+{{pass}}
+
+{{block right_sidebar}}
+{{=A(T("Administrative Interface"), _href=URL('admin','default','index'), _class='btn',
+ _style='margin-top: 1em;')}}
+<h6>{{=T("Don't know what to do?")}}</h6>
+<ul>
+ <li>{{=A(T("Online examples"), _href=URL('examples','default','index'))}}</li>
+ <li><a href="http://web2py.com">web2py.com</a></li>
+ <li><a href="http://web2py.com/book">{{=T('Documentation')}}</a></li>
+</ul>
+{{end}}
Please sign in to comment.
Something went wrong with that request. Please try again.