From e0af828c7f8f496620f4e0eaf711bb33975953b5 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Tue, 24 Feb 2015 15:44:53 -0300 Subject: [PATCH] Port error pages to jQuery --- public/500.html | 2 +- public/500.html.erb | 2 +- public/503.html | 2 +- public/503.html.erb | 2 +- public/javascripts/errors.js | 14 +++++++------- public/javascripts/jquery.js | 1 + 6 files changed, 12 insertions(+), 11 deletions(-) create mode 120000 public/javascripts/jquery.js diff --git a/public/500.html b/public/500.html index 1003820..1371a89 100644 --- a/public/500.html +++ b/public/500.html @@ -6,7 +6,7 @@ Technical problems - + diff --git a/public/500.html.erb b/public/500.html.erb index c18b8fe..85efb7b 100644 --- a/public/500.html.erb +++ b/public/500.html.erb @@ -6,7 +6,7 @@ Technical problems - + diff --git a/public/503.html b/public/503.html index 4ca387e..e786d13 100644 --- a/public/503.html +++ b/public/503.html @@ -6,7 +6,7 @@ Noosfero - System Maintainance - + diff --git a/public/503.html.erb b/public/503.html.erb index 878928b..c0823fc 100644 --- a/public/503.html.erb +++ b/public/503.html.erb @@ -6,7 +6,7 @@ Noosfero - System Maintainance - + diff --git a/public/javascripts/errors.js b/public/javascripts/errors.js index 57f097b..0a9c2a8 100644 --- a/public/javascripts/errors.js +++ b/public/javascripts/errors.js @@ -2,15 +2,15 @@ function display_error_message(language) { if (!language) { var language = ((navigator.language) ? navigator.language : navigator.userLanguage).replace('-', '_'); } - element = $(language); - if (!element) { - element = $(language.replace(/_.*$/, '')); + var $element = $('#' + language); + if ($element.size() == 0) { + $element = $('#' + language.replace(/_.*$/, '')); } - if (!element) { + if ($element.size() == 0) { element = $('en'); } - $$('.message').each(function(item) { item.hide() }); - element.getElementsBySelector('h1').each(function(title) { document.title = title.innerHTML; }); - element.show(); + $('.message').hide(); + $element.show(); + $('title').html($element.find('h1').html()); } diff --git a/public/javascripts/jquery.js b/public/javascripts/jquery.js new file mode 120000 index 0000000..a74e729 --- /dev/null +++ b/public/javascripts/jquery.js @@ -0,0 +1 @@ +jquery-2.1.1.min.js \ No newline at end of file -- libgit2 0.21.2