diff --git a/common/routes_common.go b/common/routes_common.go index 683e486c..db606182 100644 --- a/common/routes_common.go +++ b/common/routes_common.go @@ -74,23 +74,23 @@ func forumUserCheck(header *Header, w http.ResponseWriter, r *http.Request, user } // TODO: Put this on the user instance? Do we really want forum specific logic in there? Maybe, a method which spits a new pointer with the same contents as user? -func cascadeForumPerms(fperms *ForumPerms, user *User) { - if fperms.Overrides && !user.IsSuperAdmin { - user.Perms.ViewTopic = fperms.ViewTopic - user.Perms.LikeItem = fperms.LikeItem - user.Perms.CreateTopic = fperms.CreateTopic - user.Perms.EditTopic = fperms.EditTopic - user.Perms.DeleteTopic = fperms.DeleteTopic - user.Perms.CreateReply = fperms.CreateReply - user.Perms.EditReply = fperms.EditReply - user.Perms.DeleteReply = fperms.DeleteReply - user.Perms.PinTopic = fperms.PinTopic - user.Perms.CloseTopic = fperms.CloseTopic - user.Perms.MoveTopic = fperms.MoveTopic +func cascadeForumPerms(fp *ForumPerms, u *User) { + if fp.Overrides && !u.IsSuperAdmin { + u.Perms.ViewTopic = fp.ViewTopic + u.Perms.LikeItem = fp.LikeItem + u.Perms.CreateTopic = fp.CreateTopic + u.Perms.EditTopic = fp.EditTopic + u.Perms.DeleteTopic = fp.DeleteTopic + u.Perms.CreateReply = fp.CreateReply + u.Perms.EditReply = fp.EditReply + u.Perms.DeleteReply = fp.DeleteReply + u.Perms.PinTopic = fp.PinTopic + u.Perms.CloseTopic = fp.CloseTopic + u.Perms.MoveTopic = fp.MoveTopic - if len(fperms.ExtData) != 0 { - for name, perm := range fperms.ExtData { - user.PluginPerms[name] = perm + if len(fp.ExtData) != 0 { + for name, perm := range fp.ExtData { + u.PluginPerms[name] = perm } } } @@ -151,7 +151,8 @@ func panelUserCheck(w http.ResponseWriter, r *http.Request, user *User) (header stats.Themes = len(Themes) stats.Reports = 0 // TODO: Do the report count. Only show open threads? - var addPreScript = func(name string) { + addPreScript := func(name string) { + // TODO: Optimise this by removing a superfluous string alloc var tname string if theme.OverridenMap != nil { _, ok := theme.OverridenMap[name] @@ -212,6 +213,7 @@ func userCheck(w http.ResponseWriter, r *http.Request, user *User) (header *Head Writer: w, IsoCode: phrases.GetLangPack().IsoCode, } + // TODO: Optimise this by avoiding accessing a map string index header.GoogSiteVerify = header.Settings["google_site_verify"].(string) if user.IsBanned { @@ -256,7 +258,8 @@ func PrepResources(user *User, header *Header, theme *Theme) { } } - var addPreScript = func(name string) { + addPreScript := func(name string) { + // TODO: Optimise this by removing a superfluous string alloc var tname string if theme.OverridenMap != nil { //fmt.Printf("name %+v\n", name) @@ -471,6 +474,7 @@ func NoSessionMismatch(w http.ResponseWriter, r *http.Request, user User) RouteE if err != nil { return LocalError("Bad Form", w, r, user) } + // TODO: Try to eliminate some of these allocations sess := []byte(user.Session) if len(sess) == 0 { return SecurityError(w, r, user) @@ -501,6 +505,7 @@ func HandleUploadRoute(w http.ResponseWriter, r *http.Request, user User, maxFil } func NoUploadSessionMismatch(w http.ResponseWriter, r *http.Request, user User) RouteError { + // TODO: Try to eliminate some of these allocations sess := []byte(user.Session) if len(sess) == 0 { return SecurityError(w, r, user) diff --git a/common/user.go b/common/user.go index 69145b20..3ab504e4 100644 --- a/common/user.go +++ b/common/user.go @@ -57,13 +57,13 @@ type User struct { TempGroup int } -func (user *User) WebSockets() *WsJSONUser { - var groupID = user.Group - if user.TempGroup != 0 { - groupID = user.TempGroup +func (u *User) WebSockets() *WsJSONUser { + groupID := u.Group + if u.TempGroup != 0 { + groupID = u.TempGroup } // TODO: Do we want to leak the user's permissions? Users will probably be able to see their status from the group tags, but still - return &WsJSONUser{user.ID, user.Link, user.Name, groupID, user.IsMod, user.Avatar, user.MicroAvatar, user.Level, user.Score, user.Liked} + return &WsJSONUser{u.ID, u.Link, u.Name, groupID, u.IsMod, u.Avatar, u.MicroAvatar, u.Level, u.Score, u.Liked} } // Use struct tags to avoid having to define this? It really depends on the circumstances, sometimes we want the whole thing, sometimes... not. @@ -80,12 +80,12 @@ type WsJSONUser struct { Liked int } -func (user *User) Me() *MeUser { - var groupID = user.Group - if user.TempGroup != 0 { - groupID = user.TempGroup +func (u *User) Me() *MeUser { + groupID := u.Group + if u.TempGroup != 0 { + groupID = u.TempGroup } - return &MeUser{user.ID, user.Link, user.Name, groupID, user.Active, user.IsMod, user.IsSuperMod, user.IsAdmin, user.IsBanned, user.Session, user.Avatar, user.MicroAvatar, user.Tag, user.Level, user.Score, user.Liked} + return &MeUser{u.ID, u.Link, u.Name, groupID, u.Active, u.IsMod, u.IsSuperMod, u.IsAdmin, u.IsBanned, u.Session, u.Avatar, u.MicroAvatar, u.Tag, u.Level, u.Score, u.Liked} } // For when users need to see their own data, I've omitted some redundancies and less useful items, so we don't wind up sending them on every request @@ -104,7 +104,7 @@ type MeUser struct { //Perms Perms //PluginPerms map[string]bool - Session string + S string // Session Avatar string MicroAvatar string Tag string @@ -170,53 +170,53 @@ func init() { }) } -func (user *User) Init() { - user.Avatar, user.MicroAvatar = BuildAvatar(user.ID, user.RawAvatar) - user.Link = BuildProfileURL(NameToSlug(user.Name), user.ID) - user.Tag = Groups.DirtyGet(user.Group).Tag - user.InitPerms() +func (u *User) Init() { + u.Avatar, u.MicroAvatar = BuildAvatar(u.ID, u.RawAvatar) + u.Link = BuildProfileURL(NameToSlug(u.Name), u.ID) + u.Tag = Groups.DirtyGet(u.Group).Tag + u.InitPerms() } // TODO: Refactor this idiom into something shorter, maybe with a NullUserCache when one isn't set? -func (user *User) CacheRemove() { +func (u *User) CacheRemove() { ucache := Users.GetCache() if ucache != nil { - ucache.Remove(user.ID) + ucache.Remove(u.ID) } TopicListThaw.Thaw() } -func (user *User) Ban(duration time.Duration, issuedBy int) error { - return user.ScheduleGroupUpdate(BanGroup, issuedBy, duration) +func (u *User) Ban(duration time.Duration, issuedBy int) error { + return u.ScheduleGroupUpdate(BanGroup, issuedBy, duration) } -func (user *User) Unban() error { - return user.RevertGroupUpdate() +func (u *User) Unban() error { + return u.RevertGroupUpdate() } -func (user *User) deleteScheduleGroupTx(tx *sql.Tx) error { +func (u *User) deleteScheduleGroupTx(tx *sql.Tx) error { deleteScheduleGroupStmt, err := qgen.Builder.SimpleDeleteTx(tx, "users_groups_scheduler", "uid = ?") if err != nil { return err } - _, err = deleteScheduleGroupStmt.Exec(user.ID) + _, err = deleteScheduleGroupStmt.Exec(u.ID) return err } -func (user *User) setTempGroupTx(tx *sql.Tx, tempGroup int) error { +func (u *User) setTempGroupTx(tx *sql.Tx, tempGroup int) error { setTempGroupStmt, err := qgen.Builder.SimpleUpdateTx(tx, "users", "temp_group = ?", "uid = ?") if err != nil { return err } - _, err = setTempGroupStmt.Exec(tempGroup, user.ID) + _, err = setTempGroupStmt.Exec(tempGroup, u.ID) return err } // Make this more stateless? -func (user *User) ScheduleGroupUpdate(gid int, issuedBy int, duration time.Duration) error { - var temporary bool +func (u *User) ScheduleGroupUpdate(gid int, issuedBy int, duration time.Duration) error { + var temp bool if duration.Nanoseconds() != 0 { - temporary = true + temp = true } revertAt := time.Now().Add(duration) @@ -226,94 +226,94 @@ func (user *User) ScheduleGroupUpdate(gid int, issuedBy int, duration time.Durat } defer tx.Rollback() - err = user.deleteScheduleGroupTx(tx) + err = u.deleteScheduleGroupTx(tx) if err != nil { return err } - createScheduleGroupTx, err := qgen.Builder.SimpleInsertTx(tx, "users_groups_scheduler", "uid, set_group, issued_by, issued_at, revert_at, temporary", "?,?,?,UTC_TIMESTAMP(),?,?") + createScheduleGroupTx, err := qgen.Builder.SimpleInsertTx(tx, "users_groups_scheduler", "uid,set_group,issued_by,issued_at,revert_at,temporary", "?,?,?,UTC_TIMESTAMP(),?,?") if err != nil { return err } - _, err = createScheduleGroupTx.Exec(user.ID, gid, issuedBy, revertAt, temporary) + _, err = createScheduleGroupTx.Exec(u.ID, gid, issuedBy, revertAt, temp) if err != nil { return err } - err = user.setTempGroupTx(tx, gid) + err = u.setTempGroupTx(tx, gid) if err != nil { return err } err = tx.Commit() - user.CacheRemove() + u.CacheRemove() return err } -func (user *User) RevertGroupUpdate() error { +func (u *User) RevertGroupUpdate() error { tx, err := qgen.Builder.Begin() if err != nil { return err } defer tx.Rollback() - err = user.deleteScheduleGroupTx(tx) + err = u.deleteScheduleGroupTx(tx) if err != nil { return err } - err = user.setTempGroupTx(tx, 0) + err = u.setTempGroupTx(tx, 0) if err != nil { return err } err = tx.Commit() - user.CacheRemove() + u.CacheRemove() return err } // TODO: Use a transaction here // ? - Add a Deactivate method? Not really needed, if someone's been bad you could do a ban, I guess it might be useful, if someone says that email x isn't actually owned by the user in question? -func (user *User) Activate() (err error) { - _, err = userStmts.activate.Exec(user.ID) +func (u *User) Activate() (err error) { + _, err = userStmts.activate.Exec(u.ID) if err != nil { return err } - _, err = userStmts.changeGroup.Exec(Config.DefaultGroup, user.ID) - user.CacheRemove() + _, err = userStmts.changeGroup.Exec(Config.DefaultGroup, u.ID) + u.CacheRemove() return err } // TODO: Write tests for this // TODO: Delete this user's content too? // TODO: Expose this to the admin? -func (user *User) Delete() error { - _, err := userStmts.delete.Exec(user.ID) +func (u *User) Delete() error { + _, err := userStmts.delete.Exec(u.ID) if err != nil { return err } - user.CacheRemove() - return err + u.CacheRemove() + return nil } -func (user *User) bindStmt(stmt *sql.Stmt, params ...interface{}) (err error) { - params = append(params, user.ID) +func (u *User) bindStmt(stmt *sql.Stmt, params ...interface{}) (err error) { + params = append(params, u.ID) _, err = stmt.Exec(params...) - user.CacheRemove() + u.CacheRemove() return err } -func (user *User) ChangeName(username string) (err error) { - return user.bindStmt(userStmts.setUsername, username) +func (u *User) ChangeName(name string) (err error) { + return u.bindStmt(userStmts.setUsername, name) } -func (user *User) ChangeAvatar(avatar string) (err error) { - return user.bindStmt(userStmts.setAvatar, avatar) +func (u *User) ChangeAvatar(avatar string) (err error) { + return u.bindStmt(userStmts.setAvatar, avatar) } // TODO: Abstract this with an interface so we can scale this with an actual dedicated queue in a real cluster -func (user *User) ScheduleAvatarResize() (err error) { - _, err = userStmts.scheduleAvatarResize.Exec(user.ID) +func (u *User) ScheduleAvatarResize() (err error) { + _, err = userStmts.scheduleAvatarResize.Exec(u.ID) if err != nil { // TODO: Do a more generic check so that we're not as tied to MySQL me, ok := err.(*mysql.MySQLError) @@ -328,29 +328,29 @@ func (user *User) ScheduleAvatarResize() (err error) { return nil } -func (user *User) ChangeGroup(group int) (err error) { - return user.bindStmt(userStmts.changeGroup, group) +func (u *User) ChangeGroup(group int) (err error) { + return u.bindStmt(userStmts.changeGroup, group) } // ! Only updates the database not the *User for safety reasons -func (user *User) UpdateIP(host string) error { - _, err := userStmts.updateLastIP.Exec(host, user.ID) +func (u *User) UpdateIP(host string) error { + _, err := userStmts.updateLastIP.Exec(host, u.ID) ucache := Users.GetCache() if ucache != nil { - ucache.Remove(user.ID) + ucache.Remove(u.ID) } return err } -func (user *User) Update(newname string, newemail string, newgroup int) (err error) { - return user.bindStmt(userStmts.update, newname, newemail, newgroup) +func (u *User) Update(newname string, newemail string, newgroup int) (err error) { + return u.bindStmt(userStmts.update, newname, newemail, newgroup) } -func (user *User) IncreasePostStats(wcount int, topic bool) (err error) { +func (u *User) IncreasePostStats(wcount int, topic bool) (err error) { var mod int baseScore := 1 if topic { - _, err = userStmts.incrementTopics.Exec(1, user.ID) + _, err = userStmts.incrementTopics.Exec(1, u.ID) if err != nil { return err } @@ -359,34 +359,34 @@ func (user *User) IncreasePostStats(wcount int, topic bool) (err error) { settings := SettingBox.Load().(SettingMap) if wcount >= settings["megapost_min_words"].(int) { - _, err = userStmts.incrementMegaposts.Exec(1, 1, 1, user.ID) + _, err = userStmts.incrementMegaposts.Exec(1, 1, 1, u.ID) mod = 4 } else if wcount >= settings["bigpost_min_words"].(int) { - _, err = userStmts.incrementBigposts.Exec(1, 1, user.ID) + _, err = userStmts.incrementBigposts.Exec(1, 1, u.ID) mod = 1 } else { - _, err = userStmts.incrementPosts.Exec(1, user.ID) + _, err = userStmts.incrementPosts.Exec(1, u.ID) } if err != nil { return err } - _, err = userStmts.incrementScore.Exec(baseScore+mod, user.ID) + _, err = userStmts.incrementScore.Exec(baseScore+mod, u.ID) if err != nil { return err } - //log.Print(user.Score + base_score + mod) - //log.Print(getLevel(user.Score + base_score + mod)) + //log.Print(u.Score + baseScore + mod) + //log.Print(getLevel(u.Score + baseScore + mod)) // TODO: Use a transaction to prevent level desyncs? - _, err = userStmts.updateLevel.Exec(GetLevel(user.Score+baseScore+mod), user.ID) + _, err = userStmts.updateLevel.Exec(GetLevel(u.Score+baseScore+mod), u.ID) return err } -func (user *User) DecreasePostStats(wcount int, topic bool) (err error) { +func (u *User) DecreasePostStats(wcount int, topic bool) (err error) { var mod int baseScore := -1 if topic { - _, err = userStmts.incrementTopics.Exec(-1, user.ID) + _, err = userStmts.incrementTopics.Exec(-1, u.ID) if err != nil { return err } @@ -395,56 +395,56 @@ func (user *User) DecreasePostStats(wcount int, topic bool) (err error) { settings := SettingBox.Load().(SettingMap) if wcount >= settings["megapost_min_words"].(int) { - _, err = userStmts.incrementMegaposts.Exec(-1, -1, -1, user.ID) + _, err = userStmts.incrementMegaposts.Exec(-1, -1, -1, u.ID) mod = 4 } else if wcount >= settings["bigpost_min_words"].(int) { - _, err = userStmts.incrementBigposts.Exec(-1, -1, user.ID) + _, err = userStmts.incrementBigposts.Exec(-1, -1, u.ID) mod = 1 } else { - _, err = userStmts.incrementPosts.Exec(-1, user.ID) + _, err = userStmts.incrementPosts.Exec(-1, u.ID) } if err != nil { return err } - _, err = userStmts.incrementScore.Exec(baseScore-mod, user.ID) + _, err = userStmts.incrementScore.Exec(baseScore-mod, u.ID) if err != nil { return err } // TODO: Use a transaction to prevent level desyncs? - _, err = userStmts.updateLevel.Exec(GetLevel(user.Score-baseScore-mod), user.ID) + _, err = userStmts.updateLevel.Exec(GetLevel(u.Score-baseScore-mod), u.ID) return err } // Copy gives you a non-pointer concurrency safe copy of the user -func (user *User) Copy() User { - return *user +func (u *User) Copy() User { + return *u } // TODO: Write unit tests for this -func (user *User) InitPerms() { - if user.TempGroup != 0 { - user.Group = user.TempGroup +func (u *User) InitPerms() { + if u.TempGroup != 0 { + u.Group = u.TempGroup } - group := Groups.DirtyGet(user.Group) - if user.IsSuperAdmin { - user.Perms = AllPerms - user.PluginPerms = AllPluginPerms + group := Groups.DirtyGet(u.Group) + if u.IsSuperAdmin { + u.Perms = AllPerms + u.PluginPerms = AllPluginPerms } else { - user.Perms = group.Perms - user.PluginPerms = group.PluginPerms + u.Perms = group.Perms + u.PluginPerms = group.PluginPerms } /*if len(group.CanSee) == 0 { panic("should not be zero") }*/ - user.IsAdmin = user.IsSuperAdmin || group.IsAdmin - user.IsSuperMod = user.IsAdmin || group.IsMod - user.IsMod = user.IsSuperMod - user.IsBanned = group.IsBanned - if user.IsBanned && user.IsSuperMod { - user.IsBanned = false + u.IsAdmin = u.IsSuperAdmin || group.IsAdmin + u.IsSuperMod = u.IsAdmin || group.IsMod + u.IsMod = u.IsSuperMod + u.IsBanned = group.IsBanned + if u.IsBanned && u.IsSuperMod { + u.IsBanned = false } } diff --git a/public/global.js b/public/global.js index bfa92833..711d6bb5 100644 --- a/public/global.js +++ b/public/global.js @@ -725,7 +725,7 @@ function mainInit(){ let formAction = $(this).closest('a').attr("href"); $.ajax({ - url: formAction + "?session=" + me.User.Session, + url: formAction + "?s=" + me.User.S, type: "POST", dataType: "json", error: ajaxError, @@ -793,7 +793,7 @@ function mainInit(){ var formAction = $(this).closest('a').attr("href"); //console.log("Form Action:", formAction); //console.log(outData); - $.ajax({ url: formAction + "?session=" + me.User.Session, type:"POST", dataType:"json", data: outData, error: ajaxError }); + $.ajax({ url: formAction + "?s=" + me.User.S, type:"POST", dataType:"json", data: outData, error: ajaxError }); blockParent.find('.hide_on_edit').removeClass("edit_opened"); blockParent.find('.show_on_edit').removeClass("edit_opened"); }); @@ -853,7 +853,7 @@ function mainInit(){ $("#themeSelectorSelect").change(function(){ console.log("Changing the theme to " + this.options[this.selectedIndex].getAttribute("val")); $.ajax({ - url: this.form.getAttribute("action") + "?session=" + me.User.Session, + url: this.form.getAttribute("action") + "?s=" + me.User.S, type: "POST", dataType: "json", data: { "newTheme": this.options[this.selectedIndex].getAttribute("val"), isJs: "1" }, diff --git a/public/init.js b/public/init.js index 44777ced..25f6832e 100644 --- a/public/init.js +++ b/public/init.js @@ -251,7 +251,7 @@ function fetchPhrases(plist) { runInitHook("pre_init"); }); } else { - me = {User:{ID:0,Session:""},Site:{"MaxRequestSize":0}}; + me = {User:{ID:0,S:""},Site:{"MaxRequestSize":0}}; runInitHook("pre_init"); } })(); \ No newline at end of file diff --git a/public/member.js b/public/member.js index ee004d4c..34c13e68 100644 --- a/public/member.js +++ b/public/member.js @@ -68,7 +68,7 @@ console.log("hash",hash); let formData = new FormData(); - formData.append("session",me.User.Session); + formData.append("s",me.User.S); for(let i = 0; i < this.files.length; i++) formData.append("upload_files",this.files[i]); bindAttachManager(); @@ -183,7 +183,7 @@ $(".attach_item_delete").click(function(){ let formData = new URLSearchParams(); - formData.append("session",me.User.Session); + formData.append("s",me.User.S); let post = this.closest(".post_item"); let aidList = ""; @@ -233,7 +233,7 @@ }); let bulkActionSender = function(action, selectedTopics, fragBit) { - let url = "/topic/"+action+"/submit/"+fragBit+"?session=" + me.User.Session; + let url = "/topic/"+action+"/submit/"+fragBit+"?s=" + me.User.S; $.ajax({ url: url, type: "POST", diff --git a/public/panel_forums.js b/public/panel_forums.js index ed8fc5bd..1dda3e75 100644 --- a/public/panel_forums.js +++ b/public/panel_forums.js @@ -47,7 +47,7 @@ document.getElementById("panel_forums_order_button").addEventListener("click", ( console.trace(); } // ? - Is encodeURIComponent the right function for this? - req.open("POST","/panel/forums/order/edit/submit/?session=" + encodeURIComponent(me.User.Session)); + req.open("POST","/panel/forums/order/edit/submit/?s=" + encodeURIComponent(me.User.S)); req.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); let items = ""; for(let i = 0; item = forums[i];i++) items += item+","; diff --git a/public/panel_menu_items.js b/public/panel_menu_items.js index a2956522..e6387760 100644 --- a/public/panel_menu_items.js +++ b/public/panel_menu_items.js @@ -44,7 +44,7 @@ document.getElementById("panel_menu_items_order_button").addEventListener("click } // ? - Is encodeURIComponent the right function for this? let spl = document.location.pathname.split("/"); - req.open("POST","/panel/themes/menus/item/order/edit/submit/"+parseInt(spl[spl.length-1],10)+"?session=" + encodeURIComponent(me.User.Session)); + req.open("POST","/panel/themes/menus/item/order/edit/submit/"+parseInt(spl[spl.length-1],10)+"?s=" + encodeURIComponent(me.User.S)); req.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); let items = ""; for(let i = 0; item = menuItems[i];i++) items += item+","; diff --git a/public/widgets.js b/public/widgets.js index 3d4fa813..05e6117d 100644 --- a/public/widgets.js +++ b/public/widgets.js @@ -19,7 +19,7 @@ $(document).ready(() => { event.preventDefault(); eparent.remove(); let formData = new URLSearchParams(); - formData.append("session",me.User.Session); + formData.append("s",me.User.S); let req = new XMLHttpRequest(); let target = this.closest("a").getAttribute("href"); req.open("POST",target,true); @@ -58,7 +58,7 @@ $(document).ready(() => { let pform = this.closest("form"); let data = new URLSearchParams(); for (const pair of new FormData(pform)) data.append(pair[0], pair[1]); - data.append("session",me.User.Session); + data.append("s",me.User.S); var req = new XMLHttpRequest(); req.open("POST", pform.getAttribute("action")); req.send(data); diff --git a/templates/header.html b/templates/header.html index fd60ab2d..2b5c6660 100644 --- a/templates/header.html +++ b/templates/header.html @@ -7,7 +7,7 @@ {{range .Header.PreScriptsAsync}} {{end}} - + {{range .Header.ScriptsAsync}} {{end}} diff --git a/templates/panel_group_edit.html b/templates/panel_group_edit.html index a234e191..6bc316f2 100644 --- a/templates/panel_group_edit.html +++ b/templates/panel_group_edit.html @@ -7,7 +7,7 @@

{{.Name}}{{lang "panel_group_head_suffix"}}

-
+
{{lang "panel_group_name"}}
diff --git a/templates/panel_group_edit_perms.html b/templates/panel_group_edit_perms.html index 3f552f9e..024b6385 100644 --- a/templates/panel_group_edit_perms.html +++ b/templates/panel_group_edit_perms.html @@ -6,7 +6,7 @@

{{.Name}}{{lang "panel_group_head_suffix"}}

- + {{if .CurrentUser.Perms.EditGroupLocalPerms}}
{{range .LocalPerms}} diff --git a/templates/panel_pages.html b/templates/panel_pages.html index 09f9366f..28246374 100644 --- a/templates/panel_pages.html +++ b/templates/panel_pages.html @@ -7,7 +7,7 @@ {{.Title}} [{{.Name}}] - +
{{else}} @@ -21,7 +21,7 @@

{{lang "panel_pages_create_head"}}

- +
{{lang "panel_pages_create_name"}}
diff --git a/templates/panel_pages_edit.html b/templates/panel_pages_edit.html index fb8dc39e..c8398b62 100644 --- a/templates/panel_pages_edit.html +++ b/templates/panel_pages_edit.html @@ -1,23 +1,23 @@ -
-

{{lang "panel_pages_edit_head"}}

-
- -
-
-
{{lang "panel_pages_name"}}
-
-
-
-
{{lang "panel_pages_title"}}
-
-
-
-
- -
-
-
-
+
+

{{lang "panel_pages_edit_head"}}

+
+ +
+
+
{{lang "panel_pages_name"}}
+
+
+
+
{{lang "panel_pages_title"}}
+
+
+
+
+
- \ No newline at end of file +
+
+
+
+ \ No newline at end of file diff --git a/templates/panel_setting.html b/templates/panel_setting.html index 0c8911b2..25493245 100644 --- a/templates/panel_setting.html +++ b/templates/panel_setting.html @@ -1,37 +1,37 @@ -
-

{{.Setting.FriendlyName}}

-
-
-
- {{if eq .Setting.Type "list"}} -
-
{{lang "panel_setting_value"}}
-
- -
+
+

{{.Setting.FriendlyName}}

+
+
+ + {{if eq .Setting.Type "list"}} +
+
{{lang "panel_setting_value"}}
+
+
- {{else if eq .Setting.Type "bool"}} -
-
{{lang "panel_setting_value"}}
-
- -
+
+ {{else if eq .Setting.Type "bool"}} +
+
{{lang "panel_setting_value"}}
+
+
- {{else if eq .Setting.Type "textarea"}} -
-
-
- {{else}}
-
{{lang "panel_setting_value"}}
-
-
{{end}} -
-
-
- -
\ No newline at end of file +
+ {{else if eq .Setting.Type "textarea"}} +
+
+
+ {{else}}
+
{{lang "panel_setting_value"}}
+
+
{{end}} +
+
+
+ +
\ No newline at end of file diff --git a/templates/panel_word_filters.html b/templates/panel_word_filters.html index 1b23a5f4..0a875570 100644 --- a/templates/panel_word_filters.html +++ b/templates/panel_word_filters.html @@ -1,40 +1,40 @@ -
-

{{lang "panel_word_filters_head"}}

+
+

{{lang "panel_word_filters_head"}}

+
+
+ {{range .Something}} +
+ {{.Find}} + + {{.Replacement}} + + + + +
-
- {{range .Something}} -
- {{.Find}} - - {{.Replacement}} - - - - - -
- {{else}} -
- {{lang "panel_word_filters_no_filters"}} -
- {{end}} + {{else}} +
+ {{lang "panel_word_filters_no_filters"}}
+ {{end}} +
-
-

{{lang "panel_word_filters_create_head"}}

-
-
-
-
-
{{lang "panel_word_filters_create_find"}}
-
-
-
-
{{lang "panel_word_filters_create_replacement"}}
-
-
-
-
-
-
-
\ No newline at end of file +
+

{{lang "panel_word_filters_create_head"}}

+
+
+
+
+
{{lang "panel_word_filters_create_find"}}
+
+
+
+
{{lang "panel_word_filters_create_replacement"}}
+
+
+
+
+
+
+
\ No newline at end of file