hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setting中后台编辑

Browse Source
dev_wuhao
huang 9 years ago
parent 1ccb3a2c41
commit c431658333
8 changed files with 147 additions and 94 deletions
Show Stats Download Patch File Download Diff File

8
app/helpers/organizations_helper.rb
Unescape View File

@ -63,12 +63,12 @@ module OrganizationsHelper
def subfield_status_option def subfield_status_option
type = [] type = []
option1 = [] option1 = []
option1 << 0 option1 << "列表"
option1 << 0 option1 << "1"
type << option1 type << option1
option2 = [] option2 = []
option2 << 1 option2 << "图片"
option2 << 1 option2 << "0"
type << option2 type << option2
type type
end end

193
app/views/layouts/base_org_newstyle.html.erb
Unescape View File

@ -110,75 +110,103 @@
<% if is_default_field?(field) %> <% if is_default_field?(field) %>
<% case field.name %> <% case field.name %>
<% when 'course' %> <% when 'course' %>
<div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;"> <div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;">
<% if false %> <% if field.status == 0 %>
<div class="content"> <div class="content">
<div class="box-top" id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2><p class="box-title-p">course activities</p></div> <div class="box-top" id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2><p class="box-title-p">course activities</p></div>
<div class="course-list"> <% if @course_acts.nil? %>
<ul class="clearfix"> <p class="nocontent">暂无内容，敬请期待！</p>
<% unless @course_acts_homework.nil? %> <% else %>
<li > <div class="course-list">
<% @course_acts_homework.each do |act| %> <ul class="clearfix">
<%= render :partial => 'org_new_course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id, :course_activity => 0} %> <% unless @course_acts_homework.nil? %>
<% end %> <li >
</li> <% @course_acts_homework.each do |act| %>
<% end %> <%= render :partial => 'org_new_course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id, :course_activity => 0} %>
<% end %>
</li>
<% end %>
<% unless @course_acts_message.nil? %> <% unless @course_acts_message.nil? %>
<li > <li >
<% @course_acts_message.each do |act| %> <% @course_acts_message.each do |act| %>
<%= render :partial => 'org_new_course_message', :locals => {:activity => Message.find(act.org_act_id), :user_activity_id =>act.id} %> <%= render :partial => 'org_new_course_message', :locals => {:activity => Message.find(act.org_act_id), :user_activity_id =>act.id} %>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>
<% unless @course_acts_news.nil? %> <% unless @course_acts_news.nil? %>
<li > <li >
<% @course_acts_news.each do |act| %> <% @course_acts_news.each do |act| %>
<%= render :partial => 'org_new_course_news', :locals => {:activity => News.find(act.org_act_id), :user_activity_id =>act.id} %> <%= render :partial => 'org_new_course_news', :locals => {:activity => News.find(act.org_act_id), :user_activity_id =>act.id} %>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>
<div class="cl"></div>
</ul>
</div>
<div class="cl"></div>
<%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
<div class="cl"></div> <div class="cl"></div>
</ul> <% end %>
</div>
</div><!--content end--> </div><!--content end-->
<% else %> <% else %>
<div class="content"> <div class="content">
<div class="box-top" id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2></div> <div class="box-top" id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2></div>
<div class="row"> <% if @course_acts.nil? %>
<p class="nocontent">暂无内容，敬请期待！</p>
<% else %>
<div class="row">
<%= render :partial => 'organizations/org_new_course_act_list', :locals =>{:activities => @course_acts, :field => field, :organization => @organization} %> <%= render :partial => 'organizations/org_new_course_act_list', :locals =>{:activities => @course_acts, :field => field, :organization => @organization} %>
<!--row-ziyuan end--> <!--row-ziyuan end-->
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
<div class="cl"></div> <div class="cl"></div>
<% end %>
</div><!--row end--> </div><!--row end-->
<% end %> <% end %>
</div><!--box1 end--> </div><!--box1 end-->
<% when 'project' %> <% when 'project' %>
<% if true %> <% if field.status == 0 %>
<div class="content"> <div class="content">
<div class="box-top" id="course_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p"></p></div> <div class="box-top" id="course_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p"></p></div>
<div class="course-list"> <% if @project_acts.nil? %>
<ul class="clearfix"> <p class="nocontent">暂无内容，敬请期待！</p>
<% unless @project_acts.nil? %> <% else %>
<div class="course-list">
<%= render :partial => 'organizations/org_new_project_pic', :locals => {:activities => @project_acts} %> <ul class="clearfix">
<% unless @project_acts.nil? %>
<%= render :partial => 'organizations/org_new_project_pic', :locals => {:activities => @project_acts} %>
<% end %>
<div class="cl"></div>
<%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
<div class="cl"></div>
</ul>
</div>
<% end %>
<% end %>
<div class="cl"></div>
</ul>
</div>
</div><!--content end--> </div><!--content end-->
<% else %> <% else %>
<div class="content"> <div class="content">
<div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div> <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
<div class="row"> <% if @project_acts.nil? %>
<%= render :partial => 'organizations/org_new_project_act_list', :locals =>{:activities => @project_acts, :field => field, :organization => @organization} %> <p class="nocontent">暂无内容，敬请期待！</p>
<!--row-ziyuan end--> <% else %>
</div> <div class="row">
<div class="cl"></div> <%= render :partial => 'organizations/org_new_project_act_list', :locals =>{:activities => @project_acts, :field => field, :organization => @organization} %>
<%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> <!--row-ziyuan end-->
<div class="cl"></div> </div>
<div class="cl"></div>
<%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
<div class="cl"></div>
<% end %>
</div><!--row end--> </div><!--row end-->
<% end %> <% end %>
@ -188,31 +216,43 @@
<% message_ats = get_message_org(@organization.id, field.id) %> <% message_ats = get_message_org(@organization.id, field.id) %>
<% ids = field.org_document_comments.map{|o| o.id}.join(",") %> <% ids = field.org_document_comments.map{|o| o.id}.join(",") %>
<div class="box1 bg-grey" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>"> <div class="box1 bg-grey" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
<% if false %> <% if field.status == 0 %>
<div class="content"> <div class="content">
<div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div> <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
<div class="course-list"> <% if message_ats.nil? %>
<ul class="clearfix"> <p class="nocontent">暂无内容，敬请期待！</p>
<% else %>
<div class="course-list">
<ul class="clearfix">
<% message_ats.each do |act| %>
<%= render :partial => 'organizations/org_new_forum_pic', :locals => {:activity => act, :field => field, :organization => @organization} %>
<% end %>
<div class="cl"></div>
</ul>
<%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
<div class="cl"></div>
</div>
<% end %>
<% message_ats.each do |act| %>
<%= render :partial => 'organizations/org_new_forum_pic', :locals => {:activity => act, :field => field, :organization => @organization} %>
<% end %>
<div class="cl"></div>
</ul>
</div>
</div><!--content end--> </div><!--content end-->
<% else %> <% else %>
<div class="content"> <div class="content">
<div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div> <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
<div class="row"> <% if message_ats.nil? %>
<% message_ats.each do |act| %> <p class="nocontent">暂无内容，敬请期待！</p>
<%= render :partial => 'organizations/org_new_forum_list', :locals => {:activity => act, :field => field, :organization => @organization} %> <% else %>
<% end %> <div class="row">
<!--row-ziyuan end--> <% message_ats.each do |act| %>
</div> <%= render :partial => 'organizations/org_new_forum_list', :locals => {:activity => act, :field => field, :organization => @organization} %>
<div class="cl"></div> <% end %>
<%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> <!--row-ziyuan end-->
<div class="cl"></div> </div>
<div class="cl"></div>
<%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
<div class="cl"></div>
<% end %>
</div><!--row end--> </div><!--row end-->
<div class="cl"></div> <div class="cl"></div>
<% end %> <% end %>
@ -221,15 +261,20 @@
<% org_attachs = get_attach_org2(field) %> <% org_attachs = get_attach_org2(field) %>
<div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>"> <div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
<div class="content"> <div class="content">
<div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2><p class="box-title-p">resource dwonload</p></div> <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
<div class="row"> <% if org_attachs.nil? %>
<%= render :partial => 'organizations/org_new_resource', :locals => {:org_attachs => org_attachs} %> <p class="nocontent">暂无内容，敬请期待！</p>
<!--row-ziyuan end--> <% else %>
</div> <div class="row">
<%= render :partial => 'organizations/org_new_resource', :locals => {:org_attachs => org_attachs} %>
<!--row-ziyuan end-->
</div>
<div class="cl"></div>
<%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
<div class="cl"></div>
<% end %>
<div class="cl"></div>
<%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
<div class="cl"></div>
</div><!--row end--> </div><!--row end-->
<div class="cl"></div> <div class="cl"></div>
</div><!--box1 end--> </div><!--box1 end-->

23
app/views/organizations/_subfield_list.html.erb
Unescape View File

@ -2,7 +2,7 @@
<li class="orgOrder fb">顺序</li> <li class="orgOrder fb">顺序</li>
<li class="orgListUser fb">已有栏目</li> <li class="orgListUser fb">已有栏目</li>
<li class="orgListStatus fb">状态</li> <li class="orgListStatus fb">状态</li>
<li class="orgListStatus fb">排列</li> <li class="orgListStatusList fb fb">排列</li>
<li class="orgListStatus fb">类型</li> <li class="orgListStatus fb">类型</li>
<li class="orgListUser fb">域名目录</li> <li class="orgListUser fb">域名目录</li>
<div class="cl"></div> <div class="cl"></div>
@ -22,9 +22,9 @@
</li> </li>
<li class="orgListUser"><%= name %></li> <li class="orgListUser"><%= name %></li>
<li class="orgListStatus">默认</li> <li class="orgListStatus">默认</li>
<li class="orgListStatus"> <li class="orgListStatusList">
<%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %> <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
<div class="update_status_class"><span style="width: 35px; text-align: center; float: left;" class="hidden"><%=field.status %></span> <div class="update_status_class"><span style="width: 35px; text-align: center; float: left;" class="hidden"><%=field.status== 1 ? "列表" : "图片" %></span>
<a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a> <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
</div> </div>
<%= select( :name,:group_id, subfield_status_option, <%= select( :name,:group_id, subfield_status_option,
@ -33,7 +33,7 @@
<% end %> <% end %>
</li> </li>
<li class="orgListStatus">默认</li> <li class="orgListStatus">默认</li>
<a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"设为隐藏":"设为可见" %></a> <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
<div class="cl"></div> <div class="cl"></div>
</ul> </ul>
<% else %> <% else %>
@ -53,15 +53,20 @@
</div> </div>
</li> </li>
<li class="orgListStatus">新增</li> <li class="orgListStatus">新增</li>
<li class="orgListStatus"> <li class="orgListStatusList">
<% if field.field_type == "Resource" %>
列表
<% else %>
<%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %> <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
<div class="update_status_class"><span style="width: 35px; text-align: center; float: left;" class="hidden"><%=field.status %></span> <div class="update_status_class"><span style="width: 35px; text-align: center; float: left;" class="hidden"><%=field.status== 1 ? "列表" : "图片" %></span>
<a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a> <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
</div> </div>
<%= select( :name,:group_id, subfield_status_option, <%= select( :name,:group_id, subfield_status_option,
{ :include_blank => false,:selected => field.status}, { :include_blank => false,:selected => field.status},
{:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:30px;"}) %> {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:40px;"}) %>
<% end %> <% end %>
<% end %>
</li> </li>
<li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li> <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
<li class="orgListUser hidden"> <li class="orgListUser hidden">
@ -79,7 +84,7 @@
</div> </div>
</li> </li>
<%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %> <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
<a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"设为隐藏":"设为可见" %></a> <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
<%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr10" %> <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr10" %>
<a href="javascript:void(0);" class="linkBlue fr mr10" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a> <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
@ -195,7 +200,7 @@
$(edit_id).hide(); $(edit_id).hide();
} }
function hide(content, id){ function hide(content, id){
if (content.text() == '设为隐藏') if (content.text() == '隐藏')
$.ajax({ $.ajax({
url: "/organizations/hide_org_subfield?org_subfield_id=" + id, url: "/organizations/hide_org_subfield?org_subfield_id=" + id,
type: "post" type: "post"

2
app/views/organizations/hide_org_subfield.js.erb
Unescape View File

@ -1,2 +1,2 @@
$("#hide_<%= @org_subfield.id %>").text("设为可见"); $("#hide_<%= @org_subfield.id %>").text("可见");
$("#org_subfield_<%= @org_subfield.id %>").css("display", "none"); $("#org_subfield_<%= @org_subfield.id %>").css("display", "none");

2
app/views/organizations/show_org_subfield.js.erb
Unescape View File

@ -1,2 +1,2 @@
$("#hide_<%= @org_subfield.id %>").text("设为隐藏"); $("#hide_<%= @org_subfield.id %>").text("隐藏");
$("#org_subfield_<%= @org_subfield.id %>").css("display", "block"); $("#org_subfield_<%= @org_subfield.id %>").css("display", "block");

4
db/schema.rb
Unescape View File

@ -11,7 +11,7 @@
# #
# It's strongly recommended to check this file into your version control system. # It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20160331060004) do ActiveRecord::Schema.define(:version => 20160331063938) do
create_table "activities", :force => true do |t| create_table "activities", :force => true do |t|
t.integer "act_id", :null => false t.integer "act_id", :null => false
@ -1289,6 +1289,7 @@ ActiveRecord::Schema.define(:version => 20160331060004) do
t.datetime "updated_at", :null => false t.datetime "updated_at", :null => false
t.string "field_type" t.string "field_type"
t.integer "hide", :default => 0 t.integer "hide", :default => 0
t.integer "status", :default => 1
end end
create_table "organizations", :force => true do |t| create_table "organizations", :force => true do |t|
@ -1302,7 +1303,6 @@ ActiveRecord::Schema.define(:version => 20160331060004) do
t.boolean "allow_guest_download", :default => true t.boolean "allow_guest_download", :default => true
t.integer "visits", :default => 0 t.integer "visits", :default => 0
t.integer "show_mode", :default => 0 t.integer "show_mode", :default => 0
t.integer "type", :default => 1
end end
create_table "phone_app_versions", :force => true do |t| create_table "phone_app_versions", :force => true do |t|

7
public/stylesheets/org.css
Unescape View File

@ -18,12 +18,12 @@
.orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;} .orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;}
a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;} a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;}
a.saveBtn:hover {background-color:#297fb8;} a.saveBtn:hover {background-color:#297fb8;}
.orgMemberList {width:460px; float:left;} .orgMemberList {width:480px; float:left;}
.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;} .orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;}
.orgListUser {width:85px; float:left;} .orgListUser {width:85px; float:left;}
.orgListRole {width:180px; float:left;} .orgListRole {width:180px; float:left;}
.orgOrder {width:30px; float:left;margin-right:10px;text-align:center;} .orgOrder {width:30px; float:left;margin-right:10px;text-align:center;}
.orgMemContainer {width:228px;} .orgMemContainer {width:208px;}
.orgMemberAdd {float:right;} .orgMemberAdd {float:right;}
.orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;} .orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
.undis {display:none;} .undis {display:none;}
@ -75,7 +75,8 @@ a.linkGrey8:hover {color:#585858;}
#orgUserName {display:inline-block;} #orgUserName {display:inline-block;}
.org_login_list a {color:#269ac9;} .org_login_list a {color:#269ac9;}
.orgListStatus {width:55px; float:left;} .orgListStatus {width:40px; float:left;}
.orgListStatusList {width:55px; float:left;}
.personalUrl {border:1px solid #dddddd; width:75px; outline:none; white-space:nowrap; padding-left:2px;} .personalUrl {border:1px solid #dddddd; width:75px; outline:none; white-space:nowrap; padding-left:2px;}
.reCon{ margin:5px; width:710px;} .reCon{ margin:5px; width:710px;}
.retop{width:710px; height:40px; background:#eaeaea; padding:5px;} .retop{width:710px; height:40px; background:#eaeaea; padding:5px;}

2
public/stylesheets/org_new_style.css
Unescape View File

@ -182,6 +182,8 @@ a:hover.more-btn{ background:#29146f; color:#fff;}
a:hover.more-btn-center{ background:#29146f; color:#fff;} a:hover.more-btn-center{ background:#29146f; color:#fff;}
.mt30{ margin-top:30px;} .mt30{ margin-top:30px;}
.nocontent{ font-size:30px; color:#888; margin:150px auto; text-align:center;}

Write Preview
Loading…
Cancel
Save