From b4b61a3422d927da5c20aebaee40e2f45a608fa0 Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Mon, 14 Apr 2014 21:54:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8Fbug=EF=BC=9B?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E6=89=93=E5=88=86=E5=92=8C=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=80=A7=E5=89=8D=E6=8F=90=E4=BA=A4=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_app_link.html.erb | 6 +-- .../contests/show_softapplication.html.erb | 2 +- app/views/layouts/base_newcontest.html.erb | 38 +------------------ app/views/projects/new.html.erb | 2 +- app/views/softapplications/_new_message.erb | 6 +-- app/views/softapplications/new.html.erb | 22 +++++------ app/views/softapplications/show.html.erb | 22 +++++------ app/views/welcome/contest.html.erb | 2 +- config/locales/zh.yml | 1 + public/stylesheets/application.css | 21 +++++++++- 10 files changed, 53 insertions(+), 69 deletions(-) diff --git a/app/views/attachments/_app_link.html.erb b/app/views/attachments/_app_link.html.erb index 9b27a957..ecef4dda 100644 --- a/app/views/attachments/_app_link.html.erb +++ b/app/views/attachments/_app_link.html.erb @@ -1,6 +1,5 @@ -
-<% for attachment in attachments %> -

<%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%> + +<% for attachment in attachments %><%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%> <% if attachment.is_text? %> <%= link_to image_tag('magnifier.png'), :controller => 'attachments', :action => 'show', @@ -9,4 +8,3 @@ <%= h(" - #{attachment.description}") unless attachment.description.blank? %> (<%= number_to_human_size attachment.filesize %>) <% end -%> -

\ No newline at end of file diff --git a/app/views/contests/show_softapplication.html.erb b/app/views/contests/show_softapplication.html.erb index 3d6a1d73..068ac79c 100644 --- a/app/views/contests/show_softapplication.html.erb +++ b/app/views/contests/show_softapplication.html.erb @@ -68,7 +68,7 @@

- <%= link_to '创建应用', new_softapplication_path(:target=>'_blank') %> + <%= link_to '发布应用', new_softapplication_path(:target=>'_blank') %>

diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb index 2f786008..3c37cfe5 100644 --- a/app/views/layouts/base_newcontest.html.erb +++ b/app/views/layouts/base_newcontest.html.erb @@ -173,44 +173,10 @@ -
-
-
- <%= l(:label_contest_project) %> - <% if show_more_contest_project?(@contest) %> - <%= link_to l(:label_more), :controller => 'contests', :action => 'show_project'%> - <% end %> -
-
- - - - -
- <%= show_contest_project(@contest) %> -
-
-
+ -
-
-
- <%= l(:label_contest_application) %> - <% if show_more_contest_softapplication?(@contest) %> - <%= link_to l(:label_more), :controller => 'contests', :action => 'show_softapplication'%> - <% end %> -
-
- - - - -
- <%= show_contest_softapplication(@contest) %> -
-
-
+ diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index 7044d69d..aa03a1cc 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -3,7 +3,7 @@ <% if @course_tag == '1' %>

<%=l(:label_course_new)%>

-

<%=raw l(:label_course_news_description)%>

+ <%= render :partial => 'course_form', :locals => { :f => f } %> <%= submit_tag l(:button_create), :class => "enterprise"%> diff --git a/app/views/softapplications/_new_message.erb b/app/views/softapplications/_new_message.erb index e46fb299..321c7911 100644 --- a/app/views/softapplications/_new_message.erb +++ b/app/views/softapplications/_new_message.erb @@ -37,10 +37,10 @@ <%= f.text_field :reference_user_id, :style=>"display:none"%> - +
- +
<%= submit_tag l(:button_leave_meassge), :name => nil , :class => "softapplication_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%> - <%= submit_tag l(:button_clear), :name => nil, :onclick => "clearMessage('softapplication_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> <%= submit_tag l(:label_button_ok), :name => nil , :class => "softapplication_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%> + <%= submit_tag l(:button_clear_requirement), :name => nil, :onclick => "clearMessage('softapplication_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %>
diff --git a/app/views/softapplications/new.html.erb b/app/views/softapplications/new.html.erb index a300512c..444a217f 100644 --- a/app/views/softapplications/new.html.erb +++ b/app/views/softapplications/new.html.erb @@ -3,32 +3,32 @@ <%= link_to 'Back', softapplications_path %> --> -
+
<%= form_for Softapplication.new, :url => {:controller => 'softapplications', :action => 'create'}, :update => "bidding_project_list", :complete => '$("#put-bid-form").hide();', :html => {:multipart => true, :id => 'add_homework_form'} do |f| %> -
- +
+ - <%= l(:label_softapplication_name) %> - * : <%= f.text_field :name, :required => true, :size => 60, :style => "width:400px;" %> - <%= l(:label_softapplication_name_condition)%> + <%= l(:label_softapplication_name) %> + * : <%= f.text_field :name, :required => true, :size => 60, :style => "width:400px;" %> + <%= l(:label_softapplication_name_condition)%>

- <%= l(:label_softapplication_version_available) %> - * : <%= f.text_field :android_min_version_available, :required => true, :size => 60, :style => "width:400px;" %> + <%= l(:label_softapplication_version_available) %> + * : <%= f.text_field :android_min_version_available, :required => true, :size => 60, :style => "width:400px;" %>

- <%= l(:label_softapplication_type) %> + <%= l(:label_softapplication_type) %> - * : <%= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %> + * : <%= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %>
diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb index 3728af02..0d735abc 100644 --- a/app/views/softapplications/show.html.erb +++ b/app/views/softapplications/show.html.erb @@ -10,27 +10,27 @@

<%= notice %>

-
+
- + - + - + - @@ -41,14 +41,14 @@
-
-
应用简介：
+
+
应用简介：
<%= @softapplication.description %>
-
软件截图：
+
软件截图：
<% @image_results.take(4).each do |attachment| %> <%= link_to_attachment_img attachment, :class => "soft-application", :download => "true" %> @@ -60,7 +60,7 @@
-
软件评论：
+
软件评论：
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb index b1c009c9..1b265ade 100644 --- a/app/views/welcome/contest.html.erb +++ b/app/views/welcome/contest.html.erb @@ -101,7 +101,7 @@ <%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_contest) %> , <%= l(:label_welcome_trustie_contest_description) %>
-
+
diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 479bfe40..ad0d98f5 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1843,4 +1843,5 @@ zh: label_user_login_softapplication_board: 您还没有登录，请登录后参与应用评价。 label_contest_description_no: 暂无描述。 label_no_contest_softapplication: 暂无参赛应用 + label_button_ok: 确定 \ No newline at end of file diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index c8582a57..b8f40bdf 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -9,6 +9,14 @@ h4, .wiki h3 {font-size: 13px;} h4 {border-bottom: 1px dotted #bbb;} /*huang*/ /*current position*/ +.contest_count{ + width: 20%; + height: 60px; + border: 1px solid #15bccf; + border-radius: 5px 5px 5px 5px; + float:right; +} + .top-content{ background-color: #f7f7f7; height: 56px; @@ -2712,4 +2720,15 @@ div.repos_explain{ margin-bottom: 10px; border-bottom: 1px dashed rgb(204, 204, 204); width: 660px; -} \ No newline at end of file +} + +.contest-star{ + color: #bb0000; +} + +.contes-new-box{ + background: #fcfcfc; + padding-left: 85px; + padding-top: 20px; + padding-bottom: 20px; +}
<%= @softapplication.name %><%= @softapplication.name %>
所属类别：<%= @softapplication.app_type_name %>发布时间：<%=format_time @softapplication.created_at %>发布时间：<%=format_time @softapplication.created_at %>
发布人员：<%= @softapplication.user.name %> 系统支持：<%= @softapplication.android_min_version_available %>
应用下载： - <% options = {:author => true, :deletable => @softapplication.user.eql?(User.current) } %> - <%= render :partial => 'attachments/app_link', :locals => {:attachments => @app_items, :options => options} %> + 应用下载： + <% options = {:author => true, :deletable => @softapplication.user.eql?(User.current) } %> + <%= render :partial => 'attachments/app_link', :locals => {:attachments => @app_items, :options => options} %> 开发人员：<%= @softapplication.application_developers %>
竞赛总量：