diff --git a/app/controllers/sub_domains_controller.rb b/app/controllers/sub_domains_controller.rb index 5ca9b07ed..d16444a74 100644 --- a/app/controllers/sub_domains_controller.rb +++ b/app/controllers/sub_domains_controller.rb @@ -1,10 +1,10 @@ class SubDomainsController < ApplicationController layout 'base_org' - before_filter :find_org_subfield_and_subdomain, :only => [:show, :index, :new] + before_filter :find_org_subfield_and_subdomain, :only => [:show, :index] def new @subdomain = SubDomain.new - + @org_subfield = OrgSubfield.find(params[:org_subfield_id]) end def create diff --git a/app/views/layouts/base_sub_domain.html.erb b/app/views/layouts/base_sub_domain.html.erb index 3ab589111..6d4b5e514 100644 --- a/app/views/layouts/base_sub_domain.html.erb +++ b/app/views/layouts/base_sub_domain.html.erb @@ -140,7 +140,9 @@
-
banner image
+
banner image + +
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb index b1ab473f3..bd4537e70 100644 --- a/app/views/organizations/_subfield_list.html.erb +++ b/app/views/organizations/_subfield_list.html.erb @@ -98,7 +98,8 @@ 编辑 | - 添加二级目录 + + <%= link_to("添加二级目录", new_org_subfield_sub_domain_path(:org_subfield_id => field.id, :field => field), :class => "linkGrey fr mr5", :remote => true) %>
diff --git a/app/views/sub_domains/_new.html.erb b/app/views/sub_domains/_new.html.erb index 3c63c073d..3faa66632 100644 --- a/app/views/sub_domains/_new.html.erb +++ b/app/views/sub_domains/_new.html.erb @@ -1,3 +1,29 @@ -
- test -
\ No newline at end of file +
+
添加二级目录
+ <%= form_tag url_for(:controller => 'sub_domains', :action => 'create', :org_subfield_id => field.id), :id=> 'add_subfield_form_subdomain',:remote => true do %> + 二级栏目名称 + + +
确定
+ <% end %> +
+
+ + \ No newline at end of file diff --git a/app/views/sub_domains/new.html.erb b/app/views/sub_domains/new.html.erb index a497b71cf..e69de29bb 100644 --- a/app/views/sub_domains/new.html.erb +++ b/app/views/sub_domains/new.html.erb @@ -1,6 +0,0 @@ -$('#ajax-modal').html('<%= escape_javascript(render :partial => 'sub_domains/new',:locals => {:course => @course,:course_attachment_type => 1}) %>'); -showModal('ajax-modal', '513px'); -$('#ajax-modal').siblings().remove(); -$('#ajax-modal').before(""); -$('#ajax-modal').parent().css("top","40%").css("left","50%").css("border","3px solid #269ac9"); -$('#ajax-modal').parent().addClass("popbox_polls"); \ No newline at end of file diff --git a/app/views/sub_domains/new.js.erb b/app/views/sub_domains/new.js.erb index 66d9aeca2..3f7f1ad47 100644 --- a/app/views/sub_domains/new.js.erb +++ b/app/views/sub_domains/new.js.erb @@ -1 +1,6 @@ -alert("test"); \ No newline at end of file +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'sub_domains/new',:locals => {:field => @org_subfield}) %>'); +showModal('ajax-modal', '513px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before(""); +$('#ajax-modal').parent().css("top","40%").css("left","50%").css("border","3px solid #269ac9"); +$('#ajax-modal').parent().addClass("popbox_polls"); diff --git a/public/images/default_blank/icons-add.png b/public/images/default_blank/icons-add.png new file mode 100644 index 000000000..059585a0d Binary files /dev/null and b/public/images/default_blank/icons-add.png differ diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css index ad9169670..bcd110adb 100644 --- a/public/stylesheets/org2.css +++ b/public/stylesheets/org2.css @@ -74,6 +74,8 @@ a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left: .sn-sub-nav li a:hover {border-bottom:3px solid #ffbd18; height:37px;} .sn-subnav-slice {margin:12px 5px;} .sn-banner {width:1200px; height:210px; margin:0 auto;} +.sn-logo-add{ display:block; top:5px; left:0px; position:absolute; width:20px; height:20px;background:url(../images/default_blank/icons-add.png) 0px -3px no-repeat;} +.sn-banner-add{ display:block; position:absolute; top:10px; left:10px;width:27px; height:27px; background:url(../images/default_blank/icons-add.png) -32px -0px no-repeat;} .sn-content-position {width:1200px; height:50px; line-height:50px; vertical-align:middle; font-size:14px; color:#888; margin:0 auto;} /*footer样式*/ .sn-footer {width:1200px; height:220px; margin:0 auto; text-align:center; font-size:14px; color:#fff; line-height:normal;}