From 7758e9bbf11fde265df0f1b0198e7cc2a5eddb02 Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Mon, 21 Apr 2014 21:03:18 +0800 Subject: [PATCH 01/13] df --- app/views/softapplications/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb index 76483c7c0..c0234831a 100644 --- a/app/views/softapplications/show.html.erb +++ b/app/views/softapplications/show.html.erb @@ -68,7 +68,7 @@
软件评论：
-
评分: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %>
+
评分: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %>
From cc5b55ec9c2eba00d8535c627aa8bd5983726baf Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Tue, 22 Apr 2014 08:49:08 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=AE=80=E4=BB=8B=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E8=BE=B9=E8=B7=9D=E4=BB=A5=E5=8F=8A=E7=AE=80?= =?UTF-8?q?=E4=BB=8B=E9=99=90=E5=AE=9A=E5=AD=97=E6=95=B0=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/softapplications/show.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb index c0234831a..a5c3fb596 100644 --- a/app/views/softapplications/show.html.erb +++ b/app/views/softapplications/show.html.erb @@ -10,7 +10,7 @@

<%= notice %>

-
+
@@ -48,9 +48,9 @@
-
+
应用简介：
 -
<%= @softapplication.description %>
+
<%= @softapplication.description.truncate(150, omission: '...') %>
From bc068eb12b5016e24f8de398c9a60f2e37cceac1 Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Tue, 22 Apr 2014 10:59:50 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E8=B5=9B?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=9A=84=E5=88=A0=E9=99=A4=E5=92=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8A=9F=E8=83=BD=E4=BB=A5=E5=8F=8A=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=9B=B8=E5=BA=94=E7=9A=84=E5=88=A0=E9=99=A4=E5=92=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 2 +- .../softapplications_controller.rb | 30 ++++++++- app/models/attachment.rb | 2 +- app/models/softapplication.rb | 11 +++- .../contests/_list_softapplications.html.erb | 1 + app/views/layouts/_base_footer.html.erb | 63 ++++++++++++------- app/views/softapplications/index.html.erb | 2 +- 7 files changed, 79 insertions(+), 32 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 40caae261..42cb62272 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,7 +75,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.1.0) + rake (10.0.4) rdoc (3.12.2) json (~> 1.4) ruby-openid (2.1.8) diff --git a/app/controllers/softapplications_controller.rb b/app/controllers/softapplications_controller.rb index 9f14aa118..9163f5473 100644 --- a/app/controllers/softapplications_controller.rb +++ b/app/controllers/softapplications_controller.rb @@ -1,4 +1,8 @@ class SoftapplicationsController < ApplicationController + before_filter :find_softapplication, only: [:edit, :update, :destroy] + before_filter :editable, only: [:edit, :update] + before_filter :destroyable, only: :destroy + # GET /softapplications # GET /softapplications.json def index @@ -71,7 +75,7 @@ class SoftapplicationsController < ApplicationController # PUT /softapplications/1 # PUT /softapplications/1.json def update - @softapplication = Softapplication.find(params[:id]) + # @softapplication = Softapplication.find(params[:id]) respond_to do |format| if @softapplication.update_attributes(params[:softapplication]) @@ -92,11 +96,11 @@ class SoftapplicationsController < ApplicationController # DELETE /softapplications/1 # DELETE /softapplications/1.json def destroy - @softapplication = Softapplication.find(params[:id]) + # @softapplication = Softapplication.find(params[:id]) @softapplication.destroy respond_to do |format| - format.html { redirect_to softapplications_url } + format.html { redirect_to :back } format.json { head :no_content } end end @@ -192,4 +196,24 @@ class SoftapplicationsController < ApplicationController #format.api { render_api_ok } end end + + private + def find_softapplication + @softapplication = Softapplication.find_by_id(params[:id]) + end + + def editable + unless @softapplication.editable_by? User.current + render_403 + return false + end + end + + def destroyable + unless @softapplication.destroyable_by? User.current + render_403 + return false + end + end + end diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 919760ee3..3ce64d695 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -181,7 +181,7 @@ class Attachment < ActiveRecord::Base end def pack? - !!(self.filename =~ /\.(zip|rar|tar|gz)$/i) + !!(self.filename =~ /\.(zip|rar|tar|gz|exe)$/i) end def thumbnailable? diff --git a/app/models/softapplication.rb b/app/models/softapplication.rb index 205ede48b..6782b2436 100644 --- a/app/models/softapplication.rb +++ b/app/models/softapplication.rb @@ -7,7 +7,7 @@ class Softapplication < ActiveRecord::Base has_many :journals_for_messages, :as => :jour, :dependent => :destroy has_many :contesting_softapplications, :dependent => :destroy belongs_to :user - belongs_to :contest + has_many :contests, :through => :contesting_softapplications def add_jour(user, notes, reference_user_id = 0, options = {}) if options.count == 0 @@ -21,6 +21,13 @@ class Softapplication < ActiveRecord::Base def set_commit(commit) self.update_attribute(:commit, commit) end - + + def editable_by? usr + usr.admin? || self.user == usr + end + + def destroyable_by? usr + self.user == usr || usr.admin? + end end diff --git a/app/views/contests/_list_softapplications.html.erb b/app/views/contests/_list_softapplications.html.erb index 29c985b7e..5646f5d12 100644 --- a/app/views/contests/_list_softapplications.html.erb +++ b/app/views/contests/_list_softapplications.html.erb @@ -8,6 +8,7 @@ <%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication)) %> + <%= link_to '删除', c_softapplication.softapplication, method: :delete, data: { confirm: '您确定要删除吗?' } %>
diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb index bba5b2166..a941a7d1f 100644 --- a/app/views/layouts/_base_footer.html.erb +++ b/app/views/layouts/_base_footer.html.erb @@ -1,28 +1,43 @@
+
+ <%= debug(params) if Rails.env.development? %> + +
diff --git a/app/views/softapplications/index.html.erb b/app/views/softapplications/index.html.erb index be9245876..16a206508 100644 --- a/app/views/softapplications/index.html.erb +++ b/app/views/softapplications/index.html.erb @@ -1,4 +1,4 @@ -

Listing softapplications

+

参赛应用

From 05c0d2a5ac576c3fc84997eca557985f824cda30 Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Tue, 22 Apr 2014 19:27:31 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=A6=96=E9=A1=B5=E4=B8=AD=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E5=92=8C=E5=BA=94=E7=94=A8=E7=9A=84=E5=9B=BE=E6=A0=87=E5=B9=B6?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=B8=E5=BA=94=E7=9A=84=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../softapplications_controller.rb | 2 +- .../contests/_list_softapplications.html.erb | 1 - app/views/softapplications/_form.html.erb | 97 +++++++++--------- app/views/softapplications/edit.html.erb | 10 +- app/views/softapplications/new.html.erb | 73 +------------ app/views/softapplications/show.html.erb | 4 + app/views/welcome/contest.html.erb | 16 +-- config/locales/zh.yml | 1 + public/images/app1.png | Bin 0 -> 4441 bytes public/images/contest1.png | Bin 0 -> 4794 bytes 10 files changed, 72 insertions(+), 132 deletions(-) create mode 100644 public/images/app1.png create mode 100644 public/images/contest1.png diff --git a/app/controllers/softapplications_controller.rb b/app/controllers/softapplications_controller.rb index 9163f5473..5153a01d4 100644 --- a/app/controllers/softapplications_controller.rb +++ b/app/controllers/softapplications_controller.rb @@ -100,7 +100,7 @@ class SoftapplicationsController < ApplicationController @softapplication.destroy respond_to do |format| - format.html { redirect_to :back } + format.html { redirect_to home_path } format.json { head :no_content } end end diff --git a/app/views/contests/_list_softapplications.html.erb b/app/views/contests/_list_softapplications.html.erb index 5646f5d12..29c985b7e 100644 --- a/app/views/contests/_list_softapplications.html.erb +++ b/app/views/contests/_list_softapplications.html.erb @@ -8,7 +8,6 @@ -
diff --git a/app/views/softapplications/_form.html.erb b/app/views/softapplications/_form.html.erb index 5a046801f..f45125ea2 100644 --- a/app/views/softapplications/_form.html.erb +++ b/app/views/softapplications/_form.html.erb @@ -1,64 +1,69 @@ -<%= form_for(@softapplication) do |f| %> +<%= form_for(softapplication) do |f| %> - <% if @softapplication.errors.any? %> + <% if softapplication.errors.any? %>
-

<%= pluralize(@softapplication.errors.count, "error") %> prohibited this softapplication from being saved:

+

<%= pluralize(softapplication.errors.count, "error") %> prohibited this softapplication from being saved:

    - <% @softapplication.errors.full_messages.each do |msg| %> + <% softapplication.errors.full_messages.each do |msg| %>
  • <%= msg %>
    • <% end %>
<% end %> - -
- - : - - -

+
+ +
+ <%= l(:label_softapplication_name) %> + * : + <%= l(:label_softapplication_name_condition)%> + +
+
+ + + <%= l(:label_softapplication_version_available) %> + * : - - - : - + +
+
+ + + <%= l(:label_softapplication_type) %> -

+ * : - - - : - + +
+
+ + + <%= l(:label_softapplication_description) %> + * : -

+ +
+
+ + <%= l(:label_softapplication_developers) %> + * : - - - : - - -

- - -
-
- <%=l(:label_upload_softapplication_packets)%> :
-

- <%= render :partial => 'attachments/form' %> -

-
-
- -
-
- <%=l(:label_upload_softapplication_photo)%> :(<%=l(:label_upload_softapplication_photo_condition)%>)
-

- <%= render :partial => 'attachments/form' %> -

-
-
+ +
+
+
+ 上传应用软件包和应用截图 + <%= render_flash_messages %> +

+ <%= render :partial => 'attachments/form' %> +

+

(<%=l(:label_upload_softapplication_photo_condition)%>)

+ +
+
+
<%= submit_tag l(:button_create), :onclick => "return true" %>
<% end %> diff --git a/app/views/softapplications/edit.html.erb b/app/views/softapplications/edit.html.erb index f93e091d2..c9e0c6f66 100644 --- a/app/views/softapplications/edit.html.erb +++ b/app/views/softapplications/edit.html.erb @@ -1,6 +1,8 @@ -

Editing softapplication

+

<%= l(:label_edit_softapplication)%>

+ +<%= render partial: 'form', locals:{softapplication: @softapplication} %> + + -<%= render 'form' %> -<%= link_to 'Show', @softapplication %> | -<%= link_to 'Back', softapplications_path %> diff --git a/app/views/softapplications/new.html.erb b/app/views/softapplications/new.html.erb index d5ff2c9c2..1112fcfa4 100644 --- a/app/views/softapplications/new.html.erb +++ b/app/views/softapplications/new.html.erb @@ -1,76 +1,5 @@

<%= l(:label_release_softapplication)%>

- +<%= render partial: 'form', locals:{softapplication: @softapplication} %> -
- <%= 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) %> - * : - <%= l(:label_softapplication_name_condition)%> - -
-
- - - <%= l(:label_softapplication_version_available) %> - * : - - -
-
- - - <%= l(:label_softapplication_type) %> - - * : - - -
-
- - - <%= l(:label_softapplication_description) %> - * : - - -
-
- - - <%= l(:label_softapplication_developers) %> - * : - - -
-
-
- 上传应用软件包和应用截图 - <%= render_flash_messages %> -

- <%= render :partial => 'attachments/form' %> -

-

(<%=l(:label_upload_softapplication_photo_condition)%>)

- -
-
-
<%= submit_tag l(:button_create), :onclick => "return true" %>
- - - <% end %> - \ No newline at end of file diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb index a5c3fb596..d5681c4ea 100644 --- a/app/views/softapplications/show.html.erb +++ b/app/views/softapplications/show.html.erb @@ -18,6 +18,10 @@
<%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication)) %> <%= link_to '删除', c_softapplication.softapplication, method: :delete, data: { confirm: '您确定要删除吗?' } %>
<%= l(:label_softapplication_name) %> * <%= f.text_field :name, :required => true, :size => 60, :style => "width:400px;" %><%= l(:label_softapplication_name_condition)%>
<%= f.text_field :name, :required => true, :size => 60, :style => "width:400px;" %>
<%= 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;" %>
<%= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %>
<%= l(:label_softapplication_type) %> * <%= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %>
<%= f.text_field :description, :required => true, :size => 60, :style => "width:400px;" %>
<%= f.text_field :application_developers, :required => true, :size => 60, :style => "width:400px;" %>
<%= l(:label_softapplication_description) %> * <%= f.text_field :description, :required => true, :size => 60, :style => "width:400px;" %>
<%= f.text_field :name, :required => true, :size => 60, :style => "width:400px;" %>
<%= f.text_field :android_min_version_available, :required => true, :size => 60, :style => "width:400px;" %>
<%= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %>
<%= f.text_field :description, :required => true, :size => 60, :style => "width:400px;" %>
<%= f.text_field :application_developers, :required => true, :size => 60, :style => "width:400px;" %>
+ diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb index f283bd759..6ef2b4796 100644 --- a/app/views/welcome/contest.html.erb +++ b/app/views/welcome/contest.html.erb @@ -142,18 +142,18 @@
  • - <%= image_tag('/images/039.gif')%> + <%= image_tag('/images/contest1.png')%>
    -
    +
    <%= link_to(contest.name, contest.event_url, :class => "d-g-blue d-p-project-name", :title => "#{contest.name}", :target => "_blank") %>
    -
    +
    ><%=contest.description.truncate(50, omission: '...')%>

    -
    +
    发布时间：<%=format_time contest.created_on %>
    @@ -204,18 +204,18 @@
  • - <%= image_tag('/images/009.gif')%> + <%= image_tag('/images/app1.png')%>
    -
    +
    <%= link_to(softapplication.name, softapplication_path(softapplication.id), :class => "d-g-blue d-p-project-name", :title => "#{softapplication.name}", :target => "_blank") %>
    -
    +
    ><%=softapplication.description.truncate(50, omission: '...')%>

    -
    +
    发布时间：<%=format_time softapplication.created_at %>
    diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 079ad450d..c32c62c05 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1855,6 +1855,7 @@ zh: label_release_add_contest_succeed: 该应用发布并添加成功. label_add_contest_succeed_fail: 添加失败,该应用已参赛. label_no_ftapplication: 暂无应用 + label_edit_softapplication: 修改应用 \ No newline at end of file diff --git a/public/images/app1.png b/public/images/app1.png new file mode 100644 index 0000000000000000000000000000000000000000..3342781acd7be2b0a01a8b359d4a74d0ba775404 GIT binary patch literal 4441 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 pcFNM^UH~-@J+h%%912{q0Y`G(d}Hg Date: Tue, 22 Apr 2014 20:23:15 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=80=E5=B1=9E=E7=AB=9E=E8=B5=9B=E5=8F=8A?= =?UTF-8?q?=E7=9B=B8=E5=BA=94=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/softapplications/show.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb index d5681c4ea..51195dfcf 100644 --- a/app/views/softapplications/show.html.erb +++ b/app/views/softapplications/show.html.erb @@ -25,7 +25,8 @@
    • - + <% contest = @softapplication.contests.first %> + @@ -42,7 +43,7 @@ - + From b318166c15df004e4675c70c02a4257e77a4f673 Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Wed, 23 Apr 2014 09:18:43 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E7=BB=99=E5=8F=82=E4=B8=8E=E7=AB=9E?= =?UTF-8?q?=E8=B5=9B=E7=9A=84=E5=BA=94=E7=94=A8=E9=A1=B5=E9=9D=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AF=BC=E8=88=AA=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._base_softapplication_top_content.html.erb | 20 ++++++++++++ app/views/layouts/base_contest.html.erb | 30 ++++++++--------- app/views/layouts/base_newcontest.html.erb | 32 +++++++++---------- app/views/softapplications/show.html.erb | 1 + 4 files changed, 52 insertions(+), 31 deletions(-) create mode 100644 app/views/layouts/_base_softapplication_top_content.html.erb diff --git a/app/views/layouts/_base_softapplication_top_content.html.erb b/app/views/layouts/_base_softapplication_top_content.html.erb new file mode 100644 index 000000000..064e84cf0 --- /dev/null +++ b/app/views/layouts/_base_softapplication_top_content.html.erb @@ -0,0 +1,20 @@ +
    +
    <%= @softapplication.name %> + <%= link_to '删除', softapplication_path(@softapplication), method: :delete, data: { confirm: '您确定要删除吗?' } if @softapplication.destroyable_by? User.current %>  + <%= link_to '编辑', edit_softapplication_path(@softapplication), method: :get if @softapplication.destroyable_by? User.current %> +
    所属类别：<%= @softapplication.app_type_name %>
    所属类别：<%= @softapplication.app_type_name %>发布时间：<%=format_time @softapplication.created_at %>所属竞赛：<%= contest ? link_to(contest.name, show_contest_contest_path(contest)) : '尚未加入竞赛'%>
    发布人员：<%= @softapplication.user.name %>
    平均评分: <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %>发布时间：<%=format_time @softapplication.created_at %>
    + + + + + + + + + + +
    创新竞赛社区<%= l(:label_user_location) %> :
    <%=link_to request.host()+"/contests", :controller=>'contests', :action=>'index' %><%=link_to l(:field_homepage), home_path %> > + <%=link_to l(:label_contest_innovate), :controller=>'contests', :action=>'index' %> > + + <% contest = @softapplication.contests.first %><%= contest ? link_to(contest.name, show_contest_contest_path(contest)) : '尚未加入竞赛'%> + + +
    +
    \ No newline at end of file diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb index b4ba3dd4b..2bda701fe 100644 --- a/app/views/layouts/base_contest.html.erb +++ b/app/views/layouts/base_contest.html.erb @@ -26,23 +26,23 @@
    - - - + + + - - + +
    创新竞赛社区<%= l(:label_user_location) %> : -
    - <%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %> - <%= text_field_tag 'name', params[:name], :size => 20 %> - <%= hidden_field_tag 'reward_type', @bid.reward_type %> - <%= hidden_field_tag 'project_type', params[:project_type] %> - <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> - <% end %> -
    -     		创新竞赛社区<%= l(:label_user_location) %> : +
    + <%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %> + <%= text_field_tag 'name', params[:name], :size => 20 %> + <%= hidden_field_tag 'reward_type', @bid.reward_type %> + <%= hidden_field_tag 'project_type', params[:project_type] %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> + <% end %> +
    +
    <%=link_to request.host()+"/contest", :controller => 'bids', :action => 'contest' %><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %> > - <%= link_to @bid.name, bid_path %><%=link_to request.host()+"/contest", :controller => 'bids', :action => 'contest' %><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %> > + <%= link_to @bid.name, bid_path %>
    diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb index ba78cefea..147df5245 100644 --- a/app/views/layouts/base_newcontest.html.erb +++ b/app/views/layouts/base_newcontest.html.erb @@ -27,24 +27,24 @@
    - - - + + + - - + +
    创新竞赛社区<%= l(:label_user_location) %> : -
    - <%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %> - <%= text_field_tag 'name', params[:name], :size => 20 %> - <%= hidden_field_tag 'project_type', params[:project_type] %> - <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> - <% end %> -
    -     		创新竞赛社区<%= l(:label_user_location) %> : +
    + <%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %> + <%= text_field_tag 'name', params[:name], :size => 20 %> + <%= hidden_field_tag 'project_type', params[:project_type] %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> + <% end %> +
    +
    <%=link_to request.host()+"/contests", :controller=>'contests', :action=>'index' %><%=link_to l(:field_homepage), home_path %> > - <%=link_to l(:label_contest_innovate), :controller=>'contests', :action=>'index' %> > - <%= link_to @contest.name, show_contest_contest_path %> - <%=link_to request.host()+"/contests", :controller=>'contests', :action=>'index' %><%=link_to l(:field_homepage), home_path %> > + <%=link_to l(:label_contest_innovate), :controller=>'contests', :action=>'index' %> > + <%= link_to @contest.name, show_contest_contest_path %> +
    diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb index 51195dfcf..b39ab6c61 100644 --- a/app/views/softapplications/show.html.erb +++ b/app/views/softapplications/show.html.erb @@ -1,3 +1,4 @@ +<%=render :partial => 'layouts/base_softapplication_top_content'%>