修改首页轮播逻辑，完成课程详情页界面
This commit is contained in:
stormand
parent
48ae155543
commit
91ee579a26
150
.idea/vim.iml
150
.idea/vim.iml
|
|
@ -119,83 +119,81 @@
|
||||||
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/bundle" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/bundle" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="jdk" jdkName="rbenv: 2.3.1" jdkType="RUBY_SDK" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="actionmailer (v4.2.5.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="actionmailer (v4.2.5.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="actionpack (v4.2.5.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="actionpack (v4.2.5.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="actionview (v4.2.5.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="actionview (v4.2.5.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="activejob (v4.2.5.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="activejob (v4.2.5.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="activemodel (v4.2.5.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="activemodel (v4.2.5.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="activerecord (v4.2.5.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="activerecord (v4.2.5.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="activesupport (v4.2.5.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="activesupport (v4.2.5.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="autoprefixer-rails (v6.4.0.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="autoprefixer-rails (v6.4.0.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="binding_of_caller (v0.7.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="binding_of_caller (v0.7.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="bootstrap-sass (v3.3.7, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="bootstrap-sass (v3.3.7, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.13.6, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.11.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="byebug (v9.0.5, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="byebug (v9.0.5, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="carrierwave (v0.11.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="coffee-rails (v4.1.1, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="coffee-rails (v4.1.1, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="coffee-script (v2.4.1, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="coffee-script (v2.4.1, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="coffee-script-source (v1.10.0, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="coffee-script-source (v1.10.0, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="debug_inspector (v0.0.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="debug_inspector (v0.0.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="execjs (v2.7.0, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="execjs (v2.7.0, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="faker (v1.6.3, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="faker (v1.6.3, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="font-awesome-rails (v4.5.0.1, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="font-awesome-rails (v4.5.0.1, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="globalid (v0.3.7, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="globalid (v0.3.7, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="haml (v4.0.7, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="haml (v4.0.7, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="i18n (v0.7.0, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="i18n (v0.7.0, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.6.0, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.6.0, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="jquery-rails (v4.1.1, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="jquery-rails (v4.1.1, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="jquery-ui-rails (v5.0.5, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="jquery-ui-rails (v5.0.5, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="json (v1.8.3, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="kaminari (v0.16.3, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="kaminari (v0.16.3, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="loofah (v2.0.3, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="loofah (v2.0.3, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="mail (v2.6.4, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="mail (v2.6.4, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="mime-types (v3.1, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="mime-types (v3.1, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2016.0521, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2016.0521, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="mimemagic (v0.3.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="mini_portile2 (v2.1.0, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="mini_magick (v4.5.1, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="minitest (v5.9.0, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="mini_portile2 (v2.1.0, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.12.1, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="minitest (v5.9.0, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="nested_form (v0.3.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.12.1, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.6.8, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="nested_form (v0.3.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="pg (v0.18.4, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.6.8, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="pkg-config (v1.1.7, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="pg (v0.18.4, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="rack (v1.6.4, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="pkg-config (v1.1.7, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="rack-pjax (v0.8.0, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="rack (v1.6.4, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="rack-test (v0.6.3, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="rack-pjax (v0.8.0, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="rails (v4.2.5.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="rack-test (v0.6.3, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="rails-deprecated_sanitizer (v1.0.3, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="rails (v4.2.5.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="rails-dom-testing (v1.0.7, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="rails-deprecated_sanitizer (v1.0.3, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.0.3, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="rails-dom-testing (v1.0.7, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="rails_12factor (v0.0.3, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.0.3, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="rails_admin (v0.8.1, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="rails_12factor (v0.0.3, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="rails_serve_static_assets (v0.0.5, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="rails_admin (v0.8.1, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="rails_stdout_logging (v0.0.5, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="rails_serve_static_assets (v0.0.5, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="railties (v4.2.5.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="rails_stdout_logging (v0.0.5, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="rake (v11.2.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="railties (v4.2.5.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="rdoc (v4.2.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="rake (v11.2.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="remotipart (v1.2.1, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="rdoc (v4.2.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.4, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="remotipart (v1.2.1, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="sass (v3.4.22, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.4, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.6, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="sass (v3.4.22, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="sdoc (v0.4.1, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.6, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="spring (v1.7.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="sdoc (v0.4.1, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.0, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="spring (v1.7.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.1.1, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.0, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="thor (v0.19.1, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.1.1, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="thor (v0.19.1, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.5, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="turbolinks (v5.0.1, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.5, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="turbolinks-source (v5.0.0, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="turbolinks (v5.0.1, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.2, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="turbolinks-source (v5.0.0, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="uglifier (v3.0.1, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.2, rbenv: 2.3.1) [gem]" level="application" />
|
<orderEntry type="library" scope="PROVIDED" name="web-console (v2.3.0, RVM: ruby-2.2.4) [gem]" level="application" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="uglifier (v3.0.1, rbenv: 2.3.1) [gem]" level="application" />
|
|
||||||
<orderEntry type="library" scope="PROVIDED" name="web-console (v2.3.0, rbenv: 2.3.1) [gem]" level="application" />
|
|
||||||
</component>
|
</component>
|
||||||
<component name="RModuleSettingsStorage">
|
<component name="RModuleSettingsStorage">
|
||||||
<LOAD_PATH number="0" />
|
<LOAD_PATH number="0" />
|
||||||
|
|
|
||||||
|
|
@ -2,12 +2,11 @@
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="d7b1c0f9-5303-4042-90a5-05cecbda0e94" name="Default" comment="">
|
<list default="true" id="d7b1c0f9-5303-4042-90a5-05cecbda0e94" name="Default" comment="">
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.generators" afterPath="$PROJECT_DIR$/.idea/.generators" />
|
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vim.iml" afterPath="$PROJECT_DIR$/.idea/vim.iml" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vim.iml" afterPath="$PROJECT_DIR$/.idea/vim.iml" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/courses_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/courses_controller.rb" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/homes_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/homes_controller.rb" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/courses/list.html.erb" afterPath="$PROJECT_DIR$/app/views/courses/list.html.erb" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/courses/detail.erb" afterPath="$PROJECT_DIR$/app/views/courses/detail.erb" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/routes.rb" afterPath="$PROJECT_DIR$/config/routes.rb" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/homes/index.html.erb" afterPath="$PROJECT_DIR$/app/views/homes/index.html.erb" />
|
||||||
</list>
|
</list>
|
||||||
<ignored path="vim.iws" />
|
<ignored path="vim.iws" />
|
||||||
<ignored path=".idea/workspace.xml" />
|
<ignored path=".idea/workspace.xml" />
|
||||||
|
|
@ -36,81 +35,38 @@
|
||||||
</component>
|
</component>
|
||||||
<component name="FileEditorManager">
|
<component name="FileEditorManager">
|
||||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||||
<file leaf-file-name="list.html.erb" pinned="false" current-in-tab="true">
|
<file leaf-file-name="lb_aaa.png" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/courses/list.html.erb">
|
<entry file="file://$PROJECT_DIR$/public/uploads/course/avatar/1/lb_aaa.png">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="images">
|
||||||
<state relative-caret-position="234">
|
<state />
|
||||||
<caret line="13" column="50" selection-start-line="13" selection-start-column="50" selection-end-line="13" selection-end-column="50" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/config/routes.rb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="234">
|
|
||||||
<caret line="25" column="16" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="16" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="new.html.erb" pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/courses/new.html.erb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="216">
|
|
||||||
<caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="grades_controller.rb" pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/controllers/grades_controller.rb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="324">
|
|
||||||
<caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/homes/index.html.erb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="288">
|
|
||||||
<caret line="16" column="2" selection-start-line="16" selection-start-column="2" selection-end-line="16" selection-end-column="2" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="20161109105023_add_open_to_courses.rb" pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/db/migrate/20161109105023_add_open_to_courses.rb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="0">
|
|
||||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="courses_controller.rb" pinned="false" current-in-tab="false">
|
<file leaf-file-name="courses_controller.rb" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/app/controllers/courses_controller.rb">
|
<entry file="file://$PROJECT_DIR$/app/controllers/courses_controller.rb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="294">
|
<state relative-caret-position="2142">
|
||||||
<caret line="116" column="15" selection-start-line="116" selection-start-column="15" selection-end-line="116" selection-end-column="15" />
|
<caret line="119" column="21" selection-start-line="119" selection-start-column="21" selection-end-line="119" selection-end-column="21" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="avatar_uploader.rb" pinned="false" current-in-tab="false">
|
<file leaf-file-name="index.html.erb" pinned="false" current-in-tab="true">
|
||||||
<entry file="file://$PROJECT_DIR$/app/uploaders/avatar_uploader.rb">
|
<entry file="file://$PROJECT_DIR$/app/views/homes/index.html.erb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="486">
|
<state relative-caret-position="288">
|
||||||
<caret line="27" column="41" selection-start-line="27" selection-start-column="41" selection-end-line="27" selection-end-column="41" />
|
<caret line="16" column="39" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file leaf-file-name="homes_controller.rb" pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/controllers/homes_controller.rb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="108">
|
||||||
|
<caret line="6" column="46" selection-start-line="6" selection-start-column="46" selection-end-line="6" selection-end-column="46" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
|
|
@ -119,23 +75,57 @@
|
||||||
<file leaf-file-name="detail.erb" pinned="false" current-in-tab="false">
|
<file leaf-file-name="detail.erb" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/courses/detail.erb">
|
<entry file="file://$PROJECT_DIR$/app/views/courses/detail.erb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="432">
|
<state relative-caret-position="324">
|
||||||
<caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
|
<caret line="21" column="134" selection-start-line="21" selection-start-column="134" selection-end-line="21" selection-end-column="134" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="_form.html.erb" pinned="false" current-in-tab="false">
|
<file leaf-file-name="20160909105514_create_grades.rb" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/courses/_form.html.erb">
|
<entry file="file://$PROJECT_DIR$/db/migrate/20160909105514_create_grades.rb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="388">
|
<state relative-caret-position="54">
|
||||||
<caret line="120" column="4" selection-start-line="120" selection-start-column="4" selection-end-line="120" selection-end-column="76" />
|
<caret line="3" column="26" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="26" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
|
<file leaf-file-name="20160907152104_create_courses.rb" pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/db/migrate/20160907152104_create_courses.rb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="270">
|
||||||
|
<caret line="15" column="27" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="27" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file leaf-file-name="20161102052958_add_course_introduction_to_courses.rb" pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161102052958_add_course_introduction_to_courses.rb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="36">
|
||||||
|
<caret line="2" column="45" selection-start-line="2" selection-start-column="26" selection-end-line="2" selection-end-column="45" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file leaf-file-name="default_original.jpeg" pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/assets/images/fallback/default_original.jpeg">
|
||||||
|
<provider selected="true" editor-type-id="images">
|
||||||
|
<state />
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file leaf-file-name="default.jpg" pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/assets/images/fallback/default.jpg">
|
||||||
|
<provider selected="true" editor-type-id="images">
|
||||||
|
<state />
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
</leaf>
|
</leaf>
|
||||||
</component>
|
</component>
|
||||||
<component name="GeneratorOptions">
|
<component name="GeneratorOptions">
|
||||||
|
|
@ -145,14 +135,13 @@
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||||
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||||
<map>
|
<map>
|
||||||
<entry key="$PROJECT_DIR$" value="master" />
|
<entry key="$PROJECT_DIR$" value="dev" />
|
||||||
</map>
|
</map>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="IdeDocumentHistory">
|
<component name="IdeDocumentHistory">
|
||||||
<option name="CHANGED_PATHS">
|
<option name="CHANGED_PATHS">
|
||||||
<list>
|
<list>
|
||||||
<option value="$PROJECT_DIR$/app/views/users/transcript.html.erb" />
|
|
||||||
<option value="$PROJECT_DIR$/app/helpers/sessions_helper.rb" />
|
<option value="$PROJECT_DIR$/app/helpers/sessions_helper.rb" />
|
||||||
<option value="$PROJECT_DIR$/app/views/teachers/manage_transcript.html.erb" />
|
<option value="$PROJECT_DIR$/app/views/teachers/manage_transcript.html.erb" />
|
||||||
<option value="$PROJECT_DIR$/app/controllers/teachers_controller.rb" />
|
<option value="$PROJECT_DIR$/app/controllers/teachers_controller.rb" />
|
||||||
|
|
@ -194,15 +183,16 @@
|
||||||
<option value="$PROJECT_DIR$/db/migrate/20161108164630_add_avatar_to_courses.rb" />
|
<option value="$PROJECT_DIR$/db/migrate/20161108164630_add_avatar_to_courses.rb" />
|
||||||
<option value="$PROJECT_DIR$/app/models/course.rb" />
|
<option value="$PROJECT_DIR$/app/models/course.rb" />
|
||||||
<option value="$PROJECT_DIR$/app/views/courses/_form.html.erb" />
|
<option value="$PROJECT_DIR$/app/views/courses/_form.html.erb" />
|
||||||
<option value="$PROJECT_DIR$/app/controllers/homes_controller.rb" />
|
|
||||||
<option value="$PROJECT_DIR$/app/views/courses/index.html.erb" />
|
<option value="$PROJECT_DIR$/app/views/courses/index.html.erb" />
|
||||||
<option value="$PROJECT_DIR$/app/views/layouts/_content.html.erb" />
|
<option value="$PROJECT_DIR$/app/views/layouts/_content.html.erb" />
|
||||||
<option value="$PROJECT_DIR$/app/views/homes/index.html.erb" />
|
|
||||||
<option value="$PROJECT_DIR$/app/uploaders/avatar_uploader.rb" />
|
<option value="$PROJECT_DIR$/app/uploaders/avatar_uploader.rb" />
|
||||||
<option value="$PROJECT_DIR$/app/views/courses/detail.erb" />
|
|
||||||
<option value="$PROJECT_DIR$/config/routes.rb" />
|
<option value="$PROJECT_DIR$/config/routes.rb" />
|
||||||
<option value="$PROJECT_DIR$/app/views/courses/list.html.erb" />
|
<option value="$PROJECT_DIR$/app/views/courses/list.html.erb" />
|
||||||
<option value="$PROJECT_DIR$/app/controllers/courses_controller.rb" />
|
<option value="$PROJECT_DIR$/app/controllers/courses_controller.rb" />
|
||||||
|
<option value="$PROJECT_DIR$/README.md" />
|
||||||
|
<option value="$PROJECT_DIR$/app/views/courses/detail.erb" />
|
||||||
|
<option value="$PROJECT_DIR$/app/views/homes/index.html.erb" />
|
||||||
|
<option value="$PROJECT_DIR$/app/controllers/homes_controller.rb" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -250,6 +240,11 @@
|
||||||
<foldersAlwaysOnTop value="true" />
|
<foldersAlwaysOnTop value="true" />
|
||||||
</navigator>
|
</navigator>
|
||||||
<panes>
|
<panes>
|
||||||
|
<pane id="RailsProjectView" />
|
||||||
|
<pane id="Scratches">
|
||||||
|
<subPane />
|
||||||
|
</pane>
|
||||||
|
<pane id="Scope" />
|
||||||
<pane id="ProjectPane">
|
<pane id="ProjectPane">
|
||||||
<subPane>
|
<subPane>
|
||||||
<PATH>
|
<PATH>
|
||||||
|
|
@ -278,7 +273,25 @@
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="config" />
|
<option name="myItemId" value="db" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
</PATH>
|
||||||
|
<PATH>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="vim" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="CourseSelect" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="db" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="migrate" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
|
|
@ -344,24 +357,6 @@
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
<PATH>
|
|
||||||
<PATH_ELEMENT>
|
|
||||||
<option name="myItemId" value="vim" />
|
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
||||||
</PATH_ELEMENT>
|
|
||||||
<PATH_ELEMENT>
|
|
||||||
<option name="myItemId" value="CourseSelect" />
|
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
||||||
</PATH_ELEMENT>
|
|
||||||
<PATH_ELEMENT>
|
|
||||||
<option name="myItemId" value="app" />
|
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
||||||
</PATH_ELEMENT>
|
|
||||||
<PATH_ELEMENT>
|
|
||||||
<option name="myItemId" value="uploaders" />
|
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
||||||
</PATH_ELEMENT>
|
|
||||||
</PATH>
|
|
||||||
<PATH>
|
<PATH>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="vim" />
|
<option name="myItemId" value="vim" />
|
||||||
|
|
@ -394,11 +389,48 @@
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
|
<PATH>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="vim" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="CourseSelect" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="app" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="assets" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
</PATH>
|
||||||
|
<PATH>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="vim" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="CourseSelect" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="app" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="assets" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="images" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
</PATH>
|
||||||
</subPane>
|
</subPane>
|
||||||
</pane>
|
</pane>
|
||||||
<pane id="Scope" />
|
|
||||||
<pane id="Scratches" />
|
|
||||||
<pane id="RailsProjectView" />
|
|
||||||
</panes>
|
</panes>
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
|
|
@ -646,6 +678,11 @@
|
||||||
<workItem from="1479299887930" duration="2374000" />
|
<workItem from="1479299887930" duration="2374000" />
|
||||||
<workItem from="1479597022926" duration="1290000" />
|
<workItem from="1479597022926" duration="1290000" />
|
||||||
<workItem from="1479572693816" duration="3973000" />
|
<workItem from="1479572693816" duration="3973000" />
|
||||||
|
<workItem from="1479577369583" duration="779000" />
|
||||||
|
<workItem from="1479578250669" duration="32000" />
|
||||||
|
<workItem from="1479683655211" duration="1866000" />
|
||||||
|
<workItem from="1479924259664" duration="2601000" />
|
||||||
|
<workItem from="1479900001385" duration="4420000" />
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00001" summary="增加课程介绍，首页轮播的外观搭建">
|
<task id="LOCAL-00001" summary="增加课程介绍，首页轮播的外观搭建">
|
||||||
<created>1478067100340</created>
|
<created>1478067100340</created>
|
||||||
|
|
@ -665,7 +702,7 @@
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TimeTrackingManager">
|
<component name="TimeTrackingManager">
|
||||||
<option name="totallyTimeSpent" value="59461000" />
|
<option name="totallyTimeSpent" value="69159000" />
|
||||||
</component>
|
</component>
|
||||||
<component name="TodoView">
|
<component name="TodoView">
|
||||||
<todo-panel id="selected-file">
|
<todo-panel id="selected-file">
|
||||||
|
|
@ -680,7 +717,7 @@
|
||||||
<frame x="65" y="24" width="1855" height="1056" extended-state="6" />
|
<frame x="65" y="24" width="1855" height="1056" extended-state="6" />
|
||||||
<editor active="true" />
|
<editor active="true" />
|
||||||
<layout>
|
<layout>
|
||||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.48758963" sideWeight="0.4858757" order="1" side_tool="false" content_ui="combo" />
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22945395" sideWeight="0.4858757" order="1" side_tool="false" content_ui="combo" />
|
||||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34751773" sideWeight="0.5156082" order="0" side_tool="true" content_ui="tabs" />
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34751773" sideWeight="0.5156082" order="0" side_tool="true" content_ui="tabs" />
|
||||||
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||||
|
|
@ -723,42 +760,17 @@
|
||||||
<line>121</line>
|
<line>121</line>
|
||||||
<option name="timeStamp" value="160" />
|
<option name="timeStamp" value="160" />
|
||||||
</line-breakpoint>
|
</line-breakpoint>
|
||||||
|
<line-breakpoint enabled="true" type="ruby-line">
|
||||||
|
<url>file://$PROJECT_DIR$/app/controllers/homes_controller.rb</url>
|
||||||
|
<line>4</line>
|
||||||
|
<option name="timeStamp" value="162" />
|
||||||
|
</line-breakpoint>
|
||||||
</breakpoints>
|
</breakpoints>
|
||||||
<option name="time" value="161" />
|
<option name="time" value="163" />
|
||||||
</breakpoint-manager>
|
</breakpoint-manager>
|
||||||
<watches-manager />
|
<watches-manager />
|
||||||
</component>
|
</component>
|
||||||
<component name="editorHistoryManager">
|
<component name="editorHistoryManager">
|
||||||
<entry file="file://$USER_HOME$/.rvm/gems/ruby-2.2.4/gems/minitest-5.9.0/lib/minitest/test.rb" />
|
|
||||||
<entry file="file://$USER_HOME$/.rvm/gems/ruby-2.2.4/gems/actionpack-4.2.5.2/lib/action_dispatch/testing/assertions/response.rb" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/test/integration/user_login_test.rb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="0">
|
|
||||||
<caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/test/fixtures/users.yml">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="0">
|
|
||||||
<caret line="10" column="27" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/config/database.yml.travis">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="0">
|
|
||||||
<caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/config/database.yml">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="0">
|
|
||||||
<caret line="3" column="9" selection-start-line="3" selection-start-column="9" selection-end-line="3" selection-end-column="9" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/.travis.yml">
|
<entry file="file://$PROJECT_DIR$/.travis.yml">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="252">
|
<state relative-caret-position="252">
|
||||||
|
|
@ -817,14 +829,6 @@
|
||||||
<entry file="file://$PROJECT_DIR$/app/models/image.rb" />
|
<entry file="file://$PROJECT_DIR$/app/models/image.rb" />
|
||||||
<entry file="file://$PROJECT_DIR$/app/uploaders/image_uploader.rb" />
|
<entry file="file://$PROJECT_DIR$/app/uploaders/image_uploader.rb" />
|
||||||
<entry file="file://$PROJECT_DIR$/app/controllers/image_controller.rb" />
|
<entry file="file://$PROJECT_DIR$/app/controllers/image_controller.rb" />
|
||||||
<entry file="file://$PROJECT_DIR$/db/migrate/20161102052958_add_course_introduction_to_courses.rb" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/models/course.rb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="36">
|
|
||||||
<caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/db/migrate/20161108164630_add_avatar_to_courses.rb" />
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161108164630_add_avatar_to_courses.rb" />
|
||||||
<entry file="file://$PROJECT_DIR$/app/assets/images/background.jpg">
|
<entry file="file://$PROJECT_DIR$/app/assets/images/background.jpg">
|
||||||
<provider selected="true" editor-type-id="images">
|
<provider selected="true" editor-type-id="images">
|
||||||
|
|
@ -896,13 +900,6 @@
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/app/controllers/homes_controller.rb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="90">
|
|
||||||
<caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/controllers/users_controller.rb">
|
<entry file="file://$PROJECT_DIR$/app/controllers/users_controller.rb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="252">
|
<state relative-caret-position="252">
|
||||||
|
|
@ -910,6 +907,123 @@
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/views/users/_form.html.erb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="1152">
|
||||||
|
<caret line="64" column="58" selection-start-line="64" selection-start-column="21" selection-end-line="64" selection-end-column="58" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161109105023_add_open_to_courses.rb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="0">
|
||||||
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/views/courses/new.html.erb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="216">
|
||||||
|
<caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/views/courses/_form.html.erb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="2160">
|
||||||
|
<caret line="120" column="4" selection-start-line="120" selection-start-column="4" selection-end-line="120" selection-end-column="76" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/config/routes.rb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="450">
|
||||||
|
<caret line="25" column="16" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="16" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/README.md">
|
||||||
|
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
||||||
|
<state split_layout="SPLIT">
|
||||||
|
<first_editor relative-caret-position="396">
|
||||||
|
<caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
|
||||||
|
</first_editor>
|
||||||
|
<second_editor />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/models/course.rb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="36">
|
||||||
|
<caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/uploaders/avatar_uploader.rb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="486">
|
||||||
|
<caret line="27" column="41" selection-start-line="27" selection-start-column="41" selection-end-line="27" selection-end-column="41" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/controllers/grades_controller.rb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="324">
|
||||||
|
<caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/views/courses/list.html.erb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="1872">
|
||||||
|
<caret line="104" column="0" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/public/uploads/course/avatar/1/100520.jpeg">
|
||||||
|
<provider selected="true" editor-type-id="images">
|
||||||
|
<state />
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/public/uploads/course/avatar/1/big_aaa.png">
|
||||||
|
<provider selected="true" editor-type-id="images">
|
||||||
|
<state />
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/public/uploads/course/avatar/1/lb_aaa.png">
|
||||||
|
<provider selected="true" editor-type-id="images">
|
||||||
|
<state />
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/controllers/courses_controller.rb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="2142">
|
||||||
|
<caret line="119" column="21" selection-start-line="119" selection-start-column="21" selection-end-line="119" selection-end-column="21" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/assets/images/fallback/default_original.jpeg">
|
||||||
|
<provider selected="true" editor-type-id="images">
|
||||||
|
<state />
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/assets/images/fallback/default.jpg">
|
||||||
|
<provider selected="true" editor-type-id="images">
|
||||||
|
<state />
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161102052958_add_course_introduction_to_courses.rb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="36">
|
||||||
|
<caret line="2" column="45" selection-start-line="2" selection-start-column="26" selection-end-line="2" selection-end-column="45" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/db/migrate/20160909105514_create_grades.rb">
|
<entry file="file://$PROJECT_DIR$/db/migrate/20160909105514_create_grades.rb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="54">
|
<state relative-caret-position="54">
|
||||||
|
|
@ -918,26 +1032,26 @@
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/users/_form.html.erb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="1152">
|
|
||||||
<caret line="64" column="58" selection-start-line="64" selection-start-column="21" selection-end-line="64" selection-end-column="58" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/db/migrate/20160907152104_create_courses.rb">
|
<entry file="file://$PROJECT_DIR$/db/migrate/20160907152104_create_courses.rb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="108">
|
<state relative-caret-position="270">
|
||||||
<caret line="6" column="27" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="27" />
|
<caret line="15" column="27" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="27" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/db/migrate/20161109105023_add_open_to_courses.rb">
|
<entry file="file://$PROJECT_DIR$/app/views/courses/detail.erb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="0">
|
<state relative-caret-position="324">
|
||||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
<caret line="21" column="134" selection-start-line="21" selection-start-column="134" selection-end-line="21" selection-end-column="134" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/controllers/homes_controller.rb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="108">
|
||||||
|
<caret line="6" column="46" selection-start-line="6" selection-start-column="46" selection-end-line="6" selection-end-column="46" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
|
|
@ -945,71 +1059,7 @@
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/homes/index.html.erb">
|
<entry file="file://$PROJECT_DIR$/app/views/homes/index.html.erb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="288">
|
<state relative-caret-position="288">
|
||||||
<caret line="16" column="2" selection-start-line="16" selection-start-column="2" selection-end-line="16" selection-end-column="2" />
|
<caret line="16" column="39" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/uploaders/avatar_uploader.rb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="486">
|
|
||||||
<caret line="27" column="41" selection-start-line="27" selection-start-column="41" selection-end-line="27" selection-end-column="41" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/courses/detail.erb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="432">
|
|
||||||
<caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/controllers/grades_controller.rb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="324">
|
|
||||||
<caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/courses/new.html.erb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="216">
|
|
||||||
<caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/courses/_form.html.erb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="388">
|
|
||||||
<caret line="120" column="4" selection-start-line="120" selection-start-column="4" selection-end-line="120" selection-end-column="76" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/config/routes.rb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="234">
|
|
||||||
<caret line="25" column="16" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="16" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/controllers/courses_controller.rb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="294">
|
|
||||||
<caret line="116" column="15" selection-start-line="116" selection-start-column="15" selection-end-line="116" selection-end-column="15" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/courses/list.html.erb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="234">
|
|
||||||
<caret line="13" column="50" selection-start-line="13" selection-start-column="50" selection-end-line="13" selection-end-column="50" />
|
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,9 @@ class HomesController < ApplicationController
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@course=Course.all
|
@course=Course.all
|
||||||
@course_play=Course.order(:student_num).limit(3)
|
@course_play_first=Course.order("student_num DESC").limit(1)
|
||||||
|
@course_play=Course.order("student_num DESC").limit(3)-@course_play_first
|
||||||
|
@course_play_first=@course_play_first.take
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -7,17 +7,58 @@
|
||||||
<%= render "shared/sidenav" %>
|
<%= render "shared/sidenav" %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
<% if logged_in? %>
|
||||||
<div class="col-md-offset-3 col-sm-6">
|
<div class="col-md-offset-1 col-sm-6" >
|
||||||
|
<% else %>
|
||||||
|
<div class="col-md-offset-3 col-sm-6" >
|
||||||
|
<% end %>
|
||||||
<div class="panel panel-success">
|
<div class="panel panel-success">
|
||||||
<div class="panel-heading">
|
|
||||||
<h3 class="text-center">课程: <%= @course.name %></h3>
|
|
||||||
</div>
|
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<%= @course.course_introduction %>
|
<h1><%= @course.name %></h1>
|
||||||
<%= image_tag(@course.avatar_url(:thumb)) if !@course.avatar.blank? %>
|
<%= image_tag(@course.avatar_url, class: "img-responsive" ) if !@course.avatar.blank? %>
|
||||||
<%= image_tag "fallback/default.jpg" if @course.avatar.blank? %>
|
<%= image_tag "fallback/default_original.jpg" , class: "img-responsive" if @course.avatar.blank? %>
|
||||||
<%= @course.avatar %>
|
|
||||||
|
<h4>课程介绍：</h4>
|
||||||
|
<p><%=@course.course_introduction if !@course.course_introduction.blank? %><%="暂无课程介绍" if @course.course_introduction.blank? %></p>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-sm-3">
|
||||||
|
<h4>课程属性</h4>
|
||||||
|
<p><%=@course.course_type %></p>
|
||||||
|
</div>
|
||||||
|
<div class="col-sm-3">
|
||||||
|
<h4>授课方式</h4>
|
||||||
|
<p><%=@course.teaching_type %></p>
|
||||||
|
</div>
|
||||||
|
<div class="col-sm-3">
|
||||||
|
<h4>考试方式</h4>
|
||||||
|
<p><%=@course.exam_type %></p>
|
||||||
|
</div>
|
||||||
|
<div class="col-sm-3">
|
||||||
|
<h4>主讲教师</h4>
|
||||||
|
<p><%=@course.teacher.name %></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-sm-3">
|
||||||
|
<h4>限选/已选</h4>
|
||||||
|
<p><%=@course.limit_num if !@course.limit_num.blank? %> <%="无限选" if @course.limit_num.blank? %>/<%=@course.student_num %></p>
|
||||||
|
</div>
|
||||||
|
<div class="col-sm-3">
|
||||||
|
<h4>课时/学分</h4>
|
||||||
|
<p><%=@course.credit %></p>
|
||||||
|
</div>
|
||||||
|
<div class="col-sm-3">
|
||||||
|
<h4>时间/周数</h4>
|
||||||
|
<p><%=@course.course_time %>/<%=@course.course_week %></p>
|
||||||
|
</div>
|
||||||
|
<div class="col-sm-3">
|
||||||
|
<h4>上课教室</h4>
|
||||||
|
<p><%=@course.class_room %></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -6,18 +6,18 @@
|
||||||
</ol>
|
</ol>
|
||||||
<!-- 轮播（Carousel）项目 -->
|
<!-- 轮播（Carousel）项目 -->
|
||||||
<div class="carousel-inner">
|
<div class="carousel-inner">
|
||||||
<div class="item active" %>
|
<div class="item active">
|
||||||
<%= link_to detail_course_path(@course_play.find(1)) do %>
|
<%= link_to detail_course_path(@course_play_first) do %>
|
||||||
<%= image_tag(@course_play.find(1).avatar_url(:thumb)) if !@course_play.find(1).avatar.blank? %>
|
<%= image_tag @course_play_first.avatar_url(:thumb) if !@course_play_first.avatar.blank? %>
|
||||||
<%= image_tag "fallback/default.jpg" if @course_play.find(1).avatar.blank? %>
|
<%= image_tag "fallback/default.jpg" if @course_play_first.avatar.blank? %>
|
||||||
<div class="carousel-caption"><%= @course_play.find(1).name %></div>
|
<div class="carousel-caption"><%= @course_play_first.name %></div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<% @course_play.find(2,3).each do |play| %>
|
<% @course_play.each do |play| %>
|
||||||
<div class="item" >
|
<div class="item" >
|
||||||
<%= link_to detail_course_path(play) do %>
|
<%= link_to detail_course_path(play) do %>
|
||||||
<%= image_tag(play.avatar_url(:thumb)) if !play.avatar.blank? %>
|
<%= image_tag play.avatar_url(:thumb) if !play.avatar.blank? %>
|
||||||
<%= image_tag "fallback/default.jpg" if play.avatar.blank? %>
|
<%= image_tag "fallback/default.jpg" if play.avatar.blank? %>
|
||||||
<div class="carousel-caption"><%= play.name %></div>
|
<div class="carousel-caption"><%= play.name %></div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
@ -56,15 +56,11 @@
|
||||||
<th>课程编号</th>
|
<th>课程编号</th>
|
||||||
<th>课程名称</th>
|
<th>课程名称</th>
|
||||||
<th>课时/学分</th>
|
<th>课时/学分</th>
|
||||||
<th>限选</th>
|
|
||||||
<th>已选</th>
|
|
||||||
<th>课程属性</th>
|
<th>课程属性</th>
|
||||||
<th>授课方式</th>
|
<th>授课方式</th>
|
||||||
<th>考试方式</th>
|
<th>考试方式</th>
|
||||||
<th>主讲教师</th>
|
<th>主讲教师</th>
|
||||||
<th>time</th>
|
|
||||||
<th>week</th>
|
|
||||||
<th>room</th>
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|
@ -76,15 +72,10 @@
|
||||||
<td><%= course.course_code %></td>
|
<td><%= course.course_code %></td>
|
||||||
<td><%= link_to course.name, detail_course_path(course), class: 'btn-sm' %></td>
|
<td><%= link_to course.name, detail_course_path(course), class: 'btn-sm' %></td>
|
||||||
<td><%= course.credit %></td>
|
<td><%= course.credit %></td>
|
||||||
<td><%= course.limit_num %></td>
|
|
||||||
<td><%= course.student_num %></td>
|
|
||||||
<td><%= course.course_type %></td>
|
<td><%= course.course_type %></td>
|
||||||
<td><%= course.teaching_type %></td>
|
<td><%= course.teaching_type %></td>
|
||||||
<td><%= course.exam_type %></td>
|
<td><%= course.exam_type %></td>
|
||||||
<td><%= course.teacher.name %></td>
|
<td><%= course.teacher.name %></td>
|
||||||
<td><%= course.course_time %></td>
|
|
||||||
<td><%= course.course_week %></td>
|
|
||||||
<td><%= course.class_room %></td>
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue