Commit Graph

154 Commits

Author SHA1 Message Date
alan 4b9bad0dc5 修改《若有某公开课程courseA,在课程主页中搜索courseA跳转到搜索结果界面,相关链接没有对齐》bug
Signed-off-by: alan <547533434@qq.com>
2015-01-09 10:57:33 +08:00
sw 3caf5c8657 #1736 猎豹浏览器中,打开某竞赛,进入竞赛主页看到右上方搜索按钮下移了 2014-12-23 15:18:55 +08:00
sw 30d8d82f37 #1734 某竞赛主页中当搜索框为空时,点击搜索的提示问题 2014-12-23 15:13:16 +08:00
sw d6d7331ec6 修改竞赛中搜索,搜索条件可以为空,且为空时搜出所有竞赛 2014-12-19 14:45:50 +08:00
sw 4e2fe44d10 修改js验证事件,由失去焦点事件改为文本改变事件 2014-12-19 11:23:16 +08:00
sw 1fbd2e95d4 #1719 修改竞赛搜索之后标题栏错位的BUG
修改竞赛搜索之后,置空再搜索跳转到404
2014-12-18 15:39:32 +08:00
sw 7fa8d2fff8 修改竞赛模块标题栏 2014-11-27 17:05:53 +08:00
alan 857578dc92 修改bug<contest网站的作品提交界面需要改进>
Signed-off-by: alan <547533434@qq.com>
2014-11-14 11:15:46 +08:00
alan 12de248e87 Signed-off-by: alan <547533434@qq.com> 2014-11-13 10:18:07 +08:00
alan e86ef8e6f0 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-11-13 09:59:34 +08:00
alan b7a89d6108 Merge branch 'shaproup' into szzh
Conflicts:
	app/models/course.rb
	app/models/project.rb
	app/views/contests/show_attendingcontest.html.erb
	app/views/files/_course_file.html.erb
	app/views/files/_course_new.html.erb
	app/views/layouts/_base_footer.html.erb

Signed-off-by: alan <547533434@qq.com>
2014-11-13 09:59:20 +08:00
z9hang e6aa9d3592 修复用户、课程、项目、竞赛、留言模块样式,去除回复时的回复某某字样,及字数控制 2014-11-12 15:09:39 +08:00
z9hang 7d4d3f590c 项目、课程、竞赛留言模块分页控件修复 2014-11-05 09:51:30 +08:00
z9hang 07c21e97d6 修复竞赛、课程、项目留言模块样式 2014-11-04 18:30:45 +08:00
alan 66aa72d210 Signed-off-by: alan <547533434@qq.com> 2014-10-23 18:49:14 +08:00
z9hang efc247f2e7 1、各个页面在,没有数据情况下的显示调整。2、点击竞赛列表,在没有竞赛的情况下显示的是无搜索结果界面修正为列表界面 2014-10-23 17:05:36 +08:00
alan e044f5b615 修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
2014-10-23 11:30:34 +08:00
alan 859a1122b7 修改contest中contestnotification列表和通知公告的界面
Signed-off-by: alan <547533434@qq.com>
2014-10-21 23:23:07 +08:00
z9hang 258967263e 1、代码优化。2、很多页面标题不正确问题 2014-10-16 15:07:36 +08:00
sw e765445279 #1298修复竞赛作品简介超出边框的BUG 2014-10-15 17:11:33 +08:00
sw 4b40824111 #1341修复创新竞赛--用户留言:回复留言显示的是真实姓名的BUG 2014-10-15 17:04:46 +08:00
sw 8f402fe0b7 #562课程讨论区回复增加js验证
参赛作品js验证增加左右两端空格去除
2014-10-14 17:09:52 +08:00
sw 395ae35a0e #1148 调整所有日期为选择,不可手动输入 2014-10-11 16:27:39 +08:00
alan b88c361525 修改新建参赛作品样式
Signed-off-by: alan <547533434@qq.com>
2014-09-22 17:32:18 +08:00
alan 4604720475 修改竞赛作品信息
Signed-off-by: alan <547533434@qq.com>
2014-09-22 14:55:29 +08:00
alan a823700300 Signed-off-by: alan <547533434@qq.com> 2014-09-18 10:10:14 +08:00
alan c3341eb368 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/contests/index.html.erb
从远端下载该文件到本地
Signed-off-by: alan <547533434@qq.com>
2014-09-17 20:10:06 +08:00
alan f78be4ea51 解决竞赛作品提交不了bug
Signed-off-by: alan <547533434@qq.com>
2014-09-17 19:57:26 +08:00
sw 5d65901ebd 解决冲突 2014-09-17 16:08:49 +08:00
alan 875249ba58 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/contests/index.html.erb

Signed-off-by: alan <547533434@qq.com>
2014-09-17 16:05:30 +08:00
alan 02470491bd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/contests/index.html.erb
2014-09-17 15:33:47 +08:00
alan 0e07bed1ad 将contest 中的中文转换成zh.yml中的标签
Signed-off-by: alan <547533434@qq.com>
2014-09-17 14:58:13 +08:00
sw 245e0a858c 修复新建竞赛连接错误 2014-09-17 12:06:07 +08:00
sw d1435e07d4 首页隐藏显示微信扫码 #1152
解决方案:将微信扫码作为一个独立的连接页面,隐藏连接
2014-09-16 09:54:55 +08:00
alan 8c19ec8aa0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/helpers/projects_helper.rb
	app/views/contest_notification/show.html.erb

Signed-off-by: alan <547533434@qq.com>
2014-09-15 10:58:14 +08:00
alan 5e92e11561 修改bug《用户没有登陆随便参加竞赛》
Signed-off-by: alan <547533434@qq.com>
2014-09-15 10:41:15 +08:00
alan dea1a299af 修改competition的view文件,将其中不规范的代码进行修改,并将其中所有的link_to
修改成"link_to ‘welcome’ home_path,  {option}" 的形式;
统一route风格
match 'path', :to => 'controller#action'
如果 path = controller#action 则 match 'path'
Example:
match 'welcome/course', :to => 'welcome#course' 变成 match 'welcome/cource'


Signed-off-by: alan <547533434@qq.com>
2014-09-12 16:45:03 +08:00
alan 70b079041c 修改contests_controller.rb,contest.rb, contest_project.rb,contests_helper.rb,
attachments_helper.rb, application_helper.rb.
主要修改内容: 书写规范, for循环用 each 代替, if 语句的合并, unless 转换成if,
		函数名称拼写错误。

Signed-off-by: alan <547533434@qq.com>
2014-09-10 11:36:50 +08:00
linhk 08d59b9820 修改google中“参加竞赛”页面部分字重叠Bug 2014-09-05 17:16:40 +08:00
sw b49e76bf79 Merge branch 'xiaoguang-contest' into szzh
Conflicts:
	app/views/softapplications/show.html.erb
	app/views/welcome/contest.html.erb
2014-09-02 09:28:51 +08:00
sw fbb19480f5 修复火狐不兼容自动换行的问题 2014-08-28 17:30:08 +08:00
ShengYue.Xu 047f6d2c95 修改了缺陷当中 #868、#780、#603 2014-08-21 19:57:49 +08:00
hhuai 0cbcaa88e8 fixed issue 1013,“奖励方式”未对非汉字类型进行自动换行处理 2014-08-18 20:55:43 +08:00
sw f4fd1b1133 修改创建竞赛时提示描述不正确的问题 2014-08-16 16:13:39 +08:00
sw 2b12654796 Merge branch 'szzh' into develop 2014-08-16 13:33:07 +08:00
sw 9688a73aa1 1.新建竞赛作品增加js验证
2.修复上传图片一次超过2张,上传失败的BUG
2014-08-16 13:30:38 +08:00
chenmin ace256bea1 修复竞赛模块用户留言挡住右边图标的问题 2014-08-15 16:06:41 +08:00
sw 46ba7f6a7b Merge branch 'szzh' into develop 2014-08-14 15:55:43 +08:00
sw fb50defbec 修复按钮回去不正确的问题 2014-08-14 15:54:03 +08:00
sw 08821b9391 Merge branch 'szzh' into develop 2014-08-07 14:03:06 +08:00