From 805de7fc28b0f1d07ffa9d9064550ad1ef46d319 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sun, 4 Jan 2015 13:28:33 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/welcome_controller.rb | 48 +++++++++++++++++++++++---- app/views/welcome/course.html.erb | 26 +++++++++++++-- config/locales/zh.yml | 2 +- 3 files changed, 66 insertions(+), 10 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index c023a0ba3..8e11bceb5 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -62,13 +62,49 @@ class WelcomeController < ApplicationController @course_page = FirstPage.find_by_page_type('course') @school_id = params[:school_id] || User.current.user_extensions.school.try(:id) @logoLink ||= logolink() + + ##3-8月份为查找春季课程，9-2月份为查找秋季课程 + #month_now = Time.now.strftime("%m").to_i + #year_now = Time.new.strftime("%Y").to_i + #(month_now >= 3 && month_now < 9) ? course_term = l(:label_spring) : course_term = l(:label_autumn) + ##year_now -= 1 if year_now < 3 + #@school_id.nil? ? @cur_school_course = [] : @cur_school_course = find_miracle_course(10,7,@school_id, year_now, course_term) + ##未登录或者当前学校未开设课程 + #if @cur_school_course.empty? + # @has_course = false + # User.current.logged? ? course_count = 9 : course_count = 10 + # @cur_school_course += find_all_new_hot_course(course_count, @school_id, year_now, course_term) + # while @cur_school_course.count < 9 do + # if course_term == l(:label_spring) + # course_term = l(:label_autumn) + # year_now -= 1 + # else + # course_term = l(:label_spring) + # end + # @cur_school_course += find_all_new_hot_course((10-@cur_school_course.count), nil, year_now, course_term) + # end + #else + # if @cur_school_course.count < 9 + # @has_course = false + # @cur_school_course += find_all_new_hot_course(9-@cur_school_course.count, @school_id, year_now, course_term) + # if @cur_school_course.count < 9 + # if course_term == l(:label_spring) + # course_term = l(:label_autumn) + # year_now -= 1 + # else + # course_term = l(:label_spring) + # end + # @cur_school_course += find_all_new_hot_course(9-@cur_school_course.count, nil, year_now, course_term) + # end + # else + # @has_course = true + # end + #end end - - - - def logolink() - @course_page = FirstPage.find_by_page_type('course') - logo = get_avatar?(@course_page) + + def logolink() + @course_page = FirstPage.find_by_page_type('course') + logo = get_avatar?(@course_page) id = params[:school_id] logo_link = "" if id.nil? && (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index b2e9f8eb6..acb75d880 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -90,7 +90,7 @@ <% month_now = Time.now.strftime("%m").to_i %> - <% year_now = 2014 %> + <% year_now = Time.new.strftime("%Y").to_i %> <% (month_now >= 3 && month_now < 9) ? course_term = "春季学期" : course_term = "秋季学期" %> <% @school_id.nil? ? cur_school_course = [] : cur_school_course = find_miracle_course(10,7,@school_id, year_now, course_term) %> @@ -107,7 +107,17 @@ <% end %> <% User.current.logged? ? course_count = 9 : course_count = 10 %> - <%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(course_count, @school_id, year_now, course_term)} %> + <% all_new_hot_course = find_all_new_hot_course(course_count, @school_id, year_now, course_term)%> + <% while all_new_hot_course.count < course_count%> + <% if course_term == "春季学期" + year_now -= 1 + course_term = "秋季学期" + else + course_term = "春季学期" + end%> + <% all_new_hot_course += find_all_new_hot_course(course_count-all_new_hot_course.count, @school_id, year_now, course_term)%> + <% end%> + <%= render :partial => 'course_list', :locals => {:course_list => all_new_hot_course} %> <% else %> @@ -127,7 +137,17 @@
  • <%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_less_course)} %>
    • - <%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9-cur_school_course.count, @school_id, year_now, course_term)} %> + <% all_new_hot_course = find_all_new_hot_course(9-cur_school_course.count, @school_id, year_now, course_term)%> + <% while (all_new_hot_course.count + cur_school_course.count) < 9%> + <% if course_term == "春季学期" + year_now -= 1 + course_term = "秋季学期" + else + course_term = "春季学期" + end%> + <% all_new_hot_course += find_all_new_hot_course(9-(all_new_hot_course.count + cur_school_course.count), @school_id, year_now, course_term)%> + <% end%> + <%= render :partial => 'course_list', :locals => {:course_list => all_new_hot_course} %> <% end %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 62f0e0bc4..e23a563a6 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2179,7 +2179,7 @@ zh: modal_valid_passing: 可以使用 label_bug: 漏洞 - label_school_no_course: 该学校未开设任何课程，您可以查看其他学校课程 + label_school_no_course: 该学校本学期未开设任何课程，您可以查看其他学校课程 label_school_less_course: 您也可以查看其他学校课程 label_file_not_found: 对不起，该文件现在不能下载 From a09a3dc378c45f43f5c4b090479fa292a846f4f0 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sun, 4 Jan 2015 15:06:26 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=EF=BC=9A=201-3=E6=9C=88=E4=BB=BD=E6=98=BE=E7=A4=BA=E4=B8=8A?= =?UTF-8?q?=E4=B8=80=E5=B9=B4=E5=BA=A6=E7=9A=84=E7=A7=8B=E5=AD=A3=E5=AD=A6?= =?UTF-8?q?=E6=9C=9F=E7=9A=84=E8=AF=BE=E7=A8=8B=EF=BC=8C=203-9=E6=9C=88?= =?UTF-8?q?=E4=BB=BD=E6=98=BE=E7=A4=BA=E6=9C=AC=E5=B9=B4=E5=BA=A6=E7=9A=84?= =?UTF-8?q?=E6=98=A5=E5=AD=A3=E5=AD=A6=E6=9C=9F=E8=AF=BE=E7=A8=8B=EF=BC=8C?= =?UTF-8?q?=20=209-12=E6=9C=88=E4=BB=BD=E6=98=BE=E7=A4=BA=E6=9C=AC?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E7=9A=84=E7=A7=8B=E5=AD=A3=E5=AD=A6=E6=9C=9F?= =?UTF-8?q?=E7=9A=84=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/course.html.erb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index acb75d880..927734b24 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -92,7 +92,14 @@ <% month_now = Time.now.strftime("%m").to_i %> <% year_now = Time.new.strftime("%Y").to_i %> - <% (month_now >= 3 && month_now < 9) ? course_term = "春季学期" : course_term = "秋季学期" %> + <% if month_now < 3 + year_now -= 1 + course_term = "秋季学期" + elsif month_now < 9 + course_term = "秋季学期" + end + %> + <%# (month_now >= 3 && month_now < 9) ? course_term = "春季学期" : course_term = "秋季学期" %> <% @school_id.nil? ? cur_school_course = [] : cur_school_course = find_miracle_course(10,7,@school_id, year_now, course_term) %> <% if cur_school_course.count == 0 %> From 2277d388c0bc37cf8f89428f19020aae96445d7d Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 7 Jan 2015 09:37:35 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=A4?= =?UTF-8?q?=E5=A4=84=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- app/views/courses/member.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 1a8506b12..87ab7e683 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -19,7 +19,7 @@ class CoursesController < ApplicationController before_filter :authorize_course, :only => [:show, :settings, :edit, :update, :modules, :close, :reopen, :view_homework_attaches, :course] before_filter :authorize_course_global, :only => [:view_homework_attaches, :new,:create] before_filter :require_admin, :only => [:copy, :archive, :unarchive, :destroy, :calendar] - before_filter :toggleCourse, only: [:finishcourse, :restartcourse] + before_filter :toggleCourse, :only => [:finishcourse, :restartcourse] before_filter :require_login, :only => [:join, :unjoin] #before_filter :allow_join, :only => [:join] diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb index 313e50748..d199097be 100644 --- a/app/views/courses/member.html.erb +++ b/app/views/courses/member.html.erb @@ -66,7 +66,7 @@
    <% if @subPage_title == l(:label_student_list) %>
    - <%= render :partial => 'groups_name', locals: {:course_groups => @course_groups} %> + <%= render :partial => 'groups_name', :locals => {:course_groups => @course_groups} %>
    <% end %> From 035d45ea5c56da77fed9d7b8a61bd8c6d6c26c7b Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 7 Jan 2015 10:12:03 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=AE=BF=E9=97=AE=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/database.yml.example | 52 +++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 config/database.yml.example diff --git a/config/database.yml.example b/config/database.yml.example new file mode 100644 index 000000000..2ff6231d4 --- /dev/null +++ b/config/database.yml.example @@ -0,0 +1,52 @@ +# Default setup is given for MySQL with ruby1.9. If you're running Redmine +# with MySQL and ruby1.8, replace the adapter name with `mysql`. +# Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end. +# Line indentation must be 2 spaces (no tabs). + +production: + adapter: mysql2 + database: redmine + host: localhost + username: root + password: "" + encoding: utf8 + +development: + adapter: mysql2 + database: redmine_development + host: 10.107.17.20 + username: root + password: "1234" + encoding: utf8 + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + adapter: mysql2 + database: redmine_test + host: 10.107.17.20 + username: root + password: "1234" + encoding: utf8 + +# PostgreSQL configuration example +#production: +# adapter: postgresql +# database: redmine +# host: localhost +# username: postgres +# password: "postgres" + +# SQLite3 configuration example +#production: +# adapter: sqlite3 +# database: db/redmine.sqlite3 + +# SQL Server configuration example +#production: +# adapter: sqlserver +# database: redmine +# host: localhost +# username: jenkins +# password: jenkins From 8b6902f86052dbfa9a9a3917f711390946c1918a Mon Sep 17 00:00:00 2001 From: zhuhao Date: Wed, 7 Jan 2015 14:50:55 +0800 Subject: [PATCH 05/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E2=80=9C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=A0=87=E7=AD=BE=E2=80=9D=E6=8C=89=E9=92=AE=E5=8E=8B?= =?UTF-8?q?=E7=BA=BF=EF=BC=8C=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/application.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index ce3ac85de..282b760b2 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2911,8 +2911,8 @@ input[class~='ButtonClolr'],.ButtonColor{ } input[class~='m3p10'], .m3p10 { - margin: 0; - padding: 3px 10px !important; + margin-top: 5px; + padding: 5px 10px !important; height: 20px; display: inline-block; color: #ffffff; From 9e2bff77785bd2fc93f35f44908b8f8fde2ca473 Mon Sep 17 00:00:00 2001 From: alanlong9278 <547533434@qq.com> Date: Wed, 7 Jan 2015 14:59:41 +0800 Subject: [PATCH 06/23] =?UTF-8?q?=E6=89=98=E7=AE=A1=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E4=B8=AD=E5=88=9B=E5=BB=BA=E6=9F=90=E9=A1=B9=E7=9B=AE=E5=90=8E?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E8=AF=A5=E9=A1=B9=E7=9B=AE=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BBtab=E7=9A=84=E9=85=8D=E7=BD=AE---?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8Cform=E8=A1=A8=E5=8D=95=E6=B2=A1?= =?UTF-8?q?=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 261 +++++++------- .../stylesheets/window_js/mac_os_x_dialog.css | 320 ++++++++--------- .../stylesheets/window_js/nuncio.css | 328 +++++++++--------- .../stylesheets/window_js/spread.css | 216 ++++++------ public/stylesheets/jstoolbar.css | 4 +- 5 files changed, 559 insertions(+), 570 deletions(-) diff --git a/Gemfile b/Gemfile index f462133c3..634af9683 100644 --- a/Gemfile +++ b/Gemfile @@ -1,136 +1,125 @@ -source 'http://ruby.taobao.org' -#source 'http://ruby.sdutlinux.org/' - -unless RUBY_PLATFORM =~ /w32/ - # unix-like only - gem 'iconv' - gem 'rubyzip' - gem 'zip-zip' -end - -gem 'seems_rateable', path: 'lib/seems_rateable' -gem "rails", "3.2.13" -gem "jquery-rails", "~> 2.0.2" -gem "i18n", "~> 0.6.0" -gem "coderay", "~> 1.0.6" -gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby] -gem "builder", "3.0.0" -gem 'acts-as-taggable-on', '2.4.1' -gem 'spreadsheet' -gem 'ruby-ole' - -group :development do - gem 'better_errors', path: 'lib/better_errors' - gem 'rack-mini-profiler', path: 'lib/rack-mini-profiler' -end - -group :test do - gem "shoulda", "~> 3.5.0" - gem "mocha", "~> 1.1.0" - gem 'capybara', '~> 2.4.1' - gem 'nokogiri', '~> 1.6.3' - gem 'factory_girl', '~> 4.4.0' - gem 'selenium-webdriver', '~> 2.42.0' - - - platforms :mri, :mingw do - group :rmagick do - # RMagick 2 supports ruby 1.9 - # RMagick 1 would be fine for ruby 1.8 but Bundler does not support - # different requirements for the same gem on different platforms - gem "rmagick", ">= 2.0.0" - end - end -end - -group :development, :test do - gem "guard-rails", '~> 0.5.3' - gem 'spork-testunit', '~> 0.0.8' - gem 'guard-spork', '~> 1.5.1' - gem 'guard-test', '~> 1.0.0' - gem 'ruby-prof', '~> 0.15.1' unless RUBY_PLATFORM =~ /w32/ - gem 'pry' - gem 'pry-nav' - -end - - -# Gems used only for assets and not required -# in production environments by default. -group :assets do - gem 'sass-rails', '~> 3.2.3' - gem 'coffee-rails', '~> 3.2.1' - - # See https://github.com/sstephenson/execjs#readme for more supported runtimes - gem 'therubyracer', :platforms => :ruby - - gem 'uglifier', '>= 1.0.3' -end - -# Optional gem for LDAP authentication -group :ldap do - gem "net-ldap", "~> 0.3.1" -end - - -# Optional gem for OpenID authentication -group :openid do - gem "ruby-openid", "~> 2.1.4", :require => "openid" - gem "rack-openid" -end - -# Optional gem for exporting the gantt to a PNG file, not supported with jruby -platforms :jruby do - # jruby-openssl is bundled with JRuby 1.7.0 - gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0' - gem "activerecord-jdbc-adapter", "1.2.5" -end - -# Include database gems for the adapters found in the database -# configuration file -require 'erb' -require 'yaml' -database_file = File.join(File.dirname(__FILE__), "config/database.yml") -if File.exist?(database_file) - database_config = YAML::load(ERB.new(IO.read(database_file)).result) - adapters = database_config.values.map {|c| c['adapter']}.compact.uniq - if adapters.any? - adapters.each do |adapter| - case adapter - when 'mysql2' - gem "mysql2", "= 0.3.11", :platforms => [:mri, :mingw] - gem "activerecord-jdbcmysql-adapter", :platforms => :jruby - when 'mysql' - gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw] - gem "activerecord-jdbcmysql-adapter", :platforms => :jruby - when /postgresql/ - gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw] - gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby - when /sqlite3/ - gem "sqlite3", :platforms => [:mri, :mingw] - gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby - when /sqlserver/ - gem "tiny_tds", "~> 0.5.1", :platforms => [:mri, :mingw] - gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw] - else - warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems") - end - end - else - warn("No adapter found in config/database.yml, please configure it first") - end -else - warn("Please configure your config/database.yml first") -end - -local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") -if File.exists?(local_gemfile) - puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v` - instance_eval File.read(local_gemfile) -end - -# Load plugins' Gemfiles -Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file| - puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v` - instance_eval File.read(file) -end +source 'https://rubygems.org' + +unless RUBY_PLATFORM =~ /w32/ + # unix-like only + gem 'iconv' + gem 'rubyzip' + gem 'zip-zip' +end + +gem 'seems_rateable', path: 'lib/seems_rateable' +gem "rails", "3.2.13" +gem "jquery-rails", "~> 2.0.2" +gem "i18n", "~> 0.6.0" +gem "coderay", "~> 1.0.6" +gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby] +gem "builder", "3.0.0" +gem 'acts-as-taggable-on', '2.4.1' + +group :development do + gem 'better_errors', path: 'lib/better_errors' + gem 'rack-mini-profiler', path: 'lib/rack-mini-profiler' + if ENV['PRY'] + gem 'pry' + gem 'pry-nav' + end +end + +group :test do + # shoulda的版本做了改动 + #gem "shoulda", "~> 3.3.2" + gem "shoulda", "> 3.3.2" + gem "mocha", "~> 0.13.3" + gem 'capybara', '~> 2.0.0' + gem 'nokogiri', '< 1.6.0' +end + + +# Gems used only for assets and not required +# in production environments by default. +group :assets do + gem 'sass-rails', '~> 3.2.3' + gem 'coffee-rails', '~> 3.2.1' + + # See https://github.com/sstephenson/execjs#readme for more supported runtimes + gem 'therubyracer', :platforms => :ruby + + gem 'uglifier', '>= 1.0.3' +end + +# Optional gem for LDAP authentication +group :ldap do + gem "net-ldap", "~> 0.3.1" +end + + +platforms :mri, :mingw do + group :rmagick do + # RMagick 2 supports ruby 1.9 + # RMagick 1 would be fine for ruby 1.8 but Bundler does not support + # different requirements for the same gem on different platforms + gem "rmagick", ">= 2.0.0" + end +end + +# Optional gem for OpenID authentication +group :openid do + gem "ruby-openid", "~> 2.1.4", :require => "openid" + gem "rack-openid" +end + +# Optional gem for exporting the gantt to a PNG file, not supported with jruby +platforms :jruby do + # jruby-openssl is bundled with JRuby 1.7.0 + gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0' + gem "activerecord-jdbc-adapter", "1.2.5" +end + +# Include database gems for the adapters found in the database +# configuration file +require 'erb' +require 'yaml' +database_file = File.join(File.dirname(__FILE__), "config/database.yml") +if File.exist?(database_file) + database_config = YAML::load(ERB.new(IO.read(database_file)).result) + adapters = database_config.values.map {|c| c['adapter']}.compact.uniq + if adapters.any? + adapters.each do |adapter| + case adapter + when 'mysql2' + gem "mysql2", "= 0.3.11", :platforms => [:mri, :mingw] + gem "activerecord-jdbcmysql-adapter", :platforms => :jruby + when 'mysql' + gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw] + gem "activerecord-jdbcmysql-adapter", :platforms => :jruby + when /postgresql/ + gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw] + gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby + when /sqlite3/ + gem "sqlite3", :platforms => [:mri, :mingw] + gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby + when /sqlserver/ + gem "tiny_tds", "~> 0.5.1", :platforms => [:mri, :mingw] + gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw] + else + warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems") + end + end + else + warn("No adapter found in config/database.yml, please configure it first") + end +else + warn("Please configure your config/database.yml first") +end + +local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") +if File.exists?(local_gemfile) + puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v` + instance_eval File.read(local_gemfile) +end + +# Load plugins' Gemfiles +Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file| + puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v` + instance_eval File.read(file) +end diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css index e663e3c5e..4c89f602d 100644 --- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css +++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css @@ -1,160 +1,160 @@ -.overlay_mac_os_x_dialog { - background-color: #FF7224; - filter:alpha(opacity=60); - -moz-opacity: 0.6; - opacity: 0.6; -} - -.mac_os_x_dialog_nw { - background: transparent url(mac_os_x_dialog/L.png) repeat-y top left; - width:16px; - height:16px; -} - -.mac_os_x_dialog_n { - background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0; - height:18px; -} - -.mac_os_x_dialog_ne { - background: transparent url(mac_os_x_dialog/R.png) repeat-y top left; - width:16px; - height:16px; -} - -.mac_os_x_dialog_w { - background: transparent url(mac_os_x_dialog/L.png) repeat-y top left; - width:16px; -} - -.mac_os_x_dialog_e { - background: transparent url(mac_os_x_dialog/R.png) repeat-y top right; - width:16px; -} - -.mac_os_x_dialog_sw { - background: transparent url(mac_os_x_dialog/BL.png) no-repeat 0 0; - width:31px; - height:40px; -} - -.mac_os_x_dialog_s { - background: transparent url(mac_os_x_dialog/B.png) repeat-x 0 0; - height:40px; -} - -.mac_os_x_dialog_se, .mac_os_x_dialog_sizer { - background: transparent url(mac_os_x_dialog/BR.png) no-repeat 0 0; - width:31px; - height:40px; -} - -.mac_os_x_dialog_sizer { - cursor:se-resize; -} - -.mac_os_x_dialog_close { - width: 19px; - height: 19px; - background: transparent url(mac_os_x_dialog/close.gif) no-repeat 0 0; - position:absolute; - top:12px; - left:25px; - cursor:pointer; - z-index:1000; -} - -.mac_os_x_dialog_minimize { - width: 19px; - height: 19px; - background: transparent url(mac_os_x_dialog/minimize.gif) no-repeat 0 0; - position:absolute; - top:12px; - left:45px; - cursor:pointer; - z-index:1000; -} - -.mac_os_x_dialog_maximize { - width: 19px; - height: 19px; - background: transparent url(mac_os_x_dialog/maximize.gif) no-repeat 0 0; - position:absolute; - top:12px; - left:65px; - cursor:pointer; - z-index:1000; -} - -.mac_os_x_dialog_title { - float:left; - height:14px; - font-family: Tahoma, Arial, sans-serif; - font-size:12px; - text-align:center; - margin-top:6px; - width:100%; - color:#000; -} - -.mac_os_x_dialog_content { - overflow:auto; - color: #222; - font-family: Tahoma, Arial, sans-serif; - font-size: 10px; - background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0; -} - -.mac_os_x_dialog_buttons { - text-align: center; -} -/* FOR IE */ -* html .mac_os_x_dialog_nw { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale"); -} - - -* html .mac_os_x_dialog_ne { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale"); -} - -* html .mac_os_x_dialog_w { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale"); -} - -* html .mac_os_x_dialog_e { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale"); -} - -* html .mac_os_x_dialog_sw { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BL.png", sizingMethod="crop"); -} - -* html .mac_os_x_dialog_s { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/B.png", sizingMethod="scale"); -} - -* html .mac_os_x_dialog_se { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop"); -} - -* html .mac_os_x_dialog_sizer { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop"); -} - +.overlay_mac_os_x_dialog { + background-color: #FF7224; + filter:alpha(opacity=60); + -moz-opacity: 0.6; + opacity: 0.6; +} + +.mac_os_x_dialog_nw { + background: transparent url(mac_os_x_dialog/L.png) repeat-y top left; + width:16px; + height:16px; +} + +.mac_os_x_dialog_n { + background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0; + height:18px; +} + +.mac_os_x_dialog_ne { + background: transparent url(mac_os_x_dialog/R.png) repeat-y top left; + width:16px; + height:16px; +} + +.mac_os_x_dialog_w { + background: transparent url(mac_os_x_dialog/L.png) repeat-y top left; + width:16px; +} + +.mac_os_x_dialog_e { + background: transparent url(mac_os_x_dialog/R.png) repeat-y top right; + width:16px; +} + +.mac_os_x_dialog_sw { + background: transparent url(mac_os_x_dialog/BL.png) no-repeat 0 0; + width:31px; + height:40px; +} + +.mac_os_x_dialog_s { + background: transparent url(mac_os_x_dialog/B.png) repeat-x 0 0; + height:40px; +} + +.mac_os_x_dialog_se, .mac_os_x_dialog_sizer { + background: transparent url(mac_os_x_dialog/BR.png) no-repeat 0 0; + width:31px; + height:40px; +} + +.mac_os_x_dialog_sizer { + cursor:se-resize; +} + +.mac_os_x_dialog_close { + width: 19px; + height: 19px; + background: transparent url(mac_os_x_dialog/close.gif) no-repeat 0 0; + position:absolute; + top:12px; + left:25px; + cursor:pointer; + z-index:1000; +} + +.mac_os_x_dialog_minimize { + width: 19px; + height: 19px; + background: transparent url(mac_os_x_dialog/minimize.gif) no-repeat 0 0; + position:absolute; + top:12px; + left:45px; + cursor:pointer; + z-index:1000; +} + +.mac_os_x_dialog_maximize { + width: 19px; + height: 19px; + background: transparent url(mac_os_x_dialog/maximize.gif) no-repeat 0 0; + position:absolute; + top:12px; + left:65px; + cursor:pointer; + z-index:1000; +} + +.mac_os_x_dialog_title { + float:left; + height:14px; + font-family: Tahoma, Arial, sans-serif; + font-size:12px; + text-align:center; + margin-top:6px; + width:100%; + color:#000; +} + +.mac_os_x_dialog_content { + overflow:auto; + color: #222; + font-family: Tahoma, Arial, sans-serif; + font-size: 10px; + background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0; +} + +.mac_os_x_dialog_buttons { + text-align: center; +} +/* FOR IE */ +* html .mac_os_x_dialog_nw { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale"); +} + + +* html .mac_os_x_dialog_ne { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale"); +} + +* html .mac_os_x_dialog_w { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale"); +} + +* html .mac_os_x_dialog_e { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale"); +} + +* html .mac_os_x_dialog_sw { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BL.png", sizingMethod="crop"); +} + +* html .mac_os_x_dialog_s { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/B.png", sizingMethod="scale"); +} + +* html .mac_os_x_dialog_se { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop"); +} + +* html .mac_os_x_dialog_sizer { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop"); +} + diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css index 2c439bd00..e2700e5b7 100644 --- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css +++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css @@ -1,164 +1,164 @@ -.overlay_nuncio img { border: none; } - -.overlay_nuncio { - background-color: #666666; -} - -.nuncio_nw { - width: 12px; - height: 28px; - background: url(nuncio/top_left.png) no-repeat; -} - -.nuncio_n { - background: url(nuncio/top_mid.png) repeat-x; - height: 28px; -} - -.nuncio_ne { - width: 21px; - height: 28px; - background: url(nuncio/top_right.png) no-repeat; -} - -.nuncio_e { - width: 21px; - background: url(nuncio/center_right.png) repeat-y top right; -} - -.nuncio_w { - width: 12px; - background: url(nuncio/center_left.png) repeat-y top left; -} - -.nuncio_sw { - width: 12px; - height: 18px; - background: url(nuncio/bottom_left.png) no-repeat; -} - -.nuncio_s { - background: url(nuncio/bottom_mid.png) repeat-x 0 0; - height: 18px; -} - -.nuncio_se, .nuncio_sizer { - width: 21px; - height: 18px; - background: url(nuncio/bottom_right.png) no-repeat; -} - -.nuncio_close { - width: 14px; - height: 14px; - background: url(nuncio/close.png) no-repeat; - position:absolute; - top:10px; - right:22px; - cursor:pointer; - z-index:2000; -} - -.nuncio_minimize { - width: 14px; - height: 15px; - background: url(nuncio/minimize.png) no-repeat; - position:absolute; - top:10px; - right:40px; - cursor:pointer; - z-index:2000; -} - -.nuncio_title { - float:left; - font-size:11px; - font-weight: bold; - font-style: italic; - color: #fff; - width: 100% -} - -.nuncio_content { - background: url(nuncio/overlay.png) repeat; - overflow:auto; - color: #ddd; - font-family: Tahoma, Arial, "sans-serif"; - font-size: 10px; -} - -.nuncio_sizer { - cursor:se-resize; -} - - -.top_draggable, .bottom_draggable { - cursor:move -} -/* FOR IE */ -* html .nuncio_nw { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_left.png", sizingMethod="crop"); -} - -* html .nuncio_n { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_mid.png", sizingMethod="scale"); -} - -* html .nuncio_ne { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_right.png", sizingMethod="crop"); -} - -* html .nuncio_w { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_left.png", sizingMethod="scale"); -} - -* html .nuncio_e { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_right.png", sizingMethod="scale"); -} - -* html .nuncio_sw { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_left.png", sizingMethod="crop"); -} - -* html .nuncio_s { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_mid.png", sizingMethod="scale"); -} - -* html .nuncio_se { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop"); -} - -* html .nuncio_sizer { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop"); -} - -* html .nuncio_close { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/close.png", sizingMethod="crop"); -} - -* html .nuncio_minimize { - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/minimize.png", sizingMethod="crop"); -} - +.overlay_nuncio img { border: none; } + +.overlay_nuncio { + background-color: #666666; +} + +.nuncio_nw { + width: 12px; + height: 28px; + background: url(nuncio/top_left.png) no-repeat; +} + +.nuncio_n { + background: url(nuncio/top_mid.png) repeat-x; + height: 28px; +} + +.nuncio_ne { + width: 21px; + height: 28px; + background: url(nuncio/top_right.png) no-repeat; +} + +.nuncio_e { + width: 21px; + background: url(nuncio/center_right.png) repeat-y top right; +} + +.nuncio_w { + width: 12px; + background: url(nuncio/center_left.png) repeat-y top left; +} + +.nuncio_sw { + width: 12px; + height: 18px; + background: url(nuncio/bottom_left.png) no-repeat; +} + +.nuncio_s { + background: url(nuncio/bottom_mid.png) repeat-x 0 0; + height: 18px; +} + +.nuncio_se, .nuncio_sizer { + width: 21px; + height: 18px; + background: url(nuncio/bottom_right.png) no-repeat; +} + +.nuncio_close { + width: 14px; + height: 14px; + background: url(nuncio/close.png) no-repeat; + position:absolute; + top:10px; + right:22px; + cursor:pointer; + z-index:2000; +} + +.nuncio_minimize { + width: 14px; + height: 15px; + background: url(nuncio/minimize.png) no-repeat; + position:absolute; + top:10px; + right:40px; + cursor:pointer; + z-index:2000; +} + +.nuncio_title { + float:left; + font-size:11px; + font-weight: bold; + font-style: italic; + color: #fff; + width: 100% +} + +.nuncio_content { + background: url(nuncio/overlay.png) repeat; + overflow:auto; + color: #ddd; + font-family: Tahoma, Arial, "sans-serif"; + font-size: 10px; +} + +.nuncio_sizer { + cursor:se-resize; +} + + +.top_draggable, .bottom_draggable { + cursor:move +} +/* FOR IE */ +* html .nuncio_nw { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_left.png", sizingMethod="crop"); +} + +* html .nuncio_n { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_mid.png", sizingMethod="scale"); +} + +* html .nuncio_ne { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_right.png", sizingMethod="crop"); +} + +* html .nuncio_w { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_left.png", sizingMethod="scale"); +} + +* html .nuncio_e { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_right.png", sizingMethod="scale"); +} + +* html .nuncio_sw { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_left.png", sizingMethod="crop"); +} + +* html .nuncio_s { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_mid.png", sizingMethod="scale"); +} + +* html .nuncio_se { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop"); +} + +* html .nuncio_sizer { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop"); +} + +* html .nuncio_close { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/close.png", sizingMethod="crop"); +} + +* html .nuncio_minimize { + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/minimize.png", sizingMethod="crop"); +} + diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css index 9bda2a68d..d7d722e8a 100644 --- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css +++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css @@ -1,108 +1,108 @@ -.overlay_spread { - background-color: #85BBEF; - filter:alpha(opacity=60); - -moz-opacity: 0.6; - opacity: 0.6; -} - -.spread_nw { - background: transparent url(spread/left-top.gif) no-repeat 0 0; - width:10px; - height:25px; -} - -.spread_n { - background: transparent url(spread/top-middle.gif) repeat-x 0 0; - height:25px; -} - -.spread_ne { - background: transparent url(spread/right-top.gif) no-repeat 0 0; - width:10px; - height:25px; -} - -.spread_w { - background: transparent url(spread/frame-left.gif) repeat-y top left; - width:7px; -} - -.spread_e { - background: transparent url(spread/frame-right.gif) repeat-y top right; - width:7px; -} - -.spread_sw { - background: transparent url(spread/bottom-left-c.gif) no-repeat 0 0; - width:7px; - height:7px; -} - -.spread_s { - background: transparent url(spread/bottom-middle.gif) repeat-x 0 0; - height:7px; -} - -.spread_se, .spread_sizer { - background: transparent url(spread/bottom-right-c.gif) no-repeat 0 0; - width:7px; - height:7px; -} - -.spread_sizer { - cursor:se-resize; -} - -.spread_close { - width: 23px; - height: 23px; - background: transparent url(spread/button-close-focus.gif) no-repeat 0 0; - position:absolute; - top:0px; - right:11px; - cursor:pointer; - z-index:1000; -} - -.spread_minimize { - width: 23px; - height: 23px; - background: transparent url(spread/button-min-focus.gif) no-repeat 0 0; - position:absolute; - top:0px; - right:55px; - cursor:pointer; - z-index:1000; -} - -.spread_maximize { - width: 23px; - height: 23px; - background: transparent url(spread/button-max-focus.gif) no-repeat 0 0; - position:absolute; - top:0px; - right:33px; - cursor:pointer; - z-index:1000; -} - -.spread_title { - float:left; - height:14px; - font-family: Tahoma, Arial, sans-serif; - font-size:14px; - font-weight:bold; - text-align:left; - margin-top:2px; - width:100%; - color:#E47211; -} - -.spread_content { - overflow:auto; - color: #222; - font-family: Tahoma, Arial, sans-serif; - font-size: 10px; - background:#A9EA00; -} - +.overlay_spread { + background-color: #85BBEF; + filter:alpha(opacity=60); + -moz-opacity: 0.6; + opacity: 0.6; +} + +.spread_nw { + background: transparent url(spread/left-top.gif) no-repeat 0 0; + width:10px; + height:25px; +} + +.spread_n { + background: transparent url(spread/top-middle.gif) repeat-x 0 0; + height:25px; +} + +.spread_ne { + background: transparent url(spread/right-top.gif) no-repeat 0 0; + width:10px; + height:25px; +} + +.spread_w { + background: transparent url(spread/frame-left.gif) repeat-y top left; + width:7px; +} + +.spread_e { + background: transparent url(spread/frame-right.gif) repeat-y top right; + width:7px; +} + +.spread_sw { + background: transparent url(spread/bottom-left-c.gif) no-repeat 0 0; + width:7px; + height:7px; +} + +.spread_s { + background: transparent url(spread/bottom-middle.gif) repeat-x 0 0; + height:7px; +} + +.spread_se, .spread_sizer { + background: transparent url(spread/bottom-right-c.gif) no-repeat 0 0; + width:7px; + height:7px; +} + +.spread_sizer { + cursor:se-resize; +} + +.spread_close { + width: 23px; + height: 23px; + background: transparent url(spread/button-close-focus.gif) no-repeat 0 0; + position:absolute; + top:0px; + right:11px; + cursor:pointer; + z-index:1000; +} + +.spread_minimize { + width: 23px; + height: 23px; + background: transparent url(spread/button-min-focus.gif) no-repeat 0 0; + position:absolute; + top:0px; + right:55px; + cursor:pointer; + z-index:1000; +} + +.spread_maximize { + width: 23px; + height: 23px; + background: transparent url(spread/button-max-focus.gif) no-repeat 0 0; + position:absolute; + top:0px; + right:33px; + cursor:pointer; + z-index:1000; +} + +.spread_title { + float:left; + height:14px; + font-family: Tahoma, Arial, sans-serif; + font-size:14px; + font-weight:bold; + text-align:left; + margin-top:2px; + width:100%; + color:#E47211; +} + +.spread_content { + overflow:auto; + color: #222; + font-family: Tahoma, Arial, sans-serif; + font-size: 10px; + background:#A9EA00; +} + diff --git a/public/stylesheets/jstoolbar.css b/public/stylesheets/jstoolbar.css index f8e2c565e..a4af73278 100644 --- a/public/stylesheets/jstoolbar.css +++ b/public/stylesheets/jstoolbar.css @@ -2,7 +2,7 @@ padding-left: 0px; } .jstEditor textarea, .jstEditor iframe { - margin: 0; + margin: 0 !important; } .jstHandle { @@ -13,7 +13,7 @@ } .jstElements { - padding: 3px 3px 3px 10px;/*by young*/ + padding: 3px 3px 3px 0px;/*by young*/ } .jstElements button { 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 07/23] =?UTF-8?q?IE=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=AD?= =?UTF-8?q?=EF=BC=9A=E8=AF=BE=E7=A8=8B=EF=BC=8C=E7=AB=9E=E8=B5=9B=EF=BC=8C?= =?UTF-8?q?=E6=89=98=E7=AE=A1=E5=B9=B3=E5=8F=B0=E7=9A=84=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E4=B8=8D=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") %>
      From da85c3efb8eae75f018a58938bd926a8267482aa Mon Sep 17 00:00:00 2001 From: alanlong9278 <547533434@qq.com> Date: Wed, 7 Jan 2015 17:48:22 +0800 Subject: [PATCH 08/23] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=9F=90=E7=AB=9E?= =?UTF-8?q?=E8=B5=9B=E4=B8=BB=E9=A1=B5=EF=BC=8C=E7=82=B9=E5=87=BB=E5=88=9B?= =?UTF-8?q?=E6=96=B0=E7=AB=9E=E8=B5=9B=E9=93=BE=E6=8E=A5=E6=B2=A1=E5=8F=8D?= =?UTF-8?q?=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_newcontest.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb index 3bd03ed5d..61df29620 100644 --- a/app/views/layouts/base_newcontest.html.erb +++ b/app/views/layouts/base_newcontest.html.erb @@ -79,7 +79,7 @@ <%=link_to l(:field_homepage), home_path %> > - <%= l(:label_contest_innovate) %> + <%=link_to l(:label_contest_innovate), home_path %> > <%= link_to h(truncate(@contest.name, length: 20, omission: '...')), show_contest_contest_path(@contest) %> From c9de30bd83b867bb80fa22ab769898ffb515db7f Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 8 Jan 2015 12:00:43 +0800 Subject: [PATCH 09/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=E8=B0=83=E6=9F=A5=E7=9B=B8=E5=85=B3=E8=A1=A8=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=AF=B9=E5=BA=94=E7=9A=84model=E3=80=81control?= =?UTF-8?q?=E3=80=81view=E7=9A=84=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/poll_answers_controller.rb | 0 app/controllers/poll_controller.rb | 0 app/controllers/poll_user_controller.rb | 0 app/controllers/poll_votes_controller.rb | 0 app/controllers/polls_questions_controller.rb | 0 app/models/poll_answers.rb | 3 +++ app/models/poll_questions.rb | 3 +++ app/models/poll_user.rb | 3 +++ app/models/poll_votes.rb | 3 +++ app/models/polls.rb | 3 +++ db/migrate/20150108034148_create_polls.rb | 15 +++++++++++++++ .../20150108034253_create_poll_questions.rb | 12 ++++++++++++ db/migrate/20150108034414_create_poll_answers.rb | 11 +++++++++++ db/migrate/20150108035301_create_poll_votes.rb | 12 ++++++++++++ db/migrate/20150108035338_create_poll_users.rb | 10 ++++++++++ test/unit/poll_answers_test.rb | 7 +++++++ test/unit/poll_questions_test.rb | 7 +++++++ test/unit/poll_user_test.rb | 7 +++++++ test/unit/poll_votes_test.rb | 7 +++++++ test/unit/polls_test.rb | 7 +++++++ 20 files changed, 110 insertions(+) create mode 100644 app/controllers/poll_answers_controller.rb create mode 100644 app/controllers/poll_controller.rb create mode 100644 app/controllers/poll_user_controller.rb create mode 100644 app/controllers/poll_votes_controller.rb create mode 100644 app/controllers/polls_questions_controller.rb create mode 100644 app/models/poll_answers.rb create mode 100644 app/models/poll_questions.rb create mode 100644 app/models/poll_user.rb create mode 100644 app/models/poll_votes.rb create mode 100644 app/models/polls.rb create mode 100644 db/migrate/20150108034148_create_polls.rb create mode 100644 db/migrate/20150108034253_create_poll_questions.rb create mode 100644 db/migrate/20150108034414_create_poll_answers.rb create mode 100644 db/migrate/20150108035301_create_poll_votes.rb create mode 100644 db/migrate/20150108035338_create_poll_users.rb create mode 100644 test/unit/poll_answers_test.rb create mode 100644 test/unit/poll_questions_test.rb create mode 100644 test/unit/poll_user_test.rb create mode 100644 test/unit/poll_votes_test.rb create mode 100644 test/unit/polls_test.rb diff --git a/app/controllers/poll_answers_controller.rb b/app/controllers/poll_answers_controller.rb new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/poll_user_controller.rb b/app/controllers/poll_user_controller.rb new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/poll_votes_controller.rb b/app/controllers/poll_votes_controller.rb new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/polls_questions_controller.rb b/app/controllers/polls_questions_controller.rb new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/poll_answers.rb b/app/models/poll_answers.rb new file mode 100644 index 000000000..b400ddf50 --- /dev/null +++ b/app/models/poll_answers.rb @@ -0,0 +1,3 @@ +class PollAnswers < ActiveRecord::Base + attr_accessible :answer_position, :answer_text, :poll_questions_id +end diff --git a/app/models/poll_questions.rb b/app/models/poll_questions.rb new file mode 100644 index 000000000..42e376aee --- /dev/null +++ b/app/models/poll_questions.rb @@ -0,0 +1,3 @@ +class PollQuestions < ActiveRecord::Base + attr_accessible :is_necessary, :polls_id, :question_title, :question_type +end diff --git a/app/models/poll_user.rb b/app/models/poll_user.rb new file mode 100644 index 000000000..f77f2ed5c --- /dev/null +++ b/app/models/poll_user.rb @@ -0,0 +1,3 @@ +class PollUser < ActiveRecord::Base + attr_accessible :poll_id, :user_id +end diff --git a/app/models/poll_votes.rb b/app/models/poll_votes.rb new file mode 100644 index 000000000..961f0d896 --- /dev/null +++ b/app/models/poll_votes.rb @@ -0,0 +1,3 @@ +class PollVotes < ActiveRecord::Base + attr_accessible :poll_answers_id, :poll_questions_id, :user_id, :vote_text +end diff --git a/app/models/polls.rb b/app/models/polls.rb new file mode 100644 index 000000000..f37c89fe2 --- /dev/null +++ b/app/models/polls.rb @@ -0,0 +1,3 @@ +class Polls < ActiveRecord::Base + attr_accessible :closed_at, :polls_group_id, :polls_name, :polls_status, :polls_type, :published_at, :user_id +end diff --git a/db/migrate/20150108034148_create_polls.rb b/db/migrate/20150108034148_create_polls.rb new file mode 100644 index 000000000..e074e08be --- /dev/null +++ b/db/migrate/20150108034148_create_polls.rb @@ -0,0 +1,15 @@ +class CreatePolls < ActiveRecord::Migration + def change + create_table :polls do |t| + t.string :polls_name + t.string :polls_type + t.integer :polls_group_id + t.integer :polls_status + t.integer :user_id + t.datetime :published_at + t.datetime :closed_at + + t.timestamps + end + end +end diff --git a/db/migrate/20150108034253_create_poll_questions.rb b/db/migrate/20150108034253_create_poll_questions.rb new file mode 100644 index 000000000..8e795deda --- /dev/null +++ b/db/migrate/20150108034253_create_poll_questions.rb @@ -0,0 +1,12 @@ +class CreatePollQuestions < ActiveRecord::Migration + def change + create_table :poll_questions do |t| + t.string :question_title + t.integer :question_type + t.integer :is_necessary + t.integer :polls_id + + t.timestamps + end + end +end diff --git a/db/migrate/20150108034414_create_poll_answers.rb b/db/migrate/20150108034414_create_poll_answers.rb new file mode 100644 index 000000000..bc9ac6d9f --- /dev/null +++ b/db/migrate/20150108034414_create_poll_answers.rb @@ -0,0 +1,11 @@ +class CreatePollAnswers < ActiveRecord::Migration + def change + create_table :poll_answers do |t| + t.integer :poll_questions_id + t.text :answer_text + t.integer :answer_position + + t.timestamps + end + end +end diff --git a/db/migrate/20150108035301_create_poll_votes.rb b/db/migrate/20150108035301_create_poll_votes.rb new file mode 100644 index 000000000..e22228dc2 --- /dev/null +++ b/db/migrate/20150108035301_create_poll_votes.rb @@ -0,0 +1,12 @@ +class CreatePollVotes < ActiveRecord::Migration + def change + create_table :poll_votes do |t| + t.integer :user_id + t.integer :poll_questions_id + t.integer :poll_answers_id + t.text :vote_text + + t.timestamps + end + end +end diff --git a/db/migrate/20150108035338_create_poll_users.rb b/db/migrate/20150108035338_create_poll_users.rb new file mode 100644 index 000000000..158937ce0 --- /dev/null +++ b/db/migrate/20150108035338_create_poll_users.rb @@ -0,0 +1,10 @@ +class CreatePollUsers < ActiveRecord::Migration + def change + create_table :poll_users do |t| + t.integer :user_id + t.integer :poll_id + + t.timestamps + end + end +end diff --git a/test/unit/poll_answers_test.rb b/test/unit/poll_answers_test.rb new file mode 100644 index 000000000..ce8f558f4 --- /dev/null +++ b/test/unit/poll_answers_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PollAnswersTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/unit/poll_questions_test.rb b/test/unit/poll_questions_test.rb new file mode 100644 index 000000000..bbe79ea40 --- /dev/null +++ b/test/unit/poll_questions_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PollQuestionsTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/unit/poll_user_test.rb b/test/unit/poll_user_test.rb new file mode 100644 index 000000000..7dab4b63f --- /dev/null +++ b/test/unit/poll_user_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PollUserTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/unit/poll_votes_test.rb b/test/unit/poll_votes_test.rb new file mode 100644 index 000000000..77ab9121e --- /dev/null +++ b/test/unit/poll_votes_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PollVotesTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/unit/polls_test.rb b/test/unit/polls_test.rb new file mode 100644 index 000000000..5217817bb --- /dev/null +++ b/test/unit/polls_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PollsTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From 4c6ade4c08d222b9d3cf8c0d20e4cea805cc5683 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 8 Jan 2015 14:41:28 +0800 Subject: [PATCH 10/23] =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=90=84model=E4=B9=8B?= =?UTF-8?q?=E9=97=B4=E7=9A=84=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/poll_answers.rb | 2 ++ app/models/poll_questions.rb | 2 ++ app/models/poll_user.rb | 3 +++ app/models/poll_votes.rb | 4 +++ app/models/polls.rb | 2 ++ db/schema.rb | 47 +++++++++++++++++++++++++++++++++++- 6 files changed, 59 insertions(+), 1 deletion(-) diff --git a/app/models/poll_answers.rb b/app/models/poll_answers.rb index b400ddf50..8a8c3169a 100644 --- a/app/models/poll_answers.rb +++ b/app/models/poll_answers.rb @@ -1,3 +1,5 @@ class PollAnswers < ActiveRecord::Base attr_accessible :answer_position, :answer_text, :poll_questions_id + + belongs_to :poll_questions end diff --git a/app/models/poll_questions.rb b/app/models/poll_questions.rb index 42e376aee..ce272a218 100644 --- a/app/models/poll_questions.rb +++ b/app/models/poll_questions.rb @@ -1,3 +1,5 @@ class PollQuestions < ActiveRecord::Base attr_accessible :is_necessary, :polls_id, :question_title, :question_type + + belongs_to :polls end diff --git a/app/models/poll_user.rb b/app/models/poll_user.rb index f77f2ed5c..a03f6b17d 100644 --- a/app/models/poll_user.rb +++ b/app/models/poll_user.rb @@ -1,3 +1,6 @@ class PollUser < ActiveRecord::Base attr_accessible :poll_id, :user_id + + belongs_to :polls + belongs_to :user end diff --git a/app/models/poll_votes.rb b/app/models/poll_votes.rb index 961f0d896..fe52b4ac5 100644 --- a/app/models/poll_votes.rb +++ b/app/models/poll_votes.rb @@ -1,3 +1,7 @@ class PollVotes < ActiveRecord::Base attr_accessible :poll_answers_id, :poll_questions_id, :user_id, :vote_text + + belongs_to :poll_answers + belongs_to :poll_questions + belongs_to :user end diff --git a/app/models/polls.rb b/app/models/polls.rb index f37c89fe2..02de95dce 100644 --- a/app/models/polls.rb +++ b/app/models/polls.rb @@ -1,3 +1,5 @@ class Polls < ActiveRecord::Base attr_accessible :closed_at, :polls_group_id, :polls_name, :polls_status, :polls_type, :published_at, :user_id + + belongs_to :user end diff --git a/db/schema.rb b/db/schema.rb index 04a2e54c8..e919d4118 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20141231085350) do +ActiveRecord::Schema.define(:version => 20150108035338) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -790,6 +790,51 @@ ActiveRecord::Schema.define(:version => 20141231085350) do t.integer "project_id" end + create_table "poll_answers", :force => true do |t| + t.integer "poll_questions_id" + t.text "answer_text" + t.integer "answer_position" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "poll_questions", :force => true do |t| + t.string "question_title" + t.integer "question_type" + t.integer "is_necessary" + t.integer "polls_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "poll_users", :force => true do |t| + t.integer "user_id" + t.integer "poll_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "poll_votes", :force => true do |t| + t.integer "user_id" + t.integer "poll_questions_id" + t.integer "poll_answers_id" + t.text "vote_text" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "polls", :force => true do |t| + t.string "polls_name" + t.string "polls_type" + t.integer "polls_group_id" + t.integer "polls_status" + t.integer "user_id" + t.datetime "published_at" + t.datetime "closed_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "praise_tread_caches", :force => true do |t| t.integer "object_id", :null => false t.string "object_type" From 2262997c31ff34dc0d1543ba20ce0f86f1e7a9d8 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Thu, 8 Jan 2015 16:16:59 +0800 Subject: [PATCH 11/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E8=AF=BE=E7=A8=8B=E6=97=B6=EF=BC=9A=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=90=8D=E4=B8=AD=E6=9C=89=E7=A9=BA=E6=A0=BC=E6=88=96=E8=80=85?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E7=AC=A6=E5=8F=B7=E4=BC=9A=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=97=A0=E6=95=88,=E3=80=8B=20=20=20=20=20?= =?UTF-8?q?=20=E3=80=8A=20=E7=BC=BA=E9=99=B7=20Trustie-Forge#1782=20(?= =?UTF-8?q?=E5=B7=B2=E8=A7=A3=E5=86=B3):=20lable=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=92=8C=E5=AF=B9=E5=BA=94=E7=9A=84=E6=98=BE=E7=A4=BA=E5=80=BC?= =?UTF-8?q?=E4=B9=8B=E9=97=B4=E9=97=B4=E8=B7=9D=E8=BF=87=E5=A4=A7=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BE=8B=E5=A6=82=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E5=B7=A6=E4=BE=A7=E7=9A=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E5=85=B7=E4=BD=93=E5=A6=82=E5=9B=BE=E6=89=80=E7=A4=BA?= =?UTF-8?q?=E3=80=8B=20=20=20=20=20=E3=80=8A=E6=9C=AC=E5=9C=B0=E7=89=88?= =?UTF-8?q?=E4=B8=AD=E5=85=B3=E4=BA=8E=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E5=88=86=E7=BB=84=E5=87=BA=E7=8E=B0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9A=E5=BD=93=E5=89=8D=E5=B7=B2=E5=AD=98=E5=9C=A8?= =?UTF-8?q?A=E7=BB=84=EF=BC=8C=E5=86=8D=E6=AC=A1=E6=B7=BB=E5=8A=A0A?= =?UTF-8?q?=E7=BB=84=E5=BA=94=E7=BB=99=E5=87=BA=E6=8F=90=E7=A4=BA=E2=80=9C?= =?UTF-8?q?A=E7=BB=84=E5=B7=B2=E5=AD=98=E5=9C=A8=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E8=AF=A5=E5=8A=9F=E8=83=BD=E7=9B=AE=E5=89=8D=E5=8F=AA=E6=9C=89?= =?UTF-8?q?=E5=9C=A8=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=97=B6=E6=89=8D=E6=AD=A3=E5=B8=B8=E3=80=8B?= =?UTF-8?q?=20=20=20=20=E3=80=8A=E6=89=98=E7=AE=A1=EF=BC=8C=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E7=AB=9E=E8=B5=9B=E4=B8=BB=E9=A1=B5=E4=B8=AD?= =?UTF-8?q?=E4=BB=BB=E6=84=8F=E7=82=B9=E5=87=BB=E6=9F=90=E4=B8=80=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=EF=BC=8C=E8=BF=9B=E5=85=A5=E8=AF=A5=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=EF=BC=8C=E5=8F=B3=E4=B8=8A=E8=A7=92=E7=9A=84?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE=E9=A3=8E=E6=A0=BC=E5=92=8C?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E4=B8=8D=E7=BB=9F=E4=B8=80=E3=80=82=E3=80=8B?= =?UTF-8?q?=20=20=20=20=E3=80=8A=E8=BF=9B=E5=85=A5=E6=9F=90=E7=AB=9E?= =?UTF-8?q?=E8=B5=9B=E4=B8=BB=E9=A1=B5=EF=BC=8C=E7=82=B9=E5=87=BB=E5=88=9B?= =?UTF-8?q?=E6=96=B0=E7=AB=9E=E8=B5=9B=E9=93=BE=E6=8E=A5=E6=B2=A1=E5=8F=8D?= =?UTF-8?q?=E5=BA=94=E3=80=8Bbug=20Signed-off-by:=20alan=20<547533434@qq.c?= =?UTF-8?q?om>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 3 +- app/helpers/courses_helper.rb | 2 +- app/models/course.rb | 2 +- app/views/courses/member.html.erb | 31 +++++++++---------- app/views/layouts/base_contest.html.erb | 7 +++-- app/views/layouts/base_courses.html.erb | 10 ++++-- app/views/layouts/base_newcontest.html.erb | 10 +++--- app/views/layouts/base_projects.html.erb | 4 +-- app/views/layouts/base_users.html.erb | 36 +++++++++++----------- public/stylesheets/application.css | 2 +- 10 files changed, 57 insertions(+), 50 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 87ab7e683..e76fa31dc 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -500,7 +500,8 @@ class CoursesController < ApplicationController end end - def course + def + course @school_id = params[:school_id] per_page_option = 10 if @school_id == "0" or @school_id.nil? diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 096ce7ad8..8547ef18f 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -114,7 +114,7 @@ module CoursesHelper # 学生人数计算 # add by nwb def studentCount course - searchStudent(course).count.to_s#course.student.count + course.student.count.to_s#course.student.count end #课程成员数计算 diff --git a/app/models/course.rb b/app/models/course.rb index 196e7168d..c11f66d49 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -38,7 +38,7 @@ class Course < ActiveRecord::Base validates_presence_of :password, :term,:name validates_format_of :class_period, :with =>/^[1-9]\d*$/ - validates_format_of :name,:with =>/^[a-zA-Z0-9_\u4e00-\u9fa5]+$/ + validates_format_of :name,:with =>/^[^ ]+[a-zA-Z0-9_\u4e00-\u9fa5\s\S]+$/ validates_length_of :description, :maximum => 10000 before_save :self_validate after_create :create_board_sync diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb index d199097be..81c469fd8 100644 --- a/app/views/courses/member.html.erb +++ b/app/views/courses/member.html.erb @@ -1,21 +1,19 @@ -
      +
      <%= form_tag({controller: 'contests', action: 'index'}, method: :get, :id => "contst_search_form") do %> - <%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => 'regexName1();', :width => "125px" %> + <%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => 'regexName1();', :width => "125px", :style=>"float:left" %> <%= hidden_field_tag 'project_type', params[:project_type] %> <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %> - - <%= l(:label_search)%> - + + <%= l(:label_search)%> +
      <% end %> diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 835564a7b..3937c1822 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -64,10 +64,10 @@ } <%= form_tag(projects_search_path, :method => :get, :id => "project_search_form") do %> - <%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => "regexName();" %> + <%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => "regexName();", :style => "float:left" %> <%= hidden_field_tag 'project_type', params[:project_type] %> <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %> - + <%= l(:label_search)%>
      diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 5276bcd01..8b4e57024 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -221,16 +221,16 @@
      - - - <% elsif @user.user_extensions.identity == 3 %> - <% elsif @user.user_extensions.identity == 2 %> - <% end %> - <% if @user.user_extensions.identity == 0 %> - - <% else %> - - @@ -145,10 +147,10 @@ - - diff --git a/app/views/projects/search.html.erb b/app/views/projects/search.html.erb index 8e810b087..7a91082ca 100644 --- a/app/views/projects/search.html.erb +++ b/app/views/projects/search.html.erb @@ -10,7 +10,7 @@ - @@ -35,7 +35,7 @@ - From 82c2a659df3889fae196a2e96d5153932fb35f7f Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 9 Jan 2015 15:33:30 +0800 Subject: [PATCH 20/23] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E6=89=93=E5=8C=85=E4=B8=8B=E8=BD=BD=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=9F=90=E4=B8=80=E6=96=87=E4=BB=B6=E4=B8=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=B7=B3=E8=BF=87=E8=AF=A5=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=B8=8B=E8=BD=BD=E5=85=B6=E4=BB=96=E7=9A=84?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/zipdown_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb index 3612bf7a4..982e43b7b 100644 --- a/app/controllers/zipdown_controller.rb +++ b/app/controllers/zipdown_controller.rb @@ -78,7 +78,7 @@ class ZipdownController < ApplicationController # 需要将所有homework.attachments遍历加入zip # 并且返回zip路径 homeattach.attachments.each do |attach| - homeworks_attach_path << attach.diskfile#.to_s.slice((length+1)..-1) + homeworks_attach_path << attach.diskfile if File.exist?(attach.diskfile) end zipping("#{homeattach.user.lastname}#{homeattach.user.firstname}_#{((homeattach.user.user_extensions.nil? || homeattach.user.user_extensions.student_id.nil?) ? "" : homeattach.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip", homeworks_attach_path, OUTPUT_FOLDER, true) end From 9ef3849fe327d189858a15691fb9ad7fba4ad784 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 9 Jan 2015 15:59:42 +0800 Subject: [PATCH 21/23] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E6=9F=90=E4=B8=80=E9=99=84=E4=BB=B6=E3=80=82=E5=9C=A8=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E5=90=8E=E7=9A=84=E6=96=87=E4=BB=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=AF=B4=E6=98=8E=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/zipdown_controller.rb | 21 ++++++++++++++------- config/locales/zh.yml | 1 + 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb index 982e43b7b..12637e2fb 100644 --- a/app/controllers/zipdown_controller.rb +++ b/app/controllers/zipdown_controller.rb @@ -75,16 +75,21 @@ class ZipdownController < ApplicationController def zip_homework_by_user(homeattach) homeworks_attach_path = [] + not_exist_file = [] # 需要将所有homework.attachments遍历加入zip # 并且返回zip路径 homeattach.attachments.each do |attach| - homeworks_attach_path << attach.diskfile if File.exist?(attach.diskfile) + if File.exist?(attach.diskfile) + homeworks_attach_path << attach.diskfile + else + not_exist_file << attach.filename + end end - zipping("#{homeattach.user.lastname}#{homeattach.user.firstname}_#{((homeattach.user.user_extensions.nil? || homeattach.user.user_extensions.student_id.nil?) ? "" : homeattach.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip", homeworks_attach_path, OUTPUT_FOLDER, true) + zipping("#{homeattach.user.lastname}#{homeattach.user.firstname}_#{((homeattach.user.user_extensions.nil? || homeattach.user.user_extensions.student_id.nil?) ? "" : homeattach.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip", homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file) end - def zipping(zip_name_refer, files_paths, output_path, is_attachment=false) + def zipping(zip_name_refer, files_paths, output_path, is_attachment=false, not_exist_file=[]) # 输入待打包的文件列表，已经打包文件定位到ouput_path ic = Iconv.new('GBK//IGNORE', 'UTF-8//IGNORE') input_filename = files_paths @@ -101,9 +106,11 @@ class ZipdownController < ApplicationController zipfile.add(rename_file, filename) end - #zipfile.get_output_stream('ReadMe') do |os| - # os.write 'Homeworks' - #end + unless not_exist_file.empty? + zipfile.get_output_stream('FILE_LOST.txt') do |os| + os.write l(:label_file_lost) + not_exist_file.join(',').to_s + end + end end zipfile_name rescue Errno => e @@ -119,4 +126,4 @@ class ZipdownController < ApplicationController attach = Attachment.find_by_disk_filename(name) attach.filename end -end +end \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 62f0e0bc4..327cceda4 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2239,4 +2239,5 @@ zh: label_course_prompt: 课程： label_contain_resource: 已包含资源： label_quote_resource_failed: ",此资源引用失败! " + label_file_lost: 以下文件在服务器丢失： From a30cc9bea8b4a30347458c28b58ba30e5f94f9b9 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 9 Jan 2015 16:01:47 +0800 Subject: [PATCH 22/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/zh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 327cceda4..082cefe3f 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2239,5 +2239,5 @@ zh: label_course_prompt: 课程： label_contain_resource: 已包含资源： label_quote_resource_failed: ",此资源引用失败! " - label_file_lost: 以下文件在服务器丢失： + label_file_lost: 以下文件在服务器丢失，请联系相关人员重新上传： From c9e23ec52fefa3e5e94c3a83e3f8e1259470aa09 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Fri, 9 Jan 2015 17:03:58 +0800 Subject: [PATCH 23/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BD=9C=E4=B8=9A=E9=A1=B5=E9=9D=A2=E3=80=8Bbug=20Sig?= =?UTF-8?q?ned-off-by:=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_attach/new.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/homework_attach/new.html.erb b/app/views/homework_attach/new.html.erb index 2ddd59266..661e15d5b 100644 --- a/app/views/homework_attach/new.html.erb +++ b/app/views/homework_attach/new.html.erb @@ -78,8 +78,8 @@   作品描述    ：  - <%= f.text_area "description", :class => "w620", :maxlength => 3000, :placeholder => "最多3000个汉字", :onkeyup => "regexDescription();"%> - + <%= f.text_area "description", :class => "w620", :style=>"width:432px;", :maxlength => 3000, :placeholder => "最多3000个汉字", :onkeyup => "regexDescription();"%> +

      - <%= l(:label_user_joinin) %>： + + <%= l(:label_user_joinin) %>： <%= format_time(@user.created_on) %>
      - <%= l(:label_user_login) %>： + + <%= l(:label_user_login) %>： <%= format_time(@user.last_login_on) %> @@ -239,8 +239,8 @@ <% unless @user.user_extensions.nil? %> <% if @user.user_extensions.identity == 0 || @user.user_extensions.identity == 1 %>
      - <%= l(:field_occupation) %>： + + <%= l(:field_occupation) %>： <% unless @user.user_extensions.school.nil? %> @@ -250,8 +250,8 @@
      - <%= l(:field_occupation) %>： + + <%= l(:field_occupation) %>： <%= @user.user_extensions.occupation %> @@ -259,8 +259,8 @@
      - <%= l(:label_company_name) %>： + + <%= l(:label_company_name) %>： <%= @user.firstname %> @@ -268,8 +268,8 @@
      - <%= l(:label_location) %>： + + <%= l(:label_location) %>： <%= @user.user_extensions.location %> @@ -278,8 +278,8 @@
      - <%= l(:label_technical_title) %>： + + <%= l(:label_technical_title) %>： @@ -289,8 +289,8 @@ <% if @user.user_extensions.identity == 1 %> <% if(is_watching?(@user) ) %>
      - <%= l(:label_bidding_user_studentcode)%>： + + <%= l(:label_bidding_user_studentcode)%>： <%= @user.user_extensions.student_id %> @@ -298,7 +298,7 @@
      + <%= l(:label_identity)%>： @@ -309,7 +309,7 @@ <% end %> <% elsif @user.user_extensions.identity == 3 %>
      + <%= l(:label_identity)%>： diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 282b760b2..54e2a17aa 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2912,7 +2912,7 @@ input[class~='ButtonClolr'],.ButtonColor{ input[class~='m3p10'], .m3p10 { margin-top: 5px; - padding: 5px 10px !important; + padding: 5px 10px; height: 20px; display: inline-block; color: #ffffff; From 9bbc8d64eb67c64480c5dc8b8c1a9654605d8106 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Thu, 8 Jan 2015 17:04:25 +0800 Subject: [PATCH 12/23] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=AF=8D=E7=89=88?= =?UTF-8?q?=E9=A1=B5=E5=8A=A0=E8=BD=BD=E7=BC=93=E6=85=A2=20Signed-off-by:?= =?UTF-8?q?=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/courses_helper.rb | 2 +- app/views/layouts/base_courses.html.erb | 14 ++++++++------ app/views/layouts/base_newcontest.html.erb | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 8547ef18f..a862753ef 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -20,7 +20,7 @@ module CoursesHelper # 返回教师数量，即roles表中定义的Manager def teacherCount project - searchTeacherAndAssistant(project).count + project.members.count - studentCount(project).to_i # or # searchTeacherAndAssistant(project).count end diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 3c174ce84..a79914f61 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -2,6 +2,8 @@ @nav_dispaly_forum_label = 1 @nav_dispaly_course_label = nil @nav_dispaly_store_all_label = 1 %> +<% teacher_num = teacherCount(@course) %> +<% student_num = studentCount(@course) %> @@ -124,19 +126,19 @@ <% if User.current.member_of_course?(@course) %> - <%= link_to "#{teacherCount(@course)}", course_member_path(@course, :role => 1), :course => '1' %> + <%= link_to "#{teacher_num}", course_member_path(@course, :role => 1), :course => '1' %> <% else %> - <%= teacherCount(@course)%> + <%= teacher_num %> <% end%> <% if (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course)) %> - <%= link_to "#{studentCount(@course)}", course_member_path(@course, :role => 2), :course => '1' %> + <%= link_to "#{student_num}", course_member_path(@course, :role => 2), :course => '1' %> <% else %> - <%= studentCount(@course)%> + <%= student_num %> <% end %>
      - <%= l(:label_x_base_courses_teacher, :count => teacherCount(@course)) %> + <%= l(:label_x_base_courses_teacher, :count => teacher_num) %> - <%= l(:label_x_base_courses_student, :count => studentCount(@course)) %> + <%= l(:label_x_base_courses_student, :count => student_num) %> <%= l(:label_x_course_data, :count => files_count) %> diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb index 816f9ce58..6c3721fcf 100644 --- a/app/views/layouts/base_newcontest.html.erb +++ b/app/views/layouts/base_newcontest.html.erb @@ -78,8 +78,8 @@
      <%=link_to l(:field_homepage), home_path %> > - - <%=link_to l(:label_contest_innovate), home_path %> + + <%=l(:label_courses_management_platform)%> > <%= link_to h(truncate(@contest.name, length: 20, omission: '...')), show_contest_contest_path(@contest) %> From aae69417cd2271598ffef45ccc9ed6b8f0982723 Mon Sep 17 00:00:00 2001 From: zhuhao Date: Thu, 8 Jan 2015 17:05:08 +0800 Subject: [PATCH 13/23] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/tags/_tag.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb index c08a3b553..21aefa511 100644 --- a/app/views/tags/_tag.html.erb +++ b/app/views/tags/_tag.html.erb @@ -77,10 +77,10 @@ <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%> <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%> - + <%= l(:button_project_tags_add)%> - <%= link_to_function l(:button_cancel), '$("#put-tag-form").slideUp();',:class=>'ButtonColor m3p10'%> + <%= link_to_function l(:button_cancel), '$("#put-tag-form").slideUp();',:class=>'ButtonColor m3p10' ,:style=>"padding:3px 6px"%> <% end %> <% end %> From ee9d82bfc7304f1b6d5b6263e8dbd0646804cad9 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 8 Jan 2015 17:42:46 +0800 Subject: [PATCH 14/23] =?UTF-8?q?1.=E5=AE=9E=E7=8E=B0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=B0=83=E6=9F=A5=E7=9A=84model=E3=80=81control=E3=80=81view?= =?UTF-8?q?=E7=9A=84=E6=9E=B6=E6=9E=84=202.=E4=BF=AE=E6=AD=A3=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E6=96=B0=E5=A2=9E=E8=A1=A8=E4=B9=8B=E9=97=B4=E7=9A=84?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=203.=E4=BF=AE=E6=AD=A3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=B8=AD=E5=8D=95=E5=A4=8D=E6=95=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/poll_answer_controller.rb | 2 ++ app/controllers/poll_answers_controller.rb | 0 app/controllers/poll_controller.rb | 2 ++ app/controllers/poll_question_controller.rb | 2 ++ app/controllers/poll_user_controller.rb | 2 ++ app/controllers/poll_vote_controller.rb | 2 ++ app/controllers/poll_votes_controller.rb | 0 app/controllers/polls_questions_controller.rb | 0 app/models/poll.rb | 9 +++++++++ app/models/poll_answer.rb | 7 +++++++ app/models/poll_answers.rb | 5 ----- app/models/poll_question.rb | 8 ++++++++ app/models/poll_questions.rb | 5 ----- app/models/poll_user.rb | 5 +++-- app/models/poll_vote.rb | 8 ++++++++ app/models/poll_votes.rb | 7 ------- app/models/polls.rb | 5 ----- app/models/user.rb | 7 +++++++ db/migrate/20150108034148_create_polls.rb | 6 +++++- .../20150108034253_create_poll_questions.rb | 8 ++++++-- db/migrate/20150108034414_create_poll_answers.rb | 8 ++++++-- db/migrate/20150108035301_create_poll_votes.rb | 10 +++++++--- db/migrate/20150108035338_create_poll_users.rb | 6 +++++- db/schema.rb | 16 ++++++++-------- 24 files changed, 89 insertions(+), 41 deletions(-) create mode 100644 app/controllers/poll_answer_controller.rb delete mode 100644 app/controllers/poll_answers_controller.rb create mode 100644 app/controllers/poll_question_controller.rb create mode 100644 app/controllers/poll_vote_controller.rb delete mode 100644 app/controllers/poll_votes_controller.rb delete mode 100644 app/controllers/polls_questions_controller.rb create mode 100644 app/models/poll.rb create mode 100644 app/models/poll_answer.rb delete mode 100644 app/models/poll_answers.rb create mode 100644 app/models/poll_question.rb delete mode 100644 app/models/poll_questions.rb create mode 100644 app/models/poll_vote.rb delete mode 100644 app/models/poll_votes.rb delete mode 100644 app/models/polls.rb diff --git a/app/controllers/poll_answer_controller.rb b/app/controllers/poll_answer_controller.rb new file mode 100644 index 000000000..521f7ed3f --- /dev/null +++ b/app/controllers/poll_answer_controller.rb @@ -0,0 +1,2 @@ +class PollAnswerController < ApplicationController +end \ No newline at end of file diff --git a/app/controllers/poll_answers_controller.rb b/app/controllers/poll_answers_controller.rb deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb index e69de29bb..a21fdb549 100644 --- a/app/controllers/poll_controller.rb +++ b/app/controllers/poll_controller.rb @@ -0,0 +1,2 @@ +class PollController < ApplicationController +end \ No newline at end of file diff --git a/app/controllers/poll_question_controller.rb b/app/controllers/poll_question_controller.rb new file mode 100644 index 000000000..46a75c0ab --- /dev/null +++ b/app/controllers/poll_question_controller.rb @@ -0,0 +1,2 @@ +class PollQuestionController < ApplicationController +end \ No newline at end of file diff --git a/app/controllers/poll_user_controller.rb b/app/controllers/poll_user_controller.rb index e69de29bb..0373fe085 100644 --- a/app/controllers/poll_user_controller.rb +++ b/app/controllers/poll_user_controller.rb @@ -0,0 +1,2 @@ +class PollUserController < ApplicationController +end \ No newline at end of file diff --git a/app/controllers/poll_vote_controller.rb b/app/controllers/poll_vote_controller.rb new file mode 100644 index 000000000..e77bdc622 --- /dev/null +++ b/app/controllers/poll_vote_controller.rb @@ -0,0 +1,2 @@ +class PollVoteController < ApplicationController +end \ No newline at end of file diff --git a/app/controllers/poll_votes_controller.rb b/app/controllers/poll_votes_controller.rb deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/controllers/polls_questions_controller.rb b/app/controllers/polls_questions_controller.rb deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/models/poll.rb b/app/models/poll.rb new file mode 100644 index 000000000..803ee6ac6 --- /dev/null +++ b/app/models/poll.rb @@ -0,0 +1,9 @@ +class Poll < ActiveRecord::Base + #attr_accessible :closed_at, :polls_group_id, :polls_name, :polls_status, :polls_type, :published_at, :user_id + include Redmine::SafeAttributes + + belongs_to :user + has_many :poll_questions, :dependent => :destroy + has_many :poll_users, :dependent => :destroy + has_many :users, :through => :poll_users #该文件被哪些用户提交答案过 +end diff --git a/app/models/poll_answer.rb b/app/models/poll_answer.rb new file mode 100644 index 000000000..93c75da97 --- /dev/null +++ b/app/models/poll_answer.rb @@ -0,0 +1,7 @@ +class PollAnswer < ActiveRecord::Base + # attr_accessible :answer_position, :answer_text, :poll_questions_id + include Redmine::SafeAttributes + + belongs_to :poll_question + has_many :poll_votes, :dependent => :destroy +end diff --git a/app/models/poll_answers.rb b/app/models/poll_answers.rb deleted file mode 100644 index 8a8c3169a..000000000 --- a/app/models/poll_answers.rb +++ /dev/null @@ -1,5 +0,0 @@ -class PollAnswers < ActiveRecord::Base - attr_accessible :answer_position, :answer_text, :poll_questions_id - - belongs_to :poll_questions -end diff --git a/app/models/poll_question.rb b/app/models/poll_question.rb new file mode 100644 index 000000000..66dcea67e --- /dev/null +++ b/app/models/poll_question.rb @@ -0,0 +1,8 @@ +class PollQuestion < ActiveRecord::Base + # attr_accessible :is_necessary, :polls_id, :question_title, :question_type + include Redmine::SafeAttributes + + belongs_to :poll + has_many :poll_answers, :dependent => :destroy + has_many :poll_votes, :dependent => :destroy +end diff --git a/app/models/poll_questions.rb b/app/models/poll_questions.rb deleted file mode 100644 index ce272a218..000000000 --- a/app/models/poll_questions.rb +++ /dev/null @@ -1,5 +0,0 @@ -class PollQuestions < ActiveRecord::Base - attr_accessible :is_necessary, :polls_id, :question_title, :question_type - - belongs_to :polls -end diff --git a/app/models/poll_user.rb b/app/models/poll_user.rb index a03f6b17d..e7a122da9 100644 --- a/app/models/poll_user.rb +++ b/app/models/poll_user.rb @@ -1,6 +1,7 @@ class PollUser < ActiveRecord::Base - attr_accessible :poll_id, :user_id + # attr_accessible :poll_id, :user_id + include Redmine::SafeAttributes - belongs_to :polls + belongs_to :poll belongs_to :user end diff --git a/app/models/poll_vote.rb b/app/models/poll_vote.rb new file mode 100644 index 000000000..550563e38 --- /dev/null +++ b/app/models/poll_vote.rb @@ -0,0 +1,8 @@ +class PollVote < ActiveRecord::Base + # attr_accessible :poll_answers_id, :poll_questions_id, :user_id, :vote_text + include Redmine::SafeAttributes + + belongs_to :poll_answer + belongs_to :poll_question + belongs_to :user +end diff --git a/app/models/poll_votes.rb b/app/models/poll_votes.rb deleted file mode 100644 index fe52b4ac5..000000000 --- a/app/models/poll_votes.rb +++ /dev/null @@ -1,7 +0,0 @@ -class PollVotes < ActiveRecord::Base - attr_accessible :poll_answers_id, :poll_questions_id, :user_id, :vote_text - - belongs_to :poll_answers - belongs_to :poll_questions - belongs_to :user -end diff --git a/app/models/polls.rb b/app/models/polls.rb deleted file mode 100644 index 02de95dce..000000000 --- a/app/models/polls.rb +++ /dev/null @@ -1,5 +0,0 @@ -class Polls < ActiveRecord::Base - attr_accessible :closed_at, :polls_group_id, :polls_name, :polls_status, :polls_type, :published_at, :user_id - - belongs_to :user -end diff --git a/app/models/user.rb b/app/models/user.rb index e966742f1..735b80762 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -77,6 +77,13 @@ class User < Principal has_many :homework_attaches, :through => :homework_users has_many :homework_evaluations + #问卷相关关关系 + has_many :poll_users, :dependent => :destroy + has_many :poll_votes, :dependent => :destroy + has_many :poll, :dependent => :destroy #用户创建的问卷 + has_many :answers, :source => :poll, :through => :poll_users, :dependent => :destroy #用户已经完成问答的问卷 + # end + has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)}, :after_remove => Proc.new {|user, group| group.user_removed(user)} has_many :changesets, :dependent => :nullify diff --git a/db/migrate/20150108034148_create_polls.rb b/db/migrate/20150108034148_create_polls.rb index e074e08be..454f73b21 100644 --- a/db/migrate/20150108034148_create_polls.rb +++ b/db/migrate/20150108034148_create_polls.rb @@ -1,5 +1,5 @@ class CreatePolls < ActiveRecord::Migration - def change + def up create_table :polls do |t| t.string :polls_name t.string :polls_type @@ -12,4 +12,8 @@ class CreatePolls < ActiveRecord::Migration t.timestamps end end + + def down + drop_table :polls + end end diff --git a/db/migrate/20150108034253_create_poll_questions.rb b/db/migrate/20150108034253_create_poll_questions.rb index 8e795deda..2fa586dd5 100644 --- a/db/migrate/20150108034253_create_poll_questions.rb +++ b/db/migrate/20150108034253_create_poll_questions.rb @@ -1,12 +1,16 @@ class CreatePollQuestions < ActiveRecord::Migration - def change + def up create_table :poll_questions do |t| t.string :question_title t.integer :question_type t.integer :is_necessary - t.integer :polls_id + t.integer :poll_id t.timestamps end end + + def down + drop_table :poll_questions + end end diff --git a/db/migrate/20150108034414_create_poll_answers.rb b/db/migrate/20150108034414_create_poll_answers.rb index bc9ac6d9f..b6276fad0 100644 --- a/db/migrate/20150108034414_create_poll_answers.rb +++ b/db/migrate/20150108034414_create_poll_answers.rb @@ -1,11 +1,15 @@ class CreatePollAnswers < ActiveRecord::Migration - def change + def up create_table :poll_answers do |t| - t.integer :poll_questions_id + t.integer :poll_question_id t.text :answer_text t.integer :answer_position t.timestamps end end + + def down + drop_table :poll_answers + end end diff --git a/db/migrate/20150108035301_create_poll_votes.rb b/db/migrate/20150108035301_create_poll_votes.rb index e22228dc2..0b7192ab8 100644 --- a/db/migrate/20150108035301_create_poll_votes.rb +++ b/db/migrate/20150108035301_create_poll_votes.rb @@ -1,12 +1,16 @@ class CreatePollVotes < ActiveRecord::Migration - def change + def up create_table :poll_votes do |t| t.integer :user_id - t.integer :poll_questions_id - t.integer :poll_answers_id + t.integer :poll_question_id + t.integer :poll_answer_id t.text :vote_text t.timestamps end end + + def down + drop_table :poll_votes + end end diff --git a/db/migrate/20150108035338_create_poll_users.rb b/db/migrate/20150108035338_create_poll_users.rb index 158937ce0..73d155890 100644 --- a/db/migrate/20150108035338_create_poll_users.rb +++ b/db/migrate/20150108035338_create_poll_users.rb @@ -1,5 +1,5 @@ class CreatePollUsers < ActiveRecord::Migration - def change + def up create_table :poll_users do |t| t.integer :user_id t.integer :poll_id @@ -7,4 +7,8 @@ class CreatePollUsers < ActiveRecord::Migration t.timestamps end end + + def down + drop_table :poll_users + end end diff --git a/db/schema.rb b/db/schema.rb index e919d4118..00d308293 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -791,18 +791,18 @@ ActiveRecord::Schema.define(:version => 20150108035338) do end create_table "poll_answers", :force => true do |t| - t.integer "poll_questions_id" + t.integer "poll_question_id" t.text "answer_text" t.integer "answer_position" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "poll_questions", :force => true do |t| t.string "question_title" t.integer "question_type" t.integer "is_necessary" - t.integer "polls_id" + t.integer "poll_id" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false end @@ -816,11 +816,11 @@ ActiveRecord::Schema.define(:version => 20150108035338) do create_table "poll_votes", :force => true do |t| t.integer "user_id" - t.integer "poll_questions_id" - t.integer "poll_answers_id" + t.integer "poll_question_id" + t.integer "poll_answer_id" t.text "vote_text" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "polls", :force => true do |t| From 2dc626b595e866bbd4750aa14b1a752a1d868c4e Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Fri, 9 Jan 2015 10:22:30 +0800 Subject: [PATCH 15/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E5=88=97=E8=A1=A8=E4=B8=AD=E9=87=8D=E5=90=8D=E7=9A=84?= =?UTF-8?q?=E7=8F=AD=E5=90=8D=E6=8F=90=E7=A4=BA=E6=8A=A5=E9=94=99=E3=80=8B?= =?UTF-8?q?=20Signed-off-by:=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/member.html.erb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb index 81c469fd8..2599760ad 100644 --- a/app/views/courses/member.html.erb +++ b/app/views/courses/member.html.erb @@ -2,15 +2,17 @@ function check_groupname() { var $group_name = $('#group_name'); - $.get( + + $.get( '<%=valid_ajax_course_path%>', { valid: "name", - value: this.value }, + value: document.getElementById('group_name').value }, function (data) { if (!data.valid) { - alert('<%= l(:label_groupname_repeat) %>'); + alert(data.message); } }); + } @@ -46,10 +48,9 @@ } function validate_add_group() { - value1 = document.getElementById('group_name').value; + check_groupname(); - validate_groupname(value1); - validate_groupname_null(value1); + } From 4b9bad0dc5a9c818c6ad2aac88eff98e51ff397c Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Fri, 9 Jan 2015 10:57:33 +0800 Subject: [PATCH 16/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E8=8B=A5?= =?UTF-8?q?=E6=9C=89=E6=9F=90=E5=85=AC=E5=BC=80=E8=AF=BE=E7=A8=8BcourseA?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E8=AF=BE=E7=A8=8B=E4=B8=BB=E9=A1=B5=E4=B8=AD?= =?UTF-8?q?=E6=90=9C=E7=B4=A2courseA=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E7=BB=93=E6=9E=9C=E7=95=8C=E9=9D=A2=EF=BC=8C=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=93=BE=E6=8E=A5=E6=B2=A1=E6=9C=89=E5=AF=B9=E9=BD=90?= =?UTF-8?q?=E3=80=8Bbug=20Signed-off-by:=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/contests/index.html.erb | 2 +- app/views/courses/search.html.erb | 2 +- app/views/projects/search.html.erb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb index 75b892461..170f11037 100644 --- a/app/views/contests/index.html.erb +++ b/app/views/contests/index.html.erb @@ -10,7 +10,7 @@ <%= l(:label_user_location) %> : + <% if User.current.logged? %> <% unless User.current.user_extensions.identity == 1 %> <%= link_to(l(:label_newtype_contest), new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %> diff --git a/app/views/courses/search.html.erb b/app/views/courses/search.html.erb index e2c701932..661feb3c9 100644 --- a/app/views/courses/search.html.erb +++ b/app/views/courses/search.html.erb @@ -13,7 +13,7 @@ <%= l(:label_user_location) %> : + <% if User.current.logged?%> <% if User.current.user_extensions.identity == 0 %> <%= link_to(l(:label_course_new), {:controller => 'courses', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_course, nil, :global => true) %>
      <%= l(:label_course_practice) %> <%= l(:label_user_location) %> : + <% if User.current.logged?%> <% if User.current.user_extensions.identity == 0 %> <%= link_to(l(:label_course_new), {:controller => 'projects', :action => 'new', :course => 1, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
      <%= l(:label_project_deposit) %> <%= l(:label_user_location) %> : + <% if User.current.logged? %> <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %> <% end %> From 53b57d4c53b9f341ad979bb5d9125da59b87f719 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Fri, 9 Jan 2015 12:29:49 +0800 Subject: [PATCH 17/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=BB=E9=A1=B5=E7=A7=AF=E5=88=86=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E3=80=8Bbug=20Signed-off-b?= =?UTF-8?q?y:=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- app/views/layouts/users_base.html.erb | 10 +++++----- public/stylesheets/css.css | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index fa0beb311..ab796c4e3 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -129,7 +129,7 @@ class UsersController < ApplicationController end def show_new_score - render :layout => false + render :layout => 'users_base' end # end diff --git a/app/views/layouts/users_base.html.erb b/app/views/layouts/users_base.html.erb index d98ef3f46..b34609471 100644 --- a/app/views/layouts/users_base.html.erb +++ b/app/views/layouts/users_base.html.erb @@ -1,7 +1,7 @@ <% @nav_dispaly_home_path_label = 1 - @nav_dispaly_main_course_label = 1 - @nav_dispaly_main_project_label = 1 - @nav_dispaly_main_contest_label = 1 %> + @nav_dispaly_user_label = 1 + @nav_dispaly_store_all_label = 1 + %> <% @nav_dispaly_forum_label = 1%> @@ -39,12 +39,12 @@ - +
      <%= l(:label_loading) %>
      - +<%= call_hook :view_layouts_base_body_bottom %> diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index b6d61c865..444d0d383 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -149,7 +149,7 @@ a:hover.tijiao{ background:#0f99a9 !important;} .ni_con p{ color:#808181;} .ni_con a:hover{ text-decoration:none;} -.ui-widget-header{display: none;} + From b88255acfc777a558b0056d3529cc1c4b05e706d Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Fri, 9 Jan 2015 12:34:52 +0800 Subject: [PATCH 18/23] delete no use file --- 0) | 1 - 1 file changed, 1 deletion(-) delete mode 100644 0) diff --git a/0) b/0) deleted file mode 100644 index 70d77d63e..000000000 --- a/0) +++ /dev/null @@ -1 +0,0 @@ -ֹ(Y/N)? ֹ(Y/N)? ֹ(Y/N)? ֹ(Y/N)? \ No newline at end of file From 3f354a019f1923358af37208d655416a8667c2c4 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Fri, 9 Jan 2015 14:14:15 +0800 Subject: [PATCH 19/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=88=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=BB=E9=A1=B5=E4=B8=AA=E4=BA=BA=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=B9=B1=E4=BA=86=EF=BC=89=20Signed-off-by:?= =?UTF-8?q?=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_users.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 8b4e57024..f241875bd 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -205,7 +205,7 @@       		<%#= submit_tag l(:button_submit), :name => nil , :class => "bid_btn" %> - + <%= l(:label_submit)%>