Merge pull request #603 from dbarzin/dev

Dev

Author: dbarzin

resources/views/risks/scoring/form.blade.php

@@ -239,7 +239,7 @@ class="input js-threshold-max"
                                 </td>
                                 <td>
                                     <input type="color"
-                                    style="width:40px;"
+                                           style="width:40px;"
                                            name="risk_thresholds[{{ $idx }}][color]"
                                            class="js-color-input"
                                            value="{{ $t['color'] ?? '#cccccc' }}"
@@ -425,8 +425,8 @@ function updateFormulaUI() {
             '<td><input type="text"   name="risk_thresholds[' + thrIdx + '][label]" class="input js-threshold-label" required></td>' +
             '<td><input type="number" name="risk_thresholds[' + thrIdx + '][max]"   class="input" placeholder="∞" min="1" style="width:80px; text-align:center;"></td>' +
             '<td><input type="color" name="risk_thresholds[' + thrIdx + '][color]" class="js-color-input"' +
-                ' value="#cccccc" data-role="color-selector" onchange="updatePreview(this)"></td>' +
-            '<td><span class="badge js-preview" style="background:#cccccc;color:#fff">—</span></td>' +
+                ' value="#cccccc" style="width:40px;" data-role="color-selector" onchange="updatePreview(this)"></td>' +
+            '<td class="text-center"><span class="badge js-preview" style="background:#cccccc;color:#fff">—</span></td>' +
             '<td><button type="button" class="button mini alert js-remove-threshold"><span class="mif-bin"></span></button></td>';
 
         tbody.appendChild(tr);

resources/views/risks/show.blade.php

@@ -12,9 +12,19 @@
         <div class="cell-lg-1 cell-md-2">
             <strong>{{ trans("cruds.risk.fields.name") }}</strong>
         </div>
-        <div class="cell-lg-7 cell-md-9">
+        <div class="cell-lg-10 cell-md-9">
             {{ $risk->name }}
         </div>
+
+        <div class="cell-lg-1 cell-md-1">
+            @if (Auth::User()->role === 1 || Auth::User()->role === 2)
+                <button class="button primary" onclick="location.href='/risk/create'">
+                    <span class="mif-plus"></span>
+                    {{ trans('common.new') }}
+                </button>
+            @endif
+        </div>
+
     </div>
 
     {{-- Description --}}