Fixed some more bootstrap rendering

modules/invoice/classes/Controller/User/Invoice.php

@@ -75,7 +75,7 @@ class Controller_User_Invoice extends Controller_Invoice {
 	public function action_list() {
 		Block::factory()
 			->title(sprintf('Invoices for Account: %s',$this->ao->accnum()))
-			->title_icon('icon-th-list')
+			->title_icon('fa fa-list')
 			->body(Table::factory()
 				->jssort('invoices')
 				->data($this->ao->invoice->find_all())
@@ -107,64 +107,8 @@ class Controller_User_Invoice extends Controller_Invoice {
 
 		$output .= Invoice::instance($io)->render('html','all');
 
-		$output .= '<br>';
 
-		$output .= HTML::anchor(URL::link('user','invoice/email/'.$io->id),'Email',array('class'=>'btn pull-right'));
-		$output .= HTML::anchor(URL::link('user','invoice/download/'.$io->id),'Download',array('class'=>'btn pull-right'));
-
-		if ($io->due() AND ! $io->cart_exists())
-			$output .= View::factory('invoice/user/view/pay')
-				->set('mid',$io->mid())
-				->set('o',$io);
-
-		if (! $io->status) {
-			Style::factory()
-				->type('file')
-				->data('media/css/pages/invoice.css');
-
-			$output .= '<div id="watermark">Invoice CANCELLED.</div>';
-		}
-
-		Block::factory()
-			->title(sprintf('%s: %s - %s',_('Invoice'),$io->refnum(),$io->account->name()))
-			->title_icon('icon-list-alt')
-			->body($output);
-
-		$x = $io->invoice_memo->find_all();
-		if ($x->count())
-			Block::factory()
-				->title('Invoice Memos')
-				->title_icon('icon-list-alt')
-				->span(6)
-				->body(Table::factory()
-					->data($x)
-					->columns(array(
-						'id'=>'ID',
-						'date_orig'=>'Date',
-						'account->name()'=>'Account',
-						'memo'=>'Memo',
-				)));
-
-		$x = $io->email()->find_all();
-		if ($x->count())
-			Block::factory()
-				->title('Invoice Emails')
-				->title_icon('icon-list-alt')
-				->span(6)
-				->body(Table::factory()
-					->data($x)
-					->columns(array(
-						'id'=>'ID',
-						'date_orig'=>'Date',
-						'resolve("subject")'=>'Subject',
-					))
-					->prepend(array(
-						'id'=>array('url'=>URL::link('user','email/view/')),
-					))
-					->postproc(array(
-						'resolve("subject")'=>array('trim'=>55),
-					))
-				);
+		$this->template->content = View::factory('invoice/user/view')->set('o',$io)->set('output',$output);
 	}
 }
 ?>

modules/invoice/classes/Invoice.php

@@ -214,7 +214,7 @@ class Invoice {
 	 * Renders the invoice in HTML
 	 */
 	private function render_html() {
-		return View::factory('invoice/user/view')
+		return View::factory('invoice/render')
 			->set('o',$this->_io);
 	}