Ver código fonte

upgrade new issue to SUI v2

Unknwon 9 anos atrás
pai
commit
48f12d4ead

+ 1 - 0
conf/locale/locale_en-US.ini

@@ -399,6 +399,7 @@ issues.label_deletion_success = Label has been deleted successfully!
 
 pulls.compare_changes = Compare Changes
 pulls.compare_changes_desc = Compare two branches and make a pull request for changes.
+pulls.no_results = No results found.
 
 milestones.new = New Milestone
 milestones.open_tab = %d Open

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
modules/bindata/bindata.go


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
public/css/gogs.min.css


+ 4 - 2
public/js/gogs.js

@@ -104,11 +104,13 @@ function initRepository() {
 
     // Pull request
     if ($('.repository.compare.pull').length > 0) {
-        $('.choose.branch .dropdown').dropdown({
+        var $branch_dropdown = $('.choose.branch .dropdown')
+        $branch_dropdown.dropdown({
             fullTextSearch: true,
             onChange: function (text, value, $choice) {
                 window.location.href = $choice.data('url');
-            }
+            },
+            message: {noResults: $branch_dropdown.data('no-results')}
         });
     }
 };

+ 3 - 0
public/less/_base.less

@@ -63,6 +63,9 @@ img {
 		&.red {
 			color: #d95c5c!important;
 		}
+		&.right {
+			text-align: right;
+		}
 	}
 
 	.message {

+ 1 - 1
public/less/_form.less

@@ -21,7 +21,7 @@
 		}
 		@input-padding: 250px !important;
 		.header {
-			padding-left: @input-padding+20px;
+			padding-left: @input-padding+30px;
 		}
 		.inline.field > label {
 			text-align: right;

+ 2 - 4
templates/repo/issue/new.tmpl

@@ -1,14 +1,12 @@
 {{template "base/head" .}}
 <div class="repository new issue">
 	{{template "repo/header" .}}
-	<div class="ui middle page grid body">
+	<div class="ui container">
 		<div class="navbar">
 			{{template "repo/issue/navbar" .}}
 		</div>
 		<div class="ui divider"></div>
-		<div class="sixteen wide column page grid">
-			{{template "repo/issue/new_form" .}}
-		</div>
+		{{template "repo/issue/new_form" .}}
 	</div>
 </div>
 {{template "base/footer" .}}

+ 9 - 6
templates/repo/issue/new_form.tmpl

@@ -27,16 +27,19 @@
 			         {{.i18n.Tr "repo.release.loading"}}
 			      </div>
 		      </div>
-					<button class="ui right green button">
-						{{.i18n.Tr "repo.issues.create"}}
-					</button>
+		      <div class="text right">
+						<button class="ui green button">
+							{{.i18n.Tr "repo.issues.create"}}
+						</button>
+		      </div>
 		    </div>
 		  </div>
 		</div>
 	</div>
+
 	<div class="four wide column">
 		<div class="ui segment metas">
-			<div class="ui {{if .Labels}}disabled{{end}} pointing dropdown jump item">
+			<div class="ui {{if .Labels}}disabled{{end}} dropdown jump item">
 				<span class="text">
 					<strong>{{.i18n.Tr "repo.issues.new.labels"}}</strong>
 					<span class="octicon octicon-gear"></span>
@@ -52,7 +55,7 @@
 				<span class="item">filter_label_no_select</span>
 			</div>
 			<div class="ui divider"></div>
-			<div class="ui {{if .Labels}}disabled{{end}} pointing dropdown jump item">
+			<div class="ui {{if .Labels}}disabled{{end}} dropdown jump item">
 				<span class="text">
 					<strong>{{.i18n.Tr "repo.issues.new.labels"}}</strong>
 					<span class="octicon octicon-gear"></span>
@@ -68,7 +71,7 @@
 				<span class="item">filter_label_no_select</span>
 			</div>
 			<div class="ui divider"></div>
-			<div class="ui {{if .Labels}}disabled{{end}} pointing dropdown jump item">
+			<div class="ui {{if .Labels}}disabled{{end}} dropdown jump item">
 				<span class="text">
 					<strong>{{.i18n.Tr "repo.issues.new.labels"}}</strong>
 					<span class="octicon octicon-gear"></span>

+ 2 - 2
templates/repo/pulls/compare.tmpl

@@ -1,7 +1,7 @@
 {{template "base/head" .}}
 <div class="repository compare pull">
 	{{template "repo/header" .}}
-	<div class="ui middle page grid body">
+	<div class="ui container">
 		<div class="sixteen wide column page grid">
 			<h2 class="ui header">
 			  {{.i18n.Tr "repo.pulls.compare_changes"}}
@@ -9,7 +9,7 @@
 			</h2>
 			<div class="ui segment choose branch">
 				<span class="octicon octicon-git-compare"></span>
-				<div class="ui floating filter dropdown">
+				<div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}">
 					<div class="ui basic small button">
 				    <span class="text">base: {{$.BaseBranch}}</span>
 					  <i class="dropdown icon"></i>

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff