From 8b121c3e5053c9dcbc3f158297b9335a170a8dcb Mon Sep 17 00:00:00 2001 From: hhuai <8863824@gmail.com> Date: Sun, 17 Aug 2014 20:56:58 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fixed=20issue=20#998,=20=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contest_notification_controller.rb | 6 +- app/controllers/welcome_controller.rb | 2 +- app/views/contest_notification/show.html.erb | 24 +++++++ app/views/welcome/contest.html.erb | 69 +++---------------- public/stylesheets/nyan.css | 44 ++++++++++++ 5 files changed, 82 insertions(+), 63 deletions(-) diff --git a/app/controllers/contest_notification_controller.rb b/app/controllers/contest_notification_controller.rb index 143941cc0..8c6e51bd5 100644 --- a/app/controllers/contest_notification_controller.rb +++ b/app/controllers/contest_notification_controller.rb @@ -1,5 +1,5 @@ -class ContestNotificationController +class ContestNotificationController < ApplicationController def show - + @notification = ContestNotification.find(params[:id]) end -end \ No newline at end of file +end diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 4e7cf0ce9..509e5ee1d 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -110,7 +110,7 @@ class WelcomeController < ApplicationController def contest @contest_page = FirstPage.where("page_type = 'contest'").first - @contestNotification = ContestNotification.all.first + @contest_notifications = ContestNotification.order("id desc") end def search diff --git a/app/views/contest_notification/show.html.erb b/app/views/contest_notification/show.html.erb index e69de29bb..93fa1f4af 100644 --- a/app/views/contest_notification/show.html.erb +++ b/app/views/contest_notification/show.html.erb @@ -0,0 +1,24 @@ +
+ + + + + + + + + + + +
<%= l(:label_contest_innovate ) %><%= l(:label_user_location) %> : + +
contest.trustie.net<%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'welcome', :action => 'contest' %> > 详情
+
+ + +
+

<%= @notification.title %>

+
+

<%= @notification.content.html_safe %>

+
+
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb index 8df19a280..a213579a5 100644 --- a/app/views/welcome/contest.html.erb +++ b/app/views/welcome/contest.html.erb @@ -190,69 +190,20 @@ -
+

<%=l(:label_notification)%>

- <%#= link_to l(:label_more_information), forums_path %> -
-
-
<%= @contestNotification.title %>
-
-
-
- - <%= @contestNotification.content.html_safe %> -
-
- - -
-
+
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css index 2467af7a0..25dd8a5cf 100644 --- a/public/stylesheets/nyan.css +++ b/public/stylesheets/nyan.css @@ -1377,3 +1377,47 @@ div.pagination { right: 5%; } + +/*** + * contest notifications + */ +ul.contest-notification-list { + clear: both; +} +ul.contest-notification-list li{ + padding: 10px; + border-bottom: 1px solid rgb(245,245,245); + display: block; +} +ul.contest-notification-list li span.time { + color: rgb(172, 174, 177); + font-size: 13px; + line-height: 25px; +} + +ul.contest-notification-list li span.title { + font-size: 14px; +} +ul.contest-notification-list li span.content { + padding-top: 5px; + padding-bottom: 10px; +} +ul.contest-notification-list li span{ + display: block; +} + +.notification-content{ + margin: 0 auto; + width: 80%; +} +.notification-content hr{ + background: #eee; +} +.notification-content .title{ + font-size: 15px; +} + +.notification-content .content{ + font-size: 13px; +} + From a8a6d69318cf1f0cc6679d62484a632fe7b938c8 Mon Sep 17 00:00:00 2001 From: hhuai <8863824@gmail.com> Date: Mon, 18 Aug 2014 09:07:09 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=BA=86=E5=B1=B1?= =?UTF-8?q?=E4=B8=9C=E7=90=86=E5=B7=A5=E5=A4=A7=E5=AD=A6=E7=9A=84=E6=BA=90?= =?UTF-8?q?=EF=BC=8C=E6=AF=94taobao=E6=BA=90=E5=BF=AB=EF=BC=8C=E7=A8=B3?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 3 ++- Gemfile.lock | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 57d85e464..12729f741 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ -source 'http://ruby.taobao.org' +# source 'http://ruby.taobao.org' +source 'http://ruby.sdutlinux.org/' unless RUBY_PLATFORM =~ /w32/ # unix-like only diff --git a/Gemfile.lock b/Gemfile.lock index 34314d845..3051d1a27 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,7 +19,7 @@ PATH rails GEM - remote: http://ruby.taobao.org/ + remote: http://ruby.sdutlinux.org/ remote: https://rubygems.org/ specs: actionmailer (3.2.13) @@ -101,6 +101,7 @@ GEM hike (1.2.3) htmlentities (4.3.2) i18n (0.6.1) + iconv (1.0.4) journey (1.0.4) jquery-rails (2.0.3) railties (>= 3.1.0, < 5.0) @@ -193,6 +194,7 @@ GEM sass-rails rmagick (2.13.2) ruby-openid (2.1.8) + ruby-prof (0.15.1) rubyzip (1.1.6) sass (3.3.10) sass-rails (3.2.6) @@ -237,6 +239,8 @@ GEM win32console (1.3.2-x86-mingw32) xpath (2.0.0) nokogiri (~> 1.3) + zip-zip (0.3) + rubyzip (>= 1.0.0) PLATFORMS ruby @@ -258,6 +262,7 @@ DEPENDENCIES guard-test (~> 1.0.0) htmlentities i18n (~> 0.6.0) + iconv jquery-rails (~> 2.0.2) kaminari mocha (~> 1.1.0) @@ -273,6 +278,8 @@ DEPENDENCIES rich (= 1.4.6) rmagick (>= 2.0.0) ruby-openid (~> 2.1.4) + ruby-prof (~> 0.15.1) + rubyzip sass-rails (~> 3.2.3) seems_rateable! selenium-webdriver (~> 2.42.0) @@ -280,3 +287,4 @@ DEPENDENCIES spork-testunit (~> 0.0.8) therubyracer uglifier (>= 1.0.3) + zip-zip From b34e74bd1c59ed977f848d58169f8f461e0227fb Mon Sep 17 00:00:00 2001 From: hhuai <8863824@gmail.com> Date: Mon, 18 Aug 2014 17:00:52 +0800 Subject: [PATCH 3/6] =?UTF-8?q?issue=201012,=20table=E4=B8=ADtd=E6=92=91?= =?UTF-8?q?=E5=9D=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + app/views/softapplications/show.html.erb | 2 +- public/stylesheets/nyan.css | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 29bd2c4fd..0cd336786 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /Gemfile.lock /lib/plugins/acts_as_versioned/test/debug.log /config/configuration.yml +.rbenv-gemsets diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb index e41ecb842..1410563c3 100644 --- a/app/views/softapplications/show.html.erb +++ b/app/views/softapplications/show.html.erb @@ -2,7 +2,7 @@ -
+
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css index 25dd8a5cf..0b5e32f2f 100644 --- a/public/stylesheets/nyan.css +++ b/public/stylesheets/nyan.css @@ -1421,3 +1421,6 @@ ul.contest-notification-list li span{ font-size: 13px; } +.softapplications-div table td{ + word-break: break-all; +} From 0cbcaa88e8b3cf43d16f5fac2cb14e214f34e30a Mon Sep 17 00:00:00 2001 From: hhuai <8863824@gmail.com> Date: Mon, 18 Aug 2014 20:55:43 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fixed=20issue=201013,=E2=80=9C=E5=A5=96?= =?UTF-8?q?=E5=8A=B1=E6=96=B9=E5=BC=8F=E2=80=9D=E6=9C=AA=E5=AF=B9=E9=9D=9E?= =?UTF-8?q?=E6=B1=89=E5=AD=97=E7=B1=BB=E5=9E=8B=E8=BF=9B=E8=A1=8C=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=8D=A2=E8=A1=8C=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/contests/_contest_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/contests/_contest_list.html.erb b/app/views/contests/_contest_list.html.erb index 780b18c27..a91978079 100644 --- a/app/views/contests/_contest_list.html.erb +++ b/app/views/contests/_contest_list.html.erb @@ -21,7 +21,7 @@ From bdf36ca71e7f31ba2ac975fd321ce330f7d698c0 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 29 Aug 2014 16:46:11 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=B8=96=E5=AD=90=E6=97=B6=E8=AE=A8?= =?UTF-8?q?=E8=AE=BA=E5=8C=BA=E7=9A=84=E9=80=89=E6=8B=A9=20#1528?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/messages/_form.html.erb | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb index 047f7d660..d2eb73225 100644 --- a/app/views/messages/_form.html.erb +++ b/app/views/messages/_form.html.erb @@ -22,17 +22,6 @@ <% end %> <% end %>

- -<% if !replying && !@message.new_record? && @message.safe_attribute?('board_id') %> -


- <%# modify by nwb%> - <% if @message.project %> - <%= f.select :board_id, boards_options_for_select(@message.project.boards) %> - <% elsif @message.course %> - <%= f.select :board_id, boards_options_for_select(@message.course.boards) %> - <% end %> -

-<% end %>

<%= text_area :quote,:quote,:style => 'display:none' %>

From 8a6e19bcad4d477a2e42382deea8803195dc0f27 Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 2 Sep 2014 09:17:42 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E7=A7=81=E6=9C=89=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index c0e3d56f2..6849ba83d 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -183,7 +183,7 @@ module ProjectsHelper s += link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}").html_safe else unless project.is_public - s = "#{l(:label_private)}".html_safe + s = "#{l(:lable_private)}".html_safe else s = "".html_safe end
- <%= l(:label_contests_reward_method) %>:  <%= contest.budget%> + <%= l(:label_contests_reward_method) %>:  <%= contest.budget%>