Proposals

app/Console/Commands/CheckData.php

@@ -469,6 +469,10 @@ class CheckData extends Command
                 ENTITY_INVOICE,
                 ENTITY_CLIENT,
                 ENTITY_USER,
+                ENTITY_TASK_STATUS,
+            ],
+            'task_statuses' => [
+                ENTITY_USER,
             ],
             'credits' => [
                 ENTITY_CLIENT,
@@ -496,6 +500,25 @@ class CheckData extends Command
                 ENTITY_USER,
                 ENTITY_CLIENT,
             ],
+            'proposals' => [
+                ENTITY_USER,
+                ENTITY_INVOICE,
+                ENTITY_PROPOSAL_TEMPLATE,
+            ],
+            'proposal_categories' => [
+                ENTITY_USER,
+            ],
+            'proposal_templates' => [
+                ENTITY_USER,
+            ],
+            'proposal_snippets' => [
+                ENTITY_USER,
+                ENTITY_PROPOSAL_CATEGORY,
+            ],
+            'proposal_invitations' => [
+                ENTITY_USER,
+                ENTITY_PROPOSAL,
+            ],
         ];
 
         foreach ($tables as $table => $entityTypes) {

app/Libraries/HistoryUtils.php

@@ -182,7 +182,8 @@ class HistoryUtils
                     $button = '';
                 }
 
-                $str .= sprintf('<li>%s<a href="%s"><div>%s %s</div></a></li>', $button, $link, $icon, $name);
+                $padding = $str ? 16 : 0;
+                $str .= sprintf('<li style="margin-top: %spx">%s<a href="%s"><div>%s %s</div></a></li>', $padding, $button, $link, $icon, $name);
                 $lastClientId = $item->client_id;
             }
 

app/Libraries/Utils.php

@@ -566,6 +566,8 @@ class Utils
             return 'expense_categories';
         } elseif ($type === ENTITY_PROPOSAL_CATEGORY) {
             return 'proposal_categories';
+        } elseif ($type === ENTITY_TASK_STATUS) {
+            return 'task_statuses';
         } else {
             return $type . 's';
         }

app/Models/Account.php

@@ -1652,6 +1652,7 @@ class Account extends Eloquent
             ENTITY_EXPENSE,
             ENTITY_VENDOR,
             ENTITY_PROJECT,
+            ENTITY_PROPOSAL,
         ])) {
             return true;
         }
@@ -1660,6 +1661,8 @@ class Account extends Eloquent
             $entityType = ENTITY_EXPENSE;
         } elseif ($entityType == ENTITY_PROJECT) {
             $entityType = ENTITY_TASK;
+        } elseif ($entityType == ENTITY_PROPOSAL) {
+            $entityType = ENTITY_QUOTE;
         }
 
         // note: single & checks bitmask match

resources/assets/css/sidebar.css

@@ -58,6 +58,10 @@
         transition: all 0.5s ease;
     }
 
+    #left-sidebar-wrapper .btn-primary.btn-sm.pull-right {
+        margin-top: 7px;
+    }
+
     #wrapper.toggled-left #left-sidebar-wrapper {
         width: 250px;
     }
@@ -109,7 +113,8 @@
 
     #left-sidebar-wrapper .sidebar-nav li {
         text-indent: 14px;
-        line-height: 34px;
+        line-height: 32px;
+        font-size: 16px;
     }
 
     #left-sidebar-wrapper .sidebar-nav li span.badge {
@@ -129,7 +134,7 @@
     }
 
     #left-sidebar-wrapper ul {
-        min-height: 750px;
+        min-height: 760px;
     }
 
     @media (max-height: 744px) {

resources/lang/en/texts.php

@@ -2608,7 +2608,7 @@ $LANG = array(
     'invoice_project' => 'Invoice Project',
     'module_recurring_invoice' => 'Recurring Invoices',
     'module_credit' => 'Credits',
-    'module_quote' => 'Quotes',
+    'module_quote' => 'Quotes & Proposals',
     'module_task' => 'Tasks & Projects',
     'module_expense' => 'Expenses & Vendors',
     'reminders' => 'Reminders',

resources/views/partials/navigation_option.blade.php

@@ -18,7 +18,7 @@
     @endif
 
     <a href="{{ url($option == 'recurring' ? 'recurring_invoice' : $option) }}"
-        style="font-size:16px; padding-top:6px; padding-bottom:6px"
+        style="padding-top:6px; padding-bottom:6px"
         class="nav-link {{ Request::is("{$option}*") ? 'active' : '' }}">
         <i class="fa fa-{{ empty($icon) ? \App\Models\EntityModel::getIcon($option) : $icon }}" style="width:46px; padding-right:10px"></i>
         {{ ($option == 'recurring_invoices') ? trans('texts.recurring') : mtrans($option) }}

resources/views/proposals/grapesjs_header.blade.php

@@ -2,8 +2,9 @@
 <link href="{{ asset('css/grapesjs.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>
 
 <style>
-.gjs-four-color {
+.gjs-four-color,
-    color: white !important;
+.gjs-four-color-h:hover {
+    color: #3b97ff !important;
 }
 .gjs-rte-actionbar,
 .gjs-block-label,