Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce LAMP in the browser #42

Merged
merged 3 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion download_builder.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class DownloadBuilder < Middleman::Extension
option :source, "./downloads.yml", "Source manifest (.yml)"

DISPLAY_ORDER = %w[windows linux apple appleVM]
DISPLAY_ORDER = %w[windows browsers linux apple appleVM]
FRIENDLY_NAMES = {
"apple" => "OS X",
"appleVM" => "OS X (VM)",
Expand Down
14 changes: 14 additions & 0 deletions downloads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,17 @@ apple:
checksum_sha256: eb9888f2e3b131ae9a5fbec063a6b642a7285e065a8e5f5e97c699b71e2d7ac5
size: 150 Mb
url: https://sourceforge.net/projects/xampp/files/XAMPP%20Mac%20OS%20X/8.2.4/xampp-osx-8.2.4-0-installer.dmg
browsers:
- version: 8.3.12
php_version: 8.3.12
whats_included: Alpine Linux 3.20, Apache 2.4.62, MariaDB 10.11-8, PHP 8.3.12 & PEAR + multibyte (mbstring) support,
Perl 5.38.2, phpMyAdmin 5.2.1
requirements: 'Tested on Desktop versions of Chrome and derivatives'
downloads:
x64:
checksum_md5: Not required
checksum_sha1: Not required
checksum_sha256: Not required
size: '-'
browser_app: true
url: https://endor.dev/s/lamp
3 changes: 3 additions & 0 deletions en.po
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ msgstr ""
#: en.download.whats_included
msgid "What's Included?"
msgstr ""
#: en.download.run_in_browser
msgid "Run in the browser"
msgstr "Run in the browser"
#: en.download.requirements.title
msgid "Requirements"
msgstr ""
Expand Down
6 changes: 5 additions & 1 deletion locales/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ msgstr ""
msgid "What's Included?"
msgstr "What's Included?"

#: en.download.run_in_browser
msgid "Run in the browser"
msgstr "Run in the browser"

#: en.download.requirements.title
msgid "Requirements"
msgstr "Requirements"
Expand Down Expand Up @@ -2142,4 +2146,4 @@ msgid "This is most often a symptom of the VM running on a computer with an Appl
msgstr "This is most often a symptom of the VM running on a computer with an Apple M1 (arm64) CPU. The VM components do not support the M1 CPU (as of September 2022). You can only use the VM on computers with intel (x64) CPUs. On computers with the M1 CPU, please use the XAMPP native installers instead."

msgid ""
msgstr ""
msgstr ""
4 changes: 4 additions & 0 deletions locales/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ msgstr ""
msgid "What's Included?"
msgstr "¿Qué está incluido?."

#: en.download.run_in_browser
msgid "Run in the browser"
msgstr "Abrir en el navegador"

#: en.download.requirements.title
msgid "Requirements"
msgstr "Requisitos"
Expand Down
Binary file added source-common/images/browsers-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion source/localizable/download.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ keywords: xampp, apache, php, perl, mysql, windows, linux, osx
</ul>
</td>
<td class="text-right">
<%= download_link_to "#{t('Download')} (#{bits[1..-1]} bit)", download["url"], :class => "button" %>
<% if download["browser_app"] == true %>
<%= link_to t('Run in the browser'), download["url"], :class => "button", :target => "_blank" %>
<% else %>
<%= download_link_to "#{t('Download')} (#{bits[1..-1]} bit)", download["url"], :class => "button" %>
<% end %>
</td>
<td class="show-for-medium-up"><%= download["size"] %></td>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion source/localizable/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ keywords: xampp, apache, php, perl, mysql, open source distribution
</div>
</div>
<% downloads.each do |os, downloads| %>
<% if os != 'appleVM' %>
<% if os != 'appleVM' && os != 'browsers' %>
<div class="large-3 columns">
<%
last_main_version = downloads.last
Expand Down
Loading