Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #703

Browse Source
This commit is contained in:
Hillel Coren 2016-02-15 19:58:18 +02:00
parent 4012bd39ed
commit 7c3406d9e5
2 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Account.php
View File

@ -726,6 +726,10 @@ class Account extends Eloquent
public function isTrial() public function isTrial()
{ {
if (!Utils::isNinjaProd()) {
return false;
}
if ($this->pro_plan_paid && $this->pro_plan_paid != '0000-00-00') { if ($this->pro_plan_paid && $this->pro_plan_paid != '0000-00-00') {
return false; return false;
} }

58
resources/views/header.blade.php
View File

@ -258,20 +258,12 @@
localStorage.setItem('auth_provider', provider); localStorage.setItem('auth_provider', provider);
} }
$(function() { function showSearch() {
window.setTimeout(function() { $('#search-form').show();
$(".alert-hide").fadeOut(); $('#navbar-options').hide();
}, 3000); if (window.hasOwnProperty('searchData')) {
$('#search').focus();
$('#search').blur(function(){ } else {
$('#search').css('width', '110px');
$('ul.navbar-right').show();
});
$('#search').focus(function(){
$('#search').css('width', '224px');
$('ul.navbar-right').hide();
if (!window.hasOwnProperty('searchData')) {
trackEvent('/activity', '/search'); trackEvent('/activity', '/search');
$.get('{{ URL::route('getSearchData') }}', function(data) { $.get('{{ URL::route('getSearchData') }}', function(data) {
window.searchData = true; window.searchData = true;
@ -294,8 +286,22 @@
}).focus().typeahead('setQuery', $('#search').val()); }).focus().typeahead('setQuery', $('#search').val());
}); });
} }
}); }
function hideSearch() {
$('#search').typeahead('setQuery', '');
$('#search-form').hide();
$('#navbar-options').show();
}
$(function() {
window.setTimeout(function() {
$(".alert-hide").fadeOut();
}, 3000);
$('#search').blur(function(){
hideSearch();
});
if (isStorageSupported()) { if (isStorageSupported()) {
@if (Auth::check() && !Auth::user()->registered) @if (Auth::check() && !Auth::user()->registered)
@ -378,18 +384,19 @@
{!! HTML::menu_link('payment') !!} {!! HTML::menu_link('payment') !!}
</ul> </ul>
<div id="navbar-options">
<div class="navbar-form navbar-right"> <div class="navbar-form navbar-right">
@if (Auth::check()) @if (Auth::check())
@if (!Auth::user()->registered) @if (!Auth::user()->registered)
{!! Button::success(trans('texts.sign_up'))->withAttributes(array('id' => 'signUpButton', 'data-toggle'=>'modal', 'data-target'=>'#signUpModal'))->small() !!} &nbsp; {!! Button::success(trans('texts.sign_up'))->withAttributes(array('id' => 'signUpButton', 'data-toggle'=>'modal', 'data-target'=>'#signUpModal', 'style' => 'max-width:100px;;overflow:hidden'))->small() !!} &nbsp;
@elseif (Utils::isNinjaProd() && (!Auth::user()->isPro() || Auth::user()->isTrial())) @elseif (Utils::isNinjaProd() && (!Auth::user()->isPro() || Auth::user()->isTrial()))
{!! Button::success(trans('texts.go_pro'))->withAttributes(array('id' => 'proPlanButton', 'onclick' => 'showProPlan("")'))->small() !!} &nbsp; {!! Button::success(trans('texts.go_pro'))->withAttributes(array('id' => 'proPlanButton', 'onclick' => 'showProPlan("")', 'style' => 'max-width:100px;overflow:hidden'))->small() !!} &nbsp;
@endif @endif
@endif @endif
<div class="btn-group user-dropdown"> <div class="btn-group user-dropdown">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
<div id="myAccountButton" class="ellipsis" style="max-width:100px"> <div id="myAccountButton" class="ellipsis" style="max-width:{{ Utils::isPro() && ! Utils::isTrial() ? '100' : '70' }}px">
@if (session(SESSION_USER_ACCOUNTS) && count(session(SESSION_USER_ACCOUNTS))) @if (session(SESSION_USER_ACCOUNTS) && count(session(SESSION_USER_ACCOUNTS)))
{{ Auth::user()->account->getDisplayName() }} {{ Auth::user()->account->getDisplayName() }}
@else @else
@ -478,16 +485,23 @@
</li> </li>
</ul> </ul>
<form class="navbar-form navbar-right" role="search"> <ul class="nav navbar-nav navbar-right navbar-settings">
<li class="dropdown">
<a href="#" onclick="showSearch()">
<span class="glyphicon glyphicon-search" title="{{ trans('texts.search') }}"/>
</a>
</li>
</ul>
</div>
<form id="search-form" class="navbar-form navbar-right" role="search" style="display:none">
<div class="form-group"> <div class="form-group">
<input type="text" id="search" style="width: 110px;padding-top:0px;padding-bottom:0px" <input type="text" id="search" style="width: 300px;padding-top:0px;padding-bottom:0px"
class="form-control" placeholder="{{ trans('texts.search') }}"> class="form-control" placeholder="{{ trans('texts.search') }}">
</div> </div>
</form> </form>
</div><!-- /.navbar-collapse --> </div><!-- /.navbar-collapse -->