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

IE浏览器中：课程，竞赛，托管平台的主页不能正常显示

This commit is contained in:
alanlong9278 2015-01-07 17:28:45 +08:00
parent 7443cadf61
commit d212a20bbf
5 changed files with 75 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/welcome/_link_to_another.html.erb
View File

@ -1,6 +1,6 @@
<div class="clearfix"></div>
<div class="linkother"> <div class="linkother" style="margin-left: 30%; float: left">
<a href="http://<%= Setting.host_name%>" class="link_other_item"><%=l(:label_projects_management_platform)%></a> <a href="http://<%= Setting.host_name%>" class="link_other_item"><%=l(:label_projects_management_platform)%></a>
<a href="http://<%= Setting.host_course%>" class="link_other_item"><%=l(:label_courses_management_platform)%></a> <a href="http://<%= Setting.host_course%>" class="link_other_item"><%=l(:label_courses_management_platform)%></a>
<a href="http://<%= Setting.host_contest%>" class="link_other_item"><%=l(:label_contests_management_platform)%></a> <a href="http://<%= Setting.host_contest%>" class="link_other_item"><%=l(:label_contests_management_platform)%></a>
</div> </div>

116
app/views/welcome/_search_course.html.erb
View File

@ -1,58 +1,58 @@
<% <%
select_option = [] select_option = []
(select_option << ['项目', 'projects']) if project_type == Project::ProjectType_project (select_option << ['项目', 'projects']) if project_type == Project::ProjectType_project
(select_option << ['课程', 'courses']) if project_type == Project::ProjectType_course (select_option << ['课程', 'courses']) if project_type == Project::ProjectType_course
select_option << ['用户', 'users'] select_option << ['用户', 'users']
#select_option << ['教师', 'users_teacher'], #select_option << ['教师', 'users_teacher'],
#select_option << ['学生', 'users_student'] #select_option << ['学生', 'users_student']
%> %>
<style type="text/css"> <style type="text/css">
form #q, form #search_type{ form #q, form #search_type{
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
display: inline-block; display: inline-block;
margin: 0px; margin: 0px;
padding: 5px; padding: 5px;
height: 33px; height: 33px;
} }
form #q{ form #q{
font-size: 13px; font-size: 13px;
border-top-left-radius: 5px; border-top-left-radius: 5px;
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;
border-right: none; border-right: none;
} }
form #search_type{ form #search_type{
font-size: 13px; font-size: 13px;
color: #363739; color: #363739;
border-top-right-radius: 5px; border-top-right-radius: 5px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
border-bottom-left-radius: 0px; border-bottom-left-radius: 0px;
border-top-left-radius: 0px; border-top-left-radius: 0px;
border-left: 1px outset #83A9A9; border-left: 1px outset #83A9A9;
margin-left: -4px; margin-left: -4px;
-webkit-appearance: none; -webkit-appearance: none;
-moz-appearance: none; -moz-appearance: none;
text-indent: 0.01px; text-indent: 0.01px;
text-overflow: ''; text-overflow: '';
} }
.search_widget{ .search_widget{
display:inline-block; display:inline-block;
border-radius: 5px; border-radius: 5px;
} }
.search_widget:hover{ .search_widget:hover{
box-shadow: 0px 0px 3px #56B4EF; box-shadow: 0px 0px 3px #56B4EF;
} }
<%#完了把上面东西放到 .css 里%> <%#完了把上面东西放到 .css 里%>
</style> </style>
<%= form_tag({controller: :welcome, action: :search }, method: :get) do %> <%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
<div class="project-search" style="float: right"> <div class="project-search" style="float: right">
<div class='search_widget'> <div class='search_widget'>
<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字', :size => 27 %> <%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字', :size => 27, %>
<%= select_tag(:search_type, options_for_select(select_option) ) %> <%= select_tag(:search_type, options_for_select(select_option), :style => "float:right" ) %>
</div> </div>
<%#= hidden_field_tag 'project_type', project_type %> <%#= hidden_field_tag 'project_type', project_type %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> <%= submit_tag l(:label_search), :class => "enterprise", :name => nil, :style => "float:right" %>
</div> </div>
<% end %> <% end %>

17
app/views/welcome/_search_project.html.erb
View File

@ -29,7 +29,7 @@ form #search_type{
border-bottom-left-radius: 0px; border-bottom-left-radius: 0px;
border-top-left-radius: 0px; border-top-left-radius: 0px;
border-left: 1px outset #83A9A9; border-left: 1px outset #83A9A9;
margin-left: -4px; margin-left: 0px;
-webkit-appearance: none; -webkit-appearance: none;
-moz-appearance: none; -moz-appearance: none;
text-indent: 0.01px; text-indent: 0.01px;
@ -45,7 +45,7 @@ form #search_by
border-bottom-left-radius: 0px; border-bottom-left-radius: 0px;
border-top-left-radius: 0px; border-top-left-radius: 0px;
border-left: 1px outset #83A9A9; border-left: 1px outset #83A9A9;
margin-left: -6px; margin-left: 0px;
-webkit-appearance: none; -webkit-appearance: none;
-moz-appearance: none; -moz-appearance: none;
text-indent: 0.01px; text-indent: 0.01px;
@ -87,13 +87,14 @@ form #search_by
</script> </script>
<%= form_tag({controller: :welcome, action: :search }, method: :get) do %> <%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
<div class="project-search" style="float: right"> <div class="project-search" style="float: right">
<div class='search_widget'> <div class='search_widget' >
<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字', :size => 27 %>
<input type="text" name="search_by_input" hidden="hidden;" id="search_by_input" value="0"> <%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字' %>
<%= select_tag(:search_type, options_for_select(select_option), :onchange => "searchTypeChange();" ) %> <input type="text" name="search_by_input" style="display: none" id="search_by_input" value="0">
<%= select_tag(:search_by,options_for_select([["昵称","0"],["姓名","1"],["邮箱","2"]]), :onchange => "searchByChange();" ) %> <%= select_tag(:search_type, options_for_select(select_option), :onchange => "searchTypeChange();", :style => "float:right" ) %>
<%= select_tag(:search_by,options_for_select([["昵称","0"],["姓名","1"],["邮箱","2"]]), :onchange => "searchByChange();",:style => "float:right" ) %>
</div> </div>
<%#= hidden_field_tag 'project_type', project_type %> <%#= hidden_field_tag 'project_type', project_type %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> <%= submit_tag l(:label_search), :class => "enterprise", :name => nil,:style =>"float: right; margin-left:3px;margin-top:2px" %>
</div> </div>
<% end %> <% end %>

2
app/views/welcome/contest.html.erb
View File

@ -119,6 +119,7 @@
} }
})(); })();
</script> </script>
<div>
<div class='top_bar'> <div class='top_bar'>
<%#= render partial: 'wei_xin' %> <%#= render partial: 'wei_xin' %>
<div class="main-content-bar" id="main-content-bar"> <div class="main-content-bar" id="main-content-bar">
@ -324,6 +325,7 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div>
<%= render partial: 'link_to_another' %> <%= render partial: 'link_to_another' %>

2
app/views/welcome/index.html.erb
View File

@ -71,7 +71,7 @@
<div class="d-p-projectlist-box"> <div class="d-p-projectlist-box">
<ul class="d-p-projectlist"> <ul class="d-p-projectlist">
<% @projects.map do |project| %> <% @projects.map do |project| %>
<li style="overflow:auto;word-break:break-all;height:100%;word-wrap: break-word;" class='<%= cycle("odd", "even") %>'> <li style="overflow:hidden;word-break:break-all;height:100%;word-wrap: break-word;" class='<%= cycle("odd", "even") %>'>
<div style="float: left;"> <div style="float: left;">
<%= image_tag(get_project_avatar(project), :class => "avatar-4") %> <%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
</div> </div>