diff --git a/assets/static/app.js b/assets/static/app.js index 02115e30..adadc2f0 100644 --- a/assets/static/app.js +++ b/assets/static/app.js @@ -1,4 +1,4 @@ -!function(t){function e(i){if(n[i])return n[i].exports;var o=n[i]={exports:{},id:i,loaded:!1};return t[i].call(o.exports,o,o.exports,e),o.loaded=!0,o.exports}var n={};return e.m=t,e.c=n,e.p="",e(0)}([function(t,e,n){(function(t){"use strict";function e(t){if(document.body.createTextRange){var e=document.body.createTextRange();e.moveToElementText(t),e.select()}else if(window.getSelection){var n=window.getSelection(),e=document.createRange();e.selectNodeContents(t),n.removeAllRanges(),n.addRange(e)}}function i(){var e=t(".download-btn");e.length<=0||(e.hide(),t.ajax({method:"GET",url:"https://api.github.com/repos/lektor/lektor/releases",crossDomain:!0}).then(function(t){r(e.toArray(),t)},function(){e.show()}))}function o(t){var e=null,n=null;if(navigator.platform.match(/^mac/i)&&(e=/\.dmg$/,n="For OSX 10.9 and later."),null!=e)for(var i=0;i').appendTo(e),o=t("a",e);s?(o.attr("href",s.url),n.append(t("").text(s.note+" ")),n.append(t("Other platforms").attr("href",r))):o.attr("href",r),o.append(t('').text(i)),t(e).fadeIn("slow")})}function s(){var n=t(".install-row pre");n.length>0&&n.on("dblclick",function(){e(this)})}function a(){var e=t(".google-custom-search");if(0!=e.length){var n="012722186170730423054:utwznhnrrmi",i=document.createElement("script");i.type="text/javascript",i.async=!0,i.src=("https:"==document.location.protocol?"https:":"http:")+"//cse.google.com/cse.js?cx="+n;var o=document.getElementsByTagName("script")[0];o.parentNode.insertBefore(i,o),t('\n \n ').appendTo(e),t('\n
\n
\n
\n
\n \n
\n
\n
\n
\n
\n
\n ').appendTo(e);var r=l.parse(location.search);r.q&&t('input[name="q"]',e).val(r.q)}}n(2);var l=n(15);t(function(){i(),s(),a()})}).call(e,n(1))},function(t,e,n){var i,o;/*! +!function(t){function e(i){if(n[i])return n[i].exports;var o=n[i]={exports:{},id:i,loaded:!1};return t[i].call(o.exports,o,o.exports,e),o.loaded=!0,o.exports}var n={};return e.m=t,e.c=n,e.p="",e(0)}([function(t,e,n){(function(t){"use strict";function e(t){if(document.body.createTextRange){var e=document.body.createTextRange();e.moveToElementText(t),e.select()}else if(window.getSelection){var n=window.getSelection(),e=document.createRange();e.selectNodeContents(t),n.removeAllRanges(),n.addRange(e)}}function i(){var e=t(".download-btn");e.length<=0||(e.hide(),t.ajax({method:"GET",url:"https://api.github.com/repos/lektor/lektor/releases",crossDomain:!0}).then(function(t){r(e.toArray(),t)},function(){e.show()}))}function o(t){var e=null,n=null;if(navigator.platform.match(/^mac/i)&&(e=/\.dmg$/,n="For OSX 10.9 and later."),null!=e)for(var i=0;i').appendTo(e),o=t("a",e);s?(o.attr("href",s.url),n.append(t("").text(s.note+" ")),n.append(t("Other platforms").attr("href",r))):o.attr("href",r),o.append(t('').text(i)),t(e).fadeIn("slow")})}function s(){var n=t(".install-row pre");n.length>0&&n.on("dblclick",function(){e(this)})}function a(){var e=t(".google-custom-search");if(0!=e.length){var n="012722186170730423054:utwznhnrrmi",i=document.createElement("script");i.type="text/javascript",i.async=!0,i.src=("https:"==document.location.protocol?"https:":"http:")+"//cse.google.com/cse.js?cx="+n;var o=document.getElementsByTagName("script")[0];o.parentNode.insertBefore(i,o),t('\n \n ').appendTo(e),t('\n
\n
\n
\n
\n \n
\n
\n
\n
\n
\n
\n ').appendTo(e);var r=c.parse(location.search);r.q&&t('input[name="q"]',e).val(r.q)}}function l(){navigator.appVersion.indexOf("Win")>=0&&t(".hide-for-windows").hide()}n(2);var c=n(15);t(function(){i(),s(),a(),l()})}).call(e,n(1))},function(t,e,n){var i,o;/*! * jQuery JavaScript Library v2.1.4 * http://jquery.com/ * diff --git a/assets/static/app.js.map b/assets/static/app.js.map index fa2167a4..91e4df48 100644 --- a/assets/static/app.js.map +++ b/assets/static/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sources":["webpack:///app.js","webpack:///"],"mappings":"AAAA;;;;;;;;;;;;;ACwLA;;;;;;;;;;AAqiBA;AAqpHA;AAkgIA;AAg3EA","sourceRoot":""} \ No newline at end of file +{"version":3,"file":"app.js","sources":["webpack:///app.js","webpack:///"],"mappings":"AAAA;;;;;;;;;;;;;AC+LA;;;;;;;;;;AAqiBA;AAqpHA;AAkgIA;AAg3EA","sourceRoot":""} \ No newline at end of file diff --git a/content/contents.lr b/content/contents.lr index 5e1b5121..73787c15 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -40,7 +40,7 @@ contents: -
+ 
curl -sf https://www.getlektor.com/install.sh | sh
diff --git a/content/docs/installation/contents.lr b/content/docs/installation/contents.lr index f92937b2..cc9787f6 100644 --- a/content/docs/installation/contents.lr +++ b/content/docs/installation/contents.lr @@ -32,15 +32,19 @@ You need to make sure you have the following software installed on your computer * Python 2.7 (**not** Python 3.x) * ImageMagick (`brew install imagemagick` or `apt-get install imagemagick` - can get you this on OS X and Ubuntu respectively, on Windows do `choco install imagemagick`, which requires [chocolatey :ext](https://chocolatey.org/), or download from [here :ext](http://www.imagemagick.org)) + can get you this on OS X and Ubuntu respectively, on Windows do `choco + install imagemagick`, which requires [chocolatey :ext](https://chocolatey.org/), + or [download from here :ext](http://www.imagemagick.org)). -Once you have that installed and made sure that they are on your `PATH` you can get Lektor installed with our -installation script: +Once you have that installed and made sure that they are on your `PATH` you can +get Lektor installed with our installation script: ``` $ curl -sf https://www.getlektor.com/install.sh | sh ``` + For Windows you can use the `command prompt`: + ``` C:\> @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://getlektor.com/install.ps1'))" && SET PATH=%PATH%;%LocalAppData%\lektor-cli ``` diff --git a/content/downloads/contents.lr b/content/downloads/contents.lr index 89166f4f..973436e8 100644 --- a/content/downloads/contents.lr +++ b/content/downloads/contents.lr @@ -22,32 +22,31 @@ are equally well supported. ## Command Line Interface If you are on Linux or Mac you can install the command line version of -Lektor by copy/pasting a command into your terminal: +Lektor by copy/pasting a command into your terminal. + +### Mac/Linux + +This will install Lektor for you but you might have to run it with `sudo` if +your current user does not have rights to write into `/usr/local`. ``` curl -sf https://www.getlektor.com/install.sh | sh ``` + +### Windows + If you are on Windows copy/paste this command into the `command prompt`: + ``` @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://getlektor.com/install.ps1'))" && SET PATH=%PATH%;%LocalAppData%\lektor-cli ``` + alternatively use this command in your `Powershell`: + ``` iex ((new-object net.webclient).DownloadString('https://getlektor.com/install.ps1')) ``` -The command line application is written in Python and the current releases -can be found on PyPI: [pypi/Lektor](http://pypi.python.org/pypi/Lektor). - -If you know Python, you can also pip install it: - -``` -pip install Lektor -``` - -This will install Lektor for you. You might have to run it with `sudo` if -your current user does not have rights to write into `/usr/local`. - ## Desktop Application If you are on OS X you are in luck because you can use an installable diff --git a/webpack/js/app.js b/webpack/js/app.js index 66c9185e..8cb5aca9 100644 --- a/webpack/js/app.js +++ b/webpack/js/app.js @@ -136,8 +136,15 @@ function initGoogleSearch() { } } +function hideThingsForWindows() { + if (navigator.appVersion.indexOf('Win') >= 0) { + $('.hide-for-windows').hide(); + } +} + $(function() { initDownloadButton(); initInstallRow(); initGoogleSearch(); + hideThingsForWindows(); });