diff --git a/.gitignore b/.gitignore index 5a68293b8..956b86d9c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ diff.diff .*.sw* .DS_Store .idea +.directory # Bundler config /.bundle @@ -21,6 +22,7 @@ public/assets public/developer public/developer.html public/developer2 +public/images public/index.html public/package diff --git a/.gitmodules b/.gitmodules index 3843fad07..47065d90e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "public/themes"] - path = public/themes - url = git://github.com/openSUSE/opensuse-themes.git +[submodule "public/chameleon"] + path = public/chameleon + url = https://github.com/openSUSE/opensuse-theme-chameleon.git diff --git a/app/assets/images/default-screenshots/devel-package.png b/app/assets/images/default-screenshots/devel-package.png new file mode 100644 index 000000000..f103ec620 Binary files /dev/null and b/app/assets/images/default-screenshots/devel-package.png differ diff --git a/app/assets/images/default-screenshots/devel-package.svg b/app/assets/images/default-screenshots/devel-package.svg new file mode 100644 index 000000000..d682eb133 --- /dev/null +++ b/app/assets/images/default-screenshots/devel-package.svg @@ -0,0 +1,119 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/default-screenshots/doc-package.png b/app/assets/images/default-screenshots/doc-package.png new file mode 100644 index 000000000..eed1c7333 Binary files /dev/null and b/app/assets/images/default-screenshots/doc-package.png differ diff --git a/app/assets/images/default-screenshots/doc-package.svg b/app/assets/images/default-screenshots/doc-package.svg new file mode 100644 index 000000000..6764ea686 --- /dev/null +++ b/app/assets/images/default-screenshots/doc-package.svg @@ -0,0 +1,163 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/default-screenshots/file_settings.png b/app/assets/images/default-screenshots/file_settings.png deleted file mode 100644 index 932e483e4..000000000 Binary files a/app/assets/images/default-screenshots/file_settings.png and /dev/null differ diff --git a/app/assets/images/default-screenshots/files.png b/app/assets/images/default-screenshots/files.png deleted file mode 100644 index e93cb3c24..000000000 Binary files a/app/assets/images/default-screenshots/files.png and /dev/null differ diff --git a/app/assets/images/default-screenshots/kernel-package.png b/app/assets/images/default-screenshots/kernel-package.png new file mode 100644 index 000000000..9e020bfed Binary files /dev/null and b/app/assets/images/default-screenshots/kernel-package.png differ diff --git a/app/assets/images/default-screenshots/kernel-package.svg b/app/assets/images/default-screenshots/kernel-package.svg new file mode 100644 index 000000000..4453f5e2a --- /dev/null +++ b/app/assets/images/default-screenshots/kernel-package.svg @@ -0,0 +1,76 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/app/assets/images/default-screenshots/lang-package.png b/app/assets/images/default-screenshots/lang-package.png new file mode 100644 index 000000000..04cea20d2 Binary files /dev/null and b/app/assets/images/default-screenshots/lang-package.png differ diff --git a/app/assets/images/default-screenshots/lang-package.svg b/app/assets/images/default-screenshots/lang-package.svg new file mode 100644 index 000000000..7e130617c --- /dev/null +++ b/app/assets/images/default-screenshots/lang-package.svg @@ -0,0 +1,133 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/default-screenshots/no_screenshot_opensuse.png b/app/assets/images/default-screenshots/no_screenshot_opensuse.png deleted file mode 100644 index a57a9c51d..000000000 Binary files a/app/assets/images/default-screenshots/no_screenshot_opensuse.png and /dev/null differ diff --git a/app/assets/images/default-screenshots/no_screenshot_opensuse_big.png b/app/assets/images/default-screenshots/no_screenshot_opensuse_big.png deleted file mode 100644 index fb0e5a5cc..000000000 Binary files a/app/assets/images/default-screenshots/no_screenshot_opensuse_big.png and /dev/null differ diff --git a/app/assets/images/default-screenshots/openstack-package.png b/app/assets/images/default-screenshots/openstack-package.png new file mode 100644 index 000000000..7c7ecc39d Binary files /dev/null and b/app/assets/images/default-screenshots/openstack-package.png differ diff --git a/app/assets/images/default-screenshots/openstack-package.svg b/app/assets/images/default-screenshots/openstack-package.svg new file mode 100644 index 000000000..c3fcf3a91 --- /dev/null +++ b/app/assets/images/default-screenshots/openstack-package.svg @@ -0,0 +1,76 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/app/assets/images/default-screenshots/openstack.png b/app/assets/images/default-screenshots/openstack.png deleted file mode 100644 index 1dbb5f42e..000000000 Binary files a/app/assets/images/default-screenshots/openstack.png and /dev/null differ diff --git a/app/assets/images/default-screenshots/package.png b/app/assets/images/default-screenshots/package.png new file mode 100644 index 000000000..f89812e0b Binary files /dev/null and b/app/assets/images/default-screenshots/package.png differ diff --git a/app/assets/images/default-screenshots/package.svg b/app/assets/images/default-screenshots/package.svg new file mode 100644 index 000000000..909089b00 --- /dev/null +++ b/app/assets/images/default-screenshots/package.svg @@ -0,0 +1,73 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/app/assets/images/default-screenshots/perl-package.png b/app/assets/images/default-screenshots/perl-package.png new file mode 100644 index 000000000..09855b2b0 Binary files /dev/null and b/app/assets/images/default-screenshots/perl-package.png differ diff --git a/app/assets/images/default-screenshots/perl-package.svg b/app/assets/images/default-screenshots/perl-package.svg new file mode 100644 index 000000000..0727b920f --- /dev/null +++ b/app/assets/images/default-screenshots/perl-package.svg @@ -0,0 +1,76 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/app/assets/images/default-screenshots/perl.gif b/app/assets/images/default-screenshots/perl.gif deleted file mode 100644 index 0288540d2..000000000 Binary files a/app/assets/images/default-screenshots/perl.gif and /dev/null differ diff --git a/app/assets/images/default-screenshots/perl.png b/app/assets/images/default-screenshots/perl.png deleted file mode 100644 index ee3bc81dc..000000000 Binary files a/app/assets/images/default-screenshots/perl.png and /dev/null differ diff --git a/app/assets/images/default-screenshots/python-package.png b/app/assets/images/default-screenshots/python-package.png new file mode 100644 index 000000000..c028bc91b Binary files /dev/null and b/app/assets/images/default-screenshots/python-package.png differ diff --git a/app/assets/images/default-screenshots/python-package.svg b/app/assets/images/default-screenshots/python-package.svg new file mode 100644 index 000000000..1fd7194e6 --- /dev/null +++ b/app/assets/images/default-screenshots/python-package.svg @@ -0,0 +1,76 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/app/assets/images/default-screenshots/python.png b/app/assets/images/default-screenshots/python.png deleted file mode 100644 index dffcbc7f6..000000000 Binary files a/app/assets/images/default-screenshots/python.png and /dev/null differ diff --git a/app/assets/images/default-screenshots/ruby-package.png b/app/assets/images/default-screenshots/ruby-package.png new file mode 100644 index 000000000..0647ca60a Binary files /dev/null and b/app/assets/images/default-screenshots/ruby-package.png differ diff --git a/app/assets/images/default-screenshots/ruby-package.svg b/app/assets/images/default-screenshots/ruby-package.svg new file mode 100644 index 000000000..159a0b6f4 --- /dev/null +++ b/app/assets/images/default-screenshots/ruby-package.svg @@ -0,0 +1,77 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/app/assets/images/default-screenshots/rubygem.png b/app/assets/images/default-screenshots/rubygem.png deleted file mode 100644 index 8ea9390c0..000000000 Binary files a/app/assets/images/default-screenshots/rubygem.png and /dev/null differ diff --git a/app/assets/images/default-screenshots/tux.png b/app/assets/images/default-screenshots/tux.png deleted file mode 100644 index c762ab792..000000000 Binary files a/app/assets/images/default-screenshots/tux.png and /dev/null differ diff --git a/app/assets/images/distributions/leap.svg b/app/assets/images/distributions/leap.svg new file mode 100644 index 000000000..9581dc1cc --- /dev/null +++ b/app/assets/images/distributions/leap.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/app/assets/images/distributions/testing.svg b/app/assets/images/distributions/testing.svg new file mode 100644 index 000000000..0a11f074e --- /dev/null +++ b/app/assets/images/distributions/testing.svg @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/app/assets/images/distributions/tumbleweed.svg b/app/assets/images/distributions/tumbleweed.svg new file mode 100644 index 000000000..e42561a11 --- /dev/null +++ b/app/assets/images/distributions/tumbleweed.svg @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/app/assets/stylesheets/app.scss b/app/assets/stylesheets/app.scss new file mode 100644 index 000000000..c9e11a191 --- /dev/null +++ b/app/assets/stylesheets/app.scss @@ -0,0 +1,26 @@ +// New theme +.package-card { + .card-img-top { + height: 250px; + background-size: cover; + background-position: center; + background-repeat: no-repeat; + } + + // Only one line text + .card-title { + height: 1.1em; + white-space: nowrap; + overflow: hidden; + + mark { + padding: 0; + } + } + + // Only two line text + .card-text { + height: 3em; + overflow: hidden; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index 881564d00..062cb4d59 100644 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -623,4 +623,3 @@ select { .global-navigation-menu li span.global-navigation-icon { background-image:url('//static.opensuse.org/themes/bento/images/globalnav/globalnav-im.png'); } - diff --git a/app/controllers/distributions_controller.rb b/app/controllers/distributions_controller.rb index 74acabc1e..507506b15 100644 --- a/app/controllers/distributions_controller.rb +++ b/app/controllers/distributions_controller.rb @@ -3,36 +3,21 @@ class DistributionsController < ApplicationController # GET /distributions def index - render layout: 'jekyll' + render layout: 'download' end # GET /distributions/leap def leap - render layout: 'jekyll' - end - - # GET /distributions/leap/ports - def leap_ports - render layout: 'jekyll' + render layout: 'download' end # GET /distributions/tumbleweed def tumbleweed - render layout: 'jekyll' - end - - # GET /distributions/tumbleweed/ports - def tumbleweed_ports - render layout: 'jekyll' - end - - # GET /distributions/tumbleweed/unsupported - def tumbleweed_unsupported - render layout: 'jekyll' + render layout: 'download' end # GET /distributions/testing def testing - render layout: 'jekyll' + render layout: 'download' end end diff --git a/app/models/screenshot.rb b/app/models/screenshot.rb index 1e8bb2ed3..18cad671f 100644 --- a/app/models/screenshot.rb +++ b/app/models/screenshot.rb @@ -3,7 +3,7 @@ # Class to cache and resize the screenshot of a given package class Screenshot - THUMBNAIL_WIDTH = "160" + THUMBNAIL_WIDTH = "600" # @return [String] name of the package attr_reader :pkg_name @@ -30,7 +30,7 @@ def thumbnail_path(fetch: true) if cached? thumbnail_file_path(fullpath: false) elsif source_url.nil? - default_file_path(:thumbnail, fullpath: false) + default_file_path(fullpath: false) elsif fetch begin self.fetch @@ -43,7 +43,7 @@ def thumbnail_path(fetch: true) rescue Exception => e raise unless Rails.env.production? Rails.logger.debug("No screenshot fetched for: " + pkg_name) - default_file_path(:thumbnail, fullpath: false) + default_file_path(fullpath: false) end else nil @@ -60,7 +60,7 @@ def blob(type = :screenshot) if cached? cached_blob(type) elsif source_url.nil? - default_blob(type) + default_blob else begin fetch @@ -73,7 +73,7 @@ def blob(type = :screenshot) rescue Exception => e raise unless Rails.env.production? Rails.logger.debug("No screenshot fetched (blob) for: " + pkg_name) - default_blob(type) + default_blob end end end @@ -92,8 +92,8 @@ def cached_blob(type) end end - def default_blob(type) - open(default_file_path(type), "rb", &:read) + def default_blob + open(default_file_path, "rb", &:read) end def cache_key @@ -127,40 +127,50 @@ def thumbnail_file_path(fullpath: true) fullpath ? File.join(Rails.root, "public", "images", file) : file end - def default_file_path(type, fullpath: true) + def default_file_path(fullpath: true) file = case pkg_name when /-devel$/ - "file_settings.png" + "devel-package.svg" when /-devel-/ - "file_settings.png" - when /-lang$/ - "file_settings.png" + "devel-package.svg" when /-debug$/ - "file_settings.png" + "devel-package.svg" + when /-lang$/ + "lang-package.svg" + when /-l10n-/ + "lang-package.svg" + when /-i18n-/ + "lang-package.svg" + when /-translations/ + "lang-package.svg" when /-doc$/ - "files.png" + "doc-package.svg" when /-help-/ - "files.png" + "doc-package.svg" when /-javadoc$/ - "files.png" + "doc-package.svg" when /-debuginfo/ - "file_settings.png" + "devel-package.svg" when /-debugsource/ - "file_settings.png" + "devel-package.svg" when /-kmp-/ - "file_settings.png" + "devel-package.svg" when /^rubygem-/ - "rubygem.png" + "ruby-package.svg" when /^perl-/ - "perl.png" + "perl-package.svg" when /^python-/ - "python.png" + "python-package.svg" + when /^python2-/ + "python-package.svg" + when /^python3-/ + "python-package.svg" when /^kernel-/ - "tux.png" + "kernel-package.svg" when /^openstack-/i - "openstack.png" + "openstack-package.svg" else - type == :thumbnail ? "no_screenshot_opensuse.png" : "no_screenshot_opensuse_big.png" + "package.svg" end if fullpath File.join(Rails.root, "app/assets/images/default-screenshots", file) diff --git a/app/views/distributions/_unsupported_live_media.html.erb b/app/views/distributions/_unsupported_live_media.html.erb deleted file mode 100644 index ef5440302..000000000 --- a/app/views/distributions/_unsupported_live_media.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -

- <%= _('Unsupported LiveUSBs') %> -

-

- <%= _('openSUSE Tumbleweed also offers a number of unsupported LiveUSBs. These -cannot be used for Installation or Upgrade. They are not an accurate -reflection as to whether or not Tumbleweed will run on your hardware.') %> -
- <%= link_to _('Get Unsupported Tumbleweed LiveCDs.'), tumbleweed_unsupported_distributions_path %> -

diff --git a/app/views/distributions/index.html.erb b/app/views/distributions/index.html.erb index 7629ae049..1a5277cbe 100644 --- a/app/views/distributions/index.html.erb +++ b/app/views/distributions/index.html.erb @@ -1,132 +1,96 @@ -
-
-
-
-
-
-

<%= _('Get openSUSE') %>

-
- - <%= _('openSUSE is completely free to download, use and share.') %> - -
-
-
+
+
+
+

<%= _('Get openSUSE') %>

+

+ <%= _('openSUSE is completely free to download, use and share.') %> +

-
-
-
- - - - - - - - - - - - - -
- <%= link_to(tumbleweed_distributions_path) do %> - <%= image_tag('jekyll/Tumbleweed-green.png', alt: "Tumbleweed Logo") %> - <% end %> - <%= link_to 'Tumbleweed', tumbleweed_distributions_path %> - - <%= link_to(leap_distributions_path) do %> - <%= image_tag('jekyll/Leap-green.png', alt: "Leap Logo") %> - <% end %> - <%= link_to 'Leap', leap_distributions_path %> -
- <%= _('Download openSUSE’s rolling release and always run the latest packages provided by the openSUSE Project.') %> - - <%= _('Download openSUSE’s regular release and enjoy the benefits of both enterprise-grade engineering and community-developed innovation.') %> -
- -
- - - - - - - - - - - - -
- <%= link_to 'Testing', testing_distributions_path %> -
- <%= _('Help test openSUSE’s next version of Leap by downloading - the latest development milestone.') %> -
- -
- -

- <%= _('Choosing which Distribution to Download') %> -

-

- <%= _('%{tumbleweed} is a rolling-release. This means the software is always the latest stable versions available from the openSUSE Project. Things will change regularly as Free and Open Source projects continually release new versions of their software.') % { tumbleweed: link_to(_('openSUSE Tumbleweed'), tumbleweed_distributions_path) } %> -
- <%= _('Tumbleweed is recommended for Developers, openSUSE Contributors, and Linux/FOSS Enthusiasts.') %> -

- -

- <%= _('%{leap} is a regular-release. This means it releases %{annually}, with security and stability updates being the priority during each release %{lifetime}.') % - { leap: link_to(_('openSUSE Leap'), leap_distributions_path), - annually: link_to(_('annually'), _('https://en.opensuse.org/openSUSE:Roadmap')), - lifetime: link_to(_('lifetime'), _("https://en.opensuse.org/Lifetime")) - } %> - <%= _('It is not expected to change in any significant way until its next annual release.') %> -
- <%= _('Leap shares a Common Base System with %{sles}, so major architectural changes are not expected for several years, aligned with each new Major Release (eg 12, 13, etc) of SUSE Linux Enterprise.') % { - sles: link_to(_('SUSE Linux Enterprise'), "https://www.suse.com/products/server/") - } %> -
- <%= _('Leap is recommended for Sysadmins, Enterprise Developers, and ‘Regular’ Desktop Users.') %> -

+
+
+
+ <%= image_tag 'distributions/tumbleweed.svg', alt: "Tumbleweed Logo", class: "card-img-top" %> +
+

openSUSE Tumbleweed

+

<%= _('Download openSUSE’s rolling release and always run the latest packages provided by the openSUSE Project.') %>

+
+
+ <%= link_to _('Download'), tumbleweed_distributions_path, class: 'btn btn-primary' %> +
+
+
+ <%= image_tag 'distributions/leap.svg', alt: "Leap Logo", class: "card-img-top" %> +
+

openSUSE Leap

+

<%= _('Download openSUSE’s regular release and enjoy the benefits of both enterprise-grade engineering and community-developed innovation.') %>

+
+
+ <%= link_to _('Download'), leap_distributions_path, class: 'btn btn-primary' %> +
+
+
+ <%= image_tag 'distributions/testing.svg', alt: "Testing Logo", class: "card-img-top" %> +
+

openSUSE Testing

+

<%= _('Help test openSUSE’s next version of Leap by downloading the latest development milestone.') %>

+
+
+ <%= link_to _('Download'), testing_distributions_path, class: 'btn btn-primary' %> +
+
+
+
-

- <%= _('Both distributions are well tested by openQA as well as by human openSUSE contributors so both can be relied upon to work.') %> -
- <%= _('Both distributions are fully capable of being used on a Desktop PC, laptop, server, or in the cloud.') %> -

+
+
+

+ <%= _('Choosing which Distribution to Download') %> +

-

- - <%= _('If you are still not sure, download %{leap}') % { leap: link_to(_('openSUSE Leap'), leap_distributions_path) } %> - -
- <%= _('It is easy to switch to openSUSE Tumbleweed if you change your mind later.') %> -

+
+
+

+ <%= _('%{tumbleweed} is a rolling-release. This means the software is always the latest stable versions available from the openSUSE Project. Things will change regularly as Free and Open Source projects continually release new versions of their software.') % { tumbleweed: link_to(_('openSUSE Tumbleweed'), tumbleweed_distributions_path) } %> +

+

+ <%= _('Tumbleweed is recommended for Developers, openSUSE Contributors, and Linux/FOSS Enthusiasts.') %> +

+
+
+

+ <%= _('%{leap} is a regular-release. This means it releases %{annually}, with security and stability updates being the priority during each release %{lifetime}.') % + { leap: link_to(_('openSUSE Leap'), leap_distributions_path), + annually: link_to(_('annually'), _('https://en.opensuse.org/openSUSE:Roadmap')), + lifetime: link_to(_('lifetime'), _("https://en.opensuse.org/Lifetime")) + } %> + <%= _('It is not expected to change in any significant way until its next annual release.') %> + <%= _('Leap shares a Common Base System with %{sles}, so major architectural changes are not expected for several years, aligned with each new Major Release (eg 12, 13, etc) of SUSE Linux Enterprise.') % { + sles: link_to(_('SUSE Linux Enterprise'), "https://www.suse.com/products/server/") + } %> +

+

+ <%= _('Leap is recommended for Sysadmins, Enterprise Developers, and ‘Regular’ Desktop Users.') %> +

+
+
-
+

+ <%= _('Both distributions are well tested by openQA as well as by human openSUSE contributors so both can be relied upon to work.') %> +

+

+ <%= _('Both distributions are fully capable of being used on a Desktop PC, laptop, server, or in the cloud.') %> +

- - - - - - - - - - - -
- <%= _('Derivatives') %> -
- <%= _('openSUSE has a number of unofficial derivative distributions. -These are made by our awesome community, often for special purposes.') %> -
-
-
-
+

+ + <%= _('If you are still not sure, download %{leap}') % { leap: link_to('openSUSE Leap', leap_distributions_path) } %> + +

+

+ <%= _('It is easy to switch to openSUSE Tumbleweed if you change your mind later.') %> +

+
+ diff --git a/app/views/distributions/leap.html.erb b/app/views/distributions/leap.html.erb index ef5e719c8..924a447c0 100644 --- a/app/views/distributions/leap.html.erb +++ b/app/views/distributions/leap.html.erb @@ -1,94 +1,170 @@ -
-
-
-
-
-
-

Leap

-
- - <%= _('Download the latest version of openSUSE Leap, for desktop PCs, laptops, and servers.') %> - -
-
-
+<% version = '42.3' %> + +
+
+
+ <%= image_tag 'distributions/leap.svg', alt: "Leap Logo" %> +

+ openSUSE Leap <%= version %> +

-
-
-
-

<%= _('Installation Media') %> - Intel 64-bit (x86_64)

- - - - - - - - - - - - - - - - - - - - - - - -
Leap 42.2<%= _('Size') %><%= _('Download Method') %><%= _('Checksum') %>
DVD/USB Stick4.7GB - - <%= _('Direct Link') %> - - | - - BitTorrent - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
Network CD/USB Stick85MB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
-

- <%= _('openSUSE Leap is also available on other architectures, such as AArch64 (aka ARMv8) and PPC64.') %> -
- <%= link_to _('Get openSUSE Leap for other architectures.'), leap_ports_distributions_path %> -

- <%= render "choosing_media" %> - <%= render "leap_switch" %> - <%= render partial: 'documentation', locals: {distro: "Leap"} %> - <%= render "verify_download" %> - <%= render "requirements" %> -
+ +
+
+ + + +
+
+

x86_64

+
+
+
+

+ + <%= _("DVD Image") %> (4.7GB) +

+
<%= _("For DVD and USB stick") %>
+

<%= _("Contains a large collection of software for desktop or server use. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+
+

+ + <%= _("Network Image") %> (85MB) +

+
<%= _("For CD and USB stick") %>
+

<%= _("Downloads the installation system and all packages from online repositories. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+
+ +
+ +
+ <%= _('These ports are not officially supported, and they are not as stable as official distributions.') %> +
+ +

ppc64le (42.2)

+
+
+
+

+ + <%= _("DVD Image") %> (4.7GB) +

+
<%= _("For DVD and USB stick") %>
+

<%= _("Contains a large collection of software for desktop or server use. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+
+

+ + <%= _("Network Image") %> (85MB) +

+
<%= _("For CD and USB stick") %>
+

<%= _("Downloads the installation system and all packages from online repositories. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+ +

aarch64 (42.2)

+
+
+
+

+ + <%= _("DVD Image") %> (4.7GB) +

+
<%= _("For DVD and USB stick") %>
+

<%= _("Contains a large collection of software for desktop or server use. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+
+

+ + <%= _("Network Image") %> (85MB) +

+
<%= _("For CD and USB stick") %>
+

<%= _("Downloads the installation system and all packages from online repositories. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+
+
+
+
+ +
+
+ <%= render "choosing_media" %> +
+
+ +
+
+ <%= render "leap_switch" %> +
+
+ +
+
+ <%= render partial: 'documentation', locals: { distro: "Leap" } %> +
+
+ +
+
+ <%= render "verify_download" %> +
+
+ +
+
+ <%= render "requirements" %>
-
+ diff --git a/app/views/distributions/leap_ports.html.erb b/app/views/distributions/leap_ports.html.erb deleted file mode 100644 index 30e406ede..000000000 --- a/app/views/distributions/leap_ports.html.erb +++ /dev/null @@ -1,137 +0,0 @@ -
-
-
-
-
-
-

Leap Ports

-
- - <%= _('Download alternative architecture versions of openSUSE Leap, for desktop PCs, laptops, and servers.') %> - -
-
-
-
-
-
- -
-
-
-

Installation Media - PowerPC Little Endian (ppc64le)

- - - - - - - - - - - - - - - - - - - - - - - -
Leap 42.2<%= _('Size') %><%= _('Download Method') %><%= _('Checksum') %>
DVD/USB Stick3.8GB - - <%= _('Direct Link') %> - - | - BitTorrent - | - Metalink - | - <%= _('Pick Mirror') %> - - - SHA256 - -
<%= _('Network') %> CD/USB Stick67MB - - <%= _('Direct Link') %> - - | - Metalink - | - <%= _('Pick Mirror') %> - - - SHA256 - -
-

Installation Media - ARMv8 64-bit (aarch64)

- - - - - - - - - - - - - - - - - - - - - - - -
Leap 42.2<%= _('Size') %><%= _('Download Method') %><%= _('Checksum') %>
DVD/USB Stick4.7GB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
<%= _('Network') %> CD/USB Stick85MB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
- <%= render "choosing_media" %> - <%= render "leap_switch" %> - <%= render partial: 'documentation', locals: {distro: "Leap"} %> - <%= render "verify_download" %> - <%= render "requirements" %> -
-
-
diff --git a/app/views/distributions/testing.html.erb b/app/views/distributions/testing.html.erb index 575a52f46..ee3128f39 100644 --- a/app/views/distributions/testing.html.erb +++ b/app/views/distributions/testing.html.erb @@ -1,106 +1,96 @@ -
-
-
-
-
-
-

Test openSUSE

-
- - <%= _('Help test the next version of openSUSE Leap, the - regular-release distribution for desktop PCs, laptops, - and servers.') %> - -
-
-
+<% testing = false %> +<% version = '15' %> + +
+
+
+ <%= image_tag 'distributions/testing.svg', alt: "Tumbleweed Logo" %> +

+ openSUSE Leap <%= version %> Beta +

-
-
-
- -

<%= _('Currently testing %{leap_beta}') % { leap_beta: 'openSUSE Leap 42.3 Beta' } %>

-

- <%= _('This is not a supported release. It is provided to help openSUSE testers find bugs before release.') %> -
- - <%= _('Please report any issues you find in our Bugtracker.') %> - -

-

<%= _('Installation Media') %> - Intel 64-bit (x86_64)

- - - - - - - - - - - - - - - - - - - - - - - -
Leap 42.3<%= _('Size') %><%= _('Download Method') %><%= _('Checksum') %>
DVD/USB Stick4.7GB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
<%= _('Network') %> CD/USB Stick85MB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
+<% if testing %> + +
+
+ +
+ <%= _('Help test the next version of openSUSE Leap, the regular-release distribution for desktop PCs, laptops, and servers.') %> +
+ +

x86_64

+
+
+
+

+ + <%= _("DVD Image") %> (4.7GB) +

+
<%= _("For DVD and USB stick") %>
+

<%= _("Contains a large collection of software for desktop or server use. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+
+

+ + <%= _("Network Image") %> (85MB) +

+
<%= _("For CD and USB stick") %>
+

<%= _("Downloads the installation system and all packages from online repositories. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+
+
+ +
+
<%= render "choosing_media" %> +
+
+ +
+
<%= render "leap_switch" %> - <%= render partial: 'documentation', locals: {distro: "Leap", version: '42.3'} %> +
+
+ +
+
+ <%= render partial: 'documentation', locals: { distro: "Leap" } %> +
+
+ +
+
<%= render "verify_download" %> +
+
+ +
+
<%= render "requirements" %>
-
-
+ + +<% else %> + +
+
+
<%= _("No testing distribution available.") %>
+
+
+ +<% end %> diff --git a/app/views/distributions/tumbleweed.html.erb b/app/views/distributions/tumbleweed.html.erb index 12152d92d..29395b14d 100644 --- a/app/views/distributions/tumbleweed.html.erb +++ b/app/views/distributions/tumbleweed.html.erb @@ -1,94 +1,301 @@ -
-
-
-
-
-
-

Tumbleweed

-
- - <%= _('Download the rolling version of openSUSE, for desktop PCs, -laptops, and servers.') %> - -
-
-
+
+
+
+ <%= image_tag 'distributions/tumbleweed.svg', alt: "Tumbleweed Logo" %> +

+ openSUSE Tumbleweed +

-
-
-
-

<%= _('Installation Media') %> - Intel 64-bit (x86_64)

- - - - - - - - - - - - - - - - - - - - - - - -
Tumbleweed<%= _('Size') %><%= _('Download Method') %><%= _('Checksum') %>
DVD/USB Stick4.7GB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
<%= _('Network') %> CD/USB Stick85MB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
-

- openSUSE Tumbleweed - <%= _('is also available on other architectures, such as Intel 32-bit (aka i586), AArch64 (aka ARMv8) and PPC64.') %> -
- <%= link_to _('Get openSUSE Tumbleweed for other architectures.'), tumbleweed_ports_distributions_path %> -

- <%= render "choosing_media" %> - <%= render "unsupported_live_media" %> - <%= render "tumbleweed_switch" %> - <%= render partial: 'documentation', locals: { distro: "Tumbleweed" } %> - <%= render "verify_download" %> - <%= render "requirements" %> -
+
+
+ + + + +
+
+

x86_64

+
+
+
+

+ + <%= _("DVD Image") %> (4.7GB) +

+
<%= _("For DVD and USB stick") %>
+

<%= _("Contains a large collection of software for desktop or server use. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+
+

+ + <%= _("Network Image") %> (85MB) +

+
<%= _("For CD and USB stick") %>
+

<%= _("Downloads the installation system and all packages from online repositories. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+ +

i586

+
+
+
+

+ + <%= _("DVD Image") %> (4.7GB) +

+
<%= _("For DVD and USB stick") %>
+

<%= _("Contains a large collection of software for desktop or server use. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+
+

+ + <%= _("Network Image") %> (85MB) +

+
<%= _("For CD and USB stick") %>
+

<%= _("Downloads the installation system and all packages from online repositories. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+
+ +
+ +
+ <%= _('These ports are not officially supported, and they are not as stable as official distributions.') %> +
+ +

ppc64le

+
+
+
+

+ + <%= _("DVD Image") %> (4.7GB) +

+
<%= _("For DVD and USB stick") %>
+

<%= _("Contains a large collection of software for desktop or server use. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+
+

+ + <%= _("Network Image") %> (85MB) +

+
<%= _("For CD and USB stick") %>
+

<%= _("Downloads the installation system and all packages from online repositories. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+ +

ppc64

+
+
+
+

+ + <%= _("DVD Image") %> (4.7GB) +

+
<%= _("For DVD and USB stick") %>
+

<%= _("Contains a large collection of software for desktop or server use. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+
+

+ + <%= _("Network Image") %> (85MB) +

+
<%= _("For CD and USB stick") %>
+

<%= _("Downloads the installation system and all packages from online repositories. Suitable for installation or upgrade.") %>

+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Pick Mirror') %> + <%= _('Checksum') %> +
+
+
+
+ +
+ +
+ <%= _('Please Note: These LiveUSBs are not supported') %>
+ <%= _('They cannot be used to install or upgrade Tumbleweed. Please use the %{tumbleweed_media} instead.') % + { tumbleweed_media: link_to(s_('Please Use|Tumbleweed installation media'), tumbleweed_distributions_path) } %> + <%= _('They have a limited package/driver selection, so cannot be considered an accurate reflection as to whether Tumbleweed will work on your hardware or not.') %> + <%= _('They are not tested as thoroughly as the %{tumbleweed_media}.') % + { tumbleweed_media: link_to(s_('Not Tested|Tumbleweed installation media'), tumbleweed_distributions_path) } %> + <%= _('Please review %{openqa}\'s test results if you want an indication whether these LiveUSBs are working as expected.') % { openqa: link_to('openQA', 'https://openqa.opensuse.org/') } %> +
+ +

x86_64

+
+
+
+

+ + GNOME LiveCD (950MB) +

+
<%= _("For DVD and USB stick") %>
+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Checksum') %> +
+
+
+
+

+ + KDE LiveCD (950MB) +

+
<%= _("For DVD and USB stick") %>
+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Checksum') %> +
+
+
+
+

+ + Rescue LiveCD (650MB) +

+
<%= _("For CD and USB stick") %>
+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Checksum') %> +
+
+
+ +

i586

+
+
+
+

+ + GNOME LiveCD (950MB) +

+
<%= _("For DVD and USB stick") %>
+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Checksum') %> +
+
+
+
+

+ + KDE LiveCD (950MB) +

+
<%= _("For DVD and USB stick") %>
+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Checksum') %> +
+
+
+
+

+ + Rescue LiveCD (650MB) +

+
<%= _("For CD and USB stick") %>
+ <%= _('Direct Link') %> + <%= _('Metalink') %> + <%= _('Checksum') %> +
+
+
+
+
+
+ +
+
+ <%= render "choosing_media" %> +
+
+ +
+
+ <%= render "tumbleweed_switch" %> +
+
+ +
+
+ <%= render partial: 'documentation', locals: { distro: "Tumbleweed" } %> +
+
+ +
+
+ <%= render "verify_download" %> +
+
+ +
+
+ <%= render "requirements" %>
-
+ diff --git a/app/views/distributions/tumbleweed_ports.html.erb b/app/views/distributions/tumbleweed_ports.html.erb deleted file mode 100644 index c615bccfb..000000000 --- a/app/views/distributions/tumbleweed_ports.html.erb +++ /dev/null @@ -1,200 +0,0 @@ -
-
-
-
-
-
-

Tumbleweed Ports

-
- - <%= _('Download alternative architectures of the rolling version of openSUSE, for desktop PCs, laptops, and servers.') %> - -
-
-
-
-
-
-
-
-
-

<%= _('Installation Media') %> - Intel 32-bit (i586)

- - - - - - - - - - - - - - - - - - - - - - - -
Tumbleweed<%= _('Size') %><%= _('Download Method') %><%= _('Checksum') %>
DVD/USB Stick4.0GB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
Network CD/USB Stick85MB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
-

<%= _('Installation Media') %> - PowerPC Little Endian (ppc64le)

- - - - - - - - - - - - - - - - - - - - - - - -
Tumbleweed<%= _('Size') %><%= _('Download Method') %><%= _('Checksum') %>
DVD/USB Stick2.9GB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
<%= _('Network') %> CD/USB Stick85MB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
-

<%= _('Installation Media') %> - PowerPC Big Endian (ppc64)

- - - - - - - - - - - - - - - - - - - - - - - -
Tumbleweed<%= _('Size') %><%= _('Download Method') %><%= _('Checksum') %>
DVD/USB Stick2.9GB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
<%= _('Network') %> CD/USB Stick85MB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
- <%= render "choosing_media" %> - <%= render "unsupported_live_media" %> - <%= render "tumbleweed_switch" %> - <%= render partial: "documentation", locals: { distro: 'Tumbleweed' } %> - <%= render "verify_download" %> - <%= render "requirements" %> -
-
-
diff --git a/app/views/distributions/tumbleweed_unsupported.html.erb b/app/views/distributions/tumbleweed_unsupported.html.erb deleted file mode 100644 index 5927d2ed0..000000000 --- a/app/views/distributions/tumbleweed_unsupported.html.erb +++ /dev/null @@ -1,202 +0,0 @@ -
-
-
-
-
-
-

Tumbleweed LiveUSBs

-
- - <%= _('Download the LiveUSBs of the rolling version of openSUSE, for desktop PCs, laptops, and servers.') %> - -
-
-
-
-
-
- -
-
-
-

- <%= _('Please Note: These LiveUSBs are not supported') %> -

-
    -
  • - <%= _('They cannot be used to install or upgrade Tumbleweed. Please use the %{tumbleweed_media} instead.') % - { tumbleweed_media: link_to(s_('Please Use|Tumbleweed installation media'), tumbleweed_distributions_path) } %> -
    • -
  • - <%= _('They have a limited package/driver selection, so cannot be considered -an accurate reflection as to whether Tumbleweed will work on your hardware or not.') %> -
    • -
  • - <%= _('They are not tested as thoroughly as the %{tumbleweed_media}.') % - { tumbleweed_media: link_to(s_('Not Tested|Tumbleweed installation media'), tumbleweed_distributions_path) } %> - <%= _('Please review %{openqa}\'s test results if you want an indication whether these LiveUSBs are working as expected.') % { openqa: link_to('openQA', 'https://openqa.opensuse.org/') } %> -
    • -
-

<%= _('LiveUSB Media') %> - Intel 64-bit (x86_64)

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Tumbleweed<%= _('Size') %><%= _('Download Method') %><%= _('Checksum') %>
GNOME950MB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
KDE950MB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
Rescue650MB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
-

<%= _('LiveUSB Media') %> - Intel 32-bit (i686)

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Tumbleweed<%= _('Size') %><%= _('Download Method') %><%= _('Checksum') %>
GNOME950MB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
KDE950MB - - <%= _('Direct Link') %> - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
Rescue650MB - - <%= _('Direct Link') %> - - | - - Metalink - - | - - <%= _('Pick Mirror') %> - - - - SHA256 - -
- <%= render partial: "documentation", locals: { distro: 'Tumbleweed' } %> - <%= render "verify_download" %> - <%= render "requirements" %> -
-
-
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index f7dd9a0b5..edbd109a7 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,107 +1,70 @@ - +
+ \ No newline at end of file diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb new file mode 100644 index 000000000..c2e1de64a --- /dev/null +++ b/app/views/layouts/_navbar.html.erb @@ -0,0 +1,30 @@ + \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 76428da4e..f87ba53d3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,14 +1,19 @@ - + - <%= "software.opensuse.org: #{@page_title}" %> + + + + <%= @page_title || _('openSUSE Software') %> - <%= stylesheet_link_tag "application" %> + <%= stylesheet_link_tag "/chameleon/css/app.css" %> + <%= stylesheet_link_tag "app" %> + <%= javascript_include_tag "/chameleon/js/app.js" %> <%= javascript_include_tag "application" %> <%= javascript_include_tag "/themes/bento/js/l10n/global-navigation-data-#{@lang || "en"}.js" %> @@ -54,19 +59,8 @@ - + <% activenav ||= 'software' %> + <%= render :partial => "layouts/navbar", :locals => {:activenav => 'software' } %> <% unless flash.blank? %> <%= render(:partial => "layouts/flash", :object => flash) %> @@ -76,7 +70,7 @@ <% unless @hide_search_box %> <%# Caching is really crucial in the front page (at release date, at least) %> - <% if controller.controller_name == "main" && controller.action_name == "release" %> + <% if controller.controller_name == "main" && controller.action_name == "release" %> <% cache :locale => @lang, :baseproject => (@baseproject || default_baseproject) do %> <%= render :partial => 'search/find_form' %> <% end %> @@ -90,18 +84,7 @@
- + <%= render :partial => "layouts/footer" %> diff --git a/app/views/layouts/download.html.erb b/app/views/layouts/download.html.erb index 5d60214d6..21e1196af 100644 --- a/app/views/layouts/download.html.erb +++ b/app/views/layouts/download.html.erb @@ -1,14 +1,19 @@ - + - <%= "software.opensuse.org: #{@page_title}" %> + + + + <%= @page_title || _('Get openSUSE') %> - <%= stylesheet_link_tag "application" %> + <%= stylesheet_link_tag "/chameleon/css/app.css" %> + <%= stylesheet_link_tag "app" %> + <%= javascript_include_tag "/chameleon/js/app.js" %> <%= javascript_include_tag "application" %> <%= javascript_include_tag "/themes/bento/js/l10n/global-navigation-data-#{@lang || "en"}.js" %> @@ -29,7 +34,7 @@ var _paq = _paq || []; (function(){ var u=(("https:" == document.location.protocol) ? "https://beans.opensuse.org/piwik/" : "http://beans.opensuse.org/piwik/"); - _paq.push(['setSiteId', 19]); + _paq.push(['setSiteId', 7]); _paq.push(['setTrackerUrl', u+'piwik.php']); _paq.push(['trackPageView']); _paq.push([ 'setDomains', ["*.opensuse.org"]]); @@ -45,54 +50,36 @@ + <% if @lang == "ar" %> + + <% end %> + - + <%= render :partial => "layouts/navbar", :locals => {:activenav => 'download' } %> <% unless flash.blank? %> <%= render(:partial => "layouts/flash", :object => flash) %> <% end %> -
-
+ <% unless @hide_search_box %> + <%# Caching is really crucial in the front page (at release date, at least) %> + <% if controller.controller_name == "main" && controller.action_name == "release" %> + <% cache :locale => @lang, :baseproject => (@baseproject || default_baseproject) do %> + <%= render :partial => 'search/find_form' %> + <% end %> + <% else %> + <%= render :partial => 'search/find_form' %> + <% end %> + <% end %> -
-

- <%= @box_title || @page_title -%> -

-
- <%= yield %> -
-
- -
-
+ <%= yield %> - + <%= render :partial => "layouts/footer" %> diff --git a/app/views/package/_download_rows.html.erb b/app/views/package/_download_rows.html.erb index 01b1b6fb2..bc25f9ec5 100644 --- a/app/views/package/_download_rows.html.erb +++ b/app/views/package/_download_rows.html.erb @@ -1,40 +1,68 @@ <% packages.flatten.sort_by(&:project).group_by(&:project).each do |result| %> -
  • - <% if result.first == distro[:project] || result.first == "#{distro[:project]}:NonFree" - name = _("official release") - elsif result.first == "#{distro[:project]}:Update" - name = _("official update") - else - name = shorten result.first, 22 - end + <% if result.first == distro[:project] || result.first == "#{distro[:project]}:NonFree" + name = _("official release") + elsif result.first == "#{distro[:project]}:Update" + name = _("official update") + else + name = shorten result.first, 40 + end - if result.last.first.package.nil? - pkg_link = "https://build.opensuse.org/project/show/#{CGI.escape result.first}" - else - pkg_link = "https://build.opensuse.org/package/show/#{CGI.escape result.first}/#{CGI.escape result.last.first.package}" - end -%> - <%= link_to name, pkg_link %> + if result.last.first.package.nil? + pkg_link = "https://build.opensuse.org/project/show/#{CGI.escape result.first}" + else + pkg_link = "https://build.opensuse.org/package/show/#{CGI.escape result.first}/#{CGI.escape result.last.first.package}" + end -%> + +
    +
    + +
    + <%= link_to name, pkg_link %> + <% if type.eql? 'official' %> + <%= _('Official') %> + <% end %> + <% if type.eql? 'experimental' %> + <%= _('Experimental') %> + <% end %> + <% if type.eql? 'community' %> + <%= _('Community') %> + <% end %> +
    + +
    + <%# only use the latest version, obs bug: some outdated versions still listed. %> + <% version = result.last.map{|r| r.version }.max %> + <%= shorten version, 23 %> +
    + +
    + <% release = result.last.select{|r| r.version == version }.map{|v| "#{v.release}".sub(".", "").to_i}.max %> + <% items = result.last.select{|r| r.version == version && "#{r.release}".sub(".", "").to_i == release } %> + <% archs = items.map{|item| human_arch( item.arch ) }.uniq.sort %> + <% archs << _("Source") if archs.delete(_("Source")) %> - <%# only use the latest version, obs bug: some outdated versions still listed. %> - <% version = result.last.map{|r| r.version }.max %> + + <% if oneclick && distro[:project].match(/SUSE/) && !(archs.uniq == [_("Source")]) %> + <% url = url_for :controller => 'download', :action => 'ymp_without_arch_and_version', + :project => result.first, :repository => result.last.first.repository, :package => @pkgname, + :base => result.last.first.baseproject, :query => @pkgname%> + <%= _("1 Click Install") %> + <% end %> - <% release = result.last.select{|r| r.version == version }.map{|v| "#{v.release}".sub(".", "").to_i}.max %> -
      -
    • <%= shorten version, 23 %>
      • - <% items = result.last.select{|r| r.version == version && "#{r.release}".sub(".", "").to_i == release } %> - <% archs = items.map{|item| human_arch( item.arch ) }.uniq.sort %> - <% archs << _("Source") if archs.delete(_("Source")) %> - <% archs.each do |arch| %> - <% items.select{|item| human_arch( item.arch ) == arch}.each do |bin| %> -
    • <%= link_to human_arch( bin.arch ), "http://download.opensuse.org/repositories/" + bin.filepath %>
      • - <% end -%> - <% end -%> -
    - <% if oneclick && distro[:project].match(/SUSE/) && !(archs.uniq == [_("Source")]) %> - <% url = url_for :controller => 'download', :action => 'ymp_without_arch_and_version', - :project => result.first, :repository => result.last.first.repository, :package => @pkgname, - :base => result.last.first.baseproject, :query => @pkgname%> - 1 Click Install - <% end %> -
    • +
    + +
    + <% archs.each do |arch| %> + <% items.select{|item| human_arch( item.arch ) == arch}.each do |bin| %> + <%= link_to _(human_arch( bin.arch )), "http://download.opensuse.org/repositories/" + bin.filepath, :class => 'dropdown-item' %> + <% end -%> + <% end -%> +
    +
    + +
    +
    +
    <% end -%> diff --git a/app/views/package/show.html.erb b/app/views/package/show.html.erb index bf4cff793..8fd130744 100644 --- a/app/views/package/show.html.erb +++ b/app/views/package/show.html.erb @@ -1,269 +1,109 @@ - -<% content_for :content_for_head do %> - <%= javascript_include_tag "/javascripts/slimbox2.js" %> - <%= stylesheet_link_tag "/stylesheets/slimbox2/slimbox2.css" %> -<% end %> - - - -
    - -
    + + +
    +

    <%= _("Distributions") %>

    + + <% @distributions.each do |distro| -%> + <% if (pkgs = @packages.select{|s| s.baseproject == distro[:project]}).size > 0 %> + +

    <%= distro[:name] %>

    + + + <% + official, pkgs = pkgs.partition{|s| s.project == distro[:project] || s.project == "#{distro[:project]}:NonFree" } + update, pkgs = pkgs.partition{|s| s.project == "#{distro[:project]}:Update"} + stable, pkgs = pkgs.partition{|s| s.quality == "Stable"} %> + + <%= render( :partial => 'package/download_rows', :locals => {:packages => official, :distro => distro, :oneclick => true, :type => 'official'} ) if update.blank? %> + <%= render :partial => 'package/download_rows', :locals => {:packages => update, :distro => distro, :oneclick => true, :type => 'official'} %> + <%= render :partial => 'package/download_rows', :locals => {:packages => stable, :distro => distro, :oneclick => true, :type => 'official'} %> + + <% + home, pkgs = pkgs.partition{|s| s.project.match( /^home\:/ )} + devel = pkgs.reject{|s| @official_projects.include?( s.project ) || s.project.match( /^home\:/ ) || s.project.match( /#{distro[:project]}\:Update/ ) || + s.project.match( /#{distro[:project]}\:NonFree/ ) || s.project.match( /openSUSE\:Maintenance\:/ ) } %> + + + <%= render :partial => 'package/download_rows', :locals => {:packages => devel, :distro => distro, :oneclick => true, :type => 'experimental' } %> + + + <%= render :partial => 'package/download_rows', :locals => {:packages => home, :distro => distro, :oneclick => true, :type => 'community'} %> + <% end -%> + <% end -%> -
    + <% unless @extra_dists.blank? %> - +

    <%= _("Unsupported distributions") %>

    -
    +
    + <%= _("The following distributions are not officially supported. Use these packages at your own risk.") %> + +
    +
    + <% @extra_dists.each do |distro| -%> +

    <%= distro[:project] %>

    + <% pks = @extra_packages.select{|p| p.baseproject == distro[:project] } %> + <%= render :partial => 'download_rows', :locals => {:packages => pks, :distro => distro, :oneclick => false, :type => 'unsupported'} %> + <% end %>
    - + <% end %> + +
    - <% end -%> -
    -
    +<% end -%> diff --git a/app/views/search/_find_form.html.erb b/app/views/search/_find_form.html.erb index 6b979a515..a34af767c 100644 --- a/app/views/search/_find_form.html.erb +++ b/app/views/search/_find_form.html.erb @@ -1,50 +1,59 @@ - - - - -
    -

    <%= link_to _("Package Search"), {:controller => :search, :action => :find}, :id => "apps-headline" %>

    - <%= form_tag( {:controller => 'search', :action => :index}, :method => :get ) do %> - <%= text_field_tag 'q', @search_term, :size => 30, :id => "search-form", :autocomplete => "off", :autofocus => true %> - - <%= submit_tag _('Search'), :name => nil, :class => "search-go-button" %> - <%= image_tag "configure_search.png", :width => 24, :class =>"search-options-link" %> - -
    -

    - <%= hidden_field_tag("search_devel", "false") %> - <%= check_box_tag("search_devel", "true", @search_devel, {:id => "search_devel_checkbox" }) %> -
    - <%= hidden_field_tag("search_unsupported", "false") %> - - <% @distributions ||= Array.new %> -  <%= _("Show distribution:") %>  - <%= select_tag 'baseproject', options_for_select((@distributions.map{|d| [d[:name], d[:project]]} || ["ALL"]), (@baseproject or default_baseproject)) %> -

    -
    - <% end -%> +
    +
    + <%= form_tag( {:controller => 'search', :action => :index}, :method => :get ) do %> +
    + <%= text_field_tag 'q', @search_term, :size => 30, :id => "search-form", :class => 'form-control mr-2', :placeholder => 'Search packages...', :autocomplete => "off", :autofocus => true %> + + + + + +
    + + + <% end -%> +
    -
    -