#4639 #4634、#4636、#4548

Merged
zouap merged 4 commits from fix-csh into V20230828 8 months ago
  1. +4
    -4
      templates/base/head_navbar.tmpl
  2. +4
    -4
      templates/base/head_navbar_fluid.tmpl
  3. +4
    -4
      templates/base/head_navbar_home.tmpl
  4. +4
    -4
      templates/base/head_navbar_pro.tmpl
  5. +1
    -1
      templates/repo/datasets/index.tmpl
  6. +3
    -0
      web_src/js/index.js

+ 4
- 4
templates/base/head_navbar.tmpl View File

@@ -58,13 +58,13 @@
{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
{{end}}
<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
</div>
</div>
<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
{{else if .IsLandingPageHome}}
<div class="item edge">
<div class="dropdown-menu">
@@ -106,13 +106,13 @@
{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
{{end}}
<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
</div>
</div>
<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
{{else if .IsLandingPageExplore}}
<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos/square">{{.i18n.Tr "home"}}</a>
{{else if .IsLandingPageOrganizations}}


+ 4
- 4
templates/base/head_navbar_fluid.tmpl View File

@@ -55,12 +55,12 @@
{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
{{end}}
<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
</div>
</div>
<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
{{else if .IsLandingPageHome}}
<div class="item edge" >
<div class="dropdown-menu">
@@ -100,13 +100,13 @@
{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
{{end}}
<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
</div>
</div>
<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
{{else if .IsLandingPageExplore}}
<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos/square">{{.i18n.Tr "home"}}</a>
{{else if .IsLandingPageOrganizations}}


+ 4
- 4
templates/base/head_navbar_home.tmpl View File

@@ -47,13 +47,13 @@
{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
{{end}}
<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
</div>
</div>
<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
{{else if .IsLandingPageHome}}
<div class="item edge" >
<div class="dropdown-menu">
@@ -94,13 +94,13 @@
{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
{{end}}
<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
</div>
</div>
<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
{{else if .IsLandingPageExplore}}
<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos/square">{{.i18n.Tr "home"}}</a>
{{else if .IsLandingPageOrganizations}}


+ 4
- 4
templates/base/head_navbar_pro.tmpl View File

@@ -57,13 +57,13 @@
{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
{{end}}
<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
</div>
</div>
<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
{{else if .IsLandingPageHome}}
<div class="item edge">
<div class="dropdown-menu">
@@ -104,13 +104,13 @@
{{/* <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> */}}
<a class="item" href="{{AppSubUrl}}/kanban/index.html" target="_blank" rel="opener">{{.i18n.Tr "explore.data_analysis"}}</a>
{{end}}
<a class="item" target="_blank" href="https://course.openi.org.cn"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=9c23803d-b190-4b33-a59a-01a65f439bce&redirect_uri=https://course.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.course"}}</span></a>
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
<a class="item" href="{{AppSubUrl}}/tech/tech_view">科技2030项目</a>
</div>
</div>
<a class="item" target="_blank" href="https://bbs.openi.org.cn/"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
<a class="item" target="_blank" href="https://openi.pcl.ac.cn/login/oauth/authorize?client_id=08ed2763-e77b-4326-b06d-fab35338fe05&redirect_uri=https://bbs.openi.org.cn/auth/openi/login&response_type=code&state=STATE"><span class="menu-new">{{.i18n.Tr "custom.head.forum"}}</span></a>
{{else if .IsLandingPageExplore}}
<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos/square">{{.i18n.Tr "home"}}</a>
{{else if .IsLandingPageOrganizations}}


+ 1
- 1
templates/repo/datasets/index.tmpl View File

@@ -180,7 +180,7 @@
<i class="ri-heart-fill" ></i>
<span style="margin-left: 0.3rem;font-size: 0.7rem;">{{$.i18n.Tr "dataset.unfavorite"}}</span>
</button>
<button v-else class="ui mini basic button" style="display: flex;align-items: center;padding:0.5rem;border: #888888;border-top-right-radius: 0;border-bottom-right-radius: 0;margin-right: -1px;">
<button v-else class="ui mini basic button" style="display: flex;align-items: center;padding:0.5rem;border: #888888;border-top-right-radius: 0;border-bottom-right-radius: 0;margin-right: -1px;" @click="goLogin">
<i class="ri-heart-line" style="color: #FA8C16;"></i>
<span style="margin-left: 0.3rem;font-size: 0.7rem;">{{$.i18n.Tr "dataset.favorite"}}</span>
</button>


+ 3
- 0
web_src/js/index.js View File

@@ -4285,6 +4285,9 @@ function initVueDataset() {
console.log(err);
});
},
goLogin() {
window.location.href = `/user/login?redirect_to=${encodeURIComponent(window.location.href)}`;
},
postStar(id, link) {
if (this.star_active) {
let url = link + "/" + id + "/unstar";


Loading…
Cancel
Save