Merge pull request #4295 from umbraco/temp8-macro-picker-fixes

Fixes UI for macropicker and added submit button

src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html

@@ -12,11 +12,11 @@
 
         <umb-editor-container>
             <umb-box>
-                <umb-box-content>
+                <umb-box-content class="block-form">
                     <div ng-switch="wizardStep">
 
                         <div ng-switch-when="macroSelect">
-                
+
                             <div class="form-search">
                                 <i class="icon-search"></i>
                                 <input type="text"
@@ -28,7 +28,7 @@
                                         umb-auto-focus
                                         no-dirty-check />
                             </div>
-                
+
                             <ul class="umb-card-grid">
                                 <li ng-repeat="availableItem in macros | orderBy:'name' | filter:searchTerm"
                                     ng-click="selectMacro(availableItem)"
@@ -39,7 +39,7 @@
                                     </a>
                                 </li>
                             </ul>
-                
+
                             <umb-empty-state ng-if="nomacros"
                                                 position="center">
                                 <localize key="defaultdialogs_noMacros">
@@ -47,28 +47,28 @@
                                 </localize>
                             </umb-empty-state>
                         </div>
-                
+
                         <div ng-switch-when="paramSelect">
-                
+
                             <h5>{{model.selectedMacro.name}}</h5>
-                
+
                             <ul class="unstyled">
                                 <li ng-repeat="param in model.macroParams">
-                
+
                                     <ng-form name="parameterForm">
                                         <umb-control-group label="{{param.name}}">
                                             <umb-property-editor model="param"></umb-property-editor>
                                         </umb-control-group>
                                     </ng-form>
-                
+
                                 </li>
                             </ul>
-                
+
                             <umb-empty-state ng-if="noMacroParams"
                                                 position="center">
                                 <localize key="defaultdialogs_noMacroParams">There are no parameters for this macro</localize>
                             </umb-empty-state>
-                
+
                         </div>
                     </div>
                 </umb-box-content>
@@ -83,6 +83,13 @@
                     label-key="general_close"
                     action="close()">
                 </umb-button>
+
+                <umb-button
+                    type="button"
+                    button-style="success"
+                    label-key="general_submit"
+                    action="selectMacro(model)">
+                </umb-button>
             </umb-editor-footer-content-right>
         </umb-editor-footer>