From d0b030c47dc10186d13414033d1318f104061ce2 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 22 May 2012 16:11:00 +0800 Subject: [PATCH] Put inc/ajax_setting in new_admin Fix callback for link on save --- app/assets/javascripts/new_admin.js | 1 + app/models/link.rb | 2 +- app/views/layouts/new_admin.html.erb | 1 - config/locales/en.yml | 4 ++++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/new_admin.js b/app/assets/javascripts/new_admin.js index f5fed368..949753a9 100644 --- a/app/assets/javascripts/new_admin.js +++ b/app/assets/javascripts/new_admin.js @@ -17,3 +17,4 @@ //= require side_bar_history //= require rss //= require ajax_form +//= require inc/ajax_setting diff --git a/app/models/link.rb b/app/models/link.rb index 5b8c15a6..ccd79c89 100644 --- a/app/models/link.rb +++ b/app/models/link.rb @@ -13,7 +13,7 @@ class Link < Item protected def add_http - unless self.url[/^http?s:\/\//] + unless self.url[/^http:\/\//] || self.url[/^https:\/\//] self.url = 'http://' + self.url end end diff --git a/app/views/layouts/new_admin.html.erb b/app/views/layouts/new_admin.html.erb index 873b9f14..3a493a9d 100644 --- a/app/views/layouts/new_admin.html.erb +++ b/app/views/layouts/new_admin.html.erb @@ -9,7 +9,6 @@ <%= stylesheet_link_tag "new_admin" %> <%= javascript_include_tag "new_admin" %> - <%= javascript_include_tag "inc/ajax_setting" %> <%= yield :page_specific_css %> <%= yield :page_specific_javascript %> <%= csrf_meta_tag %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 2b4fac5d..cb638475 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -217,6 +217,10 @@ en: options: Options orig_upload_file: Original filename page: Page + page_context: + edit: Edit + ob_auth: + edit: Category authorization page_part_kinds: text: Text Area public_r_tag: System Widget