From 5099dbd2f82be04853ef51bf8387b3bf42308f4a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 20 Oct 2009 12:45:24 +0000 Subject: [PATCH] move the download javascript into an extra file --- app/controllers/main_controller.rb | 11 +- app/views/main/_change_install.rhtml | 16 +- app/views/main/_download_link.rhtml | 28 +-- app/views/main/developer2.rhtml | 335 +++++++++++++++-------------------- app/views/main/download.erb | 63 +++++++ config/routes.rb | 1 + 6 files changed, 232 insertions(+), 222 deletions(-) create mode 100644 app/views/main/download.erb diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 8a170a8..85d2cbb 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -7,7 +7,7 @@ class MainController < ApplicationController :redirect_to => :index # these pages are completely static: - caches_page :index, :developer, :developer2 + caches_page :index, :developer, :developer2, :developer_download_js def old_dist dist = params[:dist] @@ -58,8 +58,8 @@ class MainController < ApplicationController end def developer2 - puts request.user_preferred_languages - available = %w{en xxx da pt_BR} + puts request.user_preferred_languages + available = %w{en xxx da pt_BR hu} if params[:lang].nil? #@lang = request.compatible_language_from(available) @@ -80,6 +80,11 @@ class MainController < ApplicationController render :template => "main/developer2" end + def developer_download_js + set_developer + render :template => "main/download", :content_type => 'text/javascript', :layout => false + end + def download if params[:release] == "developer" set_developer diff --git a/app/views/main/_change_install.rhtml b/app/views/main/_change_install.rhtml index 6e944f6..22e6908 100644 --- a/app/views/main/_change_install.rhtml +++ b/app/views/main/_change_install.rhtml @@ -1,11 +1,11 @@
- +
diff --git a/app/views/main/_download_link.rhtml b/app/views/main/_download_link.rhtml index 84c7048..4ad4d3d 100644 --- a/app/views/main/_download_link.rhtml +++ b/app/views/main/_download_link.rhtml @@ -1,14 +1,14 @@ -
- <% if torrent == 1 %> - - <% else %> - - <% end %> - Download<%= text %> -
- - gpg - md5 - sha1 - -
+
+ <% if torrent == 1 %> + + <% else %> + + <% end %> + Download<%= text %> +
+ + gpg + md5 + sha1 + +
diff --git a/app/views/main/developer2.rhtml b/app/views/main/developer2.rhtml index aa54123..b033288 100644 --- a/app/views/main/developer2.rhtml +++ b/app/views/main/developer2.rhtml @@ -1,209 +1,150 @@ - <% - @right_box = :search - @page_title = _("Download %s") % @releasename - -%> +<% +@right_box = :search +@page_title = _("Download %s") % @releasename +-%> - + - + - var mylink = ''; - var myiso = ''; - var directory = "<%= @directory %>"; - var isos = new Array(); - <% @isos.each { |key, value| %> - <%= "isos['#{key}'] = '#{value}';" %> - <% } %> + + + +
- function changeiso () { - mylink = mymedium; - var arch_suffix = "-64"; - if ($('#i686').attr('checked')) { - arch_suffix = "-32"; - } - myiso = directory + "/iso/openSUSE-" + isos[mylink + arch_suffix] + ".iso"; - mylink = myiso; - var download_suffix = ''; - if ($('#p_torrent').attr('checked')) { - download_suffix = ".torrent"; - } - if ($('#p_metalink').attr('checked')) { - download_suffix = ".metalink"; - } - if ($('#p_mirror').attr('checked')) { - download_suffix = "?mirrorlist"; - } - $('#sig_gpg').attr("href", myiso + ".asc"); - $('#sig_md5').attr("href", myiso + ".md5"); - $('#sig_sha1').attr("href", myiso + ".sha1"); - mylink += download_suffix; - $('#downloadtext').html(mylink); - - var langiso = directory + "/iso/openSUSE-" + isos['lang' + arch_suffix] + ".iso"; - $('#md5_lang').attr('href', langiso + ".md5"); - $('#sha1_lang').attr('href', langiso + ".sha1"); - $('#gpg_lang').attr('href', langiso + ".asc"); - $('#iso_lang').attr('href', langiso + download_suffix); - $('#iso_nonoss').attr('href', directory + "/iso/openSUSE-" + isos['nonoss'] + ".iso" + download_suffix); - } - - $(function() { - changeiso(); - $('.helplink').show(); - $('.script_only').show(); - - $('.changeiso').click(function(){ - changeiso(); - return true; }); - - $('button.changeiso').click(function(){ - mymedium = this.id.substr(3); - changeiso(); - return false; }); +
+ "><%= _("Help") %> +
+

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

+ <%= render(:partial => "change_install", :locals => { :medium => "dvd", :comment => _("DVD is the standard medium for most") }) %> + <%= render(:partial => "change_install", :locals => { :medium => "gnome", :comment => _("Live CD with GNOME desktop") }) %> + <%= render(:partial => "change_install", :locals => { :medium => "kde", :comment => _("Live CD with KDE desktop") }) %> + <%= render(:partial => "change_install", :locals => { :medium => "net", :comment => _("Network installation for experts") }) %> + 		- $('#download').click(function() { - window.location = mylink; - return false; - }); - $('#help_64').click(function() { $("#arch_64").fadeIn("slow"); $("#link_64").hide();}); - $('#help_32').click(function() { $("#arch_32").fadeIn("slow"); $("#link_32").hide();}); - }); - - - - -
- -
- "><%= _("Help") %> -
-

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

- <%= render(:partial => "change_install", :locals => { :medium => "dvd", :comment => _("DVD is the standard medium for most") }) %> - <%= render(:partial => "change_install", :locals => { :medium => "gnome", :comment => _("Live CD with GNOME desktop") }) %> - <%= render(:partial => "change_install", :locals => { :medium => "kde", :comment => _("Live CD with KDE desktop") }) %> - <%= render(:partial => "change_install", :locals => { :medium => "net", :comment => _("Network installation for experts") }) %> - 		- -
-
-

<%= _("Type of Computer") %>

-
- - -
-
-
-
- "><%=_("Help")%> -
-

<%=_("Download Method")%>

- -
- -
- -
- -
-
-
- " style="width: 250px" id="download"/> - -
- - -
-
-
+
+
+

<%= _("Type of Computer") %>

+
+ + +
+
+
+
+ "><%=_("Help")%> +
+

<%=_("Download Method")%>

+ +
+ +
+ +
+ +
+
+
+ " style="width: 250px" id="download"/> + +
+ + +
+
+ -
+
-