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

reverted some bs3 changes

Browse Source
This commit is contained in:
mdipierro
2014-03-03 08:13:37 -06:00
parent 666a389718
commit ae0749d6b8
3 changed files with 39 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/admin/static/js/web2py.js
+2 -2
View File
@@ -75,8 +75,8 @@
* this over and over... all will be bound to the document * this over and over... all will be bound to the document
*/ */
/*adds btn class to buttons*/ /*adds btn class to buttons*/
$('button', target).addClass('btn').addClass('btn-default'); $('button', target).addClass('btn');
$('form input[type="submit"], form input[type="button"]', target).addClass('btn').addClass('btn-default'); $('form input[type="submit"], form input[type="button"]', target).addClass('btn');
/* javascript for PasswordWidget*/ /* javascript for PasswordWidget*/
$('input[type=password][data-w2p_entropy]', target).each(function () { $('input[type=password][data-w2p_entropy]', target).each(function () {
web2py.validate_entropy($(this)); web2py.validate_entropy($(this));
applications/examples/static/js/web2py.js
+2 -2
View File
@@ -75,8 +75,8 @@
* this over and over... all will be bound to the document * this over and over... all will be bound to the document
*/ */
/*adds btn class to buttons*/ /*adds btn class to buttons*/
$('button', target).addClass('btn').addClass('btn-default'); $('button', target).addClass('btn');
$('form input[type="submit"], form input[type="button"]', target).addClass('btn').addClass('btn-default'); $('form input[type="submit"], form input[type="button"]', target).addClass('btn');
/* javascript for PasswordWidget*/ /* javascript for PasswordWidget*/
$('input[type=password][data-w2p_entropy]', target).each(function () { $('input[type=password][data-w2p_entropy]', target).each(function () {
web2py.validate_entropy($(this)); web2py.validate_entropy($(this));
applications/welcome/views/default/index.html
+21 -36
View File
@@ -1,26 +1,21 @@
{{left_sidebar_enabled,right_sidebar_enabled=False,('message' in globals())}} {{left_sidebar_enabled,right_sidebar_enabled=False,('message' in globals())}}
{{extend 'layout.html'}} {{extend 'layout.html'}}
{{block head}}
<style>
#w2padmin-btn {margin:30px 0 30px 0;}
</style>
{{end head}}
{{if 'message' in globals():}} {{if 'message' in globals():}}
<h2>{{=message}}</h2> <h3>{{=message}}</h3>
<p class="lead">{{=T('How did you get here?')}}</p>
<h4>{{=T('How did you get here?')}}</h4>
<ol> <ol>
<li>{{=T('You are successfully running web2py')}}</li> <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('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', <li>{{=XML(T('Which called the function %s located in the file %s',
(A(request.function+'()',_href='#'), (A(request.function+'()',_href='#'),
A('web2py/applications/%(application)s/controllers/%(controller)s.py'%request, A('web2py/applications/%(application)s/controllers/%(controller)s.py'%request,
_href=URL('admin','default','peek', args=(request.application,'controllers',request.controller+'.py'))))))}}</li> _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', <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, 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> _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> <li>{{=T('You can modify this application and adapt it to your needs')}}</li>
</ol> </ol>
{{elif 'content' in globals():}} {{elif 'content' in globals():}}
{{=content}} {{=content}}
@@ -29,22 +24,12 @@
{{pass}} {{pass}}
{{block right_sidebar}} {{block right_sidebar}}
<button id="w2padmin-btn" class="btn btn-primary btn-lg btn-block"> {{=A(T("Administrative Interface"), _href=URL('admin','default','index'), _class='btn',
<i class="glyphicon glyphicon-cog"></i> {{=T("Administrative Interface")}}</button> _style='margin-top: 1em;')}}
<div class="panel panel-info"> <h6>{{=T("Don't know what to do?")}}</h6>
<div class="panel-heading">{{=T("Don't know what to do?")}}</div> <ul>
<ul class="list-group"> <li>{{=A(T("Online examples"), _href=URL('examples','default','index'))}}</li>
<li class="list-group-item">{{=A(T("Online examples"), _href=URL('examples','default','index'))}}</li> <li><a href="http://web2py.com">web2py.com</a></li>
<li class="list-group-item"><a href="http://web2py.com">web2py.com</a></li> <li><a href="http://web2py.com/book">{{=T('Documentation')}}</a></li>
<li class="list-group-item"><a href="http://web2py.com/book">{{=T('Documentation')}}</a></li> </ul>
</ul>
</div>
{{end}}
{{block page_js}}
<script>
$('#w2padmin-btn').click(function() {
window.location = "{{=URL('admin','default','index')}}";
});
</script>
{{end}} {{end}}