From 7111b3dcb2afb526f9c7000fc36737e09b8f4968 Mon Sep 17 00:00:00 2001 From: Nico Zanferrari Date: Wed, 8 Aug 2018 00:13:23 +0200 Subject: [PATCH 1/5] Python 3 compatibility clarification --- applications/examples/views/default/download.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/applications/examples/views/default/download.html b/applications/examples/views/default/download.html index c1ecdec5..d8df3871 100644 --- a/applications/examples/views/default/download.html +++ b/applications/examples/views/default/download.html @@ -62,16 +62,16 @@

- The source code version works on all supported platforms, including Linux, but it requires Python 2.6, or 2.7 (recommended). - It runs on Windows and most Unix systems, including Linux and BSD. + The source code version works on Windows and most Unix systems, including Linux, BSD and Mac . It requires Python 2.6 (no more supported), Python 2.7 (stable) or Python 3.5+ (recommended for new projects) already installed on your system. + There are also binary packages for Windows and Mac OS X. They include the Python 2.7 interpreter so you do not need to have it pre-installed.

Instructions

-

After download, unzip it and click on web2py.exe (windows) or web2py.app (osx). - To run from source, type:

-{{=CODE("python2.7 web2py.py", language=None, counter='>', _class='boxCode')}} +

With the binary packages, after download, just unzip it and then click on web2py.exe (windows) or web2py.app (osx). + If you prefer to run it from source with your own Python interpreter alreay installed, type:

+{{=CODE("python web2py.py", language=None, counter='>', _class='boxCode')}}

or for more info type:

-{{=CODE("python2.7 web2py.py -h", language=None, counter='>', _class='boxCode')}} +{{=CODE("python web2py.py -h", language=None, counter='>', _class='boxCode')}}

Caveats

From 46b8ad3fddfa6108ac4bec9d88d8c2088d324cd3 Mon Sep 17 00:00:00 2001 From: Kelvin Spencer Date: Wed, 8 Aug 2018 08:58:15 -0500 Subject: [PATCH 2/5] Update web2py_bootstrap.js This allows dropdown menu items to be open in the target specified if it exists without changing main/top window --- applications/admin/static/js/web2py_bootstrap.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/applications/admin/static/js/web2py_bootstrap.js b/applications/admin/static/js/web2py_bootstrap.js index 7206cb1b..abf6d1c7 100644 --- a/applications/admin/static/js/web2py_bootstrap.js +++ b/applications/admin/static/js/web2py_bootstrap.js @@ -29,5 +29,14 @@ jQuery(function(){ } hoverMenu(); // first page load jQuery(window).resize(hoverMenu); // on resize event - jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');}); + jQuery('ul.nav li.dropdown a').click(function(){ + if(jQuery(this).attr("target")){ + window.open( + jQuery(this).attr('href'), + jQuery(this).attr('target') // <- This is what makes it open in a new window. + ); + } else { + window.location=jQuery(this).attr('href'); + } + }); }); From e7fee6a4172f3e42cb12322408ec594986e34a59 Mon Sep 17 00:00:00 2001 From: Erik Montes Date: Mon, 13 Aug 2018 23:34:22 -0700 Subject: [PATCH 3/5] Create bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 35 ++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..b7353733 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,35 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. From 6b8ccff2a436cb7e30303bd8420c475aa4dfa72f Mon Sep 17 00:00:00 2001 From: Erik Montes Date: Mon, 13 Aug 2018 23:36:16 -0700 Subject: [PATCH 4/5] Create feature_request.md --- .github/ISSUE_TEMPLATE/feature_request.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..066b2d92 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,17 @@ +--- +name: Feature request +about: Suggest an idea for this project + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From ef4e46522270d9e8753fb4a381df58048383ee46 Mon Sep 17 00:00:00 2001 From: JusticeN Date: Sat, 25 Aug 2018 13:45:46 +0200 Subject: [PATCH 5/5] make make_min_web2py.py run for python3 i tried to minify the web2py server and this script was not able to run with python3.5. So i change it. --- scripts/make_min_web2py.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/make_min_web2py.py b/scripts/make_min_web2py.py index 2fef642c..587820d6 100644 --- a/scripts/make_min_web2py.py +++ b/scripts/make_min_web2py.py @@ -48,7 +48,7 @@ def main(): global REQUIRED, IGNORED if len(sys.argv) < 2: - print USAGE + print(USAGE) # make target folder target = sys.argv[1]