Merge pull request #47 from openSUSE/leap_42

Leap 42
openSUSE · Jul 24, 2015 · fb5479a · fb5479a
2 parents ec1cc78 + 53c90bc
commit fb5479a
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 87 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,33 +1,33 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.9)
-      actionpack (= 4.1.9)
-      actionview (= 4.1.9)
+    actionmailer (4.1.12)
+      actionpack (= 4.1.12)
+      actionview (= 4.1.12)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.9)
-      actionview (= 4.1.9)
-      activesupport (= 4.1.9)
+    actionpack (4.1.12)
+      actionview (= 4.1.12)
+      activesupport (= 4.1.12)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.9)
-      activesupport (= 4.1.9)
+    actionview (4.1.12)
+      activesupport (= 4.1.12)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.9)
-      activesupport (= 4.1.9)
+    activemodel (4.1.12)
+      activesupport (= 4.1.12)
       builder (~> 3.1)
-    activerecord (4.1.9)
-      activemodel (= 4.1.9)
-      activesupport (= 4.1.9)
+    activerecord (4.1.12)
+      activemodel (= 4.1.12)
+      activesupport (= 4.1.12)
       arel (~> 5.0.0)
-    activesupport (4.1.9)
+    activesupport (4.1.12)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
+    addressable (2.3.8)
     arel (5.0.1.20140414130214)
     builder (3.2.2)
     capybara (2.4.4)
@@ -36,7 +36,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    chunky_png (1.3.1)
+    chunky_png (1.3.4)
     cliver (0.3.2)
     compass (0.12.7)
       chunky_png (~> 1.2)
@@ -47,95 +47,97 @@ GEM
       sprockets (<= 2.11.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    dalli (2.7.2)
+    dalli (2.7.4)
     erubis (2.7.0)
-    execjs (2.2.2)
-    fast_gettext (0.9.0)
+    execjs (2.5.2)
+    fast_gettext (0.9.2)
     fssm (0.2.10)
-    gettext (3.1.2)
+    gettext (3.1.6)
       locale (>= 2.0.5)
-      text
-    gettext_i18n_rails (1.0.5)
-      fast_gettext (>= 0.4.8)
+      text (>= 1.3.0)
+    gettext_i18n_rails (1.2.3)
+      fast_gettext (>= 0.9.0)
     hike (1.2.3)
     hoptoad_notifier (2.4.11)
       activesupport
       builder
     i18n (0.7.0)
-    jquery-rails (3.1.1)
+    jquery-rails (3.1.3)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
     json (1.8.1)
-    locale (2.1.0)
-    mail (2.6.1)
+    locale (2.1.1)
+    mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.4.1)
+    mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.4.2)
-    multi_json (1.10.1)
-    mysql2 (0.3.16)
+    minitest (5.7.0)
+    multi_json (1.11.1)
+    mysql2 (0.3.18)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    pkg-config (1.1.5)
-    poltergeist (1.5.1)
+    pkg-config (1.1.6)
+    poltergeist (1.6.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    rack (1.5.2)
+    rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.9)
-      actionmailer (= 4.1.9)
-      actionpack (= 4.1.9)
-      actionview (= 4.1.9)
-      activemodel (= 4.1.9)
-      activerecord (= 4.1.9)
-      activesupport (= 4.1.9)
+    rails (4.1.12)
+      actionmailer (= 4.1.12)
+      actionpack (= 4.1.12)
+      actionview (= 4.1.12)
+      activemodel (= 4.1.12)
+      activerecord (= 4.1.12)
+      activesupport (= 4.1.12)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.9)
+      railties (= 4.1.12)
       sprockets-rails (~> 2.0)
-    rails-i18n (4.0.2)
+    rails-i18n (4.0.4)
       i18n (~> 0.6)
-      rails (>= 4.0)
-    railties (4.1.9)
-      actionpack (= 4.1.9)
-      activesupport (= 4.1.9)
+      railties (~> 4.0)
+    railties (4.1.12)
+      actionpack (= 4.1.12)
+      activesupport (= 4.1.12)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
     safe_yaml (1.0.4)
     sass (3.2.19)
-    sass-rails (4.0.3)
+    sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
+      sass (~> 3.2.2)
+      sprockets (~> 2.8, < 3.0)
       sprockets-rails (~> 2.0)
     sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
+    sprockets-rails (2.3.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.9)
-    text (1.2.3)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.10)
+    text (1.3.1)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.5.3)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    webmock (1.19.0)
+    webmock (1.21.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    websocket-driver (0.3.5)
+    websocket-driver (0.5.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
     xmlhash (1.3.6)
       pkg-config
     xpath (2.0.0)
@@ -166,3 +168,6 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   webmock
   xmlhash (>= 1.2.2)
+
+BUNDLED WITH
+   1.10.5
diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
@@ -139,24 +139,24 @@ def set_release(release)
 
     elsif release == "developer"
       @isos = {}
-      @directory = "http://download.opensuse.org/distribution/13.2-RC1"
-      @isos["lang-32"] = "13.2-Addon-Lang-Build0019-i586"
-      @isos["lang-64"] = "13.2-Addon-Lang-Build0019-x86_64"
-      @isos["nonoss"] = "13.2-Addon-NonOss-BiArch-Build0019-i586-x86_64"
-      @isos["kde-64"] = "13.2-KDE-Live-Build0019-x86_64"
-      @isos["kde-32"] = "13.2-KDE-Live-Build0019-i686"
-      @isos["gnome-64"] = "13.2-GNOME-Live-Build0019-x86_64"
-      @isos["gnome-32"] = "13.2-GNOME-Live-Build0019-i686"
-      @isos["dvd-64"] = "13.2-DVD-Build0019-x86_64"
-      @isos["dvd-32"] = "13.2-DVD-Build0019-i586"
-      @isos["rescue-32"] = "13.2-Rescue-CD-Build0019-i686"
-      @isos["rescue-64"] = "13.2-Rescue-CD-Build0019-x86_64"
-      @isos["net-32"] = "13.2-NET-Build0019-i586"
-      @isos["net-64"] = "13.2-NET-Build0019-x86_64"
+      @directory = "http://download.opensuse.org/distribution/leap/42.1-Milestone1"
+      @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
+      @isos["dvd-64"] = "42.1-DVD-x86_64-Build0017-Media"
+      @isos["dvd-32"] = nil
+      @isos["rescue-32"] = nil
+      @isos["rescue-64"] = nil
+      @isos["net-32"] = nil
+      @isos["net-64"] = "42.1-NET-x86_64-Build0017-Media"
 
-      @releasenotes = _("https://doc.opensuse.org/release-notes/x86_64/openSUSE/13.2/")
-      @releasename = "openSUSE 13.2 RC1"
-      @repourl = "http://download.opensuse.org/distribution/13.2"
+      @releasenotes = _("https://doc.opensuse.org/release-notes/x86_64/openSUSE/42.1/")
+      @releasename = "openSUSE 42.1 Milestone 1"
+      @repourl = "http://download.opensuse.org/distribution/leap/42.1"
       @medium = "dvd"
       @gpg = "22C0 7BA5 3417 8CD0 2EFE 22AA B88B 2FD4 3DBD C284"
     else
@@ -184,8 +184,8 @@ def redirectit(release)
 
 
   def developer
-    #redirectit("developer")
-    #return
+    redirectit("developer")
+    return
     flash.now[:warn] = _("There is no openSUSE release in testing phase at the moment. <br/>" +
         " If you want to use bleeding edge software, please use <a href='http://en.opensuse.org/Portal:Tumbleweed'>openSUSE Tumbleweed</a>.")
     @exclude_debug = true

diff --git a/app/views/main/_options.html.erb b/app/views/main/_options.html.erb
@@ -37,8 +37,10 @@
       <h4><%= _("Type of Computer") %> <%= image_tag 'help-browser.png', :id => "architectureTypeHelpPopup", :class=>"help_icon", :alt=>"?", :width => 16, :height => 16 %></h4>
 
       <div>
-        <label id="l_x86_64" class="l_change"><input id="x86_64" name="arch" value="x86_64" checked="checked" type="radio" class="changeiso" /><%=_("64 Bit PC")%></label>
-        <label id="l_i686" class="l_change"><input id="i686" name="arch" value="i686" type="radio" class="changeiso" /><%=_("Legacy 32&nbsp;Bit&nbsp;PC")%></label>
+          <label id="l_x86_64" class="l_change"><input id="x86_64" name="arch" value="x86_64" checked="checked" type="radio" class="changeiso" /><%=_("64 Bit PC")%></label>
+          <% unless @isos['dvd-32'].blank? %>
+              <label id="l_i686" class="l_change"><input id="i686" name="arch" value="i686" type="radio" class="changeiso" /><%=_("Legacy 32&nbsp;Bit&nbsp;PC")%></label>
+          <% end %>
         <div id="help_arch_content" class="hidden">
           <h2><%=_("Help on Type of Computer")%></h2>
           <p>
@@ -48,10 +50,12 @@
           <p>
             <%= _("Most new computers support <a href=\"http://en.wikipedia.org/wiki/X86-64\">x86-64</a> (also known as AMD64 and Intel64), but some laptop processors and netbook processors do not support it. So you need to check wikipedia if you want to be sure your computer supports it.") %>
           </p>
-          <h3><%=_("Legacy 32 Bit PC")%></h3>
-          <p>
-            <%= _("This version runs on all PCs including those that support 64 Bit. If you have more than 3 GB of RAM you should prefer the 64 Bit version though. openSUSE does not support processors before Pentium - the live CDs even support only i686 (Pentium Pro and later).") %>
-          </p>
+          <% unless @isos['dvd-32'].blank? %>
+              <h3><%=_("Legacy 32 Bit PC")%></h3>
+              <p>
+                  <%= _("This version runs on all PCs including those that support 64 Bit. If you have more than 3 GB of RAM you should prefer the 64 Bit version though. openSUSE does not support processors before Pentium - the live CDs even support only i686 (Pentium Pro and later).") %>
+              </p>
+          <% end %>
         </div>
       </div>
 

diff --git a/app/views/main/release.html.erb b/app/views/main/release.html.erb
@@ -47,10 +47,10 @@
           </noscript>
 
           <div id="downloaderAccordion">
-            <% if @isos["dvd-32"] %>
+            <% 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.<br/>Suitable for installation or upgrade.") }) %>
             <% end %>
-            <% if @isos["net-32"] %>
+            <% if @isos["net-64"] %>
             <%= render(:partial => "change_install", :locals => { :medium => "net", :shorttext => _("Network"), :longtext => _("Downloads the installation system and all packages from online repositories.<br/>Suitable for installation or upgrade.") }) %>
             <% end %>
             <% if @isos["gnome-32"] %>
@@ -125,6 +125,7 @@
         </ol>
       </div>
 
+      <% if @isos['lang-64'] %>
       <div id="additional_downloads">
         <h3><%=_("Add-On Downloads (optional)")%></h3>
         <ul id="addon_downloads">
@@ -136,6 +137,7 @@
           <li><p class="justify"><%=_('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.')%></p></li>
         </ul>
       </div>
+      <% end %>
 
     </div>
   </div>

diff --git a/config/routes.rb b/config/routes.rb
@@ -14,9 +14,9 @@
     get '122/:locale' => :release, :release => "122", :outdated => true, :constraints => { :locale => /[\w]+/ }
     get '121' => :release, :release => "121", :outdated => true
     get '121/:locale' => :release, :release => "121", :outdated => true, :constraints => { :locale => /[\w]+/ }
-    get ':release' => :releasemain, :constraints => { :release => /[123][\d]+/ }, :format => false
-    get ':release/:locale' =>  :release, :constraints => { :release => /[123][\d]+/, :locale => /[\w]+/ }, :format => false
-    get 'developer/:locale' => :developer, :format => false, :constraints => { :locale => /[\w]+/ }
+    get ':release' => :releasemain, :constraints => { :release => /[1234][\d]+/ }, :format => false
+    get ':release/:locale' =>  :release, :constraints => { :release => /[1234][\d]+/, :locale => /[\w]+/ }, :format => false
+    get 'developer/:locale' => :release, :format => false, :constraints => { :locale => /[\w]+/ }
 
     get 'change_install' => :change_install