diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index ab2c56a86..0947f137d 100644 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -17,11 +17,13 @@ .ui-helper-clearfix{display:block;} #iso-wrapper{padding:0;margin-right:0;padding-left:15px;padding-right:15px;} #iso-wrapper h4{margin-top:4px;float:left} -#iso-wrapper div.changeiso{border:2px solid #7C92A4;min-height:50px;margin-bottom:10px;color:#999;cursor:pointer;-moz-border-radius:5px;-webkit-border-radius:5px;background:#ffffff asset-url('gradient-light-grey.png') repeat-x scroll bottom left;} -#iso-wrapper div.changeiso:hover{border:2px solid #690;} +#iso-wrapper div.changeiso h4{margin: 4px 0 2px 0;float:none} +#iso-wrapper div.changeiso{border:2px solid #7C92A4;min-height:50px;margin-bottom:10px;color:#999;-moz-border-radius:5px;-webkit-border-radius:5px;background:#ffffff asset-url('gradient-light-grey.png') repeat-x scroll bottom left;} +#iso-wrapper div.ui-accordion div.changeiso{cursor:pointer} +#iso-wrapper div.ui-accordion div.changeiso:hover{border:2px solid #690;} #iso-wrapper div.changeiso{border-color:#4987B3;-moz-box-shadow:0px 1px 4px #999;-webkit-box-shadow:0px 1px 4px #999;box-shadow:0px 1px 4px #999;color:#333;} #iso-wrapper div.changeiso div{padding-top:5px;padding-bottom:2px;margin-right:15px;min-height:55px;} -#iso-wrapper div.changeiso img{margin:5px 15px 0 7px;float:left;height:48px;} +#iso-wrapper div.changeiso img.medium_icon{margin:5px 15px 0 7px;float:left;height:48px;} .iso-warning{border:2px solid #690;padding: 6px;margin-bottom:10px;-moz-border-radius:5px;-webkit-border-radius:5px;background:#ffffff asset-url('gradient-light-grey.png') repeat-x scroll bottom left;} .iso-warning{-moz-box-shadow:0px 1px 4px #999;-webkit-box-shadow:0px 1px 4px #999;box-shadow:0px 1px 4px #999;} .download_buttonClass{-moz-box-shadow:0px 1px 2px #ccc;-webkit-box-shadow:0px 1px 2px #ccc;box-shadow:0px 1px 2px #ccc;color:#069;background-color:#eee;} diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index aaf2e72f4..0206c8b64 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -140,7 +140,8 @@ def set_release(release) elsif release == "421" @isos = {} @directory = "http://download.opensuse.org/distribution/leap/42.1" - # No iso for: + @leap = true + # leap means no iso for: # nonoss, dvd-32, net-32, rescue-XX, kde-XX, gnome-XX, lang-XX @isos["dvd-64"] = "Leap-42.1-DVD-x86_64" @isos["net-64"] = "Leap-42.1-NET-x86_64" @@ -148,33 +149,20 @@ def set_release(release) @releasenotes = _("https://doc.opensuse.org/release-notes/x86_64/openSUSE/Leap/42.1/") @releasename = "openSUSE Leap 42.1" @repourl = "http://download.opensuse.org/distribution/leap/42.1" - @medium = "dvd" - @inline_signature = true @gpg = "22C0 7BA5 3417 8CD0 2EFE 22AA B88B 2FD4 3DBD C284" - elsif release == "developer" @isos = {} @directory = "http://download.opensuse.org/distribution/leap/42.1-RC1" - @isos["lang-32"] = nil - @isos["lang-64"] = nil - @isos["nonoss"] = nil - @isos["kde-64"] = nil - @isos["kde-32"] = nil - @isos["gnome-64"] = nil - @isos["gnome-32"] = nil + @leap = true + # leap means no iso for: + # nonoss, dvd-32, net-32, rescue-XX, kde-XX, gnome-XX, lang-XX @isos["dvd-64"] = "Leap-42.1-DVD-x86_64-Build0235-Media" - @isos["dvd-32"] = nil - @isos["rescue-32"] = nil - @isos["rescue-64"] = nil - @isos["net-32"] = nil @isos["net-64"] = "Leap-42.1-NET-x86_64-Build0235-Media" @releasenotes = _("https://doc.opensuse.org/release-notes/x86_64/openSUSE/Leap/42.1/") @releasename = "openSUSE 42.1 RC 1" @repourl = "http://download.opensuse.org/distribution/leap/42.1" - @medium = "dvd" - @inline_signature = true @gpg = "22C0 7BA5 3417 8CD0 2EFE 22AA B88B 2FD4 3DBD C284" else flash[:warn] = _("#{release} is not a supported release.") diff --git a/app/views/main/_change_install.html.erb b/app/views/main/_change_install.html.erb index 4b71a61c9..3d14036b5 100644 --- a/app/views/main/_change_install.html.erb +++ b/app/views/main/_change_install.html.erb @@ -18,7 +18,7 @@
diff --git a/app/views/main/release.html.erb b/app/views/main/release.html.erb index 7a5ea1cc1..f245b4410 100644 --- a/app/views/main/release.html.erb +++ b/app/views/main/release.html.erb @@ -19,109 +19,9 @@ <% end -%> -
- - - -
- - -
-
- -

<%= _("Installation Medium") %>

-
- - - -
- <% if @isos["dvd-64"] %> - <%= render(:partial => "change_install", :locals => { :medium => "dvd", :shorttext => _("4.7GB DVD (also suitable for USB stick)"), :longtext => _("Contains a large collection of software for desktop or server use.
Suitable for installation or upgrade.") }) %> - <% end %> - <% if @isos["net-64"] %> - <%= render(:partial => "change_install", :locals => { :medium => "net", :shorttext => _("Network"), :longtext => _("Downloads the installation system and all packages from online repositories.
Suitable for installation or upgrade.") }) %> - <% end %> - <% if @isos["gnome-32"] %> - <% livecd = ( @isos["gnome-32"].match(/.*-LiveCD-.*/) ? "CD" : "DVD" ) %> - <%= render(:partial => "change_install", :locals => { :medium => "gnome", :shorttext => _("Live GNOME"), :longtext => (_("A GNOME desktop you can run from %s or from USB stick.
Can be installed as is (no upgrade).") % [livecd]).html_safe }) %> - <% end %> - <% if @isos["kde-32"] %> - <% livecd = ( @isos["kde-32"].match(/.*-LiveCD-.*/) ? "CD" : "DVD" ) %> - <%= render(:partial => "change_install", :locals => { :medium => "kde", :shorttext => _("Live KDE"), :longtext => (_("A KDE desktop you can run from %s or from USB stick.
Can be installed as is (no upgrade).") % [livecd]).html_safe }) %> - <% end %> - <% if @isos["rescue-32"] %> - <%= render(:partial => "change_install", :locals => { :medium => "rescue", :shorttext => _("Rescue"), :longtext => _("Rescue system that you can run from CD or from USB stick.
Can not be used for installation or upgrade.") }) %> - <% end %> - <%= render(:partial => "change_install", :locals => { :medium => "derivatives", :shorttext => _("openSUSE Derivatives"), :longtext => _("Get one of the specialized distributions built on openSUSE.") }) %> -
- - - -
-
- -
- - - -
-

<%=_("How to Proceed")%>

-
    -
  1. <%=_("After having successfully downloaded the ISO image(s), create a bootable USB stick or burn the image(s) to a DVD (or a CD if the chosen image fits).")%> - -
    2. -
  2. <%=_("Boot from the DVD, CD or USB stick. In case your computer does not automatically boot from the chosen device, open the BIOS setup to allow booting from it.")%>
    3. -
-
- - <% if @isos['lang-64'] %> -
-

<%=_("Add-On Downloads (optional)")%>

-
    -
  • <%= render(:partial => "download_link", :locals => { :id => "lang32", :iso => "lang-32", :text => _("Extra Languages (32 Bit)") } ) %>
    • -
  • <%= render(:partial => "download_link", :locals => { :id => "lang64", :iso => "lang-64", :text => _("Extra Languages (64 Bit)") } ) %>
    • - -

  • <%=_('The installation process is available in many languages but, for most of them, the translation of the applications is not included in the image. If you want your openSUSE system to support some additional language, you need to download it from the Internet during the installation or any time after it. If you have easy access to the Internet you do not need this CD, but if you are planning to install openSUSE in some machine with no Internet connection, it will provide you access to all the available translations.')%>

    • -
  • <%= render(:partial => "download_link", :locals => { :id => "nonoss", :iso => "nonoss", :text => _("NonOSS CD") } )%>
    • -

  • <%=_('This CD contains free software distributed under proprietary licence not allowing its inclusion to main installation media together with free open-source software. All software from this CD could be downloaded from NON-OSS repository.')%>

    • -
-
- <% end %> +
+ <%= @leap ? render(partial: "leap_release") : render(partial: "non_leap_release") %>