From 8da551720627787c61dba1aaf85fad4d6906bc63 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 14 Oct 2015 23:56:17 +0300
Subject: [PATCH] Bug fixes

---
 .../Controllers/PublicClientController.php    |  1 +
 app/Http/routes.php                           |  3 +-
 readme.md                                     |  1 +
 .../views/accounts/customize_design.blade.php |  2 --
 .../views/accounts/notifications.blade.php    | 35 +++++++++----------
 resources/views/clients/show.blade.php        |  2 +-
 resources/views/header.blade.php              |  2 +-
 resources/views/master.blade.php              |  4 ++-
 resources/views/script.blade.php              |  2 ++
 9 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/app/Http/Controllers/PublicClientController.php b/app/Http/Controllers/PublicClientController.php
index 187a4eed9dd0..904424d98488 100644
--- a/app/Http/Controllers/PublicClientController.php
+++ b/app/Http/Controllers/PublicClientController.php
@@ -32,6 +32,7 @@ class PublicClientController extends BaseController
             'color' => $color,
             'account' => $account,
             'client' => $client,
+            'hideLogo' => $account->isWhiteLabel(),
         ];
 
         return response()->view('invited.dashboard', $data);
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 5c129c629a3a..239bb7ca0f13 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -401,12 +401,11 @@ if (!defined('CONTACT_EMAIL')) {
     define('NINJA_DATE', '2000-01-01');
 
     define('NINJA_FROM_EMAIL', 'maildelivery@invoiceninja.com');
-    define('RELEASES_URL', 'https://github.com/hillelcoren/invoice-ninja/releases/');
+    define('RELEASES_URL', 'https://trello.com/b/63BbiVVe/invoice-ninja');
     define('ZAPIER_URL', 'https://zapier.com/zapbook/invoice-ninja');
     define('OUTDATE_BROWSER_URL', 'http://browsehappy.com/');
     define('PDFMAKE_DOCS', 'http://pdfmake.org/playground.html');
     define('PHANTOMJS_CLOUD', 'http://api.phantomjscloud.com/single/browser/v1/');
-    define('GITHUB_RELEASES', 'https://github.com/hillelcoren/invoice-ninja/releases');
     define('REFERRAL_PROGRAM_URL', false);
 
     define('COUNT_FREE_DESIGNS', 4);
diff --git a/readme.md b/readme.md
index 78bd91d3e8cd..446805cfe4ac 100644
--- a/readme.md
+++ b/readme.md
@@ -26,6 +26,7 @@ If you'd like to use our code to sell your own invoicing app email us for detail
 * Tax rates and payment terms
 * Reminder emails
 * Partial payments
+* Client portal
 * Custom email templates
 * [Zapier](https://zapier.com/) integration
 * [D3.js](http://d3js.org/) visualizations
diff --git a/resources/views/accounts/customize_design.blade.php b/resources/views/accounts/customize_design.blade.php
index d492496df2d7..4e829edd70a9 100644
--- a/resources/views/accounts/customize_design.blade.php
+++ b/resources/views/accounts/customize_design.blade.php
@@ -28,8 +28,6 @@
 
 @section('content')	
     @parent
-    @include('accounts.nav', ['selected' => ACCOUNT_INVOICE_DESIGN, 'advanced' => true])
-
 
   <script>
     var invoiceDesigns = {!! $invoiceDesigns !!};
diff --git a/resources/views/accounts/notifications.blade.php b/resources/views/accounts/notifications.blade.php
index ea9ed5cc4f41..c92bf3fc7b04 100644
--- a/resources/views/accounts/notifications.blade.php
+++ b/resources/views/accounts/notifications.blade.php
@@ -26,30 +26,29 @@
 
 
     <!--
-	{!! Former::legend(trans('texts.site_updates')) !!}
+    {!! Former::legend(trans('texts.site_updates')) !!}
 
-	<div class="form-group">
-		<label for="invoice_terms" class="control-label col-lg-4 col-sm-4"></label>
-		<div class="col-lg-8 col-sm-8">
+    <div class="form-group">
+        <label for="invoice_terms" class="control-label col-lg-4 col-sm-4"></label>
+        <div class="col-lg-8 col-sm-8">
 
-			<div id="fb-root"></div>
-			<script>(function(d, s, id) {
-			  var js, fjs = d.getElementsByTagName(s)[0];
-			  if (d.getElementById(id)) return;
-			  js = d.createElement(s); js.id = id;
-			  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=635126583203143";
-			  fjs.parentNode.insertBefore(js, fjs);
-			}(document, 'script', 'facebook-jssdk'));</script>
+            <div id="fb-root"></div>
+            <script>(function(d, s, id) {
+                var js, fjs = d.getElementsByTagName(s)[0];
+                if (d.getElementById(id)) return;
+                js = d.createElement(s); js.id = id;
+                js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=635126583203143";
+                fjs.parentNode.insertBefore(js, fjs);
+            }(document, 'script', 'facebook-jssdk'));</script>
 
-			<div class="fb-follow" data-href="https://www.facebook.com/invoiceninja" data-colorscheme="light" data-layout="button" data-show-faces="false"></div>&nbsp;&nbsp;
+            <div class="fb-follow" data-href="https://www.facebook.com/invoiceninja" data-colorscheme="light" data-layout="button" data-show-faces="false"></div>&nbsp;&nbsp;
 
-	  	<a href="https://twitter.com/invoiceninja" class="twitter-follow-button" data-show-count="false" data-related="hillelcoren" data-size="medium">Follow @invoiceninja</a>
-	  	<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
-
-  </div></div>
+            <a href="https://twitter.com/invoiceninja" class="twitter-follow-button" data-show-count="false" data-related="hillelcoren" data-size="large">Follow @invoiceninja</a>
+            <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
+        </div>
+    </div>
     -->
 
-
     <div class="panel panel-default">
       <div class="panel-heading">
         <h3 class="panel-title">{!! trans('texts.custom_messages') !!}</h3>
diff --git a/resources/views/clients/show.blade.php b/resources/views/clients/show.blade.php
index 4b4eb8d3ba4e..c04e1f383efa 100644
--- a/resources/views/clients/show.blade.php
+++ b/resources/views/clients/show.blade.php
@@ -82,7 +82,7 @@
                 {{ $client->getCityState() }}<br/>
             @endif
             @if ($client->country)
-                <br/>{{ $client->country->name }}
+                {{ $client->country->name }}<br/>
             @endif
 
             @if ($client->account->custom_client_label1 && $client->custom_value1)
diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index aa83d8352ea6..f87d2f9dba5f 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -669,7 +669,7 @@
 <p>&nbsp;</p>
 <div class="container">
   {{ trans('texts.powered_by') }} <a href="https://www.invoiceninja.com/?utm_source=powered_by" target="_blank">InvoiceNinja.com</a> -
-  {!! link_to(GITHUB_RELEASES, 'v' . NINJA_VERSION, ['target' => '_blank']) !!} | 
+  {!! link_to(RELEASES_URL, 'v' . NINJA_VERSION, ['target' => '_blank']) !!} | 
   @if (Auth::user()->account->isWhiteLabel())  
     {{ trans('texts.white_labeled') }}
   @else
diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
index 20501e28f173..d22b6a5a93f2 100644
--- a/resources/views/master.blade.php
+++ b/resources/views/master.blade.php
@@ -27,7 +27,9 @@
     <script src="{{ asset('js/built.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>    
 
     <script type="text/javascript">
-        var NINJA = NINJA || {};      
+        var NINJA = NINJA || {};
+        NINJA.fontSize = 9;
+
         NINJA.isRegistered = {{ \Utils::isRegistered() ? 'true' : 'false' }};    
 
         window.onerror = function(e) {
diff --git a/resources/views/script.blade.php b/resources/views/script.blade.php
index 4f60ac5626b4..d4f2368a13d1 100644
--- a/resources/views/script.blade.php
+++ b/resources/views/script.blade.php
@@ -12,6 +12,8 @@
     NINJA.primaryColor = "{{ Auth::user()->account->primary_color }}";
     NINJA.secondaryColor = "{{ Auth::user()->account->secondary_color }}";
     NINJA.fontSize = {{ Auth::user()->account->font_size ?: DEFAULT_FONT_SIZE }};
+  @else
+    NINJA.fontSize = {{ DEFAULT_FONT_SIZE }};
   @endif
 
   NINJA.parseFloat = function(str) {