Download as
Browse Code »

Commit e0af828c7f8f496620f4e0eaf711bb33975953b5

Authored by Antonio Terceiro
1 parent e8ae9491
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Port error pages to jQuery

Showing 6 changed files with 12 additions and 11 deletions   Show diff stats
public/500.html
  Diff comments   View file @e0af828
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <title>Technical problems</title> 6 <title>Technical problems</title>
7 <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/> 7 <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/>
8 <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" /> 8 <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" />
9 - <script type='text/javascript' src='/javascripts/prototype.js'></script> 9 + <script type='text/javascript' src='/javascripts/jquery.js'></script>
10 <script type='text/javascript' src='/javascripts/errors.js'></script> 10 <script type='text/javascript' src='/javascripts/errors.js'></script>
11 </head> 11 </head>
12 <body onload='display_error_message()'> 12 <body onload='display_error_message()'>
public/500.html.erb
  Diff comments   View file @e0af828
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <title>Technical problems</title> 6 <title>Technical problems</title>
7 <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/> 7 <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/>
8 <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" /> 8 <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" />
9 - <script type='text/javascript' src='/javascripts/prototype.js'></script> 9 + <script type='text/javascript' src='/javascripts/jquery.js'></script>
10 <script type='text/javascript' src='/javascripts/errors.js'></script> 10 <script type='text/javascript' src='/javascripts/errors.js'></script>
11 </head> 11 </head>
12 <body onload='display_error_message()'> 12 <body onload='display_error_message()'>
public/503.html
  Diff comments   View file @e0af828
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <title>Noosfero - System Maintainance</title> 6 <title>Noosfero - System Maintainance</title>
7 <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/> 7 <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/>
8 <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" /> 8 <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" />
9 - <script type='text/javascript' src='/javascripts/prototype.js'></script> 9 + <script type='text/javascript' src='/javascripts/jquery.js'></script>
10 <script type='text/javascript' src='/javascripts/errors.js'></script> 10 <script type='text/javascript' src='/javascripts/errors.js'></script>
11 </head> 11 </head>
12 <body onload='display_error_message()'> 12 <body onload='display_error_message()'>
public/503.html.erb
  Diff comments   View file @e0af828
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <title>Noosfero - System Maintainance</title> 6 <title>Noosfero - System Maintainance</title>
7 <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/> 7 <link rel="stylesheet" type="text/css" href="/designs/themes/default/errors.css"/>
8 <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" /> 8 <link rel="shortcut icon" href='/designs/themes/default/favicon.ico' type="image/x-icon" />
9 - <script type='text/javascript' src='/javascripts/prototype.js'></script> 9 + <script type='text/javascript' src='/javascripts/jquery.js'></script>
10 <script type='text/javascript' src='/javascripts/errors.js'></script> 10 <script type='text/javascript' src='/javascripts/errors.js'></script>
11 </head> 11 </head>
12 <body onload='display_error_message()'> 12 <body onload='display_error_message()'>
public/javascripts/errors.js
  Diff comments   View file @e0af828
@@ -2,15 +2,15 @@ function display_error_message(language) { @@ -2,15 +2,15 @@ function display_error_message(language) {
2 if (!language) { 2 if (!language) {
3 var language = ((navigator.language) ? navigator.language : navigator.userLanguage).replace('-', '_'); 3 var language = ((navigator.language) ? navigator.language : navigator.userLanguage).replace('-', '_');
4 } 4 }
5 - element = $(language);  
6 - if (!element) {  
7 - element = $(language.replace(/_.*$/, '')); 5 + var $element = $('#' + language);
  6 + if ($element.size() == 0) {
  7 + $element = $('#' + language.replace(/_.*$/, ''));
8 } 8 }
9 - if (!element) { 9 + if ($element.size() == 0) {
10 element = $('en'); 10 element = $('en');
11 } 11 }
12 - $$('.message').each(function(item) { item.hide() });  
13 - element.getElementsBySelector('h1').each(function(title) { document.title = title.innerHTML; });  
14 - element.show(); 12 + $('.message').hide();
  13 + $element.show();
  14 + $('title').html($element.find('h1').html());
15 } 15 }
16 16
public/javascripts/jquery.js 0 → 120000
  Diff comments   View file @e0af828
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +jquery-2.1.1.min.js
0 \ No newline at end of file 2 \ No newline at end of file