mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-03 10:54:06 +02:00
new org options UI
This commit is contained in:
Unknwon committed
1 parent
80701d45bb
commit
edc99bc8a4
10 files changed
+87
-71
No files matched your search
@@ -654,9 +654,8 @@ settings.full_name = Full Name
|
|||||||
settings.website = Website
|
settings.website = Website
|
||||||
settings.location = Location
|
settings.location = Location
|
||||||
settings.update_settings = Update Settings
|
settings.update_settings = Update Settings
|
||||||
settings.change_orgname = Organization Name Changed
|
settings.update_setting_success = Organization settings has been updated successfully.
|
||||||
settings.change_orgname_desc = Organization name has been changed. This will affect how links relate to the organization. Do you want to continue?
|
settings.change_orgname_prompt = This change will affect how links relate to the organization.
|
||||||
settings.update_setting_success = Organization settings were successfully updated.
|
|
||||||
settings.delete = Delete Organization
|
settings.delete = Delete Organization
|
||||||
settings.delete_account = Delete This Organization
|
settings.delete_account = Delete This Organization
|
||||||
settings.delete_prompt = The organization will be permanently removed, and this <strong>CANNOT</strong> be undone!
|
settings.delete_prompt = The organization will be permanently removed, and this <strong>CANNOT</strong> be undone!
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import (
|
|||||||
"github.com/gogits/gogs/modules/setting"
|
"github.com/gogits/gogs/modules/setting"
|
||||||
)
|
)
|
||||||
|
|
||||||
const APP_VER = "0.6.9.0905 Beta"
|
const APP_VER = "0.6.9.0906 Beta"
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||||
|
|||||||
+5
-5
@@ -25,11 +25,11 @@ func (f *CreateOrgForm) Validate(ctx *macaron.Context, errs binding.Errors) bind
|
|||||||
}
|
}
|
||||||
|
|
||||||
type UpdateOrgSettingForm struct {
|
type UpdateOrgSettingForm struct {
|
||||||
OrgUserName string `form:"uname" binding:"Required;AlphaDashDot;MaxSize(30)" locale:"org.org_name_holder"`
|
Name string `binding:"Required;AlphaDashDot;MaxSize(30)" locale:"org.org_name_holder"`
|
||||||
OrgFullName string `form:"fullname" binding:"MaxSize(100)"`
|
FullName string `binding:"MaxSize(100)"`
|
||||||
Description string `form:"desc" binding:"MaxSize(255)"`
|
Description string `binding:"MaxSize(255)"`
|
||||||
Website string `form:"website" binding:"Url;MaxSize(100)"`
|
Website string `binding:"Url;MaxSize(100)"`
|
||||||
Location string `form:"location" binding:"MaxSize(50)"`
|
Location string `binding:"MaxSize(50)"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *UpdateOrgSettingForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
|
func (f *UpdateOrgSettingForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
|
||||||
|
|||||||
@@ -4364,7 +4364,7 @@ func confLocaleLocale_deDeIni() (*asset, error) {
|
|||||||
return a, nil
|
return a, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\x7d\xeb\x72\xdc\x48\xae\xe6\x7f\x3e\x05\xdb\x27\xbc\xee\x8e\x90\xcb\xd1\xdd\x7b\x8b\x0e\xdb\xbd\xb2\xd4\xbe\xcc\xb1\x2c\x8d\xa5\x9e\xd9\x59\x87\x83\xcd\x2a\xb2\xaa\x38\xae\x22\xab\x49\x96\xcb\x9a\x13\x27\x62\x5f\x63\x5f\x6f\x9f\x64\x81\x0f\x40\x5e\x48\x96\x6c\xcf\x4c\xec\xf9\x23\xb1\x32\x91\x37\x24\x12\x09\x20\x91\xc8\x7c\xb7\xcb\x8a\xb2\x5b\xa4\x4f\xd2\xd3\x74\x97\x57\xf5\xa6\xec\xba\xb4\x2b\x37\xcb\x87\xeb\xa6\xeb\xcb\x22\x7d\x51\xf5\xf4\xbb\xfd\x58\x2d\xca\x24\x59\x37\xdb\x92\x40\x5f\xd2\xbf\xa4\xc8\xbb\xf5\xbc\xc9\xdb\x82\x12\xce\xed\x3b\x29\x3f\xed\x36\x4d\xcb\x40\xbf\xc8\x57\xb2\x2e\x37\x3b\x2e\x43\xff\x92\xae\x5a\xd5\x59\x55\xd3\xcf\x6b\xfa\x4a\x5f\xd5\x49\xd7\x2c\xaa\x7c\x93\x05\x19\x48\xb0\xfc\x9f\xd2\x1f\xea\x22\xbd\xee\xcb\x5d\xfa\xb8\xdb\xe6\x9b\xcd\xd3\xbc\x43\x91\xbe\x4c\xf3\xc5\xa2\xd9\xd7\xfd\xe3\x47\x92\x21\x95\x37\xfb\xde\x6a\xbf\xdc\xf7\x92\xb6\xdf\x59\xd2\xaf\xbb\xa4\x2d\x57\x15\x0d\xac\xa5\xa4\xb7\xfa\x99\x1c\xca\x79\x57\xf5\xdc\xe9\x3f\xcb\x57\xf2\xb1\x6c\xbb\xaa\xe1\xfe\xfc\x49\xbe\x92\x5d\xbe\x62\x80\x2b\xfa\x97\xf4\xe5\x76\xb7\xc9\x51\xe0\x46\x3f\x93\x4d\x5e\xaf\xf6\x02\xf3\x5a\x3f\x93\x45\x5b\x52\x56\x56\x97\x07\x4a\x3d\xc3\x8f\x94\x7e\xcc\x66\xb3\x64\x4f\x38\xcd\x76\x6d\xb3\xac\x36\x65\x96\xd7\x45\xb6\x15\xac\xfd\x4a\xe9\xa9\xa6\xa7\x94\x9e\x72\x3a\x86\x51\x16\x84\xa0\x2c\xef\x74\x2c\x34\x35\x84\xaf\xbc\x4b\x50\x55\x9d\x6f\xad\x34\x7f\x26\xe5\x36\xaf\x36\x3c\x09\x0f\xf9\x83\x3a\xdf\x75\x87\x06\x53\x75\xa5\x9f\x84\x88\xac\xbf\xdd\x95\xc0\xc3\xc3\x1b\xfa\x4a\x16\xf9\xae\x5f\xac\x73\xee\xab\x7c\x25\x04\xb4\x6b\x08\x21\x4d\x7b\x0b\x38\xfb\x91\x34\xed\x2a\xaf\xab\xbf\xe5\xbd\x20\xe9\x32\xf8\x99\x6c\xab\xb6\x6d\x18\xbf\x17\xf8\x48\x68\xc4\x19\xd7\x43\x29\x6f\x08\x13\x41\x2d\x9c\xb3\xad\x56\xad\xa0\x92\x33\x2f\xf0\x8b\x6b\xe1\xbc\x65\xd3\x7e\xd0\x8c\xe7\xfc\x39\x28\x4a\x9d\xd0\xdc\xb8\xfd\xbc\x26\xe4\x6b\xee\x05\x7e\x44\x00\x5d\x92\x17\x5b\x42\xe5\x2e\xaf\x4b\xc6\xd1\x29\xff\x22\xbc\xd0\xaf\x44\x69\x2a\xeb\xca\xbe\xaf\xea\x15\x23\xfb\x54\x92\xd2\x6b\x4d\x4a\x82\x3c\x97\x76\xdb\xec\xdd\x74\x52\xfa\x5f\xe8\x67\x7a\x25\x3f\x25\x2f\x28\x84\x4c\x57\x92\x47\xd2\x65\xcb\xb2\x2c\x64\x2c\x5d\xfa\x9c\xbe\x93\xdd\x7e\xb3\x21\xac\xfd\xbe\x2f\xbb\x9e\x0b\x5d\xd1\x6f\x1a\xbf\xfc\x4e\xaa\xae\xa3\x0f\x4a\x7e\x85\x8f\x84\xa6\xae\x5e\x60\x30\x67\xf8\x48\x92\x77\x5d\x99\xb7\x8b\xf5\xfb\x44\xfe\xa3\xaf\xfc\xc1\xb4\x77\x6c\x52\x99\x90\x94\x88\xa4\x05\x6b\x20\x59\x34\x05\xff\x38\xa3\x7f\x54\x75\x55\x77\x3d\xad\xb8\xf7\x89\x7e\x30\x98\x7c\xc9\x04\xf4\x55\x0f\x2c\x68\x22\x96\x6f\xc7\x33\x98\x3e\xaf\xda\xae\x7f\xd8\x57\x44\xac\x6f\xf7\x75\xc2\xe3\xa3\xd5\x96\x15\x73\x63\x42\x2f\x1a\x42\x11\x92\x5b\x1a\xdf\xc5\xed\xf5\x1f\x5f\x9f\xa4\x57\xc4\x89\x56\x6d\x49\xdf\x29\xd5\x41\xff\xa8\xcc\x8f\xb3\x84\x4a\x59\x4b\xe7\x79\x9f\xcf\xf3\xae\xf4\x68\xe5\x4c\xa1\x6e\x97\x07\x1a\x67\xae\x06\x0e\xd6\xf5\xd1\x78\xa7\x56\x08\xd5\xa1\xeb\xca\xd5\xf1\x86\x17\x17\xa5\x33\x53\x43\xe1\xab\x4d\xc9\xe9\x54\x55\xfa\xea\xcd\x9b\xcb\xf3\x67\x69\x59\xaf\xaa\xba\x4c\x0f\x55\xbf\x4e\xf7\xfd\xf2\xbf\x67\xab\xb2\x2e\x5b\xe2\x71\x8b\x2a\xa5\x35\xd5\x12\x25\xa4\x44\xd8\x32\xb8\x59\xd2\x75\x1b\x5a\xfb\x40\xef\xf5\xf5\xeb\xf4\x82\x51\xbc\xcb\xfb\x35\x3a\xd2\xaf\x93\xee\xf7\x0d\xa3\xc8\x35\x78\xb3\x2e\x53\x50\x19\x80\x9a\xa5\xe1\x23\x2d\xb4\x8f\xb3\xa4\x6c\xdb\x8c\xd8\x52\x7f\x9b\x69\x61\xad\x6f\x08\x29\x55\x10\xe9\xd4\x4d\x9f\xce\xcb\x14\x65\x66\x49\x62\x1d\x36\xec\x9e\xee\x76\x9b\x6a\x21\x6b\xfd\x85\xe4\x79\x44\xf3\x0e\xa2\x58\x0a\xe1\x80\x28\xcb\x0b\xd0\x45\xec\x99\xd7\x43\x1a\x31\x10\x94\x5f\x97\xc4\x00\xd7\xfb\x95\xb0\xbd\x4d\xb3\x2f\xbe\x01\xa5\x5a\xef\x3d\xa1\xa6\x6f\x1b\xea\x30\xb0\xe3\x00\x7c\x13\xa7\x44\x71\xbc\x69\xb5\xe5\xb6\x21\xbe\xe2\x88\xbd\x22\x82\x3a\x54\x94\x49\x23\xed\xf2\x8f\xb4\xde\xfa\x26\xed\xd7\x55\x97\x16\x44\x6c\x0b\xae\x98\x96\xc6\x9e\xb6\x0b\x21\x0b\x22\x50\x21\x0d\x4b\x8b\xe7\x00\x50\xdb\x3d\x51\xd3\x9a\x2a\xe3\xcd\x88\x77\x4e\xaa\x72\xaa\x9f\x18\x12\xd5\x03\xfa\x26\xca\x6d\x88\x2b\x33\xdf\x3c\xc7\x87\xfe\x0e\xeb\xa7\x5e\xe5\xcb\x25\xf5\xaa\x23\xaa\x78\x99\x2e\x36\x0d\x91\xd4\xaf\x6f\x5f\x77\x4c\x30\xeb\x6c\xd7\xb4\xd8\xe6\x28\xeb\x8a\x3e\x5d\x5a\x80\x68\x86\xa8\xf7\xdb\x39\xfd\x3a\xac\x2b\xe2\x00\x40\x3b\x97\xe0\xdd\x9c\x52\xa9\x89\x7d\x47\x53\x78\x92\x12\x09\xd3\x08\x08\x65\x20\x00\x1e\x43\x51\x75\xf9\x9c\xe6\x9e\xc1\x97\xb4\x6d\xed\x5b\x22\xab\x75\xdf\xef\xac\xe5\x97\x37\x37\x57\xd2\xb4\x4b\xbd\xab\xed\x3c\xa0\x0c\xcc\xc1\x86\x37\xde\x3a\x6d\xea\x19\x88\x64\xdf\x6e\x06\xf4\x43\x63\xb5\x9c\x23\x78\xe1\x2e\x3c\xe2\x3f\xd7\x1e\x3d\xc0\x73\x47\xd2\xc9\x01\xd4\x44\x38\x2e\xb1\x01\x12\x51\x37\x3b\xae\x37\xa0\xea\x4b\x4d\xf0\xa4\x8c\x4d\xd3\xe5\xcb\xd6\x49\xb9\x90\x7d\x02\xf6\xbf\xa5\x01\x2b\x1b\xb9\xbe\x20\x34\x80\x97\x20\x75\xd9\x36\x5b\x4a\x7d\x4e\xff\x7c\x82\xef\xfe\x05\xd7\x07\x98\xbc\x28\x88\xbf\x75\x27\xe9\xdb\xe7\x67\xe9\x7f\xf9\xf1\x87\x1f\x66\xe9\xab\x9e\x57\x22\x13\xe7\x5f\x99\xa8\xe8\x53\xf6\x70\x07\x4a\x2c\xa3\x27\xba\xbb\xcLine truncated
|
var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\xbd\xeb\x92\xdc\x46\xae\x27\xfe\x9d\x4f\x41\xeb\x84\xfe\xb2\x23\x5a\xa5\xb0\xfd\xdf\x4b\x38\x24\x79\x5b\xdd\xd6\x65\x8e\x5a\xdd\xa3\x6e\xcf\xec\xac\x42\x41\xb3\x8a\xac\x2a\x8e\xaa\xc8\x32\xc9\x52\xa9\xe7\xc4\x89\xd8\xd7\xd8\xd7\xdb\x27\x59\xe0\x07\x20\x2f\x24\xab\x25\x79\x4e\xec\x7e\xe9\x66\x65\x22\x6f\x48\x24\x12\x40\x22\x91\xf9\x6e\x97\x15\x65\xb7\x48\x9f\xa4\xa7\xe9\x2e\xaf\xea\x4d\xd9\x75\x69\x57\x6e\x96\x0f\xd7\x4d\xd7\x97\x45\xfa\xa2\xea\xe9\x77\xfb\xb1\x5a\x94\x49\xb2\x6e\xb6\x25\x81\xbe\xa4\x7f\x49\x91\x77\xeb\x79\x93\xb7\x05\x25\x9c\xdb\x77\x52\x7e\xda\x6d\x9a\x96\x81\x7e\x91\xaf\x64\x5d\x6e\x76\x5c\x86\xfe\x25\x5d\xb5\xaa\xb3\xaa\xa6\x9f\xd7\xf4\x95\xbe\xaa\x93\xae\x59\x54\xf9\x26\x0b\x32\x90\x60\xf9\x3f\xa5\x3f\xd4\x45\x7a\xdd\x97\xbb\xf4\x71\xb7\xcd\x37\x9b\xa7\x79\x87\x22\x7d\x99\xe6\x8b\x45\xb3\xaf\xfb\xc7\x8f\x24\x43\x2a\x6f\xf6\xbd\xd5\x7e\xb9\xef\x25\x6d\xbf\xb3\xa4\x5f\x77\x49\x5b\xae\x2a\x1a\x58\x4b\x49\x6f\xf5\x33\x39\x94\xf3\xae\xea\xb9\xd3\x7f\x95\xaf\xe4\x63\xd9\x76\x55\xc3\xfd\xf9\x8b\x7c\x25\xbb\x7c\xc5\x00\x57\xf4\x2f\xe9\xcb\xed\x6e\x93\xa3\xc0\x8d\x7e\x26\x9b\xbc\x5e\xed\x05\xe6\xb5\x7e\x26\x8b\xb6\xa4\xac\xac\x2e\x0f\x94\x7a\x86\x1f\x29\xfd\x98\xcd\x66\xc9\x9e\x70\x9a\xed\xda\x66\x59\x6d\xca\x2c\xaf\x8b\x6c\x2b\x58\xfb\x95\xd2\x53\x4d\x4f\x29\x3d\xe5\x74\x0c\xa3\x2c\x08\x41\x59\xde\xe9\x58\x68\x6a\x08\x5f\x79\x97\xa0\xaa\x3a\xdf\x5a\x69\xfe\x4c\xca\x6d\x5e\x6d\x78\x12\x1e\xf2\x07\x75\xbe\xeb\x0e\x0d\xa6\xea\x4a\x3f\x09\x11\x59\x7f\xbb\x2b\x81\x87\x87\x37\xf4\x95\x2c\xf2\x5d\xbf\x58\xe7\xdc\x57\xf9\x4a\x08\x68\xd7\x10\x42\x9a\xf6\x16\x70\xf6\x23\x69\xda\x55\x5e\x57\xff\xc8\x7b\x41\xd2\x65\xf0\x33\xd9\x56\x6d\xdb\x30\x7e\x2f\xf0\x91\xd0\x88\x33\xae\x87\x52\xde\x10\x26\x82\x5a\x38\x67\x5b\xad\x5a\x41\x25\x67\x5e\xe0\x17\xd7\xc2\x79\xcb\xa6\xfd\xa0\x19\xcf\xf9\x73\x50\x94\x3a\xa1\xb9\x71\xfb\x79\x4d\xc8\xd7\xdc\x0b\xfc\x88\x00\xba\x24\x2f\xb6\x84\xca\x5d\x5e\x97\x8c\xa3\x53\xfe\x45\x78\xa1\x5f\x89\xd2\x54\xd6\x95\x7d\x5f\xd5\x2b\x46\xf6\xa9\x24\xa5\xd7\x9a\x94\x04\x79\x2e\xed\xb6\xd9\xbb\xe9\xa4\xf4\xbf\xd1\xcf\xf4\x4a\x7e\x4a\x5e\x50\x08\x99\xae\x24\x8f\xa4\xcb\x96\x65\x59\xc8\x58\xba\xf4\x39\x7d\x27\xbb\xfd\x66\x43\x58\xfb\x7d\x5f\x76\x3d\x17\xba\xa2\xdf\x34\x7e\xf9\x9d\x54\x5d\x47\x1f\x94\xfc\x0a\x1f\x09\x4d\x5d\xbd\xc0\x60\xce\xf0\x91\x24\xef\xba\x32\x6f\x17\xeb\xf7\x89\xfc\x47\x5f\xf9\x83\x69\xef\xd8\xa4\x32\x21\x29\x11\x49\x0b\xd6\x40\xb2\x68\x0a\xfe\x71\x46\xff\xa8\xea\xaa\xee\x7a\x5a\x71\xef\x13\xfd\x60\x30\xf9\x92\x09\xe8\xab\x1e\x58\xd0\x44\x2c\xdf\x8e\x67\x30\x7d\x5e\xb5\x5d\xff\xb0\xaf\x88\x58\xdf\xee\xeb\x84\xc7\x47\xab\x2d\x2b\xe6\xc6\x84\x5e\x34\x84\x22\x24\xb7\x34\xbe\x8b\xdb\xeb\x3f\xbf\x3e\x49\xaf\x88\x13\xad\xda\x92\xbe\x53\xaa\x83\xfe\x51\x99\x1f\x67\x09\x95\xb2\x96\xce\xf3\x3e\x9f\xe7\x5d\xe9\xd1\xca\x99\x42\xdd\x2e\x0f\x34\xce\x5c\x0d\x1c\xac\xeb\xa3\xf1\x4e\xad\x10\xaa\x43\xd7\x95\xab\xe3\x0d\x2f\x2e\x4a\x67\xa6\x86\xc2\x57\x9b\x92\xd3\xa9\xaa\xf4\xd5\x9b\x37\x97\xe7\xcf\xd2\xb2\x5e\x55\x75\x99\x1e\xaa\x7e\x9d\xee\xfb\xe5\x7f\xcd\x56\x65\x5d\xb6\xc4\xe3\x16\x55\x4a\x6b\xaa\x25\x4a\x48\x89\xb0\x65\x70\xb3\xa4\xeb\x36\xb4\xf6\x81\xde\xeb\xeb\xd7\xe9\x05\xa3\x78\x97\xf7\x6b\x74\xa4\x5f\x27\xdd\xef\x1b\x46\x91\x6b\xf0\x66\x5d\xa6\xa0\x32\x00\x35\x4b\xc3\x47\x5a\x68\x1f\x67\x49\xd9\xb6\x19\xb1\xa5\xfe\x36\xd3\xc2\x5a\xdf\x10\x52\xaa\x20\xd2\xa9\x9b\x3e\x9d\x97\x29\xca\xcc\x92\xc4\x3a\x6c\xd8\x3d\xdd\xed\x36\xd5\x42\xd6\xfa\x0b\xc9\xf3\x88\xe6\x1d\x44\xb1\x14\xc2\x01\x51\x96\x17\xa0\x8b\xd8\x33\xaf\x87\x34\x62\x20\x28\xbf\x2e\x89\x01\xae\xf7\x2b\x61\x7b\x9b\x66\x5f\x7c\x03\x4a\xb5\xde\x7b\x42\x4d\xdf\x36\xd4\x61\x60\xc7\x01\xf8\x26\x4e\x89\xe2\x78\xd3\x6a\xcb\x6d\x43\x7c\xc5\x11\x7b\x45\x04\x75\xa8\x28\x93\x46\xda\xe5\x1f\x69\xbd\xf5\x4d\xda\xaf\xab\x2e\x2d\x88\xd8\x16\x5c\x31\x2d\x8d\x3d\x6d\x17\x42\x16\x44\xa0\x42\x1a\x96\x16\xcf\x01\xa0\xb6\x7b\xa2\xa6\x35\x55\xc6\x9b\x11\xef\x9c\x54\xe5\x54\x3f\x31\x24\xaa\x07\xf4\x4d\x94\xdb\x10\x57\x66\xbe\x79\x8e\x0f\xfd\x1d\xd6\x4f\xbd\xca\x97\x4b\xea\x55\x47\x54\xf1\x32\x5d\x6c\x1a\x22\xa9\x5f\xdf\xbe\xee\x98\x60\xd6\xd9\xae\x69\xb1\xcd\x51\xd6\x15\x7d\xba\xb4\x00\xd1\x0c\x51\xef\xb7\x73\xfa\x75\x58\x57\xc4\x01\x80\x76\x2e\xc1\xbb\x39\xa5\x52\x13\xfb\x8e\xa6\xf0\x24\x25\x12\xa6\x11\x10\xca\x40\x00\x3c\x86\xa2\xea\xf2\x39\xcd\x3d\x83\x2f\x69\xdb\xda\xb7\x44\x56\xeb\xbe\xdf\x59\xcb\x2f\x6f\x6e\xae\xa4\x69\x97\x7a\x57\xdb\x79\x40\x19\x98\x83\x0d\x6f\xbc\x75\xda\xd4\x33\x10\xc9\xbe\xdd\x0c\xe8\x87\xc6\x6a\x39\x47\xf0\xc2\x5d\x78\xc4\x7f\xae\x3d\x7a\x80\xe7\x8e\xa4\x93\x03\xa8\x89\x70\x5c\x62\x03\x24\xa2\x6e\x76\x5c\x6f\x40\xd5\x97\x9a\xe0\x49\x19\x9b\xa6\xcb\x97\xad\x93\x72\x21\xfb\x04\xec\x7f\x4b\x03\x56\x36\x72\x7d\x41\x68\x00\x2f\x41\xea\xb2\x6d\xb6\x94\xfa\x9c\xfe\xf9\x04\xdf\xfd\x0b\xae\x0f\x30\x79\x51\x10\x7f\xeb\x4e\xd2\xb7\xcf\xcf\xd2\xff\xf4\xe3\x0f\x3f\xcc\xd2\x57\x3d\xaf\x44\x26\xce\xbf\x33\x51\xd1\xa7\xec\xe1\x0e\x94\x58\x46\x4f\x7Line truncated
|
||||||
|
|
||||||
func confLocaleLocale_enUsIniBytes() ([]byte, error) {
|
func confLocaleLocale_enUsIniBytes() ([]byte, error) {
|
||||||
return bindataRead(
|
return bindataRead(
|
||||||
@@ -4379,7 +4379,7 @@ func confLocaleLocale_enUsIni() (*asset, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 42301, mode: os.FileMode(420), modTime: time.Unix(1441224252, 0)}
|
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 42114, mode: os.FileMode(420), modTime: time.Unix(1441551355, 0)}
|
||||||
a := &asset{bytes: bytes, info: info}
|
a := &asset{bytes: bytes, info: info}
|
||||||
return a, nil
|
return a, nil
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+1
-1
@@ -1 +1 @@
|
|||||||
@font-face{font-family:octicons;src:url(../fonts/octicons.eot?#iefix&v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('embedded-opentype'),url(../fonts/octicons.woff?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('woff'),url(../fonts/octicons.ttf?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('truetype'),url(../fonts/octicons.svg?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d#octicons) format('svg');font-weight:400;font-style:normal}.mega-octicon,.octicon{font:normal normal normal 16px/1 octicons;display:inline-block;text-decoration:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mega-octicon{font-size:32px}.octicon-alert:before{content:'\f02d'}.octicon-arrow-down:before{content:'\f03f'}.octicon-arrow-left:before{content:'\f040'}.octicon-arrow-right:before{content:'\f03e'}.octicon-arrow-small-down:before{content:'\f0a0'}.octicon-arrow-small-left:before{content:'\f0a1'}.octicon-arrow-small-right:before{content:'\f071'}.octicon-arrow-small-up:before{content:'\f09f'}.octicon-arrow-up:before{content:'\f03d'}.octicon-beaker:before,.octicon-microscope:before{content:'\f0dd'}.octicon-bell:before{content:'\f0de'}.octicon-book:before{content:'\f007'}.octicon-bookmark:before{content:'\f07b'}.octicon-briefcase:before{content:'\f0d3'}.octicon-broadcast:before{content:'\f048'}.octicon-browser:before{content:'\f0c5'}.octicon-bug:before{content:'\f091'}.octicon-calendar:before{content:'\f068'}.octicon-check:before{content:'\f03a'}.octicon-checklist:before{content:'\f076'}.octicon-chevron-down:before{content:'\f0a3'}.octicon-chevron-left:before{content:'\f0a4'}.octicon-chevron-right:before{content:'\f078'}.octicon-chevron-up:before{content:'\f0a2'}.octicon-circle-slash:before{content:'\f084'}.octicon-circuit-board:before{content:'\f0d6'}.octicon-clippy:before{content:'\f035'}.octicon-clock:before{content:'\f046'}.octicon-cloud-download:before{content:'\f00b'}.octicon-cloud-upload:before{content:'\f00c'}.octicon-code:before{content:'\f05f'}.octicon-color-mode:before{content:'\f065'}.octicon-comment-add:before,.octicon-comment:before{content:'\f02b'}.octicon-comment-discussion:before{content:'\f04f'}.octicon-credit-card:before{content:'\f045'}.octicon-dash:before{content:'\f0ca'}.octicon-dashboard:before{content:'\f07d'}.octicon-database:before{content:'\f096'}.octicon-clone:before,.octicon-desktop-download:before{content:'\f0dc'}.octicon-device-camera:before{content:'\f056'}.octicon-device-camera-video:before{content:'\f057'}.octicon-device-desktop:before{content:'\f27c'}.octicon-device-mobile:before{content:'\f038'}.octicon-diff:before{content:'\f04d'}.octicon-diff-added:before{content:'\f06b'}.octicon-diff-ignored:before{content:'\f099'}.octicon-diff-modified:before{content:'\f06d'}.octicon-diff-removed:before{content:'\f06c'}.octicon-diff-renamed:before{content:'\f06e'}.octicon-ellipsis:before{content:'\f09a'}.octicon-eye-unwatch:before,.octicon-eye-watch:before,.octicon-eye:before{content:'\f04e'}.octicon-file-binary:before{content:'\f094'}.octicon-file-code:before{content:'\f010'}.octicon-file-directory:before{content:'\f016'}.octicon-file-media:before{content:'\f012'}.octicon-file-pdf:before{content:'\f014'}.octicon-file-submodule:before{content:'\f017'}.octicon-file-symlink-directory:before{content:'\f0b1'}.octicon-file-symlink-file:before{content:'\f0b0'}.octicon-file-text:before{content:'\f011'}.octicon-file-zip:before{content:'\f013'}.octicon-flame:before{content:'\f0d2'}.octicon-fold:before{content:'\f0cc'}.octicon-gear:before{content:'\f02f'}.octicon-gift:before{content:'\f042'}.octicon-gist:before{content:'\f00e'}.octicon-gist-secret:before{content:'\f08c'}.octicon-git-branch-create:before,.octicon-git-branch-delete:before,.octicon-git-branch:before{content:'\f020'}.octicon-git-commit:before{content:'\f01f'}.octicon-git-compare:before{content:'\f0ac'}.octicon-git-merge:before{content:'\f023'}.octicon-git-pull-request-abandoned:before,.octicon-git-pull-request:before{content:'\f009'}.octicon-globe:before{content:'\f0b6'}.octicon-graph:before{content:'\f043'}.octicon-heart:before{content:'\2665'}.octicon-history:before{content:'\f07e'}.octicon-home:before{content:'\f08d'}.octicon-horizontal-rule:before{content:'\f070'}.octicon-hubot:before{content:'\f09d'}.octicon-inbox:before{content:'\f0cf'}.octicon-info:before{content:'\f059'}.octicon-issue-closed:before{content:'\f028'}.octicon-issue-opened:before{content:'\f026'}.octicon-issue-reopened:before{content:'\f027'}.octicon-jersey:before{content:'\f019'}.octicon-key:before{content:'\f049'}.octicon-keyboard:before{content:'\f00d'}.octicon-law:before{content:'\f0d8'}.octicon-light-bulb:before{content:'\f000'}.octicon-link:before{content:'\f05c'}.octicon-link-external:before{content:'\f07f'}.octicon-list-ordered:before{content:'\f062'}.octicon-list-unordered:before{content:'\f061'}.octicon-location:before{content:'\f060'}.octicon-gLine truncated
|
@font-face{font-family:octicons;src:url(../fonts/octicons.eot?#iefix&v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('embedded-opentype'),url(../fonts/octicons.woff?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('woff'),url(../fonts/octicons.ttf?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('truetype'),url(../fonts/octicons.svg?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d#octicons) format('svg');font-weight:400;font-style:normal}.mega-octicon,.octicon{font:normal normal normal 16px/1 octicons;display:inline-block;text-decoration:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mega-octicon{font-size:32px}.octicon-alert:before{content:'\f02d'}.octicon-arrow-down:before{content:'\f03f'}.octicon-arrow-left:before{content:'\f040'}.octicon-arrow-right:before{content:'\f03e'}.octicon-arrow-small-down:before{content:'\f0a0'}.octicon-arrow-small-left:before{content:'\f0a1'}.octicon-arrow-small-right:before{content:'\f071'}.octicon-arrow-small-up:before{content:'\f09f'}.octicon-arrow-up:before{content:'\f03d'}.octicon-beaker:before,.octicon-microscope:before{content:'\f0dd'}.octicon-bell:before{content:'\f0de'}.octicon-book:before{content:'\f007'}.octicon-bookmark:before{content:'\f07b'}.octicon-briefcase:before{content:'\f0d3'}.octicon-broadcast:before{content:'\f048'}.octicon-browser:before{content:'\f0c5'}.octicon-bug:before{content:'\f091'}.octicon-calendar:before{content:'\f068'}.octicon-check:before{content:'\f03a'}.octicon-checklist:before{content:'\f076'}.octicon-chevron-down:before{content:'\f0a3'}.octicon-chevron-left:before{content:'\f0a4'}.octicon-chevron-right:before{content:'\f078'}.octicon-chevron-up:before{content:'\f0a2'}.octicon-circle-slash:before{content:'\f084'}.octicon-circuit-board:before{content:'\f0d6'}.octicon-clippy:before{content:'\f035'}.octicon-clock:before{content:'\f046'}.octicon-cloud-download:before{content:'\f00b'}.octicon-cloud-upload:before{content:'\f00c'}.octicon-code:before{content:'\f05f'}.octicon-color-mode:before{content:'\f065'}.octicon-comment-add:before,.octicon-comment:before{content:'\f02b'}.octicon-comment-discussion:before{content:'\f04f'}.octicon-credit-card:before{content:'\f045'}.octicon-dash:before{content:'\f0ca'}.octicon-dashboard:before{content:'\f07d'}.octicon-database:before{content:'\f096'}.octicon-clone:before,.octicon-desktop-download:before{content:'\f0dc'}.octicon-device-camera:before{content:'\f056'}.octicon-device-camera-video:before{content:'\f057'}.octicon-device-desktop:before{content:'\f27c'}.octicon-device-mobile:before{content:'\f038'}.octicon-diff:before{content:'\f04d'}.octicon-diff-added:before{content:'\f06b'}.octicon-diff-ignored:before{content:'\f099'}.octicon-diff-modified:before{content:'\f06d'}.octicon-diff-removed:before{content:'\f06c'}.octicon-diff-renamed:before{content:'\f06e'}.octicon-ellipsis:before{content:'\f09a'}.octicon-eye-unwatch:before,.octicon-eye-watch:before,.octicon-eye:before{content:'\f04e'}.octicon-file-binary:before{content:'\f094'}.octicon-file-code:before{content:'\f010'}.octicon-file-directory:before{content:'\f016'}.octicon-file-media:before{content:'\f012'}.octicon-file-pdf:before{content:'\f014'}.octicon-file-submodule:before{content:'\f017'}.octicon-file-symlink-directory:before{content:'\f0b1'}.octicon-file-symlink-file:before{content:'\f0b0'}.octicon-file-text:before{content:'\f011'}.octicon-file-zip:before{content:'\f013'}.octicon-flame:before{content:'\f0d2'}.octicon-fold:before{content:'\f0cc'}.octicon-gear:before{content:'\f02f'}.octicon-gift:before{content:'\f042'}.octicon-gist:before{content:'\f00e'}.octicon-gist-secret:before{content:'\f08c'}.octicon-git-branch-create:before,.octicon-git-branch-delete:before,.octicon-git-branch:before{content:'\f020'}.octicon-git-commit:before{content:'\f01f'}.octicon-git-compare:before{content:'\f0ac'}.octicon-git-merge:before{content:'\f023'}.octicon-git-pull-request-abandoned:before,.octicon-git-pull-request:before{content:'\f009'}.octicon-globe:before{content:'\f0b6'}.octicon-graph:before{content:'\f043'}.octicon-heart:before{content:'\2665'}.octicon-history:before{content:'\f07e'}.octicon-home:before{content:'\f08d'}.octicon-horizontal-rule:before{content:'\f070'}.octicon-hubot:before{content:'\f09d'}.octicon-inbox:before{content:'\f0cf'}.octicon-info:before{content:'\f059'}.octicon-issue-closed:before{content:'\f028'}.octicon-issue-opened:before{content:'\f026'}.octicon-issue-reopened:before{content:'\f027'}.octicon-jersey:before{content:'\f019'}.octicon-key:before{content:'\f049'}.octicon-keyboard:before{content:'\f00d'}.octicon-law:before{content:'\f0d8'}.octicon-light-bulb:before{content:'\f000'}.octicon-link:before{content:'\f05c'}.octicon-link-external:before{content:'\f07f'}.octicon-list-ordered:before{content:'\f062'}.octicon-list-unordered:before{content:'\f061'}.octicon-location:before{content:'\f060'}.octicon-gLine truncated
|
||||||
@@ -389,6 +389,26 @@ function initRepository() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function initOrganization(){
|
||||||
|
if ($('.organization').length == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Options
|
||||||
|
if ($('.organization.settings.options').length > 0) {
|
||||||
|
$('#org_name').keyup(function () {
|
||||||
|
var $prompt_span = $('#org-name-change-prompt');
|
||||||
|
if ($(this).val().toString().toLowerCase() != $(this).data('org-name').toString().toLowerCase()) {
|
||||||
|
$prompt_span.show();
|
||||||
|
} else {
|
||||||
|
$prompt_span.hide();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
function initWebhook() {
|
function initWebhook() {
|
||||||
if ($('.new.webhook').length == 0) {
|
if ($('.new.webhook').length == 0) {
|
||||||
return;
|
return;
|
||||||
@@ -524,5 +544,6 @@ $(document).ready(function () {
|
|||||||
initCommentForm();
|
initCommentForm();
|
||||||
initInstall();
|
initInstall();
|
||||||
initRepository();
|
initRepository();
|
||||||
|
initOrganization();
|
||||||
initWebhook();
|
initWebhook();
|
||||||
});
|
});
|
||||||
@@ -18,4 +18,11 @@
|
|||||||
&.new.org {
|
&.new.org {
|
||||||
#create-page-form;
|
#create-page-form;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.options {
|
||||||
|
input {
|
||||||
|
width: 50%!important;
|
||||||
|
min-width: 300px;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -38,29 +38,29 @@ func SettingsPost(ctx *middleware.Context, form auth.UpdateOrgSettingForm) {
|
|||||||
org := ctx.Org.Organization
|
org := ctx.Org.Organization
|
||||||
|
|
||||||
// Check if organization name has been changed.
|
// Check if organization name has been changed.
|
||||||
if org.Name != form.OrgUserName {
|
if org.Name != form.Name {
|
||||||
isExist, err := models.IsUserExist(org.Id, form.OrgUserName)
|
isExist, err := models.IsUserExist(org.Id, form.Name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Handle(500, "IsUserExist", err)
|
ctx.Handle(500, "IsUserExist", err)
|
||||||
return
|
return
|
||||||
} else if isExist {
|
} else if isExist {
|
||||||
ctx.Data["Err_UserName"] = true
|
ctx.Data["OrgName"] = true
|
||||||
ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), SETTINGS_OPTIONS, &form)
|
ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), SETTINGS_OPTIONS, &form)
|
||||||
return
|
return
|
||||||
} else if err = models.ChangeUserName(org, form.OrgUserName); err != nil {
|
} else if err = models.ChangeUserName(org, form.Name); err != nil {
|
||||||
if err == models.ErrUserNameIllegal {
|
if err == models.ErrUserNameIllegal {
|
||||||
ctx.Data["Err_UserName"] = true
|
ctx.Data["OrgName"] = true
|
||||||
ctx.RenderWithErr(ctx.Tr("form.illegal_username"), SETTINGS_OPTIONS, &form)
|
ctx.RenderWithErr(ctx.Tr("form.illegal_username"), SETTINGS_OPTIONS, &form)
|
||||||
} else {
|
} else {
|
||||||
ctx.Handle(500, "ChangeUserName", err)
|
ctx.Handle(500, "ChangeUserName", err)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
log.Trace("Organization name changed: %s -> %s", org.Name, form.OrgUserName)
|
log.Trace("Organization name changed: %s -> %s", org.Name, form.Name)
|
||||||
org.Name = form.OrgUserName
|
org.Name = form.Name
|
||||||
}
|
}
|
||||||
|
|
||||||
org.FullName = form.OrgFullName
|
org.FullName = form.FullName
|
||||||
org.Description = form.Description
|
org.Description = form.Description
|
||||||
org.Website = form.Website
|
org.Website = form.Website
|
||||||
org.Location = form.Location
|
org.Location = form.Location
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
0.6.9.0905 Beta
|
0.6.9.0906 Beta
|
||||||
@@ -1,56 +1,45 @@
|
|||||||
{{template "ng/base/head" .}}
|
{{template "base/head" .}}
|
||||||
{{template "ng/base/header" .}}
|
<div class="organization settings options">
|
||||||
{{template "org/base/header" .}}
|
{{template "org/header" .}}
|
||||||
<div id="setting-wrapper" class="main-wrapper">
|
<div class="ui container">
|
||||||
<div id="org-setting" class="container clear">
|
<div class="ui grid">
|
||||||
{{template "org/settings/nav" .}}
|
{{template "org/settings/navbar" .}}
|
||||||
<div class="grid-4-5 left">
|
<div class="twelve wide column content">
|
||||||
<div class="setting-content">
|
{{template "base/alert" .}}
|
||||||
{{template "ng/base/alert" .}}
|
<h4 class="ui top attached header">
|
||||||
<div id="setting-content">
|
{{.i18n.Tr "org.settings.options"}}
|
||||||
<div id="user-profile-setting-content" class="panel panel-radius">
|
</h4>
|
||||||
<div class="panel-header">
|
<div class="ui attached segment">
|
||||||
<strong>{{.i18n.Tr "org.settings.options"}}</strong>
|
<form class="ui form" action="{{.Link}}" method="post">
|
||||||
|
{{.CsrfTokenHtml}}
|
||||||
|
<div class="required field {{if .Err_OrgName}}error{{end}}">
|
||||||
|
<label for="org_name">{{.i18n.Tr "org.org_name_holder"}}<span class="text red hide" id="org-name-change-prompt"> {{.i18n.Tr "org.settings.change_orgname_prompt"}}</span></label>
|
||||||
|
<input id="org_name" name="name" value="{{.Org.Name}}" data-org-name="{{.Org.Name}}" autofocus required>
|
||||||
</div>
|
</div>
|
||||||
<form class="form form-align panel-body" id="org-setting-form" action="{{AppSubUrl}}/org/{{.Org.LowerName}}/settings" method="post">
|
<div class="field {{if .Err_FullName}}error{{end}}">
|
||||||
{{.CsrfTokenHtml}}
|
<label for="full_name">{{.i18n.Tr "org.org_name_holder"}}</label>
|
||||||
<input type="hidden" name="action" value="update">
|
<input id="full_name" name="full_name" value="{{.Org.FullName}}">
|
||||||
<div class="field">
|
</div>
|
||||||
<label class="req" for="orgname">{{.i18n.Tr "org.org_name_holder"}}</label>
|
<div class="field {{if .Err_Description}}error{{end}}">
|
||||||
<input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="orgname" name="uname" value="{{.Org.Name}}" data-orgname="{{.Org.Name}}" required />
|
<label for="description">{{$.i18n.Tr "org.org_desc"}}</label>
|
||||||
</div>
|
<textarea id="description" name="description" rows="2">{{.Org.Description}}</textarea>
|
||||||
<div class="white-popup-block mfp-hide" id="change-orgname-modal">
|
</div>
|
||||||
<h1 class="text-red">{{.i18n.Tr "org.settings.change_orgname"}}</h1>
|
<div class="field {{if .Err_Website}}error{{end}}">
|
||||||
<p>{{.i18n.Tr "org.settings.change_orgname_desc"}}</p>
|
<label for="website">{{.i18n.Tr "org.settings.website"}}</label>
|
||||||
<br>
|
<input id="website" name="website" type="url" value="{{.Org.Website}}">
|
||||||
<button class="btn btn-red btn-large btn-radius" id="change-orgname-submit">{{.i18n.Tr "settings.continue"}}</button>
|
</div>
|
||||||
<button class="btn btn-large btn-radius popup-modal-dismiss">{{.i18n.Tr "settings.cancel"}}</button>
|
<div class="field">
|
||||||
</div>
|
<label for="location">{{.i18n.Tr "org.settings.location"}}</label>
|
||||||
<div class="field">
|
<input id="location" name="location" value="{{.Org.Location}}">
|
||||||
<label for="full-name">{{.i18n.Tr "org.settings.full_name"}}</label>
|
</div>
|
||||||
<input class="ipt ipt-large ipt-radius {{if .Err_FullName}}ipt-error{{end}}" id="full-name" name="fullname" value="{{.Org.FullName}}" />
|
|
||||||
</div>
|
<div class="field">
|
||||||
<div class="field clear">
|
<button class="ui green button">{{$.i18n.Tr "org.settings.update_settings"}}</button>
|
||||||
<label class="left" for="desc">{{.i18n.Tr "org.org_desc"}}</label>
|
</div>
|
||||||
<textarea class="ipt ipt-large ipt-radius {{if .Err_Description}}ipt-error{{end}}" id="desc" name="desc">{{.Org.Description}}</textarea>
|
</form>
|
||||||
</div>
|
|
||||||
<div class="field">
|
|
||||||
<label for="website">{{.i18n.Tr "org.settings.website"}}</label>
|
|
||||||
<input class="ipt ipt-large ipt-radius {{if .Err_Website}}ipt-error{{end}}" id="website" name="website" type="url" value="{{.Org.Website}}" />
|
|
||||||
</div>
|
|
||||||
<div class="field">
|
|
||||||
<label for="location">{{.i18n.Tr "org.settings.location"}}</label>
|
|
||||||
<input class="ipt ipt-large ipt-radius {{if .Err_Location}}ipt-error{{end}}" id="location" name="location" type="text" value="{{.Org.Location}}" />
|
|
||||||
</div>
|
|
||||||
<div class="field">
|
|
||||||
<span class="form-label"></span>
|
|
||||||
<button class="btn btn-green btn-large btn-radius" id="change-orgname-btn" href="#change-orgname-modal">{{.i18n.Tr "org.settings.update_settings"}}</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{template "ng/base/footer" .}}
|
{{template "base/footer" .}}
|
||||||
Reference in new issue
Block a user