Merge branch 'hjq_beidou' into develop
This commit is contained in:
commit
c83eefbbaa
|
|
@ -352,7 +352,7 @@ class OrganizationsController < ApplicationController
|
|||
if !params[:name].nil?
|
||||
condition = "%#{params[:name].strip}%".gsub(" ","")
|
||||
end
|
||||
sql = "select courses.* from courses inner join members on courses.id = members.course_id where members.user_id = #{User.current.id} and courses.name like '#{condition}'"+
|
||||
sql = "select courses.* from courses inner join members on courses.id = members.course_id where members.user_id = #{User.current.id} and courses.is_public = 1 and courses.name like '#{condition}'"+
|
||||
"and courses.id not in (select distinct org_courses.course_id from org_courses where org_courses.organization_id = #{@organization.id}) and courses.is_delete=0"
|
||||
#user_courses = Course.find_by_sql(sql)
|
||||
@courses = Course.find_by_sql(sql)
|
||||
|
|
@ -396,7 +396,7 @@ class OrganizationsController < ApplicationController
|
|||
if !params[:name].nil?
|
||||
condition = "%#{params[:name].strip}%".gsub(" ","")
|
||||
end
|
||||
sql = "select projects.* from projects inner join members on projects.id = members.project_id where members.user_id = #{User.current.id} and projects.status != 9 and projects.name like '#{condition}'" +
|
||||
sql = "select projects.* from projects inner join members on projects.id = members.project_id where members.user_id = #{User.current.id} and projects.status != 9 and projects.is_public = 1 and projects.name like '#{condition}'" +
|
||||
" and projects.id not in (select org_projects.project_id from org_projects where organization_id = #{@organization.id}) and status=1"
|
||||
#user_projects = Course.find_by_sql(sql)
|
||||
@projects = Course.find_by_sql(sql)
|
||||
|
|
|
|||
|
|
@ -836,8 +836,8 @@ class UsersController < ApplicationController
|
|||
render_403
|
||||
return
|
||||
end
|
||||
user_course_ids = User.current.courses.map { |c| c.id}
|
||||
user_project_ids = User.current.projects.map {|p| p.id}
|
||||
user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
|
||||
user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
|
||||
# user_org_ids = User.current.organizations.map {|o| o.id}
|
||||
if(params[:type].blank? || params[:type] == "1") # 我的资源
|
||||
# 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
|
||||
|
|
@ -886,11 +886,11 @@ class UsersController < ApplicationController
|
|||
def user_ref_resource_search
|
||||
search = params[:search].to_s.strip.downcase
|
||||
if(params[:type].blank? || params[:type] == "1") #全部
|
||||
user_course_ids = User.current.courses.map { |c| c.id} #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
|
||||
user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id} #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
|
||||
@attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
|
||||
" or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))) and (filename like '%#{search}%') ").order("created_on desc")
|
||||
elsif params[:type] == "2" #课程资源
|
||||
user_course_ids = User.current.courses.map { |c| c.id}
|
||||
user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
|
||||
@attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like '%#{search}%') ").order("created_on desc")
|
||||
elsif params[:type] == "3" #项目资源
|
||||
@attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project' and (filename like '%#{search}%')").order("created_on desc")
|
||||
|
|
@ -1579,16 +1579,14 @@ class UsersController < ApplicationController
|
|||
|
||||
# 上传用户资源
|
||||
def user_resource_create
|
||||
user_course_ids = User.current.courses.map { |c| c.id}
|
||||
user_project_ids = User.current.projects.map {|p| p.id}
|
||||
user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
|
||||
user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
|
||||
# user_org_ids = User.current.organizations.map {|o| o.id}
|
||||
@user = User.find(params[:id])
|
||||
# 保存文件
|
||||
attach = Attachment.attach_filesex_public(@user, params[:attachments], params[:attachment_type], is_public = true)
|
||||
@order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
|
||||
@score = @b_sort == "desc" ? "asc" : "desc"
|
||||
user_course_ids = User.current.courses.map { |c| c.id}
|
||||
user_project_ids = User.current.projects.map {|p| p.id}
|
||||
# user_org_ids = User.current.organizations.map {|o| o.id}
|
||||
if(params[:type].blank? || params[:type] == "1") # 我的资源
|
||||
# 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
|
||||
|
|
@ -2467,7 +2465,7 @@ class UsersController < ApplicationController
|
|||
|
||||
# 获取我的资源
|
||||
def get_my_resources author_id, user_course_ids, user_project_ids, order, score
|
||||
attachments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
|
||||
attachments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('OrgSubfield','Principal','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
|
||||
"or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
|
||||
"or (container_type = 'Project' and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
|
||||
end
|
||||
|
|
@ -2580,8 +2578,8 @@ class UsersController < ApplicationController
|
|||
end
|
||||
@order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
|
||||
@score = @b_sort == "desc" ? "asc" : "desc"
|
||||
user_course_ids = User.current.courses.map { |c| c.id}
|
||||
user_project_ids = User.current.projects.map {|p| p.id}
|
||||
user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
|
||||
user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
|
||||
# user_org_ids = User.current.organizations.map {|o| o.id}
|
||||
if(params[:type].blank? || params[:type] == "1") # 我的资源
|
||||
# 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
|
||||
|
|
@ -2638,8 +2636,8 @@ class UsersController < ApplicationController
|
|||
@user = User.find(params[:id])
|
||||
@order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
|
||||
@score = @b_sort == "desc" ? "asc" : "desc"
|
||||
user_course_ids = User.current.courses.map { |c| c.id}
|
||||
user_project_ids = User.current.projects.map {|p| p.id} # user_org_ids = User.current.organizations.map {|o| o.id}
|
||||
user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
|
||||
user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id } # user_org_ids = User.current.organizations.map {|o| o.id}
|
||||
if(params[:type].blank? || params[:type] == "1") # 我的资源
|
||||
# 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
|
||||
@attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
|
||||
|
|
@ -2677,8 +2675,8 @@ class UsersController < ApplicationController
|
|||
# 别人的资源库是没有权限去看的
|
||||
if(params[:type].blank? || params[:type] == "1") # 我的资源
|
||||
# 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
|
||||
user_course_ids = User.current.courses.map { |c| c.id}
|
||||
user_project_ids = User.current.projects.map {|p| p.id}
|
||||
user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
|
||||
user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
|
||||
# user_org_ids = User.current.organizations.map {|o| o.id}
|
||||
@attachments = get_my_resources_search(params[:id], user_course_ids, user_project_ids, @order, @score, search)
|
||||
elsif params[:type] == "6" # 公共资源
|
||||
|
|
@ -2758,8 +2756,8 @@ class UsersController < ApplicationController
|
|||
@user = User.current
|
||||
@switch_search = params[:search].nil? ? " " : params[:search]
|
||||
search = "%#{@switch_search.strip.downcase}%"
|
||||
user_course_ids = User.current.courses.map {|c| c.id}
|
||||
user_project_ids = User.current.projects.map {|p| p.id}
|
||||
user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
|
||||
user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
|
||||
if(params[:type].nil? || params[:type].blank? || params[:type] == "1" || params[:type] == 'all') # 全部
|
||||
if params[:status] == "2"
|
||||
@attachments = get_course_resources_search(params[:id], user_course_ids, @order, @score, search)
|
||||
|
|
|
|||
|
|
@ -88,86 +88,75 @@
|
|||
<div class="header">
|
||||
<div class="header-con">
|
||||
<% if User.current.admin_of_org?(@organization) %>
|
||||
<a href="javascript:void(0);" class="fl logo" onclick="orge_new_files_upload();">
|
||||
<!--"/files/uploads/image#{iamge_path}"-->
|
||||
<% if @org_logo_attchment.blank? %>
|
||||
<img src="/images/org_new_style/logo.jpg" height="52" alt=""/>
|
||||
<% else %>
|
||||
<img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" height="52">
|
||||
<% end %>
|
||||
</a>
|
||||
<div class="logo fl">
|
||||
<a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
|
||||
<a href="" class="logo-add" title="点击替换LOGO" onclick="orge_new_files_upload();"></a>
|
||||
</div>
|
||||
<% else %>
|
||||
<a href="javascript:void(0);" class="fl logo" onclick="orge_new_files_upload();">
|
||||
<!--"/files/uploads/image#{iamge_path}"-->
|
||||
<% if @org_logo_attchment.blank? %>
|
||||
<img src="/images/org_new_style/logo.jpg" height="52" alt=""/>
|
||||
<% else %>
|
||||
<img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" height="52">
|
||||
<% end %>
|
||||
</a>
|
||||
<div class="logo fl">
|
||||
<a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<%# 登录 %>
|
||||
<%= render :partial => 'organizations/org_logined_header' %>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div><!--header end-->
|
||||
|
||||
<div class="nav-box">
|
||||
<div class="nav fl">
|
||||
<% @subfield_content.each do |field| %>
|
||||
<% if is_default_field?(field) %>
|
||||
<% case field.name %>
|
||||
<% when 'activity' %>
|
||||
<%= link_to "首页", organization_path(@organization), :class => "fl navact" %>
|
||||
<% when 'course' %>
|
||||
<a href="#course_<%= field.id %>" class="fl"> 课程动态</a>
|
||||
<% when 'project' %>
|
||||
<a href="#project_<%= field.id %>" class="fl">项目动态</a>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<% if field.field_type == "Post" && field.hide == 0 %>
|
||||
<a href="#message_<%= field.id %>" class="fl"><%= field.name %></a>
|
||||
<% elsif field.field_type == "Resource" && field.hide == 0 %>
|
||||
<a href="#resource_<%= field.id %>" class="fl"><%= field.name %></a>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% if User.current.admin_of_org?(@organization) %>
|
||||
<a href="<%= setting_organization_path(@organization) %>" class="fl">配置</a>
|
||||
<% end %>
|
||||
<div class="nav-con">
|
||||
<div class="nav fl">
|
||||
<% @subfield_content.each do |field| %>
|
||||
<% if is_default_field?(field) %>
|
||||
<% case field.name %>
|
||||
<% when 'activity' %>
|
||||
<%= link_to "首页", organization_path(@organization), :class => "fl navact" %>
|
||||
<% when 'course' %>
|
||||
<a href="#course_<%= field.id %>" class="fl"> 课程动态</a>
|
||||
<% when 'project' %>
|
||||
<a href="#project_<%= field.id %>" class="fl">项目动态</a>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<% if field.field_type == "Post" && field.hide == 0 %>
|
||||
<a href="#message_<%= field.id %>" class="fl"><%= field.name %></a>
|
||||
<% elsif field.field_type == "Resource" && field.hide == 0 %>
|
||||
<a href="#resource_<%= field.id %>" class="fl"><%= field.name %></a>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% if User.current.admin_of_org?(@organization) %>
|
||||
<a href="<%= setting_organization_path(@organization) %>" class="fl">配置</a>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
</div><!--nav end-->
|
||||
</div>
|
||||
<!--nav end-->
|
||||
|
||||
<div class="banner">
|
||||
<div class="banner-inner">
|
||||
<% if User.current.admin_of_org?(@organization) %>
|
||||
<a href="javascript:void(0);" onclick="orge_new_files_banner_upload();">
|
||||
<!--"/files/uploads/image#{iamge_path}"-->
|
||||
<% if @org_banner_attchment.blank? %>
|
||||
<img class="banner-img" src="/images/org_new_style/banner.jpg" alt=""/>
|
||||
<% else %>
|
||||
<img src="/attachments/<%= @org_banner_attchment.id %>/<%= @org_banner_attchment.filename %>" class="banner-img">
|
||||
<% end %>
|
||||
</a>
|
||||
<% if @org_banner_attchment.blank? %>
|
||||
<img class="banner-img" src="/images/org_new_style/banner.jpg" alt=""/>
|
||||
<% else %>
|
||||
<img src="/attachments/<%= @org_banner_attchment.id %>/<%= @org_banner_attchment.filename %>" class="banner-img">
|
||||
<% end %>
|
||||
<a href="#" class="banner-add" title="点击替换图片" onclick="orge_new_files_banner_upload();"></a>
|
||||
<div class="banner-txt">
|
||||
<p ><%= @organization.name %></p>
|
||||
</div>
|
||||
<% else %>
|
||||
<a href="javascript:void(0);" onclick="orge_new_files_banner_upload();">
|
||||
<!--"/files/uploads/image#{iamge_path}"-->
|
||||
<% if @org_banner_attchment.blank? %>
|
||||
<img class="banner-img" src="/images/org_new_style/banner.jpg" alt=""/>
|
||||
<% else %>
|
||||
<img src="/attachments/<%= @org_banner_attchment.id %>/<%= @org_banner_attchment.filename %>" class="banner-img">
|
||||
<% end %>
|
||||
</a>
|
||||
<% if @org_banner_attchment.blank? %>
|
||||
<img class="banner-img" src="/images/org_new_style/banner.jpg" alt=""/>
|
||||
<% else %>
|
||||
<img src="/attachments/<%= @org_banner_attchment.id %>/<%= @org_banner_attchment.filename %>" class="banner-img">
|
||||
<% end %>
|
||||
<div class="banner-txt">
|
||||
<p ><%= @organization.name %></p>
|
||||
</div>
|
||||
<% end %>
|
||||
<div class="banner-txt">
|
||||
<h1><%= @organization.name %></h1>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="cl"></div>
|
||||
|
||||
<!--模块-->
|
||||
<% @subfield_content.each do |field| %>
|
||||
<% if is_default_field?(field) %>
|
||||
|
|
|
|||
|
|
@ -145,23 +145,25 @@
|
|||
</div>
|
||||
<% end %>
|
||||
|
||||
<div class="homepagePostReplyContainer borderBottomNone minHeight48">
|
||||
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
|
||||
<div class="homepagePostReplyInputContainer mb10">
|
||||
<div nhname='new_message_<%= user_activity_id%>' style="display:none;">
|
||||
<%= form_for('new_form',:url => {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
|
||||
<input type="hidden" name="quote[quote]" value="">
|
||||
<input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
|
||||
<div nhname='toolbar_container_<%= user_activity_id%>'></div>
|
||||
<textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
|
||||
<a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
|
||||
<div class="cl"></div>
|
||||
<p nhname='contentmsg_<%= user_activity_id%>'></p>
|
||||
<% end%>
|
||||
<% if !activity.locked? %>
|
||||
<div class="homepagePostReplyContainer borderBottomNone minHeight48">
|
||||
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
|
||||
<div class="homepagePostReplyInputContainer mb10">
|
||||
<div nhname='new_message_<%= user_activity_id%>' style="display:none;">
|
||||
<%= form_for('new_form',:url => {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
|
||||
<input type="hidden" name="quote[quote]" value="">
|
||||
<input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
|
||||
<div nhname='toolbar_container_<%= user_activity_id%>'></div>
|
||||
<textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
|
||||
<a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
|
||||
<div class="cl"></div>
|
||||
<p nhname='contentmsg_<%= user_activity_id%>'></p>
|
||||
<% end%>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 171 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 4.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 40 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 28 KiB |
|
|
@ -18,45 +18,69 @@ a:hover{color:#29156f;}
|
|||
.bg-grey{ background:#f2f2f2;}
|
||||
|
||||
/** header **/
|
||||
.header{ width:100%; height:60px; background:#29146f; padding:5px 0 0px; }
|
||||
.header-con{ width:1200px; margin:0 auto;}
|
||||
.logo,.logo img{ display:block; height:52px; }
|
||||
a.login{ background:url(../images/org_new_style/icons.png) -7px -11px no-repeat; width:146px; height:55px; margin-right:40px; margin-top:11px;}
|
||||
a:hover.login{ background:url(../images/org_new_style/icons.png) -7px -88px no-repeat; }
|
||||
a.register{ background:url(../images/org_new_style/icons.png) -190px -11px no-repeat; width:158px; height:55px; ;margin-top:11px;}
|
||||
a:hover.register{ background:url(../images/org_new_style/icons.png) -190px -88px no-repeat; }
|
||||
.header{ width:100%; height:60px; padding:5px 0 0px; }
|
||||
.header-con{ width:1200px; margin:0 auto; }
|
||||
.logo{ position:relative; }
|
||||
.logo-img{ height:52px; }
|
||||
.login{ margin-top:15px;}
|
||||
.login a{ color:#fff; font-size:14px; margin-top:10px; }
|
||||
.login a{ color:#000; font-size:14px; margin-top:10px; }
|
||||
.logo-add{ display:block; top:3px; left:0px; position:absolute; width:20px; height:20px;background:url(../images/org_new_style/icons.png) -7px -573px no-repeat;}
|
||||
|
||||
|
||||
/*.header{ width:100%; height:60px; background:#29146f; padding:5px 0 0px; }*/
|
||||
/*.header-con{ width:1200px; margin:0 auto;}*/
|
||||
/*.logo,.logo img{ display:block; height:52px; }*/
|
||||
/*a.login{ background:url(../images/org_new_style/icons.png) -7px -11px no-repeat; width:146px; height:55px; margin-right:40px; margin-top:11px;}*/
|
||||
/*a:hover.login{ background:url(../images/org_new_style/icons.png) -7px -88px no-repeat; }*/
|
||||
/*a.register{ background:url(../images/org_new_style/icons.png) -190px -11px no-repeat; width:158px; height:55px; ;margin-top:11px;}*/
|
||||
/*a:hover.register{ background:url(../images/org_new_style/icons.png) -190px -88px no-repeat; }*/
|
||||
/*.login{ margin-top:15px;}*/
|
||||
/*.login a{ color:#fff; font-size:14px; margin-top:10px; }*/
|
||||
/** nav **/
|
||||
.nav-box{ width:1200px; height:60px; margin:0 auto;}
|
||||
.nav a{ display:block; padding:15px 10px; font-size:18px; color:#000; margin-right:20px; }
|
||||
.navact{border-bottom:3px solid #ffbd18;}
|
||||
.nav a:hover{border-bottom:3px solid #ffbd18;}
|
||||
.searchbox{ width:338px; height:57px; border:1px solid #ccc; -webkit-border-radius: 3px;border-radius: 3px; margin:10px 0px 0 0;}
|
||||
.search-input{width:270px; height:40px; color:#bebebe; font-size:18px; border:1px solid #ccc; -webkit-border-radius: 3px;border-radius: 3px;border:0px; background:none; margin:10px 0 0 20px;}
|
||||
.search-input:hover{ border:none;color:#fff; }
|
||||
a.search-icon{ background:url(../images/org_new_style/icons.png) -387px -11px no-repeat; width:40px; height:40px; margin-top:8px;}
|
||||
a:hover.search-icon{ background:url(../images/org_new_style/icons.png) -387px -89px no-repeat;}
|
||||
.searchbox:hover{ background:#999999; color:#fff;}
|
||||
.nav-box{ width:100%; padding:0px 0 5px; background:#eeeeee;}
|
||||
.nav-con{width:1200px; margin:0 auto; background:#eee;}
|
||||
.nav{ }
|
||||
.nav a{ display:block; padding:15px 10px; font-size:18px; color:#666666; background:#eee; border-top:3px solid #eee; margin-right:20px; }
|
||||
a.navact{border-top:3px solid #ffbd18;}
|
||||
.nav a:hover{border-top:3px solid #ffbd18;}
|
||||
|
||||
/*.nav-box{ width:1200px; height:60px; margin:0 auto;}*/
|
||||
/*.nav a{ display:block; padding:15px 10px; font-size:18px; color:#000; margin-right:20px; }*/
|
||||
/*.navact{border-bottom:3px solid #ffbd18;}*/
|
||||
/*.nav a:hover{border-bottom:3px solid #ffbd18;}*/
|
||||
/*.searchbox{ width:338px; height:57px; border:1px solid #ccc; -webkit-border-radius: 3px;border-radius: 3px; margin:10px 0px 0 0;}*/
|
||||
/*.search-input{width:270px; height:40px; color:#bebebe; font-size:18px; border:1px solid #ccc; -webkit-border-radius: 3px;border-radius: 3px;border:0px; background:none; margin:10px 0 0 20px;}*/
|
||||
/*.search-input:hover{ border:none;color:#fff; }*/
|
||||
/*a.search-icon{ background:url(../images/org_new_style/icons.png) -387px -11px no-repeat; width:40px; height:40px; margin-top:8px;}*/
|
||||
/*a:hover.search-icon{ background:url(../images/org_new_style/icons.png) -387px -89px no-repeat;}*/
|
||||
/*.searchbox:hover{ background:#999999; color:#fff;}*/
|
||||
|
||||
/* banner */
|
||||
.banner{ width:100%; height:304px; background:#070317; color:#fff; text-align:center; line-height:2.4;}
|
||||
.banner-inner{ width:1500px; margin:0 auto; position:relative; text-align:center;}
|
||||
.banner-img{ height:304px;}
|
||||
.banner-txt{position:absolute; top:30%; left:0%; width:1500px; margin:0 auto;}
|
||||
.banner{ width:100%; height:304px; color:#fff; text-align:center; line-height:2.4;position:relative;}
|
||||
.banner-inner{ width:100%; margin:0 auto; text-align:center;}
|
||||
.banner-img{ height:313px;}
|
||||
.banner-txt{position:absolute; top:25%; left:35%; width:500px; padding:30px 0; margin:0 auto; background-color:rgba(255,255,255,.3); }
|
||||
.banner-add{ display:block; position:absolute; top:10%; left:20%;width:27px; height:27px; background:url(../images/org_new_style/icons.png) -39px -570px no-repeat;}
|
||||
.banner h1{ font-size:42px;}
|
||||
.banner a{font-size:28px; color:#fff;}
|
||||
.banner a:hover{ text-decoration:underline;}
|
||||
.banner p{ font-size:18px;}
|
||||
.banner span{ font-size:16px;}
|
||||
.banner p{font-size:40px; color:#fff;}
|
||||
|
||||
/*.banner{ width:100%; height:304px; background:#070317; color:#fff; text-align:center; line-height:2.4;}*/
|
||||
/*.banner-inner{ width:1500px; margin:0 auto; position:relative; text-align:center;}*/
|
||||
/*.banner-img{ height:304px;}*/
|
||||
/*.banner-txt{position:absolute; top:30%; left:0%; width:1500px; margin:0 auto;}*/
|
||||
/*.banner h1{ font-size:42px;}*/
|
||||
/*.banner a{font-size:28px; color:#fff;}*/
|
||||
/*.banner a:hover{ text-decoration:underline;}*/
|
||||
/*.banner p{ font-size:18px;}*/
|
||||
/*.banner span{ font-size:16px;}*/
|
||||
|
||||
/** box1 **/
|
||||
.box1{ width:100%; padding:60px 0;}
|
||||
.content{ width:1200px; margin:0 auto;}
|
||||
.box-top{ margin:0 auto; text-align:center; margin-bottom:45px; }
|
||||
.box-title{ width:355px; height:67px; margin:0 auto; background:#29156f; color:#fff; text-align:center; font-size:40px; font-weight: lighter; margin-bottom:2px;}
|
||||
.box-title{ width:355px; height:67px; margin:0 auto; border-top:1px solid #ccc; border-bottom:1px solid #ccc; color:#000; text-align:center; font-size:40px; font-weight: lighter; margin-bottom:2px;}
|
||||
.box-title-p{ font-size:20px; color:#999999;}
|
||||
.row{ width:1200px; margin: 0 auto; }
|
||||
.row{ width:1200px; margin: 0 auto; }
|
||||
.row-box1{ width:365px;}
|
||||
.row-img{ margin-bottom:10px; width:365px; height:230px; display:block;}
|
||||
.row-time{ color:#ffbd18; font-size:14px; font-weight:bold; line-height:1.9;}
|
||||
|
|
@ -66,8 +90,6 @@ a:hover.search-icon{ background:url(../images/org_new_style/icons.png) -387px -8
|
|||
.row-txt{line-height:2.4; padding-bottom:10px; margin-bottom:10px; color:#888;}
|
||||
.row-txt:hover{color:#29156f;}
|
||||
.row-txt-line{border-bottom:1px solid #cccccc; width:365px;}
|
||||
a.btn-more{ display:block; font-size:14px; width:110px; height:40px; -webkit-border-radius: 3px;border-radius: 3px;background:#ffbd18; color:#fff; text-align:center; line-height:3.0;}
|
||||
a:hover.btn-more{ background:#29156f;}
|
||||
.row-box2{ width:388px; border:1px solid #ccc; border-bottom:none;}
|
||||
.row-con2 a{ display:block;padding:20px 10px; border-bottom:1px solid #ccc;}
|
||||
.row-con2 a:hover{ background:#29156f; color:#fff;}
|
||||
|
|
@ -75,6 +97,30 @@ a:hover.btn-more{ background:#29156f;}
|
|||
.row-txt2{line-height:2.4; color:#888;}
|
||||
.row-txt2:hover{ color:#fff; }
|
||||
|
||||
/*.box1{ width:100%; padding:60px 0;}*/
|
||||
/*.content{ width:1200px; margin:0 auto;}*/
|
||||
/*.box-top{ margin:0 auto; text-align:center; margin-bottom:45px; }*/
|
||||
/*.box-title{ width:355px; height:67px; margin:0 auto; background:#29156f; color:#fff; text-align:center; font-size:40px; font-weight: lighter; margin-bottom:2px;}*/
|
||||
/*.box-title-p{ font-size:20px; color:#999999;}*/
|
||||
/*.row{ width:1200px; margin: 0 auto; }*/
|
||||
/*.row-box1{ width:365px;}*/
|
||||
/*.row-img{ margin-bottom:10px; width:365px; height:230px; display:block;}*/
|
||||
/*.row-time{ color:#ffbd18; font-size:14px; font-weight:bold; line-height:1.9;}*/
|
||||
/*.row-title{ font-size:16px; font-weight:bold; line-height:1.9;display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}*/
|
||||
/*.row-con { display:block; }*/
|
||||
/*.row-con:hover{ color:#29156f; }*/
|
||||
/*.row-txt{line-height:2.4; padding-bottom:10px; margin-bottom:10px; color:#888;}*/
|
||||
/*.row-txt:hover{color:#29156f;}*/
|
||||
/*.row-txt-line{border-bottom:1px solid #cccccc; width:365px;}*/
|
||||
/*a.btn-more{ display:block; font-size:14px; width:110px; height:40px; -webkit-border-radius: 3px;border-radius: 3px;background:#ffbd18; color:#fff; text-align:center; line-height:3.0;}*/
|
||||
/*a:hover.btn-more{ background:#29156f;}*/
|
||||
/*.row-box2{ width:388px; border:1px solid #ccc; border-bottom:none;}*/
|
||||
/*.row-con2 a{ display:block;padding:20px 10px; border-bottom:1px solid #ccc;}*/
|
||||
/*.row-con2 a:hover{ background:#29156f; color:#fff;}*/
|
||||
/*.row-con2 a:hover{ color:#fff;}*/
|
||||
/*.row-txt2{line-height:2.4; color:#888;}*/
|
||||
/*.row-txt2:hover{ color:#fff; }*/
|
||||
|
||||
/** 活动专区 **/
|
||||
.con-left{ width:618px;}
|
||||
.con-left-box{ margin-bottom:20px; height:96px; display:block;}
|
||||
|
|
@ -95,7 +141,7 @@ a.con-arrow-btn{ display: block;width:25px;height:25px;background:url(../images/
|
|||
a.pre-arrow,a.pre-back{ display:block; width:25px; height:10px; background:#29156f; margin-left:5px;}
|
||||
a.pre-back{ background:#888;}
|
||||
/** footer **/
|
||||
.footer{ height:150px; background:#29156f; width:100%;}
|
||||
.footer{ height:150px; background:#bbb; width:100%;}
|
||||
.footer-con{ width:1200px; padding:30px 0 0 60px; margin:0 auto; text-align:center; font-size:14px; color:#fff;}
|
||||
.footer-con ul{ display:block; width:430px; height:50px; margin:0 auto; }
|
||||
.footer-con ul li a{font-size:18px; color:#fff; margin-right:35px; font-weight:bold;}
|
||||
|
|
@ -180,14 +226,17 @@ a:hover.read-more{ text-decoration:underline;}
|
|||
opacity: 1;
|
||||
}
|
||||
|
||||
|
||||
a.more-btn{ display:block; background:#ccc; color:#fff; margin-top:10px; width:100px; height:38px;font-size:14px; -webkit-border-radius: 5px;border-radius:5px;text-align:center; line-height:38px;}
|
||||
a.more-btn{ display:block; border:1px solid #ccc; color:#000; margin-top:10px; width:120px; height:38px;font-size:14px; -webkit-border-radius: 25px;border-radius:25px;text-align:center; line-height:38px; margin:0 auto; margin-top:30px;}
|
||||
a.more-btn-center{ display:block; border:1px solid #ccc; color:#000; margin-top:10px; width:120px; height:38px;font-size:14px; -webkit-border-radius: 25px;border-radius:25px;text-align:center; line-height:38px; margin:0 auto; margin-top:30px;}
|
||||
a:hover.more-btn{ background:#29146f; color:#fff;}
|
||||
a:hover.more-btn-center{ background:#29146f; color:#fff;}
|
||||
a:hover.more-btn-center{ background:#aaa; color:#fff;}
|
||||
.mt30{ margin-top:30px;}
|
||||
|
||||
/*a.more-btn{ display:block; background:#ccc; color:#fff; margin-top:10px; width:100px; height:38px;font-size:14px; -webkit-border-radius: 5px;border-radius:5px;text-align:center; line-height:38px;}*/
|
||||
/*a.more-btn{ display:block; border:1px solid #ccc; color:#000; margin-top:10px; width:120px; height:38px;font-size:14px; -webkit-border-radius: 25px;border-radius:25px;text-align:center; line-height:38px; margin:0 auto; margin-top:30px;}*/
|
||||
/*a.more-btn-center{ display:block; border:1px solid #ccc; color:#000; margin-top:10px; width:120px; height:38px;font-size:14px; -webkit-border-radius: 25px;border-radius:25px;text-align:center; line-height:38px; margin:0 auto; margin-top:30px;}*/
|
||||
/*a:hover.more-btn{ background:#29146f; color:#fff;}*/
|
||||
/*a:hover.more-btn-center{ background:#29146f; color:#fff;}*/
|
||||
/*.mt30{ margin-top:30px;}*/
|
||||
|
||||
.nocontent{ font-size:30px; color:#888; margin:150px auto; text-align:center;}
|
||||
|
||||
/** 帖子列表模式 **/
|
||||
|
|
|
|||
Loading…
Reference in New Issue