Merge remote-tracking branch 'origin/V20211228' into zouap

options/locale/locale_en-US.ini

@@ -1131,6 +1131,7 @@ issues.filter_label_exclude = `Use <code>alt</code> + <code>click/enter</code> t
 issues.filter_label_no_select = All labels
 issues.filter_milestone = Milestone
 issues.filter_milestone_no_select = All milestones
+issues.filter_milestone_no_add =  Not add milestones 
 issues.filter_assignee = Assignee
 issues.filter_assginee_no_select = All assignees
 issues.filter_type = Type

options/locale/locale_zh-CN.ini

@@ -1141,6 +1141,7 @@ issues.filter_label_exclude=`使用 <code>alt</code> + <code>鼠标左键 / 回
 issues.filter_label_no_select=所有标签
 issues.filter_milestone=里程碑筛选
 issues.filter_milestone_no_select=所有里程碑
+issues.filter_milestone_no_add=未添加里程碑
 issues.filter_assignee=指派人筛选
 issues.filter_assginee_no_select=所有指派成员
 issues.filter_type=类型筛选

templates/repo/issue/list.tmpl

@@ -1,3 +1,11 @@
+<style>
+	.repository .filter.menu.labels .svg{
+		margin-right: 2px !important;
+	}
+	.ovfl{
+		overflow-y:hidden !important;
+	}
+</style>
 {{template "base/head" .}}
 <div class="repository">
 	{{template "repo/header" .}}
@@ -57,16 +65,41 @@
 					</div>
 
 					<!-- Milestone -->
-					<div class="ui {{if not .Milestones}}disabled{{end}} dropdown jump item">
+					<div class="ui {{if and (not .OpenMilestones) (not .ClosedMilestones)}}disabled{{end}} dropdown jump item">
 						<span class="text">
 							{{.i18n.Tr "repo.issues.filter_milestone"}}
 							<i class="dropdown icon"></i>
 						</span>
 						<div class="menu">
 							<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_milestone_no_select"}}</a>
-							{{range .Milestones}}
-								<a class="{{if eq $.MilestoneID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}&assignee={{$.AssigneeID}}">{{.Name}}</a>
-							{{end}}
+							<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone=-1&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_milestone_no_add"}}</a>
+						
+											
+							{{if .OpenMilestones}}
+								<div class="divider" ></div>
+								<div class="header ovfl"  >
+									{{svg "octicon-milestone" 12 }}
+									{{.i18n.Tr "repo.issues.new.open_milestone"}}
+								</div>
+								{{range .OpenMilestones}}
+									<a  class="{{if eq $.MilestoneID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}&assignee={{$.AssigneeID}}">
+										{{.Name}}
+									</a>
+								{{end}}
+						  	{{end}}
+
+							{{if .ClosedMilestones}}
+							    <div class="divider"></div>
+							    <div class="header ovfl" >
+									{{svg "octicon-milestone" 12}}
+									{{.i18n.Tr "repo.issues.new.closed_milestone"}}
+							     </div>
+							    {{range .ClosedMilestones}}
+								<a  class="{{if eq $.MilestoneID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}&assignee={{$.AssigneeID}}">
+									{{.Name}}
+								</a>
+								{{end}}
+							{{end}}							
 						</div>
 					</div>
 

web_src/js/components/MinioUploader.vue

@@ -52,7 +52,7 @@ export default {
     previewTemplate +=
       '            <span data-dz-name data-dz-thumbnail></span>';
     previewTemplate += '        </div>\n    ';
-    previewTemplate += '        <div class="dz-size" data-dz-size></div>\n  ';
+    previewTemplate += '        <div class="dz-size" data-dz-size style="white-space: nowrap"></div>\n  ';
     previewTemplate += '    </div>\n  ';
     previewTemplate += '    <div class="dz-progress ui active progress">';
     previewTemplate +=

web_src/js/components/ObsUploader.vue

@@ -53,7 +53,7 @@ export default {
     previewTemplate +=
       '            <span data-dz-name data-dz-thumbnail></span>';
     previewTemplate += '        </div>\n    ';
-    previewTemplate += '        <div class="dz-size" data-dz-size></div>\n  ';
+    previewTemplate += '        <div class="dz-size" data-dz-size style="white-space: nowrap"></div>\n  ';
     previewTemplate += '    </div>\n  ';
     previewTemplate += '    <div class="dz-progress ui active progress">';
     previewTemplate +=