#1525 Triggere mailer for admin created accounts

6 files changed, 174 insertions, 178 deletions

diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index 46c6ff3dde..a7af39aff1 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -20,43 +20,42 @@
               </tr>
             </thead>
             <tbody>
-               {{range .Notices}}
-               <tr>
-		<td>{{.Id}}</td>
-		<td>{{$.i18n.Tr .TrStr}}</td>
-		<td><span>{{.Description}}</span></td>
-		<td>{{.Created}}</td>
-		<td><a href="{{AppSubUrl}}/admin/notices/{{.Id}}/delete"><i class="fa fa-trash-o text-red"></i></a></td>
-               </tr>
-               {{end}}
+              {{range .Notices}}
+              <tr>
+                <td>{{.Id}}</td>
+                <td>{{$.i18n.Tr .TrStr}}</td>
+                <td><span>{{.Description}}</span></td>
+                <td>{{.Created}}</td>
+                <td><a href="{{AppSubUrl}}/admin/notices/{{.Id}}/delete"><i class="fa fa-trash-o text-red"></i></a></td>
+              </tr>
+              {{end}}
             </tbody>
           </table>
-	</div>
-
-	{{with .Page}}
-	  {{if gt .TotalPages 1}}
-	    <div class="center page buttons">
-	      <div class="ui borderless pagination menu">
-		<a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
-                <a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}"{{end}}>
-                  <i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
-                </a>
-                {{range .Pages}}
-                      {{if eq .Num -1}}
-                        <a class="disabled item">...</a>
-                      {{else}}
-                        <a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}"{{end}}>{{.Num}}</a>
-                      {{end}}
-                {{end}}
-                <a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}"{{end}}>
-		      {{$.i18n.Tr "repo.issues.next"}}&nbsp;<i class="icon right arrow"></i>
-                </a>
-		<a class="{{if .IsLast}}disabled{{end}} item" href="{{$.Link}}?page={{.TotalPages}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
 	      </div>
-	    </div>
-          {{end}}
-	{{end}}
 
+	      {{with .Page}}
+        {{if gt .TotalPages 1}}
+        <div class="center page buttons">
+          <div class="ui borderless pagination menu">
+            <a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
+            <a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}"{{end}}>
+              <i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
+            </a>
+            {{range .Pages}}
+            {{if eq .Num -1}}
+            <a class="disabled item">...</a>
+            {{else}}
+            <a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}"{{end}}>{{.Num}}</a>
+            {{end}}
+            {{end}}
+            <a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}"{{end}}>
+              {{$.i18n.Tr "repo.issues.next"}}&nbsp;<i class="icon right arrow"></i>
+            </a>
+            <a class="{{if .IsLast}}disabled{{end}} item" href="{{$.Link}}?page={{.TotalPages}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
+          </div>
+        </div>
+        {{end}}
+        {{end}}
       </div>
     </div>
   </div>
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index 1ca61dd5c2..4070b46ec0 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -2,65 +2,62 @@
 <div class="admin user">
   <div class="ui container">
     <div class="ui grid">
-      {{template "admin/navbar" .}}
-      <div class="twelve wide column content">
-        {{template "base/alert" .}}
-        <h4 class="ui top attached header">
-          {{.i18n.Tr "admin.orgs.org_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
-        </h4>
-        <div class="ui attached table segment">
-          <table class="ui very basic striped table">
-			<thead>
-			  <tr>
-			    <th>ID</th>
-			    <th>{{.i18n.Tr "admin.orgs.name"}}</th>
-			    <th>{{.i18n.Tr "email"}}</th>
-			    <th>{{.i18n.Tr "admin.orgs.teams"}}</th>
-			    <th>{{.i18n.Tr "admin.orgs.members"}}</th>
-			    <th>{{.i18n.Tr "admin.users.repos"}}</th>
-				<th>{{.i18n.Tr "admin.users.created"}}</th>
-			  </tr>
-			</thead>
-			<tbody>
-			  {{range .Orgs}}
-			  <tr>
-			    <td>{{.Id}}</td>
-			    <td><a href="{{AppSubUrl}}/org/{{.Name}}">{{.Name}}</a></td>
-			    <td>{{.Email}}</td>
-			    <td>{{.NumTeams}}</td>
-			    <td>{{.NumMembers}}</td>
-			    <td>{{.NumRepos}}</td>
-			    <td><span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created}}</span></td>
-			  </tr>
-			  {{end}}
-			</tbody>
-		  </table>
-	</div>
-
-	{{with .Page}}
-	  {{if gt .TotalPages 1}}
-	    <div class="center page buttons">
-	      <div class="ui borderless pagination menu">
-		<a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
-                <a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}"{{end}}>
-                  <i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
-                </a>
-                {{range .Pages}}
-                      {{if eq .Num -1}}
-                        <a class="disabled item">...</a>
-                      {{else}}
-                        <a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}"{{end}}>{{.Num}}</a>
-                      {{end}}
-                {{end}}
-                <a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}"{{end}}>
-		      {{$.i18n.Tr "repo.issues.next"}}&nbsp;<i class="icon right arrow"></i>
-                </a>
-		<a class="{{if .IsLast}}disabled{{end}} item" href="{{$.Link}}?page={{.TotalPages}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
-	      </div>
-	    </div>
-          {{end}}
-	{{end}}
+	    {{template "admin/navbar" .}}
+	    <div class="twelve wide column content">
+	      {{template "base/alert" .}}
+	      <h4 class="ui top attached header">
+	        {{.i18n.Tr "admin.orgs.org_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
+	      </h4>
+	      <div class="ui attached table segment">
+	        <table class="ui very basic striped table">
+						<thead>
+						  <tr>
+						    <th>ID</th>
+						    <th>{{.i18n.Tr "admin.orgs.name"}}</th>
+						    <th>{{.i18n.Tr "admin.orgs.teams"}}</th>
+						    <th>{{.i18n.Tr "admin.orgs.members"}}</th>
+						    <th>{{.i18n.Tr "admin.users.repos"}}</th>
+								<th>{{.i18n.Tr "admin.users.created"}}</th>
+						  </tr>
+						</thead>
+						<tbody>
+						  {{range .Orgs}}
+						  <tr>
+						    <td>{{.Id}}</td>
+						    <td><a href="{{AppSubUrl}}/org/{{.Name}}">{{.Name}}</a></td>
+						    <td>{{.NumTeams}}</td>
+						    <td>{{.NumMembers}}</td>
+						    <td>{{.NumRepos}}</td>
+						    <td><span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created}}</span></td>
+						  </tr>
+						  {{end}}
+						</tbody>
+				  </table>
+				</div>
 
+				{{with .Page}}
+			  {{if gt .TotalPages 1}}
+		    <div class="center page buttons">
+		      <div class="ui borderless pagination menu">
+						<a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
+	          <a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}"{{end}}>
+	            <i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
+	          </a>
+	          {{range .Pages}}
+	          {{if eq .Num -1}}
+	          <a class="disabled item">...</a>
+	          {{else}}
+	          <a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}"{{end}}>{{.Num}}</a>
+	          {{end}}
+	          {{end}}
+	          <a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}"{{end}}>
+	    			{{$.i18n.Tr "repo.issues.next"}}&nbsp;<i class="icon right arrow"></i>
+	          </a>
+						<a class="{{if .IsLast}}disabled{{end}} item" href="{{$.Link}}?page={{.TotalPages}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
+		      </div>
+		    </div>
+		    {{end}}
+				{{end}}
       </div>
     </div>
   </div>
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index e350ad8f86..84046c4ed4 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -1,70 +1,69 @@
 {{template "base/head" .}}
 <div class="admin user">
-  <div class="ui container">
-    <div class="ui grid">
-      {{template "admin/navbar" .}}
-      <div class="twelve wide column content">
-        {{template "base/alert" .}}
-        <h4 class="ui top attached header">
-          {{.i18n.Tr "admin.repos.repo_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
-        </h4>
-        <div class="ui attached table segment">
-          <table class="ui very basic striped table">
-			<thead>
-			  <tr>
-			    <th>ID</th>
-				<th>{{.i18n.Tr "admin.repos.owner"}}</th>
-				<th>{{.i18n.Tr "admin.repos.name"}}</th>
-				<th>{{.i18n.Tr "admin.repos.private"}}</th>
-				<th>{{.i18n.Tr "admin.repos.watches"}}</th>
-				<th>{{.i18n.Tr "admin.repos.stars"}}</th>
-				<th>{{.i18n.Tr "admin.repos.issues"}}</th>
-				<th>{{.i18n.Tr "admin.users.created"}}</th>
-			  </tr>
-			</thead>
-			<tbody>
-			  {{range .Repos}}
-				<tr>
-				  <td>{{.ID}}</td>
-				  <td><a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a></td>
-                  <td><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></td>
-			      <td><i class="fa fa{{if .IsPrivate}}-check{{end}}-square-o"></i></td>
-				  <td>{{.NumWatches}}</td>
-				  <td>{{.NumStars}}</td>
-			      <td>{{.NumIssues}}</td>
-				  <td><span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created}}</span></td>
-				</tr>
-			  {{end}}
-			</tbody>
-		  </table>
-	</div>
-
-	{{with .Page}}
-	  {{if gt .TotalPages 1}}
-	    <div class="center page buttons">
-	      <div class="ui borderless pagination menu">
-		<a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
-                <a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}"{{end}}>
-                  <i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
-                </a>
-                {{range .Pages}}
-                      {{if eq .Num -1}}
-                        <a class="disabled item">...</a>
-                      {{else}}
-                        <a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}"{{end}}>{{.Num}}</a>
-                      {{end}}
-                {{end}}
-                <a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}"{{end}}>
-		      {{$.i18n.Tr "repo.issues.next"}}&nbsp;<i class="icon right arrow"></i>
-                </a>
-		<a class="{{if .IsLast}}disabled{{end}} item" href="{{$.Link}}?page={{.TotalPages}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
-	      </div>
-	    </div>
-          {{end}}
-	{{end}}
+	<div class="ui container">
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+				{{.i18n.Tr "admin.repos.repo_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
+				</h4>
+				<div class="ui attached table segment">
+					<table class="ui very basic striped table">
+						<thead>
+							<tr>
+								<th>ID</th>
+								<th>{{.i18n.Tr "admin.repos.owner"}}</th>
+								<th>{{.i18n.Tr "admin.repos.name"}}</th>
+								<th>{{.i18n.Tr "admin.repos.private"}}</th>
+								<th>{{.i18n.Tr "admin.repos.watches"}}</th>
+								<th>{{.i18n.Tr "admin.repos.stars"}}</th>
+								<th>{{.i18n.Tr "admin.repos.issues"}}</th>
+								<th>{{.i18n.Tr "admin.users.created"}}</th>
+							</tr>
+						</thead>
+						<tbody>
+							{{range .Repos}}
+							<tr>
+								<td>{{.ID}}</td>
+								<td><a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a></td>
+								<td><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></td>
+								<td><i class="fa fa{{if .IsPrivate}}-check{{end}}-square-o"></i></td>
+								<td>{{.NumWatches}}</td>
+								<td>{{.NumStars}}</td>
+								<td>{{.NumIssues}}</td>
+								<td><span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created}}</span></td>
+							</tr>
+							{{end}}
+						</tbody>
+					</table>
+				</div>
 
-      </div>
-    </div>
-  </div>
+				{{with .Page}}
+				{{if gt .TotalPages 1}}
+				<div class="center page buttons">
+					<div class="ui borderless pagination menu">
+						<a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
+						<a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}"{{end}}>
+							<i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
+						</a>
+						{{range .Pages}}
+						{{if eq .Num -1}}
+						<a class="disabled item">...</a>
+						{{else}}
+						<a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}"{{end}}>{{.Num}}</a>
+						{{end}}
+						{{end}}
+						<a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}"{{end}}>
+							{{$.i18n.Tr "repo.issues.next"}}&nbsp;<i class="icon right arrow"></i>
+						</a>
+						<a class="{{if .IsLast}}disabled{{end}} item" href="{{$.Link}}?page={{.TotalPages}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
+					</div>
+				</div>
+				{{end}}
+				{{end}}
+			</div>
+		</div>
+	</div>
 </div>
 {{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl
index 7272343818..34630ececa 100644
--- a/templates/admin/user/new.tmpl
+++ b/templates/admin/user/new.tmpl
@@ -44,6 +44,16 @@
               <input id="password" name="password" type="password" value="{{.password}}" {{if eq .login_type "0-0"}}required{{end}}>
             </div>
 
+            <!-- Send register notify e-mail -->
+            {{if .CanSendEmail}}
+            <div class="inline field">
+              <div class="ui checkbox">
+                <label><strong>{{.i18n.Tr "admin.users.send_register_notify"}}</strong></label>
+                <input name="send_notify" type="checkbox" {{if .send_notify}}checked{{end}}>
+              </div>
+            </div>
+            {{end}}
+
             <div class="field">
               <button class="ui green button">{{.i18n.Tr "admin.users.new_account"}}</button>
             </div>
diff --git a/templates/mail/auth/register_notify.tmpl b/templates/mail/auth/register_notify.tmpl
new file mode 100644
index 0000000000..ae9d76b727
--- /dev/null
+++ b/templates/mail/auth/register_notify.tmpl
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>  
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>{{.User.Name}}, welcome to {{.AppName}}</title>
+</head>
+
+<body>
+  <p>Hi <b>{{.User.Name}}</b>, this is your registration confirmation email for {{.AppName}}!</p>
+  <p>You can now login via username: {{.User.Name}}.</p>
+  <p>© 2015 <a target="_blank" href="http://gogs.io">Gogs: Go Git Service</a></p>
+</body>
+</html>
diff --git a/templates/mail/auth/register_success.tmpl b/templates/mail/auth/register_success.tmpl
deleted file mode 100644
index 7b642ea052..0000000000
--- a/templates/mail/auth/register_success.tmpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>  
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>{{.User.Name}}, welcome to {{.AppName}}</title>
-</head>
-
-<body class="mail register success">
-  <div class="ui segment">
-    <div class="ui header">
-      <img class="ui image" src="{{.AppUrl}}/img/favicon.png">
-      {{.AppName}}
-    </div>
-    <div class="ui divider"></div>
-    <p>Hi <b>{{.User.Name}}</b>, this is your registration email for {{.AppName}}!</p>
-    <p>Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>:</p>
-    <p><a href="{{.AppUrl}}user/activate?code={{.Code}}">{{.AppUrl}}user/activate?code={{.Code}}</a></p>
-    <p>Not working? Try copying and pasting it to your browser.</p>
-  </div>
-  <p class="copyright text grey">© 2015 <a target="_blank" href="http://gogs.io">Gogs: Go Git Service</a></p>
-</body>
-</html>