Просмотр исходного кода

Remove Streamer and Maker which Closes #29, #30

Yoginth 6 лет назад
Родитель
Сommit
7c9ffbd456

Разница между файлами не показана из-за своего большого размера
+ 1 - 2
models/user.go


+ 0 - 1
pkg/form/admin.go

@@ -55,7 +55,6 @@ type AdminEditUser struct {
 	AllowImportLocal bool
 	Suspended        bool
 	IsVerified       bool
-	IsMaker          bool
 	GitoteDeveloper  bool
 	PrivateProfile   bool
 	IsBeta           bool

+ 0 - 1
routes/admin/users.go

@@ -230,7 +230,6 @@ func EditUserPost(c *context.Context, f form.AdminEditUser) {
 	u.AllowImportLocal = f.AllowImportLocal
 	u.Suspended = f.Suspended
 	u.IsVerified = f.IsVerified
-	u.IsMaker = f.IsMaker
 	u.GitoteDeveloper = f.GitoteDeveloper
 	u.IsBeta = f.IsBeta
 	u.PrivateProfile = f.PrivateProfile

+ 0 - 6
templates/admin/user/edit.tmpl

@@ -133,12 +133,6 @@
 								<input name="is_verified" type="checkbox" {{if .User.IsVerified}}checked{{end}}>
 							</div>
 						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<label><strong>This account is maker</strong> <i class="maker octicon octicon-paintcan"></i></label>
-								<input name="is_maker" type="checkbox" {{if .User.IsMaker}}checked{{end}}>
-							</div>
-						</div>
 						<div class="inline field">
 							<div class="ui checkbox">
 								<label><strong>This account is staff</strong> <i class="isstaff octicon octicon-tools"></i></label>

+ 0 - 1
templates/admin/user/list.tmpl

@@ -36,7 +36,6 @@
 										</a>
 										<br/>
 										{{if .IsVerified}}<i class="admin-badge verified octicon octicon-verified"></i>{{end}}
-										{{if .IsMaker}}<i class="admin-badge maker octicon octicon-paintcan"></i>{{end}}
 										{{if .Twitch}}<i class="admin-badge streamer octicon octicon-broadcast"></i>{{end}}
 										{{if .IsBeta}}<i class="admin-badge developer octicon octicon-circuit-board"></i>{{end}}
 										{{if .IsStaff}}<i class="admin-badge isstaff octicon octicon-tools"></i>{{end}}

+ 2 - 9
templates/user/profile.tmpl

@@ -68,12 +68,10 @@
 				</a>
 			</div>
 		</div>
-		{{if or .Owner.GitoteDeveloper .Owner.IsBeta .Owner.IsMaker}}
+		{{if or .Owner.GitoteDeveloper .Owner.IsBeta}}
 			<div style="margin-top:1rem" class="ui mini images">
 				{{if .Owner.GitoteDeveloper}}<img class="ui image" src="https://gitote-cdn.netlify.com/img/badges/gitotedeveloper.png">{{end}}
 				{{if .Owner.IsBeta}}<img class="ui image" src="https://gitote-cdn.netlify.com/img/badges/beta.png">{{end}}
-				{{if .Owner.IsMaker}}<img class="ui image" src="https://gitote-cdn.netlify.com/img/badges/maker.png">{{end}}
-				{{if .Owner.Twitch}}<img class="ui image" src="https://gitote-cdn.netlify.com/img/badges/streamer.png">{{end}}
 			</div>
 		{{end}}
 		{{if and .IsLogged (ne .LoggedUserName .Owner.Name)}}
@@ -201,7 +199,7 @@
 									{{.Owner.NumFollowing}} {{.i18n.Tr "user.following"}}
 								</a>
 							</li>
-							{{if or .Owner.GitoteDeveloper .Owner.IsBeta .Owner.IsMaker .Owner.Twitch}}
+							{{if or .Owner.GitoteDeveloper .Owner.IsBeta .Owner.Twitch}}
 								<li>
 									<div class="ui tiny images">
 										{{if .Owner.GitoteDeveloper}}
@@ -214,11 +212,6 @@
 												<img class="ui image" src="https://gitote-cdn.netlify.com/img/badges/beta.png">
 											</a>
 										{{end}}
-										{{if .Owner.IsMaker}}
-											<a class="poping up" target="_blank" href="/maker" data-content="Maker" data-variation="inverted tiny" data-position="left center">
-												<img class="ui image" src="https://gitote-cdn.netlify.com/img/badges/maker.png">
-											</a>
-										{{end}}
 										{{if .Owner.Twitch}}
 											<a class="poping up" target="_blank" href="/streamer" data-content="Streamer" data-variation="inverted tiny" data-position="left center">
 												<img class="ui image" src="https://gitote-cdn.netlify.com/img/badges/streamer.png">