Use repository headers extension point instead of sidemenus

Author: takezoe

src/main/scala/Plugin.scala

@@ -1,13 +1,16 @@
 import gitbucket.core.controller.Context
 import gitbucket.core.model.Issue
-import gitbucket.core.plugin.Link
+import gitbucket.core.service.{AccountService, IssuesService, RepositoryService}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util.Implicits.request2Session
 import gitbucket.notifications._
+import gitbucket.notifications.model.Watch
+import gitbucket.notifications.service.NotificationsService
 import io.github.gitbucket.solidbase.migration.LiquibaseMigration
 import io.github.gitbucket.solidbase.model.Version
 
-class Plugin extends gitbucket.core.plugin.Plugin {
+class Plugin extends gitbucket.core.plugin.Plugin
+  with NotificationsService with RepositoryService with AccountService with IssuesService {
 
   override val pluginId = "notifications"
 
@@ -30,14 +33,16 @@ class Plugin extends gitbucket.core.plugin.Plugin {
   override val issueHooks       = Seq(new service.IssueHook)
   override val pullRequestHooks = Seq(new service.PullRequestHook)
 
-  override val repositoryMenus = Seq(
-    (repository: RepositoryInfo, context: Context) =>
-      Some(Link(
-        id    = "watch",
-        label = "Watch",
-        path  = "/watch",
-        icon  = Some("menu-icon octicon octicon-eye")
-      ))
+  override val repositoryHeaders = Seq(
+    (repository: RepositoryInfo, context: Context) =>  {
+      context.loginAccount.map { loginAccount =>
+        implicit val session = request2Session(context.request)
+
+        html.watch(getWatch(repository.owner, repository.name, loginAccount.userName).map(_.notification) getOrElse {
+          if (autoSubscribeUsersForRepository(repository.owner, repository.name) contains loginAccount.userName) Watch.Watching else Watch.NotWatching
+        }, repository)(context)
+      }
+    }
   )
 
   override val issueSidebars = Seq(

src/main/twirl/gitbucket/notifications/watch.scala.html

@@ -1,19 +1,13 @@
 @(notification: gitbucket.notifications.model.Watch.Notification,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@gitbucket.core.html.main("Watch", Some(repository)){
-  @gitbucket.core.html.menu("watch", repository){
-
-    @gitbucket.core.helper.html.dropdown("Notifications"){
-      @gitbucket.notifications.model.Watch.Notification.values.map { n =>
-        <li>
-          <a href="#" class="watch" data-id="@n.id">
-            @gitbucket.core.helper.html.checkicon(notification.id == n.id) @n.name
-          </a>
-        </li>
-      }
-    }
-
+@gitbucket.core.helper.html.dropdown("Notifications"){
+  @gitbucket.notifications.model.Watch.Notification.values.map { n =>
+    <li>
+      <a href="#" class="watch" data-id="@n.id">
+        @gitbucket.core.helper.html.checkicon(notification.id == n.id) @n.name
+      </a>
+    </li>
   }
 }
 <script>