Merge branch 'release/1.6.0'

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.englishtown</groupId>
     <artifactId>stash-hook-mirror</artifactId>
-    <version>1.5.0</version>
+    <version>1.6.0</version>
 
     <organization>
         <name>Englishtown</name>
@@ -27,9 +27,9 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <stash.version>2.4.1</stash.version>
+        <stash.version>2.6.0</stash.version>
-        <stash.data.version>2.4.1</stash.data.version>
+        <stash.data.version>2.6.0</stash.data.version>
-        <amps.version>4.2.3</amps.version>
+        <amps.version>4.2.5</amps.version>
         <plugin.testrunner.version>1.1.1</plugin.testrunner.version>
 
         <junit.version>4.10</junit.version>

src/main/resources/static/mirror-repository-hook.css

@@ -1,3 +0,0 @@
-.et-remove-button {
-    margin-left: 5px !important;
-}

src/main/resources/static/mirror-repository-hook.js

@@ -27,7 +27,7 @@ define('et/hook/mirror', ['jquery', 'exports'], function ($, exports) {
         function addRemoveButton() {
             // Select all fieldset groups that don't have a remove button
             var group = $(".et-mirror-group").not(":has(.et-remove-button)");
-            var html = createButton({name: 'et-remove-button', text: 'Remove', extraClasses: 'et-remove-button'});
+            var html = createButton({buttonText: 'Remove', extraClasses: 'et-remove-button add-hook-button', extraAttributes: 'type=button'});
             group.find('.et-mirror-repo input').after(html);
 
             group.find('.et-remove-button').click(function (e) {

src/main/resources/static/mirror-repository-hook.soy

@@ -21,14 +21,15 @@
     {/foreach}
 
     // Button to add additional mirrors
-    {call aui.form.button}
+    {call stash.buttons.button}
         {param id: 'et-add-button' /}
-        {param text: 'Add Mirror' /}
+        {param buttonText: 'Add Mirror' /}
+        {param extraAttributes: 'type=button' /}
     {/call}
 
     // Call init method with subview callback
     <script>
-        require("et/hook/mirror").init(com.englishtown.stash.hook.mirrorrepositoryhook.subview, aui.form.button);
+        require("et/hook/mirror").init(com.englishtown.stash.hook.mirrorrepositoryhook.subview, stash.buttons.button);
     </script>
 {/template}