Bug fixes

2025-07-09 03:14:30 -04:00 · 2014-03-23 15:36:18 +02:00 · 2014-03-23 15:36:18 +02:00 · 631cdef345
commit 631cdef345
parent 6e532063fd
9 changed files with 37 additions and 48 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,6 +10,7 @@
 /bootstrap/compiled.php
 /bootstrap/environment.php
 /vendor
+/.env.development.php
 /composer.phar
 /composer.lock
 /.DS_Store
--- 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();
--- a/app/routes.php
+++ b/app/routes.php
@ -1,7 +1,6 @@
 <?php


-
 /*
 |--------------------------------------------------------------------------
 | Application Routes
@ -175,7 +174,7 @@ HTML::macro('breadcrumbs', function() {


 define('CONTACT_EMAIL', 'contact@invoiceninja.com');
-define('ANALYTICS_KEY', 'UA-46031341-1');
+//define('ANALYTICS_KEY', 'UA-46031341-1');

 define('ENV_DEVELOPMENT', 'local');
 define('ENV_STAGING', 'staging');
--- a/app/views/accounts/details.blade.php
+++ b/app/views/accounts/details.blade.php
@ -63,8 +63,8 @@
 			{{ Former::text('phone') }}

 			{{ Former::legend('Localization') }}
-			{{ Former::select('language_id')->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')
--- a/app/views/accounts/notifications.blade.php
+++ b/app/views/accounts/notifications.blade.php
@ -20,7 +20,6 @@
 		<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];
@ -30,11 +29,9 @@
 			  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>
-		<div style="padding-left: 70px">	      
+			<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-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></div>

--- a/app/views/master.blade.php
+++ b/app/views/master.blade.php
@ -45,14 +45,14 @@

  <body>

-  @if (App::environment() == ENV_PRODUCTION)  
+  @if (App::environment() == ENV_PRODUCTION && isset($_ENV['ANALYTICS_KEY']) && $_ENV['ANALYTICS_KEY'])  
    <script>
      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');

-      ga('create', ANALYTICS_KEY);
+      ga('create', '{{ $_ENV['ANALYTICS_KEY'] }}');
      ga('send', 'pageview');
    </script>
  @endif
--- a/app/views/public/header.blade.php
+++ b/app/views/public/header.blade.php
@ -75,8 +75,8 @@
          <!--<a href="https://twitter.com/invoiceninja" class="twitter-follow-button" data-show-count="false" 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 class="fb-like" data-href="https://www.invoiceninja.com" data-layout="button" data-action="like" data-show-faces="false" data-share="false"></div>          
+          &nbsp;

-          <div style="padding-left: 58px">
          <a href="https://twitter.com/share" class="twitter-share-button" data-url="https://www.invoiceninja.com/" data-via="invoiceninja" data-related="hillelcoren" data-count="none" data-text="Free online invoicing">Tweet</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>
          &nbsp;
@ -91,16 +91,10 @@
              var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
            })();
          </script>       
-          </div>
-<!--
-<a href="http://twitter.com/eas_id"><span class=
-"socicon">c</span></a> 
-<a href=
-"http://facebook.com/invoiceninja" target="_blank"><span class=
-"socicon">b</span></a> <a href=
-"http://twitter.com/invoiceninja" target="_blank"><span class=
-"socicon">a</span></a>
-->
+          &nbsp;
+
+          <!--<iframe src="http://ghbtns.com/github-btn.html?user=hillelcoren&repo=invoice-ninja&type=watch" allowtransparency="true" frameborder="0" scrolling="0" width="62" height="20"></iframe>-->
+
  <p>&nbsp;</p>
  <p>Copyright © 2014 InvoiceNinja. All rights reserved.</p>
 </div> 
--- 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;  
 }
--- 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;