From 631cdef3458633e869d83e07290b21abb9ab02ef Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 23 Mar 2014 15:36:18 +0200 Subject: [PATCH] Bug fixes --- .gitignore | 1 + app/controllers/AccountController.php | 2 +- app/routes.php | 3 +- app/views/accounts/details.blade.php | 4 +-- app/views/accounts/notifications.blade.php | 21 +++++------ app/views/master.blade.php | 4 +-- app/views/public/header.blade.php | 42 ++++++++++------------ public/css/splash.css | 4 +-- public/css/style.css | 4 +-- 9 files changed, 37 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index 0981b45f552c..5bc74ae5bab7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ /bootstrap/compiled.php /bootstrap/environment.php /vendor +/.env.development.php /composer.phar /composer.lock /.DS_Store diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index ef1363aa7f79..d82c2ebccf32 100755 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -516,7 +516,7 @@ class AccountController extends \BaseController { $account->date_format_id = Input::get('date_format_id') ? Input::get('date_format_id') : null; $account->datetime_format_id = Input::get('datetime_format_id') ? Input::get('datetime_format_id') : null; $account->currency_id = Input::get('currency_id') ? Input::get('currency_id') : 1; // US Dollar - $account->language_id = Input::get('language_id') ? Input::get('language_id') : 1; // English + //$account->language_id = Input::get('language_id') ? Input::get('language_id') : 1; // English $account->save(); $user = Auth::user(); diff --git a/app/routes.php b/app/routes.php index ff83260e0141..4db3a8cfc8f4 100755 --- a/app/routes.php +++ b/app/routes.php @@ -1,7 +1,6 @@ addOption('','')->label('Language') - ->fromQuery($languages, 'name', 'id') }} + {{-- Former::select('language_id')->addOption('','')->label('Language') + ->fromQuery($languages, 'name', 'id') --}} {{ Former::select('currency_id')->addOption('','')->label('Currency') ->fromQuery($currencies, 'name', 'id') }} {{ Former::select('timezone_id')->addOption('','')->label('Timezone') diff --git a/app/views/accounts/notifications.blade.php b/app/views/accounts/notifications.blade.php index e8f4939bdf36..3dd004f7394c 100755 --- a/app/views/accounts/notifications.blade.php +++ b/app/views/accounts/notifications.blade.php @@ -20,21 +20,18 @@
+
+ -
- - -
-
+
   -
diff --git a/app/views/master.blade.php b/app/views/master.blade.php index 88230779a104..0007b13cd929 100755 --- a/app/views/master.blade.php +++ b/app/views/master.blade.php @@ -45,14 +45,14 @@ - @if (App::environment() == ENV_PRODUCTION) + @if (App::environment() == ENV_PRODUCTION && isset($_ENV['ANALYTICS_KEY']) && $_ENV['ANALYTICS_KEY']) @endif diff --git a/app/views/public/header.blade.php b/app/views/public/header.blade.php index 036eecb02ac0..49f74f4b40f9 100644 --- a/app/views/public/header.blade.php +++ b/app/views/public/header.blade.php @@ -75,32 +75,26 @@
+   -
- - -   - -
+ + +   + +
+ + + +   + + - - -
-

 

Copyright © 2014 InvoiceNinja. All rights reserved.

diff --git a/public/css/splash.css b/public/css/splash.css index b086c8f99983..23e9c34d4e75 100644 --- a/public/css/splash.css +++ b/public/css/splash.css @@ -529,10 +529,8 @@ footer .social .socicon { } div.fb_iframe_widget { - position: absolute !important; - display: inline-block; + display: inline; } - div.fb_iframe_widget > span { vertical-align: top !important; } diff --git a/public/css/style.css b/public/css/style.css index 333d1644b2b3..fa13e78efc23 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -620,12 +620,12 @@ border-color: #08273c; cursor: pointer; } div.fb_iframe_widget { - position: absolute !important; - display: inline-block; + display: inline; } div.fb_iframe_widget > span { vertical-align: top !important; } + @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { color: #ecf0f1;