Merge remote-tracking branch 'upstream/master'

app/controllers/AccountController.php

@@ -498,6 +498,8 @@ class AccountController extends \BaseController {
 		{
 			$account = Account::findOrFail(Auth::user()->account_id);
 			$account->name = trim(Input::get('name'));
+			$account->work_email = trim(Input::get('work_email'));
+			$account->work_phone = trim(Input::get('work_phone'));
 			$account->address1 = trim(Input::get('address1'));
 			$account->address2 = trim(Input::get('address2'));
 			$account->city = trim(Input::get('city'));

app/database/migrations/2014_03_03_155556_add_phone_to_account.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddPhoneToAccount extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('accounts', function($table)
+		{
+			$table->string('work_phone');
+			$table->string('work_email');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('accounts', function($table)
+		{
+			$table->dropColumn('work_phone');
+			$table->dropColumn('work_email');
+		});
+	}
+	
+}

app/views/accounts/details.blade.php

@@ -27,6 +27,8 @@
 
 			{{ Former::legend('Details') }}
 			{{ Former::text('name') }}
+			{{ Former::text('work_email')->label('Email') }}
+			{{ Former::text('work_phone')->label('Phone') }}
 			{{ Former::file('logo')->max(2, 'MB')->accept('image')->inlineHelp('Supported: JPEG, GIF and PNG. Recommnded size: 120px width, 80px height') }}
 
 			@if (file_exists($account->getLogoPath()))
@@ -75,7 +77,7 @@
 	</div>
 	
 	<center>
-		{{ Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') }}
+		{{ Button::lg_success_submit('Save')->append_with_icon('floppy-disk') }}
 	</center>
 
 	{{ Former::close() }}

app/views/accounts/notifications.blade.php

@@ -18,7 +18,7 @@
 	{{ Former::textarea('invoice_terms')->label('Set default invoice terms') }}
 	{{ Former::textarea('email_footer')->label('Set default email signature') }}
 
-	{{ Former::actions( Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') ) }}
+	{{ Former::actions( Button::lg_success_submit('Save')->append_with_icon('floppy-disk') ) }}
 	{{ Former::close() }}
 
 @stop

app/views/accounts/payments.blade.php

@@ -45,7 +45,7 @@
 		
 	@endforeach
 
-	{{ Former::actions( Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') ) }}
+	{{ Former::actions( Button::lg_success_submit('Save')->append_with_icon('floppy-disk') ) }}
 	{{ Former::close() }}
 
 

app/views/clients/edit.blade.php

@@ -148,10 +148,8 @@
 
 	</script>
 
-
-
 	<center class="buttons">
-		{{ Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') }}
+		{{ Button::lg_primary_submit_success('Save')->append_with_icon('floppy-disk') }}
         {{ Button::lg_default_link('clients/' . ($client ? $client->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
 	</center>
 

app/views/credits/edit.blade.php

@@ -28,10 +28,9 @@
 
 		</div>
 	</div>
-
+	<center class="buttons">
-	<center style="margin-top:16px">
+		{{ Button::lg_primary_submit_success('Save')->append_with_icon('floppy-disk') }}
-		{{ Button::lg_primary_submit('Save') }} &nbsp;|&nbsp;
+        {{ Button::lg_default_link('credits/' . ($credit ? $credit->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
-		{{ link_to('credits/' . ($credit ? $credit->public_id : ''), 'Cancel') }}	
 	</center>
 
 	{{ Former::close() }}

app/views/dashboard.blade.php

@@ -98,8 +98,8 @@
 
 <div class="row">
   <div class="col-md-6">  
-    <div class="panel panel-default dashboard" style="min-height:320px">
+    <div class="panel panel-default dashboard" style="min-height:320px;">
-      <div class="panel-heading">
+      <div class="panel-heading" style="margin:0;">
         <h3 class="panel-title">
           <i class="glyphicon glyphicon-time"></i> Upcoming invoices
         </h3>

app/views/invoices/edit.blade.php

@@ -571,6 +571,10 @@
     invoice.imageLogoWidth2 =325/2;
     invoice.imageLogoHeight2 = 81/2;
 
+    invoice.imageLogo3 = "{{ HTML::image_data('images/report_logo3.jpg') }}";
+    invoice.imageLogoWidth3 =325/2;
+    invoice.imageLogoHeight3 = 81/2;
+
 
     return invoice;
 	}
@@ -1393,7 +1397,7 @@
 		}
 
 		$('.word-wrap').each(function(index, input) {
-			$(input).height($(input).val().split('\n').length * 22);
+			$(input).height($(input).val().split('\n').length * 20);
 		});
 	}
 
@@ -1464,7 +1468,7 @@
 	if (!model.invoice().discount()) model.invoice().discount('');
 
 	ko.applyBindings(model);	
-
+	onItemChange();
 
 	</script>
 

app/views/payments/edit.blade.php

@@ -32,9 +32,9 @@
 		</div>
 	</div>
 
-	<center style="margin-top:16px">
+	<center class="buttons">
-		{{ Button::lg_primary_submit_success('Save') }} &nbsp;|&nbsp;
+        {{ Button::lg_primary_submit_success('Save')->append_with_icon('floppy-disk') }}
-		{{ link_to('payments/' . ($payment ? $payment->public_id : ''), 'Cancel') }}	
+         {{ Button::lg_default_link('payments/' . ($payment ? $payment->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
 	</center>
 
 	{{ Former::close() }}

public/css/style.css

@@ -53,7 +53,8 @@ margin-bottom: 0;
 padding-top: 10px;
 }
 textarea.form-control {
-height: auto !important;
+/*height: auto !important;*/
+min-height: 40px;
 }
 /*tables*/
 table.dataTable { border-radius: 3px; border-collapse: collapse;
@@ -73,7 +74,7 @@ th:last-child {
 tr {border: none;}
 th {border-left: 1px solid #d26b26; }
 .table>thead>tr>th, .table>tbody>tr>th, .table>tfoot>tr>th, .table>thead>tr>td, .table>tbody>tr>td, .table>tfoot>tr>td {
-vertical-align: middle;
+vertical-align: top;
 border-top: none;
 border-bottom: 1px solid #dfe0e1;
 }
@@ -448,6 +449,8 @@ background-clip: padding-box;
 }
 .panel-body {padding: 25px;}
 
+.dashboard .panel-heading { margin: -1px; }
+
 .dashboard .panel-body {padding: 0;}
 
 .dashboard .table-striped>tbody>tr>td, .table-striped>tbody>tr>th { background-color: #fbfbfb;}