diff --git a/app/views/bids/contest.html.erb b/app/views/bids/contest.html.erb index 565e558d7..9cffe1172 100644 --- a/app/views/bids/contest.html.erb +++ b/app/views/bids/contest.html.erb @@ -1,5 +1,3 @@ - -
<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %> @@ -28,7 +26,6 @@
<% end %>
- @@ -46,6 +43,9 @@ <% if @bids.size > 0%> +
+ +
<%= sort_contest(@s_state)%>
<%= render :partial => 'contest_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %> diff --git a/app/views/projects/course.html.erb b/app/views/projects/course.html.erb index f635e0867..3e82961c5 100644 --- a/app/views/projects/course.html.erb +++ b/app/views/projects/course.html.erb @@ -2,7 +2,6 @@ <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %> <% end %> -
<%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %> @@ -30,8 +29,13 @@
<% end %> -
- +
+ +
+
+
aaaa
+
+
<%= sort_course(@s_type, @project_type)%> diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index e9b780d0f..5264bda7f 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -2,12 +2,11 @@ <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %> <% end %> -
<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %> - +
<%= l(:label_project_deposit) %><%= l(:label_project_deposit) %> <%= l(:label_user_location) %> : <% if User.current.logged? %> @@ -28,9 +27,12 @@
<% end %> -
- - + +
+
+
a
+
+
<%= sort_project(@s_type, @project_type) %>
<%= render_project_hierarchy(@projects)%> diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css index 2bf095e4f..764939f3c 100644 --- a/public/stylesheets/nyan.css +++ b/public/stylesheets/nyan.css @@ -11,6 +11,9 @@ .ph10_5{ /*padding horizontal 10% 5%*/ padding: 0px 5% 0px 10%; } +.clear_both{ + clear: both; +} * { font-family: Helvetica, Tahoma, Arial, "Microsoft YaHei", "微软雅黑", SimSun, "宋体", STXihei, "华文细黑", Heiti, "黑体", sans-serif; } @@ -341,3 +344,19 @@ table.content-text-list tbody tr td.locked, div.memo-section .locked{ font-size: 1.5em; padding-left: 4%; } +/* xx动态框 +*******************************************************************************/ +.project_acts *{border:1px solid #000000;} +.project_acts{ + height: 250px; + +} +.project_acts .project_acts_left{ + float: left; + height: 100%; + width: 61%; +} +.project_acts .project_acts_right{ + height: 100%; + margin-left: 61%; +} \ No newline at end of file