diff --git a/app/views/cooperation/index.html.erb b/app/views/cooperation/index.html.erb index 2a3a7a430..2341f45cf 100644 --- a/app/views/cooperation/index.html.erb +++ b/app/views/cooperation/index.html.erb @@ -40,6 +40,9 @@
  • 湘潭大学
  • +
  • + 中国开源软件推进联盟 +
  • diff --git a/app/views/projects/settings/_new_modules.html.erb b/app/views/projects/settings/_new_modules.html.erb index aaf3e748b..196287449 100644 --- a/app/views/projects/settings/_new_modules.html.erb +++ b/app/views/projects/settings/_new_modules.html.erb @@ -1,42 +1,42 @@

    问题跟踪模块与实训模块不能同时选择

    一旦选定并保存后,将不能修改

    - - - \ No newline at end of file diff --git a/app/views/projects/settings/_new_trainig_task.html.erb b/app/views/projects/settings/_new_trainig_task.html.erb index 2c27c29dc..e92c42006 100644 --- a/app/views/projects/settings/_new_trainig_task.html.erb +++ b/app/views/projects/settings/_new_trainig_task.html.erb @@ -1,15 +1,26 @@ -

    请输入脚本

    -

    <%= link_to "开启实训", training_project_execute_project_path(@project) %>

    - - - + 取消 + 确定 + + + +

    请输入脚本

    +

    <%= link_to "开启实训", training_project_execute_project_path(@project) %>

    + + + \ No newline at end of file diff --git a/db/migrate/20170219025424_add_script_to_project.rb b/db/migrate/20170219025424_add_script_to_project.rb index 058f59280..27f76485b 100644 --- a/db/migrate/20170219025424_add_script_to_project.rb +++ b/db/migrate/20170219025424_add_script_to_project.rb @@ -1,5 +1,5 @@ -class AddScriptToProject < ActiveRecord::Migration - def change - add_column :projects, :script, :text - end -end +class AddScriptToProject < ActiveRecord::Migration + def change + add_column :projects, :script, :text + end +end diff --git a/public/images/footer_logo/p-zgkyrj.png b/public/images/footer_logo/p-zgkyrj.png new file mode 100644 index 000000000..abd08c264 Binary files /dev/null and b/public/images/footer_logo/p-zgkyrj.png differ