diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 1b4c8a0f6..294f9b7d4 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -57,7 +57,7 @@
:data => {:confirm => l(:text_are_you_sure)},
:class => 'postOptionLink'
) if @message.course_destroyable_by?(User.current) %>
- <%= link_to "转发",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %>
+ <%= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %>
diff --git a/app/views/messages/_join_org_subfield_menu.html.erb b/app/views/messages/_join_org_subfield_menu.html.erb
index 0bdc19f44..f4af91c87 100644
--- a/app/views/messages/_join_org_subfield_menu.html.erb
+++ b/app/views/messages/_join_org_subfield_menu.html.erb
@@ -33,7 +33,7 @@
@@ -43,7 +43,7 @@
<% organizations.each do |org| %>
- - <%= link_to org.name, messages_get_subfield_on_click_org_path(:organization_id => org.id), :remote => true %>
+ - <%= link_to org.name, messages_get_subfield_on_click_org_path(:organization_id => org.id), :remote => true,:style =>"border:none; outline:none;" %>
<% end %>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index b20a7c22d..9468e05ce 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -118,7 +118,7 @@
:data => {:confirm => l(:text_are_you_sure)},
:class => 'postOptionLink'
) if @message.destroyable_by?(User.current) %>
- <%= link_to "转发",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %>
+ <%= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %>
diff --git a/app/views/messages/_show_org_subfields.html.erb b/app/views/messages/_show_org_subfields.html.erb
index 78e8a4c92..659e1230e 100644
--- a/app/views/messages/_show_org_subfields.html.erb
+++ b/app/views/messages/_show_org_subfields.html.erb
@@ -1,4 +1,4 @@
-
+
<% if !org.nil? %>
组织:<%= org.name %>
@@ -8,6 +8,6 @@
<% end %>
<% else %>
- 请在左侧选择要转发的位置
+ 请在左侧选择组织
<% end %>
\ No newline at end of file
diff --git a/public/images/arrowList.png b/public/images/arrowList.png
index 99dcfc0f5..8385a6a7d 100644
Binary files a/public/images/arrowList.png and b/public/images/arrowList.png differ
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 99c5168d9..42186ed36 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -5,7 +5,7 @@ body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";
div,img,tr,td,table{ border:0;}
table,tr,td{border:0;cellspacing:0; cellpadding:0;}
ol,ul,li{ list-style-type:none}
-a:link,a:visited{color:#7f7f7f;text-decoration:none;}
+a:link,a:visited{color:#7f7f7f !important;text-decoration:none;}
a:hover,a:active{color:#000;}
a:hover {text-decoration: none; }
textarea {resize: none;}
@@ -119,6 +119,7 @@ h4{ font-size:14px; color:#3b3b3b;}
.mb8 {margin-bottom:8px;}
.mb10{ margin-bottom:10px !important;}
.mb20{ margin-bottom:20px;}
+.pl10 {padding-left:10px;}
.pl15{ padding-left:15px;}
.pl5{ padding-left:5px;}
.pt5{ padding-top:5px;}
@@ -408,7 +409,7 @@ a:hover.search_btn{ background: #0fa9bb;}
/*发送资源弹窗*/
/*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/
-.resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
+.resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
.sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:100px; display:inline-block; font-weight:bold;}
.resourcesSendTo {float:left; height:20px; margin-top:15px;}
.resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
@@ -424,7 +425,7 @@ a:hover.search_btn{ background: #0fa9bb;}
.courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left}
.courseSendCancel:hover {background-color:#717171;}
.courseReferContainer {float:left; max-height:120px; overflow:scroll; overflow-x:hidden; margin-right:16px; margin-bottom:10px;}
-a.sendSourceText {font-size:14px; color:#ffffff; display:block;}
+a.sendSourceText {font-size:14px; color:#ffffff !important; display:block;}
/*上传资源弹窗*/
.resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
@@ -926,7 +927,7 @@ span.at {color:#269ac9;}
.columnWrap li {padding-left:10px; color:#585858;}
.columnWrap span {width:150px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:inline-block;}
.sectionRow:hover {background-color:#cccccc; cursor:pointer;}
-.sectionContent {display:none;}
+.sectionContent {display:block;}
.sectionContent li {padding-left:30px;}
.sectionContent li:hover {background-color:#cccccc; cursor:pointer;}
.sectionContent span {width:175px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; display:inline-block; height:18px; vertical-align:middle;}
\ No newline at end of file