From d212a20bbfb13fe94fd9d3126106e69b1287bfc2 Mon Sep 17 00:00:00 2001 From: alanlong9278 <547533434@qq.com> Date: Wed, 7 Jan 2015 17:28:45 +0800 Subject: [PATCH] =?UTF-8?q?IE=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=AD=EF=BC=9A?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=EF=BC=8C=E7=AB=9E=E8=B5=9B=EF=BC=8C=E6=89=98?= =?UTF-8?q?=E7=AE=A1=E5=B9=B3=E5=8F=B0=E7=9A=84=E4=B8=BB=E9=A1=B5=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/_link_to_another.html.erb | 10 +- app/views/welcome/_search_course.html.erb | 116 ++++++++++---------- app/views/welcome/_search_project.html.erb | 17 +-- app/views/welcome/contest.html.erb | 2 + app/views/welcome/index.html.erb | 2 +- 5 files changed, 75 insertions(+), 72 deletions(-) diff --git a/app/views/welcome/_link_to_another.html.erb b/app/views/welcome/_link_to_another.html.erb index 14640897c..e9a19be4e 100644 --- a/app/views/welcome/_link_to_another.html.erb +++ b/app/views/welcome/_link_to_another.html.erb @@ -1,6 +1,6 @@ -
-
- <%=l(:label_projects_management_platform)%> - <%=l(:label_courses_management_platform)%> - <%=l(:label_contests_management_platform)%> + +
+ <%=l(:label_projects_management_platform)%> + <%=l(:label_courses_management_platform)%> + <%=l(:label_contests_management_platform)%>
\ No newline at end of file diff --git a/app/views/welcome/_search_course.html.erb b/app/views/welcome/_search_course.html.erb index fda9dae7c..5721af9fb 100644 --- a/app/views/welcome/_search_course.html.erb +++ b/app/views/welcome/_search_course.html.erb @@ -1,58 +1,58 @@ -<% - select_option = [] - (select_option << ['项目', 'projects']) if project_type == Project::ProjectType_project - (select_option << ['课程', 'courses']) if project_type == Project::ProjectType_course - select_option << ['用户', 'users'] - #select_option << ['教师', 'users_teacher'], - #select_option << ['学生', 'users_student'] -%> - -<%= form_tag({controller: :welcome, action: :search }, method: :get) do %> -
-
- <%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字', :size => 27 %> - <%= select_tag(:search_type, options_for_select(select_option) ) %> -
- <%#= hidden_field_tag 'project_type', project_type %> - <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> -
-<% end %> +<% + select_option = [] + (select_option << ['项目', 'projects']) if project_type == Project::ProjectType_project + (select_option << ['课程', 'courses']) if project_type == Project::ProjectType_course + select_option << ['用户', 'users'] + #select_option << ['教师', 'users_teacher'], + #select_option << ['学生', 'users_student'] +%> + +<%= form_tag({controller: :welcome, action: :search }, method: :get) do %> +
+
+ <%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字', :size => 27, %> + <%= select_tag(:search_type, options_for_select(select_option), :style => "float:right" ) %> +
+ <%#= hidden_field_tag 'project_type', project_type %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil, :style => "float:right" %> +
+<% end %> diff --git a/app/views/welcome/_search_project.html.erb b/app/views/welcome/_search_project.html.erb index b86ff64f9..5922d4180 100644 --- a/app/views/welcome/_search_project.html.erb +++ b/app/views/welcome/_search_project.html.erb @@ -29,7 +29,7 @@ form #search_type{ border-bottom-left-radius: 0px; border-top-left-radius: 0px; border-left: 1px outset #83A9A9; - margin-left: -4px; + margin-left: 0px; -webkit-appearance: none; -moz-appearance: none; text-indent: 0.01px; @@ -45,7 +45,7 @@ form #search_by border-bottom-left-radius: 0px; border-top-left-radius: 0px; border-left: 1px outset #83A9A9; - margin-left: -6px; + margin-left: 0px; -webkit-appearance: none; -moz-appearance: none; text-indent: 0.01px; @@ -87,13 +87,14 @@ form #search_by <%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
-
- <%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字', :size => 27 %> - - <%= select_tag(:search_type, options_for_select(select_option), :onchange => "searchTypeChange();" ) %> - <%= select_tag(:search_by,options_for_select([["昵称","0"],["姓名","1"],["邮箱","2"]]), :onchange => "searchByChange();" ) %> +
+ + <%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字' %> + + <%= 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" ) %>
<%#= 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" %>
<% end %> diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb index 07696386f..c85b75797 100644 --- a/app/views/welcome/contest.html.erb +++ b/app/views/welcome/contest.html.erb @@ -119,6 +119,7 @@ } })(); +
<%#= render partial: 'wei_xin' %>
@@ -324,6 +325,7 @@
+
<%= render partial: 'link_to_another' %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 4dd58641b..0dc62c6a3 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -71,7 +71,7 @@
    <% @projects.map do |project| %> -
  • +
  • <%= image_tag(get_project_avatar(project), :class => "avatar-4") %>