Commit Graph

52 Commits

Author SHA1 Message Date
z9hang 46e97b7ae4 删除多出来的页脚 2014-11-17 10:31:48 +08:00
z9hang 096b0e271f 课程页面页脚偏移问题 2014-11-17 09:54:21 +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 5f7d7c821c 添加网站的默认页脚(使空数据库时显示更合理) 2014-10-23 15:56:59 +08:00
alan e044f5b615 修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
2014-10-23 11:30:34 +08:00
z9hang e4ff85894d 1、部分代码优化。2、未参加课程或项目的用户个人主页界面不显示对应的tab页 2014-10-17 15:02:09 +08:00
z9hang ff95178ce7 修正页脚合作单位不显示问题,原因:控制中的变量名被修改,但未改view中对应的变量名,解决:改为一致的 2014-10-15 17:31:02 +08:00
sw 802c0ea565 1.修改未配置页脚时进入首页报错的BUG 2014-10-15 11:31:21 +08:00
z9hang 2ed4ace7c9 添加非网站页脚的空判断 2014-10-14 16:54:31 +08:00
z9hang af59cef90b 网站页脚配置功能 2014-10-13 17:38:59 +08:00
luguo 075b43f836 解决版权符号问题 2014-08-21 09:18:10 +08:00
ShengYue.Xu e6c8dbef4f 修改了版权符号,由原来的@改成了© 2014-08-20 21:22:19 +08:00
yanxd 87671e9d73 base footer merge bug. 2014-07-22 09:39:27 +08:00
nwb 1d4dad22ad Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop
Conflicts:
	ReadMe.txt
	app/views/layouts/_base_footer.html.erb
2014-07-11 11:38:36 +08:00
nwb bdaf59513b Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop
Conflicts:
	app/views/layouts/_base_footer.html.erb
2014-07-11 09:11:37 +08:00
yanxd 449b87e38d remove cnzz 2014-07-08 15:38:37 +08:00
yanxd aca63146e9 搜索文件归属,课程相关逻辑修改,查询把过滤去掉了。暂时没想有什么过滤的好办法 2014-07-07 16:52:39 +08:00
nwb dd396a6da2 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-07 16:27:49 +08:00
z9hang 470f40db82 去除绝对网址 2014-07-05 11:00:01 +08:00
yanxd f664ec10b4 Merge branch 'szzh' into develop
Conflicts:
	app/views/bids/_bid_homework_show.html.erb
2014-07-03 09:07:09 +08:00
xianbo 830e2d4fb4 隐藏 站长统计 2014-07-01 18:18:25 +08:00
yanxd c5d892a214 footer 2014-06-16 08:47:42 +08:00
yanxd 70abac4c1e Merge branch 'competition' into develop
Conflicts:
	app/controllers/application_controller.rb
	config/locales/en.yml
	config/locales/zh.yml
	db/schema.rb
2014-06-13 10:59:43 +08:00
yanxd 858a7936b5 revert userscore catch exception, added cache to footer. 2014-06-12 16:19:46 +08:00
yanxd cccb19e733 cnzz 2014-06-12 15:46:16 +08:00
wanglinchun 372de9932a 英文版竞赛子站完成 2014-06-06 11:24:05 +08:00
z9hang fc1d5baf95 课程、竞赛、项目的主页的上下间距缩小
logo和大学名称的居中对齐,以及搜索条的上下居中。
2014-05-17 15:15:33 +08:00
kg db2ab5b945 modify issue filter and base_footer 2014-05-08 14:18:42 +08:00
yanxd be6ae6ef34 d 2014-04-27 10:57:02 +08:00
yanxd 939e4cc100 footer 下方距离
welcome调整下主页
2014-04-26 09:03:25 +08:00
wanglinchun 9af6c03547 Merge branch 'competition' into develop
Conflicts:
	Gemfile.lock
	app/views/layouts/_base_footer.html.erb
2014-04-23 17:18:53 +08:00
yanxd e2a5e2f730 footer 2014-04-23 16:37:19 +08:00
wanglinchun bc068eb12b 添加参赛应用的删除和修改功能以及添加相应的删除和修改权限 2014-04-22 10:59:50 +08:00
yanxd a4ab29f49d footer logo modify 2014-04-19 11:04:44 +08:00
kg bdefa322cc modify foot 2014-04-18 17:57:11 +08:00
kg d450da9df8 footer , footer of base_course,upload files count and delete all upload 2014-04-17 08:33:44 +08:00
kg 3013930f28 modify footer 2014-04-16 22:15:33 +08:00
kg 3f096f9167 add pdl logo 2014-04-16 22:15:32 +08:00
kg 69dbd5a85e add logos and modify footer;footer position problem of some projects and courses 2014-04-16 22:15:31 +08:00
kg 2cec3b0490 modify footer 2014-04-16 22:15:30 +08:00
yanxd 1b6cdeac05 列表上提交作业,大概好了吧 2014-04-09 11:06:13 +08:00
yanxd 2ca1362e83 “按用户搜索”和“搜索”的区别,分别可以搜索什么? 上面搜索删掉
1、标签的格式需 要优化(所有涉及到标签的地方的标签的格式都需要调整) tag周围距离
“课程通知“应该调整到“课程作业”后面  改!
2014-02-25 15:43:03 +08:00
yanxd 7deeab62bc course.trustie.net 2014-02-24 10:40:45 +08:00
wanglinchun 7e20f9015e footer 2014-01-24 14:23:05 +08:00
yanxd 9dd6bdc0ae store framework => route, and refactory debug params in html/footer. 2014-01-10 09:19:50 +08:00
yanxd 6bab3a95a7 add analytics. 2013-12-18 07:56:19 +08:00
huangjingquan d01b61ba5a 修改了“footer",,每天新闻增加了下划线 2013-08-12 15:52:17 +08:00
huangjingquan 2db0b87e6e 主界面 2013-08-11 15:27:34 +08:00
huangjingquan e3be481bac trustie2改成trustie 2013-08-10 20:12:23 +08:00
huangjingquan 38c6a187e4 主页显示以及header部分 2013-08-10 09:31:48 +08:00