jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/szzh' into szzh

This commit is contained in:
lizanle 2015-08-31 11:59:42 +08:00
parent e9b501058b 8763243e31
commit 5b40628a5b
13 changed files with 88 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
app/controllers/welcome_controller.rb
View File

@ -98,9 +98,12 @@ class WelcomeController < ApplicationController
end end
def course def course
@course_page = FirstPage.find_by_page_type('course') redirect_to signin_path
@school_id = params[:school_id] || User.current.user_extensions.school.try(:id) || 117 return
@logoLink ||= logolink() #
# @course_page = FirstPage.find_by_page_type('course')
# @school_id = params[:school_id] || User.current.user_extensions.school.try(:id) || 117
# @logoLink ||= logolink()
end end
def logolink() def logolink()
@ -140,8 +143,11 @@ class WelcomeController < ApplicationController
def contest def contest
@contest_page = FirstPage.find_by_page_type('contest') redirect_to signin_path
@contest_notifications = Contestnotification.order("created_at desc").limit(5) return
# @contest_page = FirstPage.find_by_page_type('contest')
# @contest_notifications = Contestnotification.order("created_at desc").limit(5)
end end
def search def search
@ -181,28 +187,28 @@ class WelcomeController < ApplicationController
private private
# 判断网站的入口，是课程 course 则跳过index去渲染 course 方法 # 判断网站的入口，是课程 course 则跳过index去渲染 course 方法
def entry_select def entry_select
url = request.original_url.gsub('/','') # url = request.original_url.gsub('/','')
if url.include?(Setting.url_course.gsub('/','')) # if url.include?(Setting.url_course.gsub('/',''))
if @first_page.show_course == 1 # if @first_page.show_course == 1
course # course
render :course # render :course
else # else
render_404 # render_404
end # end
#
return 0 # return 0
elsif url.include?(Setting.url_contest.gsub('/','')) # elsif url.include?(Setting.url_contest.gsub('/',''))
if @first_page.show_contest == 1 # if @first_page.show_contest == 1
contest # contest
render :contest # render :contest
else # else
render_404 # render_404
end # end
#
return 0 # return 0
elsif url.include?(Setting.url_user.gsub('/','')) # elsif url.include?(Setting.url_user.gsub('/',''))
#redirect_to(:controller => "users", :action => "index") # #redirect_to(:controller => "users", :action => "index")
end # end
end end

15
app/helpers/application_helper.rb
View File

@ -2254,6 +2254,21 @@ module ApplicationHelper
technical_title technical_title
end end
def get_user_roll user
technical_title = ""
case user.user_extensions.identity.to_s
when "0"
technical_title = get_technical_title user
when "1"
technical_title = l(:label_account_identity_student)
when "2"
technical_title = l(:label_account_identity_enterprise)
when "3"
technical_title = l(:label_account_identity_developer)
end
technical_title
end
def ie8? def ie8?
request.env["HTTP_USER_AGENT"] =~ /MSIE 8.0/ request.env["HTTP_USER_AGENT"] =~ /MSIE 8.0/

2
app/views/courses/_history.html.erb
View File

@ -5,7 +5,7 @@
<div class="ping_dispic"> <div class="ping_dispic">
<%= link_to image_tag(url_to_avatar(journal.user),:width => '46',:height => '46'), user_path(journal.user) %> <%= link_to image_tag(url_to_avatar(journal.user),:width => '46',:height => '46'), user_path(journal.user) %>
</div> </div>
<div class="ping_discon upload_img" style="width: 670px;"> <div class="ping_discon upload_img" style="width: 610px;">
<div class="ping_distop f14"> <div class="ping_distop f14">
<!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> --> <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
<span> <span>

2
app/views/layouts/_logined_header.html.erb
View File

@ -56,7 +56,7 @@
<%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %> <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
<input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索"/> <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索"/>
<input type="hidden" name="search_type" id="type" value=""/> <input type="hidden" name="search_type" id="type" value=""/>
<input type="text" class="none"/> <input type="text" style="display: none;"/>
<a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a> <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
<% end %> <% end %>
<div class="navSearchTypeBox" id="navHomepageSearchType"> <div class="navSearchTypeBox" id="navHomepageSearchType">

4
app/views/layouts/new_base_user.html.erb
View File

@ -50,9 +50,11 @@
<span class="<%= @user.user_extensions.gender == 1 ? 'homepageImageSexWomen' : 'homepageImageSexMan' %> "></span> <span class="<%= @user.user_extensions.gender == 1 ? 'homepageImageSexWomen' : 'homepageImageSexMan' %> "></span>
<% end %> <% end %>
<div class="cl"></div> <div class="cl"></div>
<% if @user.user_extensions && @user.user_extensions.identity %>
<p class="mb20 c_dark f14"> <p class="mb20 c_dark f14">
<%= get_technical_title @user %> <%= get_user_roll @user %>
</p> </p>
<% end%>
<div id="watch_user_btn_div"> <div id="watch_user_btn_div">
<%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %> <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
</div> </div>

2
app/views/news/_course_form.html.erb
View File

@ -27,7 +27,7 @@
<%= render :partial => 'attachments/new_form', :locals => {:container => @news} %> <%= render :partial => 'attachments/new_form', :locals => {:container => @news} %>
<div class="cl"></div> <div class="cl"></div>
</li> </li>
<li class="ml50" > <li class="ml40" >
<% if is_new %> <% if is_new %>
<%= link_to l(:button_create), "javascript:void(0)", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'blue_btn fl c_white' %> <%= link_to l(:button_create), "javascript:void(0)", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'blue_btn fl c_white' %>
<%= link_to l(:button_cancel), course_news_index_path(@course), :onclick => '$("#add-news").hide()', :class => 'blue_btn grey_btn fl c_white' %> <%= link_to l(:button_cancel), course_news_index_path(@course), :onclick => '$("#add-news").hide()', :class => 'blue_btn grey_btn fl c_white' %>

2
app/views/poll/_poll.html.erb
View File

@ -2,7 +2,7 @@
<% poll_name = poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%> <% poll_name = poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
<% if @is_teacher%> <% if @is_teacher%>
<li title="<%= poll.polls_name %>"> <li title="<%= poll.polls_name %>">
<div style="width: 370px;float: left;"> <div style="width: 310px;float: left;">
<% if has_commit %> <% if has_commit %>
<%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%> <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%>
<% else %> <% else %>

2
app/views/users/_user_jours.html.erb
View File

@ -8,7 +8,7 @@
div.ke-toolbar .ke-outline{border:none;} div.ke-toolbar .ke-outline{border:none;}
div.respond-form .reply_btn{margin-left:565px;margin-top:5px;} div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
div.recall_con{width:600px;} div.recall_con{width:570px;}
div.recall_con .reply_btn{margin-left:555px;margin-top:5px;} div.recall_con .reply_btn{margin-left:555px;margin-top:5px;}
</style> </style>
<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>

2
app/views/users/user_homeworks.html.erb
View File

@ -14,7 +14,7 @@
function reset_homework(){ function reset_homework(){
$("#homework_name").val(""); $("#homework_name").val("");
$("#homework_end_time").val(""); $("#homework_end_time").val("<%= (Time.now + 3600 * 24).strftime('%Y-%m-%d')%>");
$("#course_id").val(""); $("#course_id").val("");
$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new })%>"); $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new })%>");
homework_description_editor.html(""); homework_description_editor.html("");

32
public/stylesheets/courses.css
View File

@ -1,7 +1,7 @@
/*右侧内容--动态*/ /*右侧内容--动态*/
.project_r_h{ width:730px; height:40px; background:#eaeaea; margin-bottom:10px;} .project_r_h{ width:670px; height:40px; background:#eaeaea; margin-bottom:10px;}
.project_r_h02{ width:980px; height:40px; background:#eaeaea; margin-bottom:10px;} .project_r_h02{ width:920px; height:40px; background:#eaeaea; margin-bottom:10px;}
.project_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;} .project_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;}
.project_r_box{ border:1px solid #e2e1e1; width:670px; margin-top:10px;} .project_r_box{ border:1px solid #e2e1e1; width:670px; margin-top:10px;}
.project_h3 { color:#646464; font-size:14px; padding:0 10px; border-bottom:1px solid #e2e1e1;} .project_h3 { color:#646464; font-size:14px; padding:0 10px; border-bottom:1px solid #e2e1e1;}
@ -52,7 +52,7 @@ a:hover.problem_new_btn{ background:#ff7143; color:#fff;}
.problem_p span{ color:#ff3e00;} .problem_p span{ color:#ff3e00;}
a.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;} a.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;}
a:hover.problem_pic{border:1px solid #64bdd9;} a:hover.problem_pic{border:1px solid #64bdd9;}
.problem_txt{ width:670px; margin-left:10px; color:#777777;word-break: break-all;word-wrap: break-word;} .problem_txt{ width:610px; margin-left:10px; color:#777777;word-break: break-all;word-wrap: break-word;}
a.problem_name{ color:#ff5722;max-width:60px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;} a.problem_name{ color:#ff5722;max-width:60px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
a:hover.problem_name{ color:#d33503;} a:hover.problem_name{ color:#d33503;}
a.problem_tit{ color:#0781b4; max-width:410px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;vertical-align: top;} a.problem_tit{ color:#0781b4; max-width:410px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;vertical-align: top;}
@ -105,14 +105,14 @@ a:hover.grey_btn{ background:#717171; color:#fff;}
.w90{width:90px;} .w90{width:90px;}
.ml10{margin-left:10px;} .ml10{margin-left:10px;}
.resource{ width:670px;} .resource{ width:670px;}
.re_top{width:720px; height:40px; background:#eaeaea; padding:5px;} .re_top{width:660px; height:40px; background:#eaeaea; padding:5px;}
.re_top input{ float:left;} .re_top input{ float:left;}
.re_search{ margin-top:7px; margin-left:5px;} .re_search{ margin-top:7px; margin-left:5px;}
.re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;} .re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;}
.re_schbtn{ width:60px; height:26px; color:#fff; margin-right:5px; border:none; margin-left:0px;padding-left: 0px;} .re_schbtn{ width:60px; height:26px; color:#fff; margin-right:5px; border:none; margin-left:0px;padding-left: 0px;}
a.re_fabu { display:block; width:90px; height:30px; font-size:14px; color:#fff; text-align:center; padding-top:10px; } a.re_fabu { display:block; width:90px; height:30px; font-size:14px; color:#fff; text-align:center; padding-top:10px; }
a:hover.re_fabu{background:#55a1b9;} a:hover.re_fabu{background:#55a1b9;}
.re_con{ margin:5px; width:720px;} .re_con{ margin:5px; width:665px;}
.re_con_top{color:#494949; } .re_con_top{color:#494949; }
.re_con_top span{ color:#999999; font-weight:bold;} .re_con_top span{ color:#999999; font-weight:bold;}
a.re_select{ display:block; border:1px solid #ff9900; color:#ff9900; margin-left:10px; padding:1px 5px;} a.re_select{ display:block; border:1px solid #ff9900; color:#ff9900; margin-left:10px; padding:1px 5px;}
@ -172,7 +172,7 @@ a:hover.work_edit{color: #fff; background: #64bdd9;}
.wzan a{ display: block;} .wzan a{ display: block;}
a.wzan_img{background:url(images/pic_zan.png) 0 -59px no-repeat; display:block; height:31px; width:30px; color:#fff;} a.wzan_img{background:url(images/pic_zan.png) 0 -59px no-repeat; display:block; height:31px; width:30px; color:#fff;}
a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;} a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
.msg_box{ width:728px; border-bottom:1px dashed #CCC; padding-top:10px;} .msg_box{ width:670px; border-bottom:1px dashed #CCC; padding-top:10px;}
.msg_box h4{ } .msg_box h4{ }
.msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666; font-size:12px; } .msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666; font-size:12px; }
@ -212,7 +212,7 @@ a:hover.ping_sub{ background:#14a8b9;}
.ping_C{border-bottom:1px dashed #CCC; padding:10px 0 0px;} .ping_C{border-bottom:1px dashed #CCC; padding:10px 0 0px;}
.ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;} .ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;}
.ping_dispic a:hover{border:1px solid #15bccf;} .ping_dispic a:hover{border:1px solid #15bccf;}
.ping_discon{ float:left; width:670px; margin-left:10px; } .ping_discon{ float:left; width:610px; margin-left:10px; }
/*.ping_distop span{ float:left;}*/ /*.ping_distop span{ float:left;}*/
.ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;} .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
.ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;} .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
@ -221,16 +221,16 @@ a:hover.ping_sub{ background:#14a8b9;}
/* 创建作品 work */ /* 创建作品 work */
.Newwork{ width:668px; height:418px;} .Newwork{ width:668px; height:418px;}
.N_top{ float:right; margin-left:390px; } .N_top{ float:right; margin-left:390px; }
.N_con{ color:#484747; font-weight:bold; width:710px; margin-top:10px; } .N_con{ color:#484747; font-weight:bold; width:660px; margin-top:10px; }
.N_con p{ } .N_con p{ }
.w430{ width:470px;} .w430{ width:470px;}
.w557{ width:557px;} .w557{ width:557px;}
.w350{ width:350px;} .w350{ width:350px;}
.h400{height: 400px !important;} .h400{height: 400px !important;}
.w620{ width:480px; height:160px; border:1px solid #CCC;} .w620{ width:480px; height:160px; border:1px solid #CCC;}
.bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:530px; } .bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:470px; }
.bo02{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:480px; margin-left:2px; color: #999; } .bo02{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:480px; margin-left:2px; color: #999; }
.hwork_txt{ width:610px; padding-left:5px; background:#fff;} .hwork_txt{ width:560px; padding-left:5px; background:#fff;}
a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:10px;} a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:10px;}
a:hover.tijiao{ background:#0f99a9;} a:hover.tijiao{ background:#0f99a9;}
.members_left{ float:left; width:410px; margin-right:20px; text-align:center;} .members_left{ float:left; width:410px; margin-right:20px; text-align:center;}
@ -556,7 +556,7 @@ a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #64bdd9; pa
/* 20150423作业评分*/ /* 20150423作业评分*/
.ml14{ margin-left:14px;} .ml14{ margin-left:14px;}
.w548{ width:600px;} .w548{ width:552px;}
.w547{ width:544px;} .w547{ width:544px;}
.w196{ width:182px;} .w196{ width:182px;}
.w459{ width:459px;} .w459{ width:459px;}
@ -572,18 +572,18 @@ a:hover.icon_add{background:url(../stylesheets/images/icons.png) -20px -310px no
.w664{ width:664px;} .w664{ width:664px;}
.w140{ width:140px;} .w140{ width:140px;}
.talklist_box{ } .talklist_box{ }
.talkmain_box{ width:730px; border-bottom:1px dashed #d9d9d9; margin-bottom:20px; margin-top: 10px;} .talkmain_box{ width:670px; border-bottom:1px dashed #d9d9d9; margin-bottom:20px; margin-top: 10px;}
.talkmain_pic{} .talkmain_pic{}
a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;} a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;}
a:hover.talkmain_pic{border:1px solid #64bdd9;} a:hover.talkmain_pic{border:1px solid #64bdd9;}
.talkmain_txt{ width:670px; margin-left:10px; color:#333;} .talkmain_txt{ width:610px; margin-left:10px; color:#333;}
a.talkmain_name{ color:#ff5722;} a.talkmain_name{ color:#ff5722;}
a:hover.talkmain_name{ color:#d33503;} a:hover.talkmain_name{ color:#d33503;}
.talkmain_tit{ color:#0781b4; width:450px; display:block; } .talkmain_tit{ color:#0781b4; width:450px; display:block; }
.talklist_main{ } .talklist_main{ }
/*.talkWrapArrow{ display:block; float:right; margin-right:10px;background:url(../images/arrow.png) 0 0 no-repeat; height:7px; width:13px;}*/ /*.talkWrapArrow{ display:block; float:right; margin-right:10px;background:url(../images/arrow.png) 0 0 no-repeat; height:7px; width:13px;}*/
.talkConIpt{ background:#f2f2f2; } .talkConIpt{ background:#f2f2f2; }
.talkWrapBox{ width:660px; margin-left:60px; } .talkWrapBox{ width:610px; margin-left:60px; }
.inputFeint{ border:1px solid #d9d9d9; background:#fff; width:583px; height:50px; margin:10px; margin-bottom:5px;color:#666;} .inputFeint{ border:1px solid #d9d9d9; background:#fff; width:583px; height:50px; margin:10px; margin-bottom:5px;color:#666;}
.inputFeint02{ border:1px solid #d9d9d9; background:#fff; width:535px; height:30px; margin:5px 0 5px 50px; color:#666;} .inputFeint02{ border:1px solid #d9d9d9; background:#fff; width:535px; height:30px; margin:5px 0 5px 50px; color:#666;}
.inputFeint03{ border:1px solid #d9d9d9; background:#fff; width:490px; height:30px; margin:5px 0 5px 0px; color:#666;} .inputFeint03{ border:1px solid #d9d9d9; background:#fff; width:490px; height:30px; margin:5px 0 5px 0px; color:#666;}
@ -592,7 +592,7 @@ a.Msg_pic{ display:block; width:34px; height:34px; padding:2px; border:1px solid
a:hover.Msg_pic{border:1px solid #64bdd9;} a:hover.Msg_pic{border:1px solid #64bdd9;}
a.Reply_pic{ display:block; width:30px; height:30px; padding:2px; border:1px solid #e3e3e3; float:left;} a.Reply_pic{ display:block; width:30px; height:30px; padding:2px; border:1px solid #e3e3e3; float:left;}
a:hover.Reply_pic{border:1px solid #64bdd9;} a:hover.Reply_pic{border:1px solid #64bdd9;}
.Msg_txt{ float:left; width:630px; margin-left:10px;} .Msg_txt{ float:left; width:540px; margin-left:10px;}
.Msg_txt p{ } .Msg_txt p{ }
.talkWrapMsg ul li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;} .talkWrapMsg ul li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;}
.talkReply{ width:540px; margin-left:50px; border-top:1px dashed #d9d9d9; padding-top:10px; } .talkReply{ width:540px; margin-left:50px; border-top:1px dashed #d9d9d9; padding-top:10px; }
@ -604,7 +604,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
/* 20150423作业评分*/ /* 20150423作业评分*/
.ml14{ margin-left:14px;} .ml14{ margin-left:14px;}
.w548{ width:600px;} .w548{ width:552px;}
.w547{ width:544px;} .w547{ width:544px;}
.w196{ width:196px;} .w196{ width:196px;}
.w186{ width:186px;} .w186{ width:186px;}

4
public/stylesheets/header.css
View File

@ -90,8 +90,8 @@ li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;}
a.topnav_login_box:hover {color:#a1ebff;} a.topnav_login_box:hover {color:#a1ebff;}
.navRow1 {margin:0; padding:0;} .navRow1 {margin:0; padding:0;}
.navRow2 {margin:0; padding:0;} .navRow2 {margin:0; padding:0;}
.topnav_login_list{ border:1px solid #269ac9; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;margin-top: -4px;} .topnav_login_list{ border:1px solid #15bccf; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;margin-top: -5px;}
.topnav_login_list a{color:#269ac9;} .topnav_login_list a{color:#15bccf;}
.topnav_login_list li{ } .topnav_login_list li{ }
/*底部*/ /*底部*/

16
public/stylesheets/polls.css
View File

@ -7,8 +7,8 @@
/*问卷列表*/ /*问卷列表*/
.polls_content{ width:609px;} .polls_content{ width:609px;}
.polls_content02{ width:730px;} .polls_content02{ width:670px;}
.polls_head{ width:730px; height:48px; background:#eaeaea;} .polls_head{ width:670px; height:48px; background:#eaeaea;}
.polls_head h2{ float:left; font-size:14px; color:#585858; margin:11px 0 0 10px;} .polls_head h2{ float:left; font-size:14px; color:#585858; margin:11px 0 0 10px;}
.polls_head span{ font-weight:normal; color:#15bccf;} .polls_head span{ font-weight:normal; color:#15bccf;}
a.newbtn{ float:right; display:block; width:80px; height:27px; padding-top:3px; background:#64bdd9; color:#fff; font-size:14px; margin:10px; text-align:center;} a.newbtn{ float:right; display:block; width:80px; height:27px; padding-top:3px; background:#64bdd9; color:#fff; font-size:14px; margin:10px; text-align:center;}
@ -61,7 +61,7 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
/*问卷编辑*/ /*问卷编辑*/
.polls_edit{ color:#767676;} .polls_edit{ color:#767676;}
a:hover{ text-decoration:none; cursor:pointer;} a:hover{ text-decoration:none; cursor:pointer;}
.tabs{ width:718px; height: auto; border:1px solid #cbcbcb; padding:10px 0 0 10px; margin-bottom:10px;} .tabs{ width:658px; height: auto; border:1px solid #cbcbcb; padding:10px 0 0 10px; margin-bottom:10px;}
.tab_item { float:left; height:30px; background:#eeeeee; margin-right:4px; padding:0 8px; margin-bottom:10px;} .tab_item { float:left; height:30px; background:#eeeeee; margin-right:4px; padding:0 8px; margin-bottom:10px;}
.icon_delete{ font-size:16px;} .icon_delete{ font-size:16px;}
a:hover.icon_delete{ font-weight: bold;} a:hover.icon_delete{ font-weight: bold;}
@ -69,7 +69,7 @@ a:hover.icon_delete{ font-weight: bold;}
.tab_add{float:left; width:22px; height:22px; border:1px solid #cbcbcb; margin-top:6px; } .tab_add{float:left; width:22px; height:22px; border:1px solid #cbcbcb; margin-top:6px; }
.icon_page_add{ background:url(images/icons.png) 4px -314px no-repeat; width:22px; height:27px; display:block;} .icon_page_add{ background:url(images/icons.png) 4px -314px no-repeat; width:22px; height:27px; display:block;}
a:hover.icon_page_add{ background:url(images/icons.png) -16px -314px no-repeat;} a:hover.icon_page_add{ background:url(images/icons.png) -16px -314px no-repeat;}
.tab_item02{ float:left; width:154px; height:30px;background:#eeeeee; margin-right:10px; padding:0 10px; margin-bottom:10px; padding:10px 0 0 15px;} .tab_item02{ float:left; width:139px; height:30px;background:#eeeeee; margin-right:10px; padding:0 10px; margin-bottom:10px; padding:10px 0 0 15px;}
.tab_item02:hover{ background:#c9c9c9;} .tab_item02:hover{ background:#c9c9c9;}
.tab_icon{padding-left:25px;} .tab_icon{padding-left:25px;}
a:hover.tab_item02{ background:#fff;} a:hover.tab_item02{ background:#fff;}
@ -78,9 +78,9 @@ a:hover.tab_item02{ background:#fff;}
.icon_text{background:url(images/icons.png) 0px -80px no-repeat; } .icon_text{background:url(images/icons.png) 0px -80px no-repeat; }
.icon_textarea{background:url(images/icons.png) 0px -121px no-repeat; } .icon_textarea{background:url(images/icons.png) 0px -121px no-repeat; }
.ur_editor {width:708px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;} .ur_editor {width:648px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;}
.ur_title_editor_title{ margin-bottom:10px;} .ur_title_editor_title{ margin-bottom:10px;}
.input_title{ width:688px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold; background:#fff;border-style:solid; border:1px solid #CBCBCB;} .input_title{ width:627px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold; background:#fff;border-style:solid; border:1px solid #CBCBCB;}
.textarea_editor{ width:627px; height:120px; padding:10px; margin-bottom:10px; background:#fff; border-style:solid; border:1px solid #CBCBCB;} .textarea_editor{ width:627px; height:120px; padding:10px; margin-bottom:10px; background:#fff; border-style:solid; border:1px solid #CBCBCB;}
.btn_submit{ width:56px; height:24px; padding-top:4px;background:#15bccf; color:#fff; text-align:center; display:block; float:left; margin-right:10px;} .btn_submit{ width:56px; height:24px; padding-top:4px;background:#15bccf; color:#fff; text-align:center; display:block; float:left; margin-right:10px;}
a:hover.btn_submit{background:#0fa9bb;} a:hover.btn_submit{background:#0fa9bb;}
@ -98,7 +98,7 @@ a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;} a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
.ur_editor_toolbar{ margin-bottom:10px;} .ur_editor_toolbar{ margin-bottom:10px;}
.ur_editor_toolbar input{ width:40px; height:20px; background:#fff;} .ur_editor_toolbar input{ width:40px; height:20px; background:#fff;}
.ur_editor02{width:708px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px;} .ur_editor02{width:648px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px;}
a.ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; margin-bottom:10px; } a.ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; margin-bottom:10px; }
a:hover.ur_button_submit{ background:#0fa9bb; text-decoration:none;} a:hover.ur_button_submit{ background:#0fa9bb; text-decoration:none;}
@ -139,7 +139,7 @@ a:hover.btn_pu{ background:#3cb761;}
.polls_n p{ margin-top:-4px;} .polls_n p{ margin-top:-4px;}
/***新增20150123***/ /***新增20150123***/
.ur_buttons{ width:260px; } .ur_buttons{ width:275px; }
.ur_button_submit{ float:left;} .ur_button_submit{ float:left;}
.polls_cha{float:left; margin-left:15px; margin-top:10px;} .polls_cha{float:left; margin-left:15px; margin-top:10px;}

4
public/stylesheets/public.css
View File

@ -225,7 +225,7 @@ a:hover.blue_n_btn{ background:#329cbd;}
/*框架主类容*/ /*框架主类容*/
#Container{ width:1000px; margin:0 auto; } #Container{ width:940px; margin:0 auto; }
/*头部导航*/ /*头部导航*/
#Header{ margin:10px 0; background:#15bccf; height:40px; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; } #Header{ margin:10px 0; background:#15bccf; height:40px; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; }
@ -291,7 +291,7 @@ a:hover.search_btn{ background: #0fa9bb;}
.search_text{ border:1px solid #15bccf; background:#fff; width:220px; height:25px; padding-left:5px; } .search_text{ border:1px solid #15bccf; background:#fff; width:220px; height:25px; padding-left:5px; }
/*主类容左右分栏*/ /*主类容左右分栏*/
#LSide{ width:240px; } #LSide{ width:240px; }
#RSide{ width:730px; margin-left:10px; background:#fff; padding:10px; margin-bottom:10px;} #RSide{ width:670px; margin-left:10px; background:#fff; padding:10px; margin-bottom:10px;}
/*底部*/ /*底部*/