Fix up buttons in form management dialog

include/staff/org-view.inc.php

@@ -16,7 +16,7 @@ if(!defined('OSTSCPINC') || !$thisstaff || !is_object($org)) die('Invalid path')
             </span>
 <?php } ?>
 <?php if ($thisstaff->hasPerm(Organization::PERM_DELETE)) { ?>
-            <a id="org-delete" class="action-button pull-right org-action"
+            <a id="org-delete" class="red button action-button pull-right org-action"
             href="#orgs/<?php echo $org->getId(); ?>/delete"><i class="icon-trash"></i>
             <?php echo __('Delete Organization'); ?></a>
 <?php } ?>

include/staff/orgs.inc.php

@@ -90,7 +90,7 @@ $_SESSION['orgs_qs_'.$qhash] = $query;
 
 <div class="pull-right">
 <?php if ($thisstaff->hasPerm(Organization::PERM_CREATE)) { ?>
-    <a class="action-button add-org"
+    <a class="green button action-button add-org"
         href="#">
         <i class="icon-plus-sign"></i>
         <?php echo __('Add Organization'); ?>
@@ -104,7 +104,7 @@ if ($thisstaff->hasPerm(Organization::PERM_DELETE)) { ?>
     </span>
     <div id="action-dropdown-more" class="action-dropdown anchor-right">
         <ul>
-            <li><a class="orgs-action" href="#delete">
+            <li class="danger"><a class="orgs-action" href="#delete">
                 <i class="icon-trash icon-fixed-width"></i>
                 <?php echo __('Delete'); ?></a></li>
         </ul>

include/staff/templates/form-manage.tmpl.php

@@ -23,20 +23,10 @@ foreach ($forms as $e) { ?>
 <?php } ?>
 </div>
 <hr/>
+<div>
 <i class="icon-plus"></i>&nbsp;
 <select name="new-form" onchange="javascript:
-    var $sel = $(this).find('option:selected');
-    $('#ticket-entries').append($('<div></div>').addClass('sortable row-item')
-        .text(' '+$sel.text())
-        .data('id', $sel.val())
-        .prepend($('<i>').addClass('icon-reorder'))
-        .append($('<input/>').attr({name:'forms[]', type:'hidden'}).val($sel.val()))
-        .append($('<div></div>').addClass('button-group')
-          .append($('<div></div>').addClass('delete')
-            .append($('<a href=\'#\'>').append($('<i>').addClass('icon-trash')))
-        ))
-    );
-    $sel.prop('disabled',true);">
+    $(this).parent().find('button').trigger('click');">
 <option selected="selected" disabled="disabled"><?php
     echo __('Add a form'); ?></option>
 <?php foreach (DynamicForm::objects()->filter(array(
@@ -48,6 +38,36 @@ foreach ($forms as $e) { ?>
     echo $f->getTitle(); ?></option><?php
 } ?>
 </select>
+<button type="button" class="inline green button" onclick="javascript:
+    var select = $(this).parent().find('select'),
+        $sel = select.find('option:selected'),
+        id = $sel.val();
+    if (!id || !parseInt(id))
+        return;
+    if ($sel.prop('disabled'))
+        return;
+    $('#ticket-entries').append($('<div></div>').addClass('sortable row-item')
+        .text(' '+$sel.text())
+        .data('id', id)
+        .prepend($('<i>').addClass('icon-reorder'))
+        .append($('<input/>').attr({name:'forms[]', type:'hidden'}).val(id))
+        .append($('<div></div>').addClass('button-group')
+          .append($('<div></div>').addClass('delete')
+            .append($('<a href=\'#\'>')
+              .append($('<i>').addClass('icon-trash'))
+              .click(function() {
+                $sel.prop('disabled',false);
+                $(this).closest('div.row-item').remove();
+                $('#delete-warning').show();
+                return false;
+              })
+            )
+        ))
+    );
+    $sel.prop('disabled',true);"><i class="icon-plus-sign"></i>
+<?php echo __('Add'); ?></button>
+</div>
+
 <div id="delete-warning" style="display:none">
 <hr>
     <div id="msg_warning"><?php echo __(
@@ -70,13 +90,5 @@ foreach ($forms as $e) { ?>
 <script type="text/javascript">
 $(function() {
     $('#ticket-entries').sortable({containment:'parent',tolerance:'pointer'});
-    $(document).on('click', '#ticket-entries .delete a', function() {
-        var $div = $(this).closest('.sortable.row-item');
-        $('select[name=new-form]').find('option[data-id='+$div.data('id')+']')
-            .prop('disabled',false);
-        $div.remove();
-        $('#delete-warning').show();
-        return false;
-    })
 });
 </script>

scp/css/scp.css

@@ -2103,15 +2103,22 @@ div.selected-signature .inner {
 }
 
 .row-item .button-group div {
-    padding: 9px;
-    padding-left: 12px;
     display: inline-block;
 }
+.row-item .button-group div a {
+    padding: 9px 12px 8px;
+}
 .row-item .management {
     margin-top: 10px;
     border-top: 1px dashed black;
 }
 
+.row-item:first-child .delete {
+    border-top-right-radius: 5px;
+}
+.row-item:last-child .delete {
+    border-bottom-right-radius: 5px;
+}
 .row-item .delete:hover {
     background: #fc9f41; /* Old browsers */
     color: rgba(255,255,255,0.8) !important;