From c6b039c6f96762709af109613b5262ea061e25b8 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 30 Aug 2015 03:21:59 +0800 Subject: [PATCH] new repo options UI --- README.md | 1 - README_ZH.md | 1 - conf/locale/locale_en-US.ini | 4 +- modules/auth/repo_form.go | 12 +- modules/bindata/bindata.go | 4 +- public/css/gogs.min.css | 2 +- public/js/gogs.js | 3 + public/less/_repository.less | 26 ++ templates/repo/settings/githook_edit.tmpl | 3 +- templates/repo/settings/options.tmpl | 295 +++++++++++----------- 10 files changed, 196 insertions(+), 155 deletions(-) diff --git a/README.md b/README.md index 4ee0cc5f1e..7ad87a5d84 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,6 @@ There are 5 ways to install Gogs: ## Contributors -- The [core team](http://gogs.io/team) of this project. - Ex-team members [@lunny](https://github.com/lunny) and [@fuxiaohei](https://github.com/fuxiaohei). - See [contributors page](https://github.com/gogits/gogs/graphs/contributors) for full list of contributors. - See [TRANSLATORS](conf/locale/TRANSLATORS) for full list of translators. diff --git a/README_ZH.md b/README_ZH.md index 9404486433..d11dfa0951 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -64,7 +64,6 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自 ## 贡献成员 -- 本项目的 [开发团队](http://gogs.io/team)。 - 前团队成员 [@lunny](https://github.com/lunny) 和 [@fuxiaohei](https://github.com/fuxiaohei)。 - 您可以通过查看 [贡献者页面](https://github.com/gogits/gogs/graphs/contributors) 获取完整的贡献者列表。 - 您可以通过查看 [TRANSLATORS](conf/locale/TRANSLATORS) 文件获取完整的翻译人员列表。 diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 739ee0e3ea..afdb775290 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -503,7 +503,9 @@ settings.transfer_desc = Transfer this repository to another user or to an organ settings.new_owner_has_same_repo = The new owner already has a repository with same name. Please choose another name. settings.delete = Delete This Repository settings.delete_desc = Once you delete a repository, there is no going back. Please be certain. -settings.transfer_notices =
- You will lose access if new owner is a individual user.
- You will conserve access if new owner is an organization and if you're one of the owners.
+settings.transfer_notices = - You will lose access if new owner is a individual user.