Mirror fix and hide missing pages for 0.5 release

diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini
index 21442539ab2746899423773536c06cdc2c2d625a..55d22f23eec24798d9eb32c096ed326461e2c56d 100644 (file)
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@@ -234,6 +234,11 @@ settings.update_webhook = 更新 Web 钩子
 settings.update_hook_success = Web 钩子更新成功！
 settings.delete_webhook = 删除 Web 钩子
 settings.recent_deliveries = 最近推送记录
+settings.hook_type = 钩子类型
+settings.add_slack_hook_desc = 为您的仓库增加 <a href="http://slack.com">Slack</a> 集成
+settings.slack_token = 令牌
+settings.slack_domain = 域名
+settings.slack_channel = 频道
 
 [org]
 org_name_holder = 组织名称

diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 6f3d4c66ca62eb4a8a22e018616769c41f870ba2..381250824895cea7a84209e417027f9e5748f1a7 100644 (file)
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -44,14 +44,14 @@
                     </button>
                 </a>
             </li>
-            <li id="repo-header-fork">
+            <!-- <li id="repo-header-fork">
                 <a id="repo-header-fork-btn" href="{{.RepoLink}}/action/fork">
                     <button class="btn btn-gray text-bold btn-radius">
                         <i class="octicon octicon-repo-forked"></i>{{.i18n.Tr "repo.fork"}}
                         <span class="num">{{.Repository.NumForks}}</span>
                     </button>
                 </a>
-            </li>
+            </li> -->
         </ul>
     </div>
 </div>
\ No newline at end of file

diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 42b8bdd4b16a8c7f0736070ac66f3541d243feda..094730847741b8bbc950d3da2fe278f14971494f 100644 (file)
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -9,11 +9,11 @@
                 <a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a>
             </p>
             <ul id="repo-file-nav" class="clear menu menu-line">
-                <li>
+                <!-- <li>
                     <a href="#">
                         <button class="btn btn-green btn-small btn-radius" id="repo-compare-btn"><i class="octicon octicon-git-compare"></i></button>
                     </a>
-                </li>
+                </li> -->
                 <li id="repo-branch-switch" class="down drop">
                     <a href="#">
                         <button class="btn btn-gray btn-small btn-radius">
@@ -22,24 +22,24 @@
                         </button>
                     </a>
                     <div class="drop-down panel">
-                        <p class="panel-header text-bold">Branches & Tags</p>
-                        <input id="repo-branch-filter-ipt" class="ipt ipt-large" type="text" placeholder="find branches / tags"/>
+                        <p class="panel-header text-bold">Branches <!-- & Tags --></p>
+                        <!-- <input id="repo-branch-filter-ipt" class="ipt ipt-large" type="text" placeholder="find branches / tags"/> -->
                         <div id="repo-branch-tag">
                             <ul class="menu menu-line tab-nav clear" id="repo-branch-tab-nav">
                                 <li class="js-tab-nav js-tab-nav-show left" data-tab-target="#repo-branch-list"><a href="#">Branches</a></li>
-                                <li class="js-tab-nav left" data-tab-target="#repo-tag-list"><a href="#">Tags</a></li>
+                                <!-- <li class="js-tab-nav left" data-tab-target="#repo-tag-list"><a href="#">Tags</a></li> -->
                             </ul>
                             <ul class="menu menu-vertical switching-list" id="repo-branch-list">
                                 {{range .Branches}}
                                 <li {{if eq . $.BranchName}}class="checked"{{end}}><a href="{{$.RepoLink}}/src/{{.}}"><i class="octicon octicon-check"></i>{{.}}</a></li>
                                 {{end}}
                             </ul>
-                            <ul class="menu menu-vertical switching-list" id="repo-tag-list">
+                            <!-- <ul class="menu menu-vertical switching-list" id="repo-tag-list">
                                 <li><a href="#"><i class="octicon octicon-check"></i>0.3.3</a></li>
                                 <li><a href="#"><i class="octicon octicon-check"></i>0.4.4</a></li>
                                 <li class="checked"><a href="#"><i class="octicon octicon-check"></i>0.1</a></li>
                                 <li><a href="#"><i class="octicon octicon-check"></i>0.1 beta</a></li>
-                            </ul>
+                            </ul> -->
                         </div>
                     </div>
                 </li>
@@ -55,7 +55,7 @@
                         {{end}}
                     {{end}}
                 </li>
-                <li id="repo-commits-jump" class="repo-jump right">
+                <!-- <li id="repo-commits-jump" class="repo-jump right">
                     <a href="#">
                         <button class="btn btn-small btn-gray btn-right-radius"><i class="octicon octicon-git-commit"></i></button>
                     </a>
@@ -64,7 +64,7 @@
                     <a href="#">
                         <button class="btn btn-small btn-gray btn-left-radius"><i class="octicon octicon-list-unordered"></i></button>
                     </a>
-                </li>
+                </li> -->
             </ul>
             {{if .IsFile}}
                 {{template "repo/view_file" .}}

diff --git a/templates/repo/settings/gogs_hook.tmpl b/templates/repo/settings/gogs_hook.tmpl
deleted file mode 100644 (file)
index 678d640..0000000
--- a/templates/repo/settings/gogs_hook.tmpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<div id="gogs" class="{{if (and .PageIsSettingsHooksEdit (not (eq .HookType "gogs")))}}hidden{{end}}">
-  <form class="form form-align panel-body repo-setting-form" id="repo-setting-form-gogs"  action="{{.RepoLink}}/settings/hooks/gogs/{{if .PageIsSettingsHooksNew}}new{{else}}{{.Webhook.Id}}{{end}}" method="post">
-    {{.CsrfTokenHtml}}
-    <input type="hidden" name="hook_type" value="gogs">
-    <div class="text-center panel-desc">{{.i18n.Tr "repo.settings.add_webhook_desc" | Str2html}}</div>
-    <div class="field">
-        <label class="req" for="payload-url">{{.i18n.Tr "repo.settings.payload_url"}}</label>
-        <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="payload-url" name="payload_url" type="url" value="{{.Webhook.Url}}" required />
-    </div>
-    <div class="field">
-      <label class="req">{{.i18n.Tr "repo.settings.content_type"}}</label>
-      <select name="content_type">
-          <option value="1" {{if or .PageIsSettingsHooksNew (eq .Webhook.ContentType 1)}}selected{{end}}>application/json</option>
-          <option value="2" {{if eq .Webhook.ContentType 2}}selected{{end}}>application/x-www-form-urlencoded</option>
-      </select>
-    </div>
-    <div class="field">
-        <label for="secret">{{.i18n.Tr "repo.settings.secret"}}</label>
-        <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="secret" name="secret" type="password" value="{{.Webhook.Secret}}" autocomplete="off" />
-    </div>
-    {{template "repo/settings/hook_settings" .}}
-  </form>
-</div>

diff --git a/templates/repo/settings/hook_gogs.tmpl b/templates/repo/settings/hook_gogs.tmpl
new file mode 100644 (file)
index 0000000..35b5899
--- /dev/null
+++ b/templates/repo/settings/hook_gogs.tmpl
@@ -0,0 +1,23 @@
+<div id="gogs" class="{{if (and .PageIsSettingsHooksEdit (not (eq .HookType "Gogs")))}}hidden{{end}}">
+  <form class="form form-align panel-body repo-setting-form" id="repo-setting-form-gogs"  action="{{.RepoLink}}/settings/hooks/gogs/{{if .PageIsSettingsHooksNew}}new{{else}}{{.Webhook.Id}}{{end}}" method="post">
+    {{.CsrfTokenHtml}}
+    <input type="hidden" name="hook_type" value="gogs">
+    <div class="text-center panel-desc">{{.i18n.Tr "repo.settings.add_webhook_desc" | Str2html}}</div>
+    <div class="field">
+        <label class="req" for="payload-url">{{.i18n.Tr "repo.settings.payload_url"}}</label>
+        <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="payload-url" name="payload_url" type="url" value="{{.Webhook.Url}}" required />
+    </div>
+    <div class="field">
+      <label class="req">{{.i18n.Tr "repo.settings.content_type"}}</label>
+      <select name="content_type">
+          <option value="1" {{if or .PageIsSettingsHooksNew (eq .Webhook.ContentType 1)}}selected{{end}}>application/json</option>
+          <option value="2" {{if eq .Webhook.ContentType 2}}selected{{end}}>application/x-www-form-urlencoded</option>
+      </select>
+    </div>
+    <div class="field">
+        <label for="secret">{{.i18n.Tr "repo.settings.secret"}}</label>
+        <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="secret" name="secret" type="password" value="{{.Webhook.Secret}}" autocomplete="off" />
+    </div>
+    {{template "repo/settings/hook_settings" .}}
+  </form>
+</div>

diff --git a/templates/repo/settings/hook_new.tmpl b/templates/repo/settings/hook_new.tmpl
index 7a450282b1fab3b4ba20b7d47087b8bde28d05e5..2bce97a26b133a74e1bdf6182ee2ab80ab34d389 100644 (file)
--- a/templates/repo/settings/hook_new.tmpl
+++ b/templates/repo/settings/hook_new.tmpl
@@ -14,8 +14,8 @@
                                        <strong>{{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}}</strong>
                                </div>
                           {{template "repo/settings/hook_types" .}}
-                          {{template "repo/settings/gogs_hook" .}}
-                          {{template "repo/settings/slack_hook" .}}
+                          {{template "repo/settings/hook_gogs" .}}
+                          {{template "repo/settings/hook_slack" .}}
                            </div>
                        </div>
                        {{if .PageIsSettingsHooksEdit}}

diff --git a/templates/repo/settings/hook_slack.tmpl b/templates/repo/settings/hook_slack.tmpl
new file mode 100644 (file)
index 0000000..50d28e2
--- /dev/null
+++ b/templates/repo/settings/hook_slack.tmpl
@@ -0,0 +1,20 @@
+<div id="slack" class="{{if or .PageIsSettingsHooksNew (and .PageIsSettingsHooksEdit (not (eq .HookType "Slack")))}}hidden{{end}}">
+  <form class="form form-align panel-body repo-setting-form" id="repo-setting-form-slack" action="{{.RepoLink}}/settings/hooks/slack/{{if .PageIsSettingsHooksNew}}new{{else}}{{.Webhook.Id}}{{end}}" method="post">
+    {{.CsrfTokenHtml}}
+    <input type="hidden" name="hook_type" value="slack">
+    <div class="text-center panel-desc">{{.i18n.Tr "repo.settings.add_slack_hook_desc" | Str2html}}</div>
+    <div class="field">
+        <label class="req" for="domain">{{.i18n.Tr "repo.settings.slack_domain"}}</label>
+        <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="domain" name="domain" type="text" value="{{.SlackHook.Domain}}" placeholde="myslack" required />
+    </div>
+    <div class="field">
+        <label class="req" for="token">{{.i18n.Tr "repo.settings.slack_token"}}</label>
+        <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="token" name="token" type="text" value="{{.SlackHook.Token}}" autocomplete="off" required />
+    </div>
+    <div class="field">
+        <label class="req" for="channel">{{.i18n.Tr "repo.settings.slack_channel"}}</label>
+        <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="channel" name="channel" type="text" value="{{.SlackHook.Channel}}" placeholder="#general" required />
+    </div>
+    {{template "repo/settings/hook_settings" .}}
+  </form>
+</div>

diff --git a/templates/repo/settings/nav.tmpl b/templates/repo/settings/nav.tmpl
index 6288ca6cd7bbd55d6cb9fef52f54b270b3b15d54..ef0765feac56d94c47956e16b5988dbdfc28bd0d 100644 (file)
--- a/templates/repo/settings/nav.tmpl
+++ b/templates/repo/settings/nav.tmpl
@@ -5,7 +5,7 @@
             <li {{if .PageIsSettingsOptions}}class="current"{{end}}><a href="{{.RepoLink}}/settings">{{.i18n.Tr "repo.settings.options"}}</a></li>
             <li {{if .PageIsSettingsCollaboration}}class="current"{{end}}><a href="{{.RepoLink}}/settings/collaboration">{{.i18n.Tr "repo.settings.collaboration"}}</a></li>
             <li {{if .PageIsSettingsHooks}}class="current"{{end}}><a href="{{.RepoLink}}/settings/hooks">{{.i18n.Tr "repo.settings.hooks"}}</a></li>
-            <li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.i18n.Tr "repo.settings.deploy_keys"}}</a></li>
+            <!-- <li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.i18n.Tr "repo.settings.deploy_keys"}}</a></li> -->
         </ul>
     </div>
 </div>
\ No newline at end of file

diff --git a/templates/repo/settings/slack_hook.tmpl b/templates/repo/settings/slack_hook.tmpl
deleted file mode 100644 (file)
index e68571a..0000000
--- a/templates/repo/settings/slack_hook.tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="slack" class="{{if or .PageIsSettingsHooksNew (and .PageIsSettingsHooksEdit (not (eq .HookType "slack")))}}hidden{{end}}">
-  <form class="form form-align panel-body repo-setting-form" id="repo-setting-form-slack" action="{{.RepoLink}}/settings/hooks/slack/{{if .PageIsSettingsHooksNew}}new{{else}}{{.Webhook.Id}}{{end}}" method="post">
-    {{.CsrfTokenHtml}}
-    <input type="hidden" name="hook_type" value="slack">
-    <div class="text-center panel-desc">{{.i18n.Tr "repo.settings.add_slack_hook_desc" | Str2html}}</div>
-    <div class="field">
-        <label class="req" for="domain">{{.i18n.Tr "repo.settings.slack_domain"}}</label>
-        <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="domain" name="domain" type="text" value="{{.SlackHook.Domain}}" placeholde="myslack" required />
-    </div>
-    <div class="field">
-        <label class="req" for="token">{{.i18n.Tr "repo.settings.slack_token"}}</label>
-        <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="token" name="token" type="text" value="{{.SlackHook.Token}}" autocomplete="off" required />
-    </div>
-    <div class="field">
-        <label class="req" for="channel">{{.i18n.Tr "repo.settings.slack_channel"}}</label>
-        <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="channel" name="channel" type="text" value="{{.SlackHook.Channel}}" placeholder="#general" required />
-    </div>
-    {{template "repo/settings/hook_settings" .}}
-  </form>
-</div>

diff --git a/templates/repo/sidebar.tmpl b/templates/repo/sidebar.tmpl
index 39d999cabc5e5e5028ea0e9436889b2d92c7907d..f671bfc1b1e80797b182e7fca0e506f19d155843 100644 (file)
--- a/templates/repo/sidebar.tmpl
+++ b/templates/repo/sidebar.tmpl
@@ -3,23 +3,23 @@
         <li>
             <a class="radius" href="{{.RepoLink}}/issues"><i class="octicon octicon-issue-opened"></i>Issues<span class="num right label label-blue label-radius">{{.Repository.NumOpenIssues}}</span></a>
         </li>
-        <li>
+        <!-- <li>
             <a class="radius" href="{{.RepoLink}}/pulls"><i class="octicon octicon-git-pull-request"></i>Pull Requests<span class="num right label label-blue label-radius">{{.Repository.NumOpenPulls}}</span></a>
-        </li>
+        </li> -->
         <li class="border-bottom"></li>
         <li class="head">{{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}}</li>
         <li>
             <a class="radius" href="{{.RepoLink}}/commits/{{.BranchName}}"><i class="octicon octicon-history"></i>Commits <span class="num right label label-gray label-radius">{{.CommitsCount}}</span></a>
         </li>
-        <li>
+        <!-- <li>
             <a class="radius" href="{{.RepoLink}}/branches"><i class="octicon octicon-git-branch"></i>Branches<span class="num right label label-gray label-radius">{{.BrancheCount}}</span></a>
-        </li>
+        </li> -->
         <li>
             <a class="radius" href="{{.RepoLink}}/releases"><i class="octicon octicon-tag"></i>Releases <span class="num right label label-gray label-radius">{{.Repository.NumTags}}</span></a>
         </li>
-        <li>
+        <!-- <li>
             <a class="radius" href="#"><i class="octicon octicon-organization"></i>contributors <span class="num right label label-gray label-radius">43</span></a>
-        </li>
+        </li> -->
         <li class="border-bottom"></li>
         <li>
             <a class="radius" href="{{.RepoLink}}/settings"><i class="octicon octicon-tools"></i>settings</a>

diff --git a/templates/user/dashboard/nav.tmpl b/templates/user/dashboard/nav.tmpl
index 6064f3569272784fc0845e6b2d267b87b749ca24..c37447d3a69b01446c973b419f5855eb82dae26b 100644 (file)
--- a/templates/user/dashboard/nav.tmpl
+++ b/templates/user/dashboard/nav.tmpl
@@ -24,21 +24,23 @@
                         </a>
                     </li>
                     {{end}}
-                    <li>
+                    <!-- <li>
                         <a href="/user/settings/orgs"><i class="octicon octicon-organization"></i>{{.i18n.Tr "manage_org"}}</a>
-                    </li>
+                    </li> -->
                     <li>
                         <a href="/org/create"><i class="octicon octicon-plus"></i>{{.i18n.Tr "new_org"}}</a>
                     </li>
                 </ul>
             </div>
         </li>
+        {{if not .ContextUser.IsOrganization}}
         <li class="right">
             <a {{if $.PageIsIssues}}class="current"{{end}} href="{{.ContextUser.DashboardLink}}issues"><i class="octicon octicon-issue-opened"></i>{{.i18n.Tr "issues"}}</a>
         </li>
-        <li class="right">
+        {{end}}
+        <!-- <li class="right">
             <a {{if .PageIsPulls}}class="current"{{end}} href="{{.ContextUser.DashboardLink}}pulls"><i class="octicon octicon-git-pull-request"></i>{{.i18n.Tr "pull_requests"}}</a>
-        </li>
+        </li> -->
         <li class="right">
             <a {{if $.PageIsNews}}class="current"{{end}} href="{{.ContextUser.DashboardLink}}"><i class="octicon octicon-rss"></i>{{.i18n.Tr "news_feed"}}</a>
         </li>