diff --git a/views/enquiries/view.ctp b/views/enquiries/view.ctp index 73023b46..acce7c5b 100755 --- a/views/enquiries/view.ctp +++ b/views/enquiries/view.ctp @@ -61,7 +61,6 @@ $class = ' class="altrow"';?>   - > > diff --git a/views/layouts/default.ctp b/views/layouts/default.ctp index 337dd952..349730bf 100755 --- a/views/layouts/default.ctp +++ b/views/layouts/default.ctp @@ -1,48 +1,42 @@ - + - + - <?php __('CMC'); ?> - <?php echo $title_for_layout; ?> + <?php __('CMC'); ?> + <?php echo $title_for_layout; ?> - 0) { - echo $html->meta('favicon.ico','/img/core.png', array('type'=>'icon')); - } - else { + + if ($debugLevel > 0) { + echo $html->meta('favicon.ico', '/img/core.png', array('type' => 'icon')); + } else { echo $html->meta('icon'); - } - - echo $html->css('quotenik'); - echo $html->css('jquery-ui.custom.css'); + + echo $html->css('quotenik'); + echo $html->css('jquery-ui.custom.css'); - //echo $javascript->link('ckeditor/ckeditor'); + //echo $javascript->link('ckeditor/ckeditor'); - echo $javascript->link('jquery'); + echo $javascript->link('jquery'); - echo $javascript->link('jquery-ui'); - echo $javascript->link('jquery.form'); - echo $javascript->link('menu'); - echo $javascript->link('global'); - echo $javascript->link('search'); - echo $javascript->link('jquery.jeditable.mini'); - //echo $javascript->link('ckeditor/adapters/jquery'); + echo $javascript->link('jquery-ui'); + echo $javascript->link('jquery.form'); + echo $javascript->link('menu'); + echo $javascript->link('global'); + echo $javascript->link('search'); + echo $javascript->link('jquery.jeditable.mini'); + //echo $javascript->link('ckeditor/adapters/jquery'); - echo $scripts_for_layout; - - - ?> + echo $scripts_for_layout; + ?> @@ -54,47 +48,46 @@
- link('Login', '/users/login'); - } - else { - $logoutlink = $html->link('Logout', '/users/logout'); - echo $html->link($currentuser['User']['username'], '/users/view/'. $currentuser['User']['id']). ' (' . $logoutlink.')'; - } - ?> +link('Login', '/users/login'); +} else { + $logoutlink = $html->link('Logout', '/users/logout'); + echo $html->link($currentuser['User']['username'], '/users/view/' . $currentuser['User']['id']) . ' (' . $logoutlink . ')'; +} +?>
- check('Message.flash')): - $session->flash(); - endif; - ?> -
image('ajax-loader.gif'); ?>
- +check('Message.flash')): + $session->flash(); +endif; +?> +
image('ajax-loader.gif'); ?>
+
@@ -180,50 +171,48 @@ - create('Enquiry', array('default'=>false, 'id'=>'searchForm', 'default'=>'false')); - echo '

Search'; - echo $html->image('system-search.png'); - echo '

'; - echo "

Search for: Enquiry Number, Job Number, Customer, Contact or Customer Order Number

"; + create('Enquiry', array('default' => false, 'id' => 'searchForm', 'default' => 'false')); + echo '

Search'; + echo $html->image('system-search.png'); + echo '

'; + echo "

Search for: Enquiry Number, Job Number, Customer, Contact or Customer Order Number

"; - echo $form->input('Enquiry.search_string', array('label'=>false, 'id'=>'searchString')); + echo $form->input('Enquiry.search_string', array('label' => false, 'id' => 'searchString')); + ?> - ?> -
end(); - ?> + echo $form->end(); + ?> -
image('ajax-loader.gif'); ?>
+
image('ajax-loader.gif'); ?>
-
- +
+ - "; - - ?> +if ($mem_usage < 1024) + echo $mem_usage . " bytes"; +elseif ($mem_usage < 1048576) + echo round($mem_usage / 1024, 2) . " kilobytes"; +else + echo round($mem_usage / 1048576, 2) . " megabytes"; +echo "
"; +?> - + - + diff --git a/webroot/css/quotenik.css b/webroot/css/quotenik.css index fa646d9e..9d5fbcfe 100755 --- a/webroot/css/quotenik.css +++ b/webroot/css/quotenik.css @@ -1093,9 +1093,8 @@ span.principle-emails { span.enquiry-view-comments { color: #000000; - font-size: 100%; + font-size: 90%; text-align: left; - line-height: 1; white-space: pre-line; } diff --git a/webroot/js/document_add_edit.js b/webroot/js/document_add_edit.js index f4eb3f16..9a177803 100644 --- a/webroot/js/document_add_edit.js +++ b/webroot/js/document_add_edit.js @@ -38,7 +38,9 @@ $(function() { $.post('/line_items/ajax_add', thisLineItemInputs, function(data) { if(data == 'SUCCESS') { + loadLineItems(); $( "#addLineItemModal" ).dialog('close'); + } else { @@ -50,13 +52,10 @@ $(function() { }, Cancel: function() { - $( this ).dialog( "close" ); + loadLineItems(); + $( this ).dialog( "close" ); } - }, - close: function() { - loadLineItems(); - } }); @@ -410,10 +409,18 @@ function savePages() { function loadLineItems() { var documentID = $("#documentID").html(); - $.get('/line_items/getTable/'+documentID, function(data) { + /*$.get('/line_items/getTable/'+documentID, function(data) { $("#lineItems").html(data); + });*/ + + $.ajax({ + url: '/line_items/getTable/'+documentID, + cache: false, + success: function(data) { + $("#lineItems").html(data); + } }); - + }