From 9bc56a5adfd00fa65c6414044e81e5a58eafcab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 15 Nov 2019 14:40:30 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../competitions/Competitimain/CompetitionsIndex.js | 1 - .../Competitimain/Competitionsindex.css | 1 - .../src/modules/courses/coursesHome/CoursesHome.js | 1 - public/react/src/modules/moop_cases/CaseList.js | 13 ++++++++++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js index 6fd4d7db7..e747a81e3 100644 --- a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js +++ b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js @@ -78,7 +78,6 @@ class CompetitionsIndex extends Component{ height: 300px; background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.competition_banner_url === null ?`images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.competition_banner_url)}); background-color: #081C4B; - background-size: cover; background-position: center; background-repeat: no-repeat; } diff --git a/public/react/src/modules/competitions/Competitimain/Competitionsindex.css b/public/react/src/modules/competitions/Competitimain/Competitionsindex.css index 6aa2fd641..cddb1492b 100644 --- a/public/react/src/modules/competitions/Competitimain/Competitionsindex.css +++ b/public/react/src/modules/competitions/Competitimain/Competitionsindex.css @@ -153,7 +153,6 @@ .Competitionshead{ background-color: #2d28ba !important; - background-size: cover !important; background-position: center !important; background-position: 50% !important; background-repeat: no-repeat !important; diff --git a/public/react/src/modules/courses/coursesHome/CoursesHome.js b/public/react/src/modules/courses/coursesHome/CoursesHome.js index a2f664c0a..d4e4609f6 100644 --- a/public/react/src/modules/courses/coursesHome/CoursesHome.js +++ b/public/react/src/modules/courses/coursesHome/CoursesHome.js @@ -119,7 +119,6 @@ class CoursesHome extends Component{ height: 300px; background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.course_banner_url === null ?`images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.course_banner_url)}); background-color: #081C4B; - background-size: cover; background-position: center; background-repeat: no-repeat; } diff --git a/public/react/src/modules/moop_cases/CaseList.js b/public/react/src/modules/moop_cases/CaseList.js index f0b58d9f4..fe2331d9a 100644 --- a/public/react/src/modules/moop_cases/CaseList.js +++ b/public/react/src/modules/moop_cases/CaseList.js @@ -98,7 +98,18 @@ class CaseList extends Component{ return( - + +

From 06b361a497ea57b7affb211f2b2195f2bceacd1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 15 Nov 2019 14:50:32 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/exercise/yslexercisetable.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/exercise/yslexercisetable.css b/public/react/src/modules/courses/exercise/yslexercisetable.css index 7092815d0..f984ba970 100644 --- a/public/react/src/modules/courses/exercise/yslexercisetable.css +++ b/public/react/src/modules/courses/exercise/yslexercisetable.css @@ -58,5 +58,5 @@ .columnstwoachievement{ width: 199px; text-align: right !important; - padding-right: 60px !important; + padding-right: 97px !important; } From 1770b2ed17b03ae86f821c351bf7f74e3b32a3e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 15 Nov 2019 15:41:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/NewHeader.js | 15 +++++++-------- .../src/modules/user/usersInfo/InfosBanner.js | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 2c6372d66..fc633c975 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -872,7 +872,6 @@ submittojoinclass=(value)=>{ } } - // console.log("NewHeadergetHelmetapi432423423423"); // console.log(mygetHelmetapi2); // console.log("NewHeadermygetHelmetapi123123123123"); @@ -1234,11 +1233,11 @@ submittojoinclass=(value)=>{

    @@ -1307,9 +1306,9 @@ submittojoinclass=(value)=>{ {/* /courses/join_course_multi_role */} -
  • + {this.props.user&&this.props.user.main_site===true?
  • 加入开发项目 -
    • + :""} {tojoinitemtype===true? this.setState({moduleName: 'paths'})} to={`/users/${username}/paths`}>实践课程 } -
  • + {this.props.user&&this.props.user.main_site===true?
  • this.setState({moduleName: 'projects'})} to={`/users/${username}/projects`}>开发项目 -
    • + :""} {/*
  • */} {/* this.setState({moduleName: 'package'})}*/} From 253ab8d3e5cec71875ed93e473a4156f2080ba69 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 15 Nov 2019 15:57:59 +0800 Subject: [PATCH 4/6] laboratory manage: setting modify --- app/views/cooperative/laboratory_settings/edit.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/cooperative/laboratory_settings/edit.html.erb b/app/views/cooperative/laboratory_settings/edit.html.erb index 4dc350610..a3e165627 100644 --- a/app/views/cooperative/laboratory_settings/edit.html.erb +++ b/app/views/cooperative/laboratory_settings/edit.html.erb @@ -145,7 +145,7 @@ <% (setting.navbar || setting.default_navbar).each do |nav| %> - + <%= text_field_tag('navbar[][name]', nav['name'], id: nil, class: 'form-control') %> <%= text_field_tag('navbar[][link]', nav['link'], id: nil, class: 'form-control') %> From 00662666cdb7f156380a46bb2b41909ffb24fb89 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 15 Nov 2019 16:04:42 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=99=AE=E9=80=9A=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=98=BE=E7=A4=BA=E7=8A=B6=E6=80=81=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/busyWork/CommonWorkSetting.js | 2 +- .../src/modules/courses/common/comments/CCommentItem.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js index 9e4b9f4b8..30c418eef 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js @@ -1143,7 +1143,7 @@ class CommonWorkSetting extends Component{ rules={rules} course_group={adaptered_group_settings} rulesCheckInfo={(info)=>this.rulesCheckInfo(info)} - flagPageEdit={true} + flagPageEdit={startEditFlag} moduleName="作业" > } diff --git a/public/react/src/modules/courses/common/comments/CCommentItem.js b/public/react/src/modules/courses/common/comments/CCommentItem.js index 5d904a36b..1d61bc428 100644 --- a/public/react/src/modules/courses/common/comments/CCommentItem.js +++ b/public/react/src/modules/courses/common/comments/CCommentItem.js @@ -173,7 +173,8 @@ class CCommentItem extends Component{ return parent.journals.map(item => { //
    {item.content} {item.user_info.user_name}
    - // src={getImageUrl(`images/${item.image_url}`)} + // src={getImageUrl(`images/${item.image_url}`)} + const imgSrc = (!item.user_info.user_image_url || item.user_info.user_image_url === '--') ? `${getUrl()}/images/edu_user/anony.png` : item.user_info.user_image_url; return (
    @@ -184,7 +185,7 @@ class CCommentItem extends Component{ : 用户头像 }
    From a5375692d47d951c492a11ff5a89efa3324a0435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 15 Nov 2019 16:04:59 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/Resource/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js index c63348c83..d6e2bf650 100644 --- a/public/react/src/modules/courses/Resource/index.js +++ b/public/react/src/modules/courses/Resource/index.js @@ -827,7 +827,7 @@ class Fileslists extends Component{ {this.props.isAdmin()?this.addDir()} className={"mr30 font-16"}>新建目录:""} {this.props.isAdmin()?parseInt(this.props.match.params.main_id)!=parseInt(this.props.coursesids)?this.editDir(name)} className={"mr30 font-16"}>目录重命名:"":""} - {this.props.isAdmin()||this.props.isStudent() ? this.addResource()}>选用资源:""} + {this.props.isAdmin()||this.props.isStudent() ? this.props.user&&this.props.user.main_site===true? this.addResource()}>选用资源:"":""} {this.props.isAdmin()||this.props.isStudent() ? this.sendResources()}>上传资源:""} }