Fix controller mounting path and view

Author: takezoe

build.sbt

@@ -1,6 +1,6 @@
 val Organization = "fr.brouillard.gitbucket"
 val ProjectName = "gitbucket-announce-plugin"
-val ProjectVersion = "1.7.0"
+val ProjectVersion = "1.7.1"
 
 lazy val root = (project in file(".")).enablePlugins(SbtTwirl)
 

src/main/scala/Plugin.scala

@@ -19,13 +19,14 @@ class Plugin extends gitbucket.core.plugin.Plugin {
     , new Version("1.5.0")
     , new Version("1.6.0")
     , new Version("1.7.0")
+    , new Version("1.7.1")
   )
 
   override val systemSettingMenus: Seq[(Context) => Option[Link]] = Seq(
     (ctx: Context) => Some(Link("announce", "Global Announce", "admin/announce"))
   )
 
   override val controllers = Seq(
-    "/admin/announce" -> new AnnounceController()
+    "/*" -> new AnnounceController()
   )
 }

src/main/twirl/fr/brouillard/gitbucket/announce/announce.scala.html

@@ -6,36 +6,36 @@
 @import gitbucket.core.view.helpers._
 @import gitbucket.core.util.Directory._
 @main("New announce"){
-@menu("announce"){
-@information(info)
-<form action="@path/admin/announce" method="POST" validate="true">
-        @if(settings.useSMTP && settings.smtp.nonEmpty){
-    <div class="panel panel-default">
-        <div class="panel-heading strong">New announce</div>
-        <div class="panel-body">
+  @menu("announce"){
+    @information(info)
+    <form action="@path/admin/announce" method="POST" validate="true">
+      @if(settings.useSMTP && settings.smtp.nonEmpty){
+        <div class="panel panel-default">
+          <div class="panel-heading strong">New announce</div>
+          <div class="panel-body">
             <fieldset>
-                <label><span class="strong">To</span></label>
-                <input type="text" style="width: 635px;" name="to"/>
-                <p class="muted">Enter a comma separated list of groupname the announce will be sent to, or the keyword 'ALL' to send to all users</p>                
+              <label><span class="strong">To</span></label>
+              <input type="text" name="to" class="form-control"/>
+              <p class="muted">Enter a comma separated list of groupname the announce will be sent to, or the keyword 'ALL' to send to all users</p>                
             </fieldset>
             <fieldset>
-                <label><span class="strong">Subject</span></label>
-                <input type="text" style="width: 635px;" name="subject"/>
+              <label><span class="strong">Subject</span></label>
+              <input type="text" name="subject" class="form-control"/>
             </fieldset>
             <label><span class="strong">Content</span></label>
             <fieldset>
-                <textarea style="width: 635px; height: 100px;" name="content"></textarea>
+              <textarea style="height: 100px;" name="content" class="form-control"></textarea>
             </fieldset>
+          </div>
         </div>
-    </div>
-    <fieldset>
-        <input type="submit" class="btn btn-success" value="Send Announce"/>
-    </fieldset>
-        } else {
-    <div class="box">
-            <p>SMTP settings are disabled, verify your setup.</p>
-    </div>
-        }
-</form>
-}
+        <fieldset>
+          <input type="submit" class="btn btn-success" value="Send Announce"/>
+        </fieldset>
+      } else {
+        <div class='alert alert-danger'>
+          SMTP settings are disabled, verify your setup.
+        </div>
+      }
+    </form>
+  }
 }