Merge branch 'V20211228' into fix-1218

templates/org/select_pro.tmpl

@@ -28,6 +28,7 @@
 	} 
     .descript_height{
         color: #101010 !important;
+        margin: 10px 0;
         height: 40px !important;
         word-break:break-all;
         line-height: 20px; 
@@ -47,6 +48,7 @@
     /deep/ ui.checkbox input[type=checkbox]::after{
         border: 1px solid #0366D6 !important;
     }
+
 </style>
 <div class="ui stackable grid">
     <div style="width: 100%;margin:15px 0;">
@@ -70,24 +72,27 @@
                             <div class="card" >
                             
                                 <div class="extra full_height" >
-                                    <div class=" header ">
+                                    <div class=" header " style="overflow: hidden; white-space: nowrap; text-overflow: ellipsis;">
                                         <a class="header_card" href="{{.Link}}">  {{.Name}}</a>
                                     </div>
                                     <div class='content descript_height'>
                                         {{.Description}}
                                     </div>
                                     
-                                    
-                                    <div class="content tags_height" style="margin-top: 5px;">
+                                   
+                                    <div class="content " >
                                         {{if .Topics }}
-                                            <div class=" ui tags ">
+                                            <div class=" ui tags " >
                                                 {{range .Topics}}
-                                                    {{if ne . "" }}<a href="{{AppSubUrl}}/explore/repos?q={{.}}&topic={{$.Topic}}"><div class="ui small label topic">{{.}}</div></a>{{end}}
-                                                {{end}}
+                                                        {{if ne . "" }}<a style="margin: 5px 0;width: 100%;overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" href="{{AppSubUrl}}/explore/repos?q={{.}}&topic={{$.Topic}}"><div class="ui small label topic"  >{{.}}</div></a>{{end}}
+                                                    {{end}}
                                             </div>
                                         {{end}}
-                                    </div>
-                                
+                                    </div> 
+                                   
+                                    
+                                </div>
+                                <div class=" extra " style="color:#888888;border-top: none !important">
                                     <div class="ui mini right compact marg" >
                                         <a class="item marg ">
                                             {{svg "octicon-eye" 16}} {{.NumWatches}}
@@ -100,9 +105,6 @@
                                         </a>
                                         
                                     </div>
-
-                                    
-                                    
                                 </div>
                             </div>   
                         {{end}}
@@ -133,7 +135,7 @@
         </div>
         <p id='recommend'></p>
        
-        <div class="inline field" style="margin-left: 30%;">
+        <div class="inline field" style="margin-left: 37%;">
             <div class="actions">
                 <button id="submitId" type="button" class="ui create_train_job green deny button"  onclick="saveSeletedPro(1)">
                     {{.i18n.Tr "explore.save"}}
@@ -171,7 +173,7 @@
 
         $.ajax({
             type:"GET",
-            url:"/org/{{.Org.DisplayName}}/org_tag/repo_list?tagId="+typeTag,
+            url:"/org/{{.Org.Name}}/org_tag/repo_list?tagId="+typeTag,
             dataType:"json",
             async:false,
             success:function(json){
@@ -179,7 +181,7 @@
                 var n_length = data.length
                 pro_html = getHTML(data)
                 $("#org_list").append(pro_html)
-                console.log('原始',data)
+                // console.log('原始',data)
                 checkedNum(0)
             }
         });
@@ -214,7 +216,7 @@
         // console.log("数据：",saveData)
         $.ajax({
          type:"POST",
-         url:"/org/{{.Org.DisplayName}}/org_tag/repo_submit?tagId="+typeTag,
+         url:"/org/{{.Org.Name}}/org_tag/repo_submit?tagId="+typeTag,
          contentType:'application/json',
          dataType:"json",
          async:false,