developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put inc/ajax_setting in new_admin 

Fix callback for link on save
This commit is contained in:
Christophe Vilayphiou 2012-05-22 16:11:00 +08:00
parent ef72a2330c
commit d0b030c47d
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/new_admin.js
View File

@ -17,3 +17,4 @@
//= require side_bar_history //= require side_bar_history
//= require rss //= require rss
//= require ajax_form //= require ajax_form
//= require inc/ajax_setting

2
app/models/link.rb
View File

@ -13,7 +13,7 @@ class Link < Item
protected protected
def add_http def add_http
unless self.url[/^http?s:\/\//] unless self.url[/^http:\/\//] || self.url[/^https:\/\//]
self.url = 'http://' + self.url self.url = 'http://' + self.url
end end
end end

1
app/views/layouts/new_admin.html.erb
View File

@ -9,7 +9,6 @@
<![endif]--> <![endif]-->
<%= stylesheet_link_tag "new_admin" %> <%= stylesheet_link_tag "new_admin" %>
<%= javascript_include_tag "new_admin" %> <%= javascript_include_tag "new_admin" %>
<%= javascript_include_tag "inc/ajax_setting" %>
<%= yield :page_specific_css %> <%= yield :page_specific_css %>
<%= yield :page_specific_javascript %> <%= yield :page_specific_javascript %>
<%= csrf_meta_tag %> <%= csrf_meta_tag %>

4
config/locales/en.yml
View File

@ -217,6 +217,10 @@ en:
options: Options options: Options
orig_upload_file: Original filename orig_upload_file: Original filename
page: Page page: Page
page_context:
edit: Edit
ob_auth:
edit: Category authorization
page_part_kinds: page_part_kinds:
text: Text Area text: Text Area
public_r_tag: System Widget public_r_tag: System Widget