diff options
author | Amandeep Singh <35252877+adsingh14@users.noreply.github.com> | 2021-12-20 21:02:31 +0300 |
---|---|---|
committer | Amandeep Singh <35252877+adsingh14@users.noreply.github.com> | 2022-01-03 21:37:07 +0300 |
commit | d52a4be8ebe696b29ac5876c33ecb09c65bc4a19 (patch) | |
tree | 7cf3b6a42dd630a88e4d31bafb887667d951839f | |
parent | 02815ce0733286ce8b99c13b1c7bac136339dbbb (diff) |
Remove windows-setup auto download functionality
-rw-r--r-- | app/assets/javascripts/application.js | 18 | ||||
-rw-r--r-- | app/assets/stylesheets/downloads.scss | 23 | ||||
-rw-r--r-- | app/views/downloads/download_windows.html.erb | 61 |
3 files changed, 28 insertions, 74 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 83efe38a..52d43f46 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -238,24 +238,6 @@ var Downloads = { Downloads.observeGUIOSFilter(); Downloads.observePopState(); Downloads.filterGUIS(); - Downloads.triggerAutoDownload(); - }, - - triggerAutoDownload: function() { - var ref = document.referrer; - var src = $('#auto-download-link').attr('href'); - - if (this.shouldAutoDownload(ref, src)) { - $('.downloading .hide').show(); - document.location = src; - } - }, - - shouldAutoDownload: function(ref, src) { - if (!ref || !src) { - return false; - } - return ref.indexOf(document.location.origin) === 0; }, getOSFilter: function() { diff --git a/app/assets/stylesheets/downloads.scss b/app/assets/stylesheets/downloads.scss index d2f3e134..11dd4e22 100644 --- a/app/assets/stylesheets/downloads.scss +++ b/app/assets/stylesheets/downloads.scss @@ -38,29 +38,6 @@ } } -.callout.downloading { - background: $callout-color url("/images/icons/download.png") 24px 24px no-repeat; - padding: 20px 30px 20px 100px !important; - - h3 { - font-size: 18px; - color: $orange; - } - - p { - margin-bottom: 15px !important; - font-size: 15px; - line-height: 1.3em; - } - - p.small { - margin-bottom: 0 !important; - font-size: 12px; - line-height: 1.4; - color: $light-font-color; - } -} - #download-next-steps { @include clearfix; @extend .unstyled !optional; diff --git a/app/views/downloads/download_windows.html.erb b/app/views/downloads/download_windows.html.erb index 3d2232e4..39b5d69f 100644 --- a/app/views/downloads/download_windows.html.erb +++ b/app/views/downloads/download_windows.html.erb @@ -7,39 +7,34 @@ <% end %> <div id="main"> - <h1>Downloading Git</h1> - <div class="callout downloading"> - <h3 class="hide">Your download is starting...</h3> - <p> - <%= raw "You are downloading the latest (<strong>#{@download.version.name}</strong>) <strong>#{@bitness}</strong> version of <strong>Git for Windows</strong>. This is the most recent <a href='#{@project_url}'>maintained build</a>. It was released <strong>#{time_ago_in_words @download.release_date} ago</strong>, on #{@download.release_date.strftime("%Y-%m-%d")}." %> - </p> - <p> - <%= raw "<strong><a id=\"auto-download-link\" href=\"#{@download.url}\">Click here to download manually</a><span class=\"hide\">, if your download hasn't started.</span></strong>" %> - </p> - <h3>Other Git for Windows downloads</h3> - <h4>Executable Setup</h4> - <p> - <%= raw "<strong><a href=\"#{@download32.url}\">32-bit Git for Windows Setup</a>.</strong>" %> - </p> - <p> - <%= raw "<strong><a href=\"#{@download64.url}\">64-bit Git for Windows Setup</a>.</strong>" %> - </p> - <h4>Portable ("thumbdrive edition")</h4> - <p> - <%= raw "<strong><a href=\"#{@download32portable.url}\">32-bit Git for Windows Portable</a>.</strong>" %> - </p> - <p> - <%= raw "<strong><a href=\"#{@download64portable.url}\">64-bit Git for Windows Portable</a>.</strong>" %> - </p> - <h4>Using winget tool</h4> - <p> - Install <a href="https://docs.microsoft.com/en-us/windows/package-manager/winget">winget tool</a> if you don't already have it, then type this command in command prompt or Powershell.<br> - <code>winget install --id Git.Git -e --source winget</code> - </p> - <p class="small"> - <%= raw "The current source code release is version <strong>#{@latest.name}</strong>. If you want the newer version, you can build it from <a href=\"#{@source_url}\">the source code</a>." %> - </p> - </div> + <h1>Download for Windows</h1> + <p> + <%= raw "<strong><a id=\"auto-download-link\" href=\"#{@download.url}\">Click here to download </a></strong>" %><%= raw " the latest (<strong>#{@download.version.name}</strong>) <strong>#{@bitness}</strong> version of <strong>Git for Windows</strong>. This is the most recent <a href='#{@project_url}'>maintained build</a>. It was released <strong>#{time_ago_in_words @download.release_date} ago</strong>, on #{@download.release_date.strftime("%Y-%m-%d")}." %> + </p> + <h3>Other Git for Windows downloads</h3> + <h4>Standalone Installer</h4> + <p> + <%= raw "<strong><a href=\"#{@download32.url}\">32-bit Git for Windows Setup</a>.</strong>" %> + </p> + <p> + <%= raw "<strong><a href=\"#{@download64.url}\">64-bit Git for Windows Setup</a>.</strong>" %> + </p> + <h4>Portable ("thumbdrive edition")</h4> + <p> + <%= raw "<strong><a href=\"#{@download32portable.url}\">32-bit Git for Windows Portable</a>.</strong>" %> + </p> + <p> + <%= raw "<strong><a href=\"#{@download64portable.url}\">64-bit Git for Windows Portable</a>.</strong>" %> + </p> + <h4>Using winget tool</h4> + <p> + Install <a href="https://docs.microsoft.com/en-us/windows/package-manager/winget">winget tool</a> if you don't already have it, then type this command in command prompt or Powershell.<br> + <code>winget install --id Git.Git -e --source winget</code> + </p> + <p class="small"> + <%= raw "The current source code release is version <strong>#{@latest.name}</strong>. If you want the newer version, you can build it from <a href=\"#{@source_url}\">the source code</a>." %> + </p> + <h2>Now What?</h2> <p> Now that you have downloaded Git, it's time to start using it. |