Merge branch 'szzh' into dev_dingxu

Conflicts:
	Gemfile
	app/views/homework_attach/new.html.erb
	app/views/layouts/base_newcontest.html.erb
	public/stylesheets/jstoolbar.css

Gemfile

@@ -1,125 +1,249 @@
 source 'https://rubygems.org'
 
 unless RUBY_PLATFORM =~ /w32/
+5		
   # unix-like only
+6		
   gem 'iconv'
+7		
   gem 'rubyzip'
+8		
   gem 'zip-zip'
+9		
 end
-
+10		
+11		
 gem 'seems_rateable', path: 'lib/seems_rateable'
+12		
 gem "rails", "3.2.13"
+13		
 gem "jquery-rails", "~> 2.0.2"
+14		
 gem "i18n", "~> 0.6.0"
+15		
 gem "coderay", "~> 1.0.6"
+16		
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
+17		
 gem "builder", "3.0.0"
+18		
 gem 'acts-as-taggable-on', '2.4.1'
-
+19		
+gem 'spreadsheet'
+20		
+gem 'ruby-ole'
+21		
+22		
 group :development do
+23		
   gem 'better_errors', path: 'lib/better_errors'
+24		
   gem 'rack-mini-profiler', path: 'lib/rack-mini-profiler'
-  if ENV['PRY']
+25		
-    gem 'pry'
+end
-    gem 'pry-nav'
+26		
+27		
+group :test do
+28		
+  gem "shoulda", "~> 3.5.0"
+29		
+  gem "mocha", "~> 1.1.0"
+30		
+  gem 'capybara', '~> 2.4.1'
+31		
+  gem 'nokogiri', '~> 1.6.3'
+32		
+  gem 'factory_girl', '~> 4.4.0'
+33		
+  gem 'selenium-webdriver', '~> 2.42.0'
+34		
+35		
+36		
+  platforms :mri, :mingw do
+37		
+    group :rmagick do
+38		
+      # RMagick 2 supports ruby 1.9
+39		
+      # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
+40		
+      # different requirements for the same gem on different platforms
+41		
+      gem "rmagick", ">= 2.0.0"
+42		
+    end
+43		
   end
+44		
 end
-
+45		
-# group :test do
+46		
-#  # shoulda的版本做了改动
+group :development, :test do
-#  #gem "shoulda", "~> 3.3.2"
+47		
-#  gem "shoulda", "> 3.3.2"
+	gem "guard-rails", '~> 0.5.3'
-#  gem "mocha", "~> 0.13.3"
+48		
-#  gem 'capybara', '~> 2.0.0'
+	gem 'spork-testunit', '~> 0.0.8'
-#  gem 'nokogiri', '< 1.6.0'
+49		
-# end
+	gem 'guard-spork', '~> 1.5.1'
-
+50		
-
+	gem 'guard-test', '~> 1.0.0'
+51		
+	gem 'ruby-prof', '~> 0.15.1' unless RUBY_PLATFORM =~ /w32/
+52		
+	gem 'pry'
+53		
+	gem 'pry-nav'
+54		
+55		
+end
+56		
+57		
+58		
 # Gems used only for assets and not required
+59		
 # in production environments by default.
+60		
 group :assets do
+61		
   gem 'sass-rails',   '~> 3.2.3'
+62		
   gem 'coffee-rails', '~> 3.2.1'
-
+63		
+64		
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+65		
    gem 'therubyracer', :platforms => :ruby
-
+66		
+67		
   gem 'uglifier', '>= 1.0.3'
+68		
 end
-
+69		
+70		
 # Optional gem for LDAP authentication
+71		
 group :ldap do
+72		
   gem "net-ldap", "~> 0.3.1"
+73		
 end
-
+74		
-
+75		
-# platforms :mri, :mingw do
+76		
-#  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
+77		
 group :openid do
+78		
   gem "ruby-openid", "~> 2.1.4", :require => "openid"
+79		
   gem "rack-openid"
+80		
 end
-
+81		
+82		
 # Optional gem for exporting the gantt to a PNG file, not supported with jruby
+83		
 platforms :jruby do
+84		
   # jruby-openssl is bundled with JRuby 1.7.0
+85		
   gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
+86		
   gem "activerecord-jdbc-adapter", "1.2.5"
+87		
 end
-
+88		
+89		
 # Include database gems for the adapters found in the database
+90		
 # configuration file
+91		
 require 'erb'
+92		
 require 'yaml'
+93		
 database_file = File.join(File.dirname(__FILE__), "config/database.yml")
+94		
 if File.exist?(database_file)
+95		
   database_config = YAML::load(ERB.new(IO.read(database_file)).result)
+96		
   adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
+97		
   if adapters.any?
+98		
     adapters.each do |adapter|
+99		
       case adapter
+100		
       when 'mysql2'
+101		
         gem "mysql2", "= 0.3.11", :platforms => [:mri, :mingw]
+102		
         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+103		
       when 'mysql'
+104		
         gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw]
+105		
         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+106		
       when /postgresql/
+107		
         gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw]
+108		
         gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
+109		
       when /sqlite3/
+110		
         gem "sqlite3", :platforms => [:mri, :mingw]
+111		
         gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+112		
       when /sqlserver/
+113		
         gem "tiny_tds", "~> 0.5.1", :platforms => [:mri, :mingw]
+114		
         gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
+115		
       else
+116		
         warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems")
+117		
       end
+118		
     end
+119		
   else
+120		
     warn("No adapter found in config/database.yml, please configure it first")
+121		
   end
+122		
 else
+123		
   warn("Please configure your config/database.yml first")
+124		
 end
-
+125		
+126		
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
+127		
 if File.exists?(local_gemfile)
+128		
   puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
+129		
   instance_eval File.read(local_gemfile)
+130		
 end
-
+131		
+132		
 # Load plugins' Gemfiles
+133		
 Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file|
+134		
   puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
+135		
   instance_eval File.read(file)
-end
+136		
+end

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]
@@ -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?

app/controllers/forums_controller.rb

@@ -13,6 +13,44 @@ class ForumsController < ApplicationController
   include SortHelper
 
   PageLimit = 20
+  def create_feedback
+    if User.current.logged?
+      @memo = Memo.new(params[:memo])
+      @memo.forum_id = "1"
+      @memo.author_id = User.current.id
+      #@forum = @memo.forum
+      respond_to do |format|
+        if @memo.save
+          format.html { redirect_to forum_path(@memo.forum) }
+        else
+          sort_init 'updated_at', 'desc'
+          sort_update 'created_at' => "#{Memo.table_name}.created_at",
+                      'replies' => "#{Memo.table_name}.replies_count",
+                      'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
+
+          @topic_count = @forum.topics.count
+          @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
+          @memos = @forum.topics.
+              reorder("#{Memo.table_name}.sticky DESC").
+              includes(:last_reply).
+              limit(@topic_pages.per_page).
+              offset(@topic_pages.offset).
+              order(sort_clause).
+              preload(:author, {:last_reply => :author}).
+              all
+
+          flash.now[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}"
+          # back_error_page = @memo.parent_id.nil? ? forum_path(@forum) : forum_memo_path(@forum, @memo.parent_id)
+          format.html { render action: :show, layout: 'base_forums' }#, error: "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}" }
+          format.json { render json: @memo.errors, status: :unprocessable_entity }
+        end
+      end
+    else
+      respond_to do |format|
+       format.html { redirect_to signin_path }
+     end
+    end
+  end
 
   def create_memo
     @memo = Memo.new(params[:memo])
@@ -49,16 +87,15 @@ class ForumsController < ApplicationController
       end
     end
   end
-  
+
   def index
     @offset, @limit = api_offset_and_limit({:limit => 10})
     @forums_all = Forum.reorder("sticky DESC")
     @forums_count = @forums_all.count
     @forums_pages = Paginator.new @forums_count, @limit, params['page']
 
-
     @offset ||= @forums_pages.offset
-     @forums = @forums_all.offset(@offset).limit(@limit).all
+    @forums = @forums_all.offset(@offset).limit(@limit).all
     #@forums = Forum.all
     respond_to do |format|
       format.html # index.html.erb
@@ -86,14 +123,12 @@ class ForumsController < ApplicationController
                     preload(:author, {:last_reply => :author}).
                     all
 
-
-
     # @offset, @limit = api_offset_and_limit({:limit => 10})
     # @forum = Forum.find(params[:id])
     # @memos_all = @forum.topics
     # @topic_count = @memos_all.count
     # @topic_pages = Paginator.new @topic_count, @limit, params['page']
-    
+
     # @offset ||= @topic_pages.offset
     # @memos = @memos_all.offset(@offset).limit(@limit).all
     respond_to do |format|
@@ -176,7 +211,6 @@ class ForumsController < ApplicationController
     @forums_count = @forums_all.count
     @forums_pages = Paginator.new @forums_count, @limit, params['page']
 
-
     @offset ||= @forums_pages.offset
     @forums = @forums_all.offset(@offset).limit(@limit).all
     respond_to do |format|
@@ -197,7 +231,7 @@ class ForumsController < ApplicationController
     @memos_all = @forum.topics.where("subject LIKE ?", q)
     @topic_count = @memos_all.count
     @topic_pages = Paginator.new @topic_count, @limit, params['page']
-    
+
     @offset ||= @topic_pages.offset
     @memos = @memos_all.offset(@offset).limit(@limit).all
     respond_to do |format|
@@ -205,20 +239,17 @@ class ForumsController < ApplicationController
         render 'show', :layout => 'base_forums'
       }
       format.json { render json: @forum }
-    end 
+    end
   end
 
-
-
   private
 
-
   def find_forum_if_available
     @forum = Forum.find(params[:id]) if params[:id]
   rescue ActiveRecord::RecordNotFound
     render_404
     nil
-  end
+    end
 
   def authenticate_user_edit
     find_forum_if_available

app/controllers/poll_answer_controller.rb

@@ -0,0 +1,2 @@
+class PollAnswerController < ApplicationController
+end

app/controllers/poll_controller.rb

@@ -0,0 +1,2 @@
+class PollController < ApplicationController
+end

app/controllers/poll_question_controller.rb

@@ -0,0 +1,2 @@
+class PollQuestionController < ApplicationController
+end

app/controllers/poll_user_controller.rb

@@ -0,0 +1,2 @@
+class PollUserController < ApplicationController
+end

app/controllers/poll_vote_controller.rb

@@ -0,0 +1,2 @@
+class PollVoteController < ApplicationController
+end

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
 
@@ -188,9 +188,9 @@ class UsersController < ApplicationController
     for user in @watcher
       events << Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 30)
     end
-    
+
-    
+
-    
+
     @events_by_day = events.group_by(&:event_date)
 
     unless User.current.admin?

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#.to_s.slice((length+1)..-1)
+      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|
+      unless not_exist_file.empty?
-      #  os.write 'Homeworks'
+        zipfile.get_output_stream('FILE_LOST.txt') do |os|
-      #end
+          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

app/helpers/application_helper.rb

@@ -1593,6 +1593,12 @@ module ApplicationHelper
     end
     s
   end
+  
+  def get_memo
+    @new_memo = Memo.new
+    #@new_memo.subject = "有什么想说的，尽管来咆哮吧~~"
+    @public_forum = Forum.find(1)
+  end
 
   private
 

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
@@ -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
 
   #课程成员数计算

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

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

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

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

app/models/poll_user.rb

@@ -0,0 +1,7 @@
+class PollUser < ActiveRecord::Base
+  # attr_accessible :poll_id, :user_id
+  include Redmine::SafeAttributes
+
+  belongs_to :poll
+  belongs_to :user
+end

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

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

app/views/contests/index.html.erb

@@ -10,7 +10,7 @@
           <td class="location-list">
             <strong><%= l(:label_user_location) %> :</strong>
           </td>
-          <td rowspan="2">
+          <td rowspan="2" valign="bottom">
             <% 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") %>

app/views/courses/member.html.erb

@@ -1,21 +1,21 @@
 <script type="text/javascript">
-    jQuery(document).ready(function () {
+   function check_groupname() {
-        var $group_name = $('#group_name')
+       var $group_name = $('#group_name');
-        $group_name.blur(function (event) {
+
-            if ($(this).is('#group_name')) {
+
-                $.get(
+               $.get(
-                        '<%=valid_ajax_course_path%>',
+               '<%=valid_ajax_course_path%>',
-                        { valid: "name",
+               { valid: "name",
-                            value: this.value },
+                   value: document.getElementById('group_name').value },
-                        function (data) {
+               function (data) {
-                            if (!data.valid) {
+                   if (!data.valid) {
-                                alert('<%= l(:label_groupname_repeat) %>');
+                       alert(data.message);
-                            }
+                   }
-                        });
+               });
-            }
+
+   }
+
 
-        });
-    });
 </script>
 <script type=" text/javascript" charset="utf-8">
     function validate_groupname(value1) {
@@ -48,9 +48,9 @@
 
     }
     function validate_add_group() {
-        value1 = document.getElementById('group_name').value;
+
-        validate_groupname(value1);
+        check_groupname();
-        validate_groupname_null(value1);
+
 
     }
 </script>
@@ -66,7 +66,7 @@
   <div class="cl"></div>
   <% if @subPage_title == l(:label_student_list) %>
   <div class="st_addclass" id = "st_groups">
-    <%= render :partial => 'groups_name', locals: {:course_groups => @course_groups} %>
+    <%= render :partial => 'groups_name', :locals => {:course_groups => @course_groups} %>
   </div>
     <% end %>
 

app/views/courses/search.html.erb

@@ -13,7 +13,7 @@
           <td class="location-list">
             <strong><%= l(:label_user_location) %> :</strong>
           </td>
-          <td rowspan="2">
+          <td rowspan="2" valign="bottom">
             <% 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) %></td>

app/views/forums/create_feedback.js.erb

@@ -0,0 +1,6 @@
+$(function(){
+    $("#button1").click(function(){
+        myTips("您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！","success");
+    });
+
+})

app/views/homework_attach/new.html.erb

@@ -82,6 +82,8 @@
               <br />
               <span id="homework_attach_description_span" style="padding-left: 100px;"></span>
             </p>
+            <br/>  <span id="homework_attach_description_span" style="padding-left: 100px;"></span>
+            </p>
             <div class="cl"></div>
             <p>
               <label style="float: left;">

app/views/layouts/_base_feedback.html.erb

@@ -0,0 +1,150 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>意见反馈浮窗</title>
+
+<script>
+function mypostion(o){
+	var width=$(window).width();
+	var height=$(window).height();
+	var divW=$(o).outerWidth();
+	var divH=$(o).outerHeight();
+	var left=(width-divW)/2+$(window).scrollLeft();
+	var top=(height-divH)/2+$(window).scrollTop();
+	return {"left":left,"top":top};
+};
+
+function myTips(msg,status){
+	if(status!="success" && status!="error"){status="error";};
+	if (status=="success") {
+		$("body").append('<div class="ui-mask" id="ui-mask"></div><div class="change_success" id="change_success"><!--span class="send_close" onclick="$(this).parent().remove();$("#ui-mask").remove();"></span--><i></i>'+msg+'</div>');
+		var my=mypostion("#change_success");
+		$("#change_success").css({"position":"absolute","z-index":"9999999","top":my.top+"px","left":my.left+"px"});
+		$("#ui-mask").show();
+		$("#change_success").show();
+		setTimeout(function(){
+			$("#change_success,#ui-mask").fadeOut("slow",function(){
+				$("#ui-mask").remove();
+				$("#change_success").remove();
+			});
+		},2500);
+	}
+	else{
+	$("body").append('<div class="ui-mask" id="ui-mask"></div><div class="change_error" id="change_error"><!--span class="send_close" onclick="$(this).parent().remove();$("#ui-mask").remove();"></span--><i></i>'+msg+'</div>');
+		var my=mypostion("#change_error");
+		$("#change_error").css({"position":"absolute","z-index":"9999999","top":my.top+"px","left":my.left+"px"});
+		$("#ui-mask").show();
+		$("#change_error").show();
+		setTimeout(function(){
+			$("#change_error,#ui-mask").fadeOut("slow",function(){
+				$("#ui-mask").remove();
+				$("#change_error").remove();
+			});
+		},1000);
+	};
+};
+
+
+$(function(){
+	$("#button1").click(function(){
+		myTips("您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！","success");
+	});
+
+})
+
+function f_submit()
+{
+    $("#new_memo").submit();
+}
+</script>
+
+<style type="text/css">
+/*浮窗*/ 
+body{ height:3000px; font-family:'微软雅黑';} 
+div,ul,li,body,h3,p{margin:0; padding:0;} 
+a{ text-decoration:none;}
+#roll{ background:url(/images/f_opnion.jpg) 0 0 no-repeat;width:157px; height:332px; position:absolute;}
+.opnionBox{ width: 130px; height:146px; margin:76px auto 20px; } 
+.opnionText{  width: 120px !important; height:130px; outline:none; border:none !important;padding: 0 5px !important; color: #03a8bb;line-height:1.5; font-size:12px; }
+a.opnionButton{  width:40px; height:20px; display:block;  margin:0 auto;font-size:14px; color:#fd6e2a; font-weight: bold;    }
+a:hover.opnionButton{ text-decoration:underline;}
+.opnionCall{ color:#03a8bb; font-size:12px;  width:105px;  margin:0 auto;}
+.opnionCall .tectitle{ font-size:14px; alignment-adjust: central; color:#03a8bb; margin-bottom:8px,}
+/*提示框*/ 
+.ui-mask{background-color:#000;opacity:0.5;filter:alpha(opacity=50);width:100%;height:100%;position:fixed;_position:absolute;left:0;top:0;z-index:9999998;display:none;}
+.change_success{
+	display:block;
+	height:60px;
+	width:300px;
+	line-height:1.9;
+	font-size:14px;
+	font-weight:500;
+	background:#fff;
+	color:#1395a4;
+	border:5px solid #1395a4;
+	font-size:14px;
+	padding:30px 20px;
+	position: absolute;
+	_position: absolute;
+	left:0;
+	top:0;
+	z-index:9999999;
+}
+</style>
+</head>
+
+<body>
+<div id="roll">
+<div  class="opnionBox">	
+	
+	<% get_memo %>
+		<%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
+	<div class="actions" style="max-width:680px">
+		<p>
+          <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%>
+        </p>
+        <p>
+          <%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%>
+        </p>
+		  <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
+          <a href="javascript:void(0);" class="opnionButton" id="" onclick="f_submit();">提&nbsp;&nbsp;交</a>
+		<% end %>
+	</div>
+	
+
+    </form>
+    <div class="clear"></div>
+</div>
+
+<div class="opnionCall">
+	<div class="tectitle">技术支持：</div>
+    <p ><%= l(:label_course_adcolick) %><a href="http://user.trustie.net/users/12/user_newfeedback">黄井泉</a><br>
+    	<%= l(:label_course_adcolick) %><a href="http://user.trustie.net/users/34/user_newfeedback">白羽</a></p>
+</div>
+
+</div> 
+
+</body>
+</html>
+<script>
+	var roll=document.getElementById('roll'), 
+	initX=0, 
+	initY, 
+	compY, 
+	sp=15, 
+	//可调整时间间隔，步进值不宜过大，不然IE下有点闪屏； 
+	timeGap=5, 
+	doc=document.documentElement, 
+	docBody=document.body; 
+	compY=initY=100; 
+	roll.style.right=initX+"px"; 
+	;(function(){ 
+	var curScrollTop=(doc.scrollTop||docBody.scrollTop||0)-(doc.clientTop||docBody.clientTop||0); 
+	//每次comP的值都不一样；直到roll.style.top===doc.scrollTop+initY； 
+	compY+=(curScrollTop+initY-compY)/sp; 
+	roll.style.top=Math.ceil(compY)+"px"; 
+	setTimeout(arguments.callee,timeGap); 
+	})(); 
+</script>
+

app/views/layouts/_base_header.html.erb

@@ -27,6 +27,7 @@
 		#@nav_dispaly_user_label = 1
 	end
 %>
+<%= render :partial => "layouts/base_feedback" %>
 <div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;">
 	<div class="welcome_logo">
 		<%=link_to image_tag("/images/logo.png",weight:"36px", height: "36px")%>

app/views/layouts/base_contest.html.erb

@@ -41,11 +41,14 @@
                                     </td>
                                     <td rowspan="2" width="250px">
                                         <div class="project-search">
-                                            <%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %>
+                                            <%= form_tag({:controller => 'bids', :action => 'contest'}, :id => "contest_search_form",:method => :get) do %>
                                                 <%= text_field_tag 'name', params[:name], :size => 20 %>
                                                 <%= hidden_field_tag 'reward_type', @bid.reward_type %>
                                                 <%= hidden_field_tag 'project_type', params[:project_type] %>
-                                                <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+                                              <a href="#" onclick="$('#contest_search_form').submit();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
+                                                <%= l(:label_search)%>
+                                              </a>
+                                                <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
                                             <% end %>
                                         </div>
                                     </td>

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) %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -46,9 +48,13 @@
       </td>
       <td rowspan="2" width="250px">
         <div class="top-content-search">
-          <%= form_tag(:controller => 'courses', :action => 'search', :method => :get) do %>
+
-              <%= text_field_tag 'name', params[:name], :size => 20 %>
+          <%= form_tag({:controller => 'courses', :action => 'search'},:id => "course_search_form", :method => :get) do %>
-              <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+              <%= text_field_tag 'name', params[:name], :size => 20, :style => "float:left" %>
+              <a href="#" onclick="$('#course_search_form').submit();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
+                <%= l(:label_search)%>
+              </a>
+              <%#= submit_tag l(:label_search), :class => "ButtonColor m3p10", :name => nil, :style => "float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" %>
           <% end %>
         </div>
       </td>
@@ -120,19 +126,19 @@
           <td class="font_index">
             <!-- 1 教师； 2 学生；0 全部-->
             <% 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 %>
                 <span>
-                  <%= teacherCount(@course)%>
+                  <%= teacher_num %>
                 </span>
             <% end%>
           </td>
           <td class="font_index">
             <% 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 %>
                 <span>
-                  <%= studentCount(@course)%>
+                  <%= student_num %>
                 </span>
             <% end %>
           </td>
@@ -141,10 +147,10 @@
           </td>
         <tr class="font_aram">
           <td align="center" width="80px" id="teacherCount">
-            <%= l(:label_x_base_courses_teacher, :count => teacherCount(@course)) %>
+            <%= l(:label_x_base_courses_teacher, :count => teacher_num) %>
           </td>
           <td align="center" width="80px" id="studentCount">
-            <%= l(:label_x_base_courses_student, :count => studentCount(@course)) %>
+            <%= l(:label_x_base_courses_student, :count => student_num) %>
           </td>
           <td align="center" width="80px">
             <%= l(:label_x_course_data, :count => files_count) %>

app/views/layouts/base_newcontest.html.erb

@@ -61,14 +61,14 @@
                                               if(regexName1()){$("#contst_search_form").submit();}
                                           }
                                         </script>
-                                        <div class="project-search" style="width: 100%">
+                                        <div class="project-search" style="float: left; margin: 0px">
                                             <%= 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 %>
-                                                <a href="#" onclick="submitSerch();" class="ButtonColor m3p10" style="/*padding-top: 7px !important;*/ height:50%;">
+                                              <a href="#" onclick="submitSerch();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
-                                                    <%= l(:label_search)%>
+                                                <%= l(:label_search)%>
-                                                </a>
+                                              </a>
                                                 <br />
                                               <span id="contest_name_span_head"></span>
                                             <% end %>
@@ -78,11 +78,11 @@
                                 <tr>
                                     <td>
                                       <%=link_to l(:field_homepage), home_path %> >
-                                      <a>
+                                      <a href="http://<%= Setting.host_contest %>" class="link_other_item">
-                                        <%= l(:label_contest_innovate) %>
+                                        <%=l(:label_contests_management_platform)%>
                                       </a> >
                                       <span title="<%= @contest.name%>">
-                                        <%= link_to h(truncate(@contest.name, length: 20, omission: '...')), show_contest_contest_path(@contest) %>
+                                        <%= link_to h(truncate(@contest.name, length: 20, omission: '...')), contest_contestnotifications_path(@contest) %>
                                       </span>
                                     </td>
                                 </tr>

app/views/layouts/base_projects.html.erb

@@ -64,10 +64,10 @@
                                               }
                                             </script>
 											<%= 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 %>
-                                                <a href="#" onclick="submitSerch();" class="ButtonColor m3p10" >
+                                                <a href="#" onclick="submitSerch();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
                                                     <%= l(:label_search)%>
                                                 </a>
                                                 <br />

app/views/layouts/base_users.html.erb

@@ -205,7 +205,7 @@
                                                             <td align="right">
                                                               <%#= submit_tag l(:button_submit), :name => nil ,
                                                                                 :class => "bid_btn" %>
-                                                              <a href="#"  onclick='$("#my_brief_introduction").parent().submit();'  class="ButtonColor m3p10" >
+                                                              <a href="#"  onclick='$("#my_brief_introduction").parent().submit();'  class="ButtonColor m3p10" style="padding: 5px 10px;" >
                                                                 <%= l(:label_submit)%>
                                                               </a>
                                                             </td>
@@ -221,16 +221,16 @@
 									<div class="inf_user_context">
 										<table style="font-family:'微软雅黑'" width="240">
 											<tr>
-												<td style="padding-left: 5px" width="70px">
+												<td style=" float: right" width="70px">
-                                                  <%= l(:label_user_joinin) %>：
+                                                 <span style="float: right"> <%= l(:label_user_joinin) %>：</span>
                                                 </td>
                                               <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
                                                 <%= format_time(@user.created_on) %>
                                               </td>
 											</tr>
 											<tr>
-												<td style="padding-left: 5px">
+												<td style=" float: right" width="70px">
-                                                  <%= l(:label_user_login) %>：
+                                               <span style="float: right">   <%= l(:label_user_login) %>：</span>
                                                 </td>
                                               <td class="font_lighter_sidebar" style="padding-left: 0px">
                                                 <%= 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 %>
                                                 <tr>
-                                                    <td style="padding-left: 5px" width="70px">
+                                                    <td style=" float: right" width="70px">
-                                                      <%= l(:field_occupation) %>：
+                                                      <span style="float: right"><%= l(:field_occupation) %>：</span>
                                                     </td>
                                                     <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
                                                         <% unless @user.user_extensions.school.nil? %>
@@ -250,8 +250,8 @@
                                                 </tr>
                                                   <% elsif @user.user_extensions.identity == 3 %>
                                                   <tr>
-                                                    <td style="padding-left: 5px" width="70px">
+                                                    <td style=" float: right" width="70px">
-                                                      <%= l(:field_occupation) %>：
+                                                     <span style="float: right"> <%= l(:field_occupation) %>：</span>
                                                     </td>
                                                     <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
                                                         <%= @user.user_extensions.occupation %>
@@ -259,8 +259,8 @@
                                                   </tr>
                                               <% elsif @user.user_extensions.identity == 2 %>
                                                   <tr>
-                                                    <td style="padding-left: 18px" width="70px">
+                                                    <td style=" float: right" width="70px">
-                                                      <%= l(:label_company_name) %>：
+                                                    <span style="float: right">  <%= l(:label_company_name) %>：</span>
                                                     </td>
                                                     <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
                                                       <%= @user.firstname %>
@@ -268,8 +268,8 @@
                                                   </tr>
                                                  <% end %>
 											<tr>
-												<td style="padding-left: 31px" width="76px">
+												<td style=" float: right" width="70px">
-                                                  <%= l(:label_location) %>：
+                                                 <span style="float: right"> <%= l(:label_location) %>：</span>
                                                 </td>
                                                 <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
                                                   <%= @user.user_extensions.location %>
@@ -278,8 +278,8 @@
 											</tr>
 											<tr>
 												<% if @user.user_extensions.identity == 0 %>
-                                                  <td style="padding-left: 31px" width="76px" >
+                                                  <td style=" float: right" width="70px" >
-                                                    <%= l(:label_technical_title) %>：
+                                                   <span style="float: right"> <%= l(:label_technical_title) %>：</span>
                                                   </td>
                                                   <td  class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
                                                        <span id = "td_tech_title"></span>
@@ -289,8 +289,8 @@
 											<% if @user.user_extensions.identity == 1 %>
                                                 <% if(is_watching?(@user) ) %>
                                                 <tr>
-                                                    <td style="padding-left: 31px" width="70px" >
+                                                    <td style=" float: right" width="70px" >
-                                                      <%= l(:label_bidding_user_studentcode)%>：
+                                                     <span style="float: right"> <%= l(:label_bidding_user_studentcode)%>：</span>
                                                     </td>
                                                     <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
                                                       <%= @user.user_extensions.student_id %>
@@ -298,7 +298,7 @@
                                                 </tr>
                                                 <% else %>
                                                       <tr>
-                                                        <td style="padding-left: 31px" width="70px" >
+                                                        <td style=" float: right" width="70px" >
                                                           <%= l(:label_identity)%>：
                                                         </td>
                                                         <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
@@ -309,7 +309,7 @@
                                                 <% end %>
 											<% elsif @user.user_extensions.identity == 3 %>
                                                 <tr>
-                                                  <td style="padding-left: 31px" width="70px" >
+                                                  <td style=" float: right" width="70px" >
                                                     <%= l(:label_identity)%>：
                                                   </td>
                                                   <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">

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_user_label = 1
-   @nav_dispaly_main_project_label = 1
+   @nav_dispaly_store_all_label = 1
-   @nav_dispaly_main_contest_label = 1 %>
+ %>
 <% @nav_dispaly_forum_label = 1%>
 <!DOCTYPE html>
 <html lang="<%= current_language %>">
@@ -39,12 +39,12 @@
       </div>
     </div>
 
-    <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
+    <div id="ajax-indicator" ><span><%= l(:label_loading) %></span></div>
     <div id="ajax-modal" style="display:none;"></div>
 
 
   </div>
 </div>
-<!--<#%= call_hook :view_layouts_base_body_bottom %>-->
+<%= call_hook :view_layouts_base_body_bottom %>
 </body>
 </html>

app/views/projects/search.html.erb

@@ -10,7 +10,7 @@
 			<tr>
 				<td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_course_practice) %></td>
 				<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
-				<td rowspan="2">
+				<td rowspan="2" valign="bottom">
 				<% 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) %></td>
@@ -35,7 +35,7 @@
 				<tr>
 					<td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_project_deposit) %></td>
 					<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
-					<td rowspan="2">
+					<td rowspan="2" valign="bottom">
 					<% 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 %>	

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"%>
              <!--<%#= f.submit l(:button_project_tags_add),:class => "ButtonColor m3p10" %>-->
-            <a href="#"  onclick='$("#tags_name").parent().submit();'  class="ButtonColor m3p10" >
+            <a href="#"  onclick='$("#tags_name").parent().submit();'  class="ButtonColor m3p10" style="padding: 3px 6px">
               <%= l(:button_project_tags_add)%>
             </a>
-            <%= 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 %>
 		</div>
 <% end %>

app/views/welcome/_link_to_another.html.erb

@@ -1,6 +1,6 @@
-<div class="clearfix"></div>
+
-<div class="linkother">
+<div class="linkother" style="margin-left: 30%; float: left">
-  <a href="http://<%= Setting.host_name%>" class="link_other_item"><%=l(:label_projects_management_platform)%></a>
+  <a href="http://<%= Setting.host_name%>" class="link_other_item"><%=l(:label_projects_management_platform)%></a>
-  <a href="http://<%= Setting.host_course%>" class="link_other_item"><%=l(:label_courses_management_platform)%></a>
+  <a href="http://<%= Setting.host_course%>" class="link_other_item"><%=l(:label_courses_management_platform)%></a>
-  <a href="http://<%= Setting.host_contest%>" class="link_other_item"><%=l(:label_contests_management_platform)%></a>
+  <a href="http://<%= Setting.host_contest%>" class="link_other_item"><%=l(:label_contests_management_platform)%></a>
 </div>

app/views/welcome/_search_course.html.erb

@@ -1,58 +1,58 @@
-<%
+<%
-	select_option = []
+	select_option = []
-	(select_option << ['项目', 'projects']) if project_type == Project::ProjectType_project
+	(select_option << ['项目', 'projects']) if project_type == Project::ProjectType_project
-	(select_option << ['课程', 'courses']) if project_type == Project::ProjectType_course
+	(select_option << ['课程', 'courses']) if project_type == Project::ProjectType_course
-	select_option << ['用户', 'users']
+	select_option << ['用户', 'users']
-	#select_option << ['教师', 'users_teacher'],
+	#select_option << ['教师', 'users_teacher'],
-	#select_option << ['学生', 'users_student']
+	#select_option << ['学生', 'users_student']
-%>
+%>
-<style type="text/css">
+<style type="text/css">
-form #q, form #search_type{
+form #q, form #search_type{
-	-webkit-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
+	-moz-box-sizing: border-box;
-	box-sizing: border-box;
+	box-sizing: border-box;
-	display: inline-block;
+	display: inline-block;
-	margin: 0px;
+	margin: 0px;
-	padding: 5px;
+	padding: 5px;
-	height: 33px;
+	height: 33px;
-}
+}
-form #q{
+form #q{
-	font-size: 13px;
+	font-size: 13px;
-	border-top-left-radius: 5px;
+	border-top-left-radius: 5px;
-	border-bottom-left-radius: 5px;
+	border-bottom-left-radius: 5px;
-	border-right: none;
+	border-right: none;
-
+
-}
+}
-form #search_type{
+form #search_type{
-	font-size: 13px;
+	font-size: 13px;
-	color: #363739;
+	color: #363739;
-	border-top-right-radius: 5px;
+	border-top-right-radius: 5px;
-	border-bottom-right-radius: 5px;
+	border-bottom-right-radius: 5px;
-	border-bottom-left-radius: 0px;
+	border-bottom-left-radius: 0px;
-	border-top-left-radius: 0px;
+	border-top-left-radius: 0px;
-	border-left: 1px outset #83A9A9;
+	border-left: 1px outset #83A9A9;
-	margin-left: -4px;
+	margin-left: -4px;
-	-webkit-appearance: none;
+	-webkit-appearance: none;
-	-moz-appearance: none;
+	-moz-appearance: none;
-	text-indent: 0.01px;
+	text-indent: 0.01px;
-	text-overflow: '';
+	text-overflow: '';
-}
+}
-.search_widget{
+.search_widget{
-	display:inline-block;
+	display:inline-block;
-	border-radius: 5px;
+	border-radius: 5px;
-}
+}
-.search_widget:hover{
+.search_widget:hover{
-	box-shadow: 0px 0px 3px #56B4EF;
+	box-shadow: 0px 0px 3px #56B4EF;
-}
+}
-<%#完了把上面东西放到 .css 里%>
+<%#完了把上面东西放到 .css 里%>
-</style>
+</style>
-<%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
+<%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
-<div class="project-search" style="float: right">
+<div class="project-search" style="float: right">
-	<div class='search_widget'>
+	<div class='search_widget'>
-		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字',  :size => 27 %>
+		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字',  :size => 27, %>
-		<%= select_tag(:search_type, options_for_select(select_option) ) %>
+		<%= select_tag(:search_type, options_for_select(select_option), :style => "float:right" ) %>
-	</div>
+	</div>
-		<%#= hidden_field_tag 'project_type', project_type %>
+		<%#= 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" %>
-		</div>	
+		</div>	
-<% end %>	
+<% end %>	

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
 </script>
 <%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
 <div class="project-search" style="float: right">
-	<div class='search_widget'>
+	<div class='search_widget' >
-		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字',  :size => 27 %>
+
-        <input type="text" name="search_by_input" hidden="hidden;" id="search_by_input" value="0">
+		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字' %>
-		<%= select_tag(:search_type, options_for_select(select_option), :onchange => "searchTypeChange();" ) %>
+        <input type="text" name="search_by_input" style="display: none" id="search_by_input" value="0">
-        <%= select_tag(:search_by,options_for_select([["昵称","0"],["姓名","1"],["邮箱","2"]]), :onchange => "searchByChange();" )  %>
+		<%= 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" )  %>
 	</div>
 		<%#= 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" %>
 		</div>	
 <% end %>	

app/views/welcome/contest.html.erb

@@ -119,6 +119,7 @@
     }
 })();
 </script>
+<div>
 <div class='top_bar'>
   <%#= render partial: 'wei_xin' %>
 	<div class="main-content-bar" id="main-content-bar">
@@ -324,6 +325,7 @@
 
 
 <div class="clearfix"></div>
+</div>
 <%= render partial: 'link_to_another' %>
 
 

app/views/welcome/index.html.erb

@@ -71,7 +71,7 @@
 	<div class="d-p-projectlist-box">
 		<ul class="d-p-projectlist">
 			<% @projects.map do |project| %>
-			<li style="overflow:auto;word-break:break-all;height:100%;word-wrap: break-word;" class='<%= cycle("odd", "even") %>'>
+			<li style="overflow:hidden;word-break:break-all;height:100%;word-wrap: break-word;" class='<%= cycle("odd", "even") %>'>
 				<div style="float: left;">
 					<%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
 				</div>

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

config/locales/zh.yml

@@ -2239,4 +2239,5 @@ zh:
   label_course_prompt: 课程：
   label_contain_resource: 已包含资源：
   label_quote_resource_failed: ",此资源引用失败! "
+  label_file_lost: 以下文件在服务器丢失，请联系相关人员重新上传：
 

config/routes.rb

@@ -168,6 +168,7 @@ RedmineApp::Application.routes.draw do
     end
     member do
       post 'create_memo'
+      post 'create_feedback'
       match 'search_memo', :via => [:get, :post]
     end
     resources :memos do
@@ -176,6 +177,7 @@ RedmineApp::Application.routes.draw do
       end
     end
   end
+  
 
   resources :shares
 

db/migrate/20150108034148_create_polls.rb

@@ -0,0 +1,19 @@
+class CreatePolls < ActiveRecord::Migration
+  def up
+    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
+
+  def down
+    drop_table :polls
+  end
+end

db/migrate/20150108034253_create_poll_questions.rb

@@ -0,0 +1,16 @@
+class CreatePollQuestions < ActiveRecord::Migration
+  def up
+    create_table :poll_questions do |t|
+      t.string :question_title
+      t.integer :question_type
+      t.integer :is_necessary
+      t.integer :poll_id
+
+      t.timestamps
+    end
+  end
+
+  def down
+  	drop_table :poll_questions
+  end
+end

db/migrate/20150108034414_create_poll_answers.rb

@@ -0,0 +1,15 @@
+class CreatePollAnswers < ActiveRecord::Migration
+  def up
+    create_table :poll_answers do |t|
+      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

db/migrate/20150108035301_create_poll_votes.rb

@@ -0,0 +1,16 @@
+class CreatePollVotes < ActiveRecord::Migration
+  def up
+    create_table :poll_votes do |t|
+      t.integer :user_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

db/migrate/20150108035338_create_poll_users.rb

@@ -0,0 +1,14 @@
+class CreatePollUsers < ActiveRecord::Migration
+  def up
+    create_table :poll_users do |t|
+      t.integer :user_id
+      t.integer :poll_id
+
+      t.timestamps
+    end
+  end
+
+  def down
+  	drop_table :poll_users
+  end
+end

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_question_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  "poll_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_question_id"
+    t.integer  "poll_answer_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"

public/stylesheets/application.css

@@ -2911,8 +2911,8 @@ input[class~='ButtonClolr'],.ButtonColor{
 }
 
 input[class~='m3p10'], .m3p10 {
-    margin: 0;
+    margin-top: 5px;
-    padding: 3px 10px !important;
+    padding: 5px 10px;
     height: 20px;
     display: inline-block;
     color: #ffffff;

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;}
+
 
 
 

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 {

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

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

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

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

test/unit/polls_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class PollsTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end