| @@ -84,22 +84,6 @@ | |||||
| <div class="organization profile"> | <div class="organization profile"> | ||||
| {{/* overflow: auto is the clearfix - this avoids the image going beyond | {{/* overflow: auto is the clearfix - this avoids the image going beyond | ||||
| the container where it is supposed to stay inside. */}} | the container where it is supposed to stay inside. */}} | ||||
| <!-- <div class="organization-info"> | |||||
| <div class="ui center aligned container " style="overflow: auto"> | |||||
| <img class="ui circular image" id="org-avatar" src="{{.Org.SizedRelAvatarLink 140}}"/> | |||||
| <div id="org-info"> | |||||
| <div class="ui header"> | |||||
| {{.Org.DisplayName}} | |||||
| {{if .IsOrganizationOwner}}<a class="middle text grey" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16}}</a>{{end}} | |||||
| </div> | |||||
| {{if .Org.Description}}<p class="text grey desc">{{.Org.Description}}</p>{{end}} | |||||
| <div class="meta"> | |||||
| {{if .Org.Location}}<div class="item">{{svg "octicon-location" 16}} <span>{{.Org.Location}}</span></div>{{end}} | |||||
| {{if .Org.Website}}<div class="item">{{svg "octicon-link" 16}} <a target="_blank" rel="noopener noreferrer" href="{{.Org.Website}}">{{.Org.Website}}</a></div>{{end}} | |||||
| </div> | |||||
| </div> | |||||
| </div> | |||||
| </div> --> | |||||
| <div class="organization-info organization-info_1000"> | <div class="organization-info organization-info_1000"> | ||||
| <div class="ui center aligned container " style="overflow: auto"> | <div class="ui center aligned container " style="overflow: auto"> | ||||
| @@ -107,7 +91,6 @@ | |||||
| <div class="content" style="text-align: left;margin-left:100px" > | <div class="content" style="text-align: left;margin-left:100px" > | ||||
| <div class="ui header" > | <div class="ui header" > | ||||
| {{.Org.DisplayName}} | {{.Org.DisplayName}} | ||||
| <!-- {{if .IsOrganizationOwner}}<a class="middle text grey" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16}}</a>{{end}} --> | |||||
| </div> | </div> | ||||
| <div class="description" > | <div class="description" > | ||||
| {{if .Org.Description}}<p class="text grey desc">{{.Org.Description}}</p>{{end}} | {{if .Org.Description}}<p class="text grey desc">{{.Org.Description}}</p>{{end}} | ||||
| @@ -120,23 +103,7 @@ | |||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| {{template "org/navber_course" .}} | |||||
| <!-- <div class="ui container " style="overflow: auto"> | |||||
| <img class="ui left image" id="org-avatar" src="{{.Org.SizedRelAvatarLink 140}}"/> | |||||
| <p id="org-info"> | |||||
| <div class="ui header"> | |||||
| {{.Org.DisplayName}} | |||||
| {{if .IsOrganizationOwner}}<a class="middle text grey" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16}}</a>{{end}} | |||||
| </div> | |||||
| {{if .Org.Description}}<p class="text grey desc">{{.Org.Description}}</p>{{end}} | |||||
| <div class="meta"> | |||||
| {{if .Org.Location}}<div class="item">{{svg "octicon-location" 16}} <span>{{.Org.Location}}</span></div>{{end}} | |||||
| {{if .Org.Website}}<div class="item">{{svg "octicon-link" 16}} <a target="_blank" rel="noopener noreferrer" href="{{.Org.Website}}">{{.Org.Website}}</a></div>{{end}} | |||||
| </div> | |||||
| </p> | |||||
| </div> --> | |||||
| {{template "org/navber_course" .}} | |||||
| <div class="ui container"> | <div class="ui container"> | ||||
| @@ -148,11 +115,13 @@ | |||||
| <div class="ui ten wide tablet eleven wide computer column" id='tag'> | <div class="ui ten wide tablet eleven wide computer column" id='tag'> | ||||
| <a class="{{if eq $.Keyword "" }} tag_bg {{end}} tag_key ui small tag_lable topic omit" href="{{$.Link}}?" >全部关键字</span></a> | <a class="{{if eq $.Keyword "" }} tag_bg {{end}} tag_key ui small tag_lable topic omit" href="{{$.Link}}?" >全部关键字</span></a> | ||||
| {{range .CoursesKeywords}} | {{range .CoursesKeywords}} | ||||
| <!-- <a class="ui small lable tag_lable topic" >{{.}}</a> --> | |||||
| <a class="{{if eq $.Keyword . }} tag_bg {{end}} tag_key ui small tag_lable topic omit" href="{{$.Link}}?q={{.}}" > | |||||
| {{.}} | |||||
| </a> | |||||
| {{if ne . ""}} | |||||
| <a class="{{if eq $.Keyword . }} tag_bg {{end}} tag_key ui small tag_lable topic omit" href="{{$.Link}}?q={{.}}" > | |||||
| {{.}} | |||||
| </a> | |||||
| {{end}} | |||||
| {{end}} | {{end}} | ||||
| </div> | </div> | ||||
| @@ -174,11 +143,6 @@ | |||||
| <div class="ui sixteen wide computer column"> | <div class="ui sixteen wide computer column"> | ||||
| <div class="ui mobile reversed stackable grid"> | <div class="ui mobile reversed stackable grid"> | ||||
| <div class="ui ten wide tablet eleven wide computer column"> | <div class="ui ten wide tablet eleven wide computer column"> | ||||
| <!-- {{if .CanCreateOrgRepo}} | |||||
| <div class="text right"> | |||||
| <a class="ui green button" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{.i18n.Tr "new_repo"}}</a> | |||||
| </div> | |||||
| {{end}} --> | |||||
| {{template "org/course_list" .}} | {{template "org/course_list" .}} | ||||
| {{template "base/paginate" .}} | {{template "base/paginate" .}} | ||||
| </div> | </div> | ||||
| @@ -190,9 +154,6 @@ | |||||
| <div class="ui right"> | <div class="ui right"> | ||||
| <a class="text grey" id="model" onclick="showcreate()">{{svg "octicon-gear" 16}}</a> | <a class="text grey" id="model" onclick="showcreate()">{{svg "octicon-gear" 16}}</a> | ||||
| </div> | </div> | ||||
| <!-- {{if .IsOrganizationMember}} --> | |||||
| <!-- {{end}} --> | |||||
| </h4> | </h4> | ||||
| <div class="ui attached table segment course items noborder"> | <div class="ui attached table segment course items noborder"> | ||||
| @@ -209,9 +170,9 @@ | |||||
| <a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a> | <a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a> | ||||
| <p class="text grey"> | <p class="text grey"> | ||||
| {{if ne .CreatorID 0}} | {{if ne .CreatorID 0}} | ||||
| 贡献者:{{.Creator.Name}} | |||||
| 贡献者:{{.Creator.Name}} | |||||
| {{else}} | {{else}} | ||||
| 贡献者:{{.Owner.Name}} | |||||
| 贡献者:{{.Owner.Name}} | |||||
| {{end}} | {{end}} | ||||
| </p> | </p> | ||||
| </div> | </div> | ||||
| @@ -229,9 +190,6 @@ | |||||
| <div class="ui right"> | <div class="ui right"> | ||||
| <a class="text grey" href="{{.OrgLink}}/members">{{.MembersTotal}} {{svg "octicon-chevron-right" 16}}</a> | <a class="text grey" href="{{.OrgLink}}/members">{{.MembersTotal}} {{svg "octicon-chevron-right" 16}}</a> | ||||
| </div> | </div> | ||||
| <!-- {{if .IsOrganizationMember}} --> | |||||
| <!-- {{end}} --> | |||||
| </h4> | </h4> | ||||
| <div class="ui attached segment members noborder"> | <div class="ui attached segment members noborder"> | ||||
| {{$isMember := .IsOrganizationMember}} | {{$isMember := .IsOrganizationMember}} | ||||
| @@ -311,30 +269,6 @@ | |||||
| {{template "base/footer" .}} | {{template "base/footer" .}} | ||||
| <script> | <script> | ||||
| // var div = document.getElementsByClassName("ui ten wide tablet eleven wide computer column").getElementsByTagName("a"); | |||||
| // function changeBgcolor(){ | |||||
| // document.getElementsByClassName("ui small lable tag_lable topic tag_bg").className= "ui small lable tag_lable topic"; | |||||
| // // this.classList.add("tag_bg") | |||||
| // } | |||||
| // window.onload = function (){ | |||||
| // // function changeBgcolor (obj){ | |||||
| // // document.getElementsByTagName("search_selectPro").value='' | |||||
| // // obj.getElementsByTagName('span').className = "ui small tag_lable topic omit tag_bg"; | |||||
| // var atag =document.getElementById("tag").getElementsByTagName("a"); | |||||
| // var i = 0; | |||||
| // for (i = 0; i < atag.length; i++){ | |||||
| // atag[i].onclick = function () | |||||
| // { | |||||
| // for (i = 0; i < atag.length; i++) | |||||
| // atag[i].getElementsByTagName('span')[0].className = "ui small tag_lable topic omit"; | |||||
| // this.getElementsByTagName('span')[0].className = "ui small tag_lable topic omit tag_bg"; | |||||
| // }; | |||||
| // } | |||||
| // }; | |||||
| var data; | var data; | ||||
| var filterData=[]; | var filterData=[]; | ||||
| var num=0; | var num=0; | ||||
| @@ -390,7 +324,7 @@ | |||||
| function saveSeletedPro(typeTag){ | function saveSeletedPro(typeTag){ | ||||
| var saveData=[]; | var saveData=[]; | ||||
| $('input[name="select_pro_name"]:checked').each(function(){ | $('input[name="select_pro_name"]:checked').each(function(){ | ||||
| console.log('值',this.dataset.repoid) | |||||
| // console.log('值',this.dataset.repoid) | |||||
| saveData.push(parseInt(this.dataset.repoid)); | saveData.push(parseInt(this.dataset.repoid)); | ||||
| }) | }) | ||||
| @@ -398,8 +332,7 @@ | |||||
| alert("最多可选9个,保存失败") | alert("最多可选9个,保存失败") | ||||
| return | return | ||||
| } | } | ||||
| // saveData = getSelecteDataID(); | |||||
| // console.log("数据:",saveData) | |||||
| $.ajax({ | $.ajax({ | ||||
| type:"POST", | type:"POST", | ||||
| url:"/org/{{.Org.Name}}/org_tag/repo_submit?tagId="+typeTag, | url:"/org/{{.Org.Name}}/org_tag/repo_submit?tagId="+typeTag, | ||||
| @@ -409,7 +342,7 @@ | |||||
| data:JSON.stringify({'repoList':saveData | data:JSON.stringify({'repoList':saveData | ||||
| }), | }), | ||||
| success:function(res){ | success:function(res){ | ||||
| console.log('保存成功'); | |||||
| // console.log('保存成功'); | |||||
| location.reload() | location.reload() | ||||
| } | } | ||||
| @@ -437,15 +370,15 @@ | |||||
| filterData.push(data[i]) | filterData.push(data[i]) | ||||
| } | } | ||||
| } | } | ||||
| console.log("选中的值:",selectedData) | |||||
| console.log("筛选包括选中的值:",filterData) | |||||
| // console.log("选中的值:",selectedData) | |||||
| // console.log("筛选包括选中的值:",filterData) | |||||
| var showData=[]; | var showData=[]; | ||||
| for(i=0;i<selectedData.length;i++){ | for(i=0;i<selectedData.length;i++){ | ||||
| filterData =filterData.filter((item)=>{ | filterData =filterData.filter((item)=>{ | ||||
| return item.RepoID!=selectedData[i].RepoID | return item.RepoID!=selectedData[i].RepoID | ||||
| }); | }); | ||||
| } | } | ||||
| console.log("筛选后不包括选中的值:",filterData) | |||||
| // console.log("筛选后不包括选中的值:",filterData) | |||||
| $("#org_list").empty() | $("#org_list").empty() | ||||
| if(searchValue!=""){ | if(searchValue!=""){ | ||||
| if (filterData.length!=0){ | if (filterData.length!=0){ | ||||