Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on L5

Browse Source 
Also includes very minor meta tag changes to bring to industry standard.
This commit is contained in:
Jeramy Simpson 2015-04-02 14:09:32 +10:00
parent 515f6fd131
commit 37ca4c9481
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ClientController.php
View File

@ -1,6 +1,7 @@
<?php namespace App\Http\Controllers; <?php namespace App\Http\Controllers;
use Auth; use Auth;
use Datatable;
use Utils; use Utils;
use View; use View;
use URL; use URL;
@ -9,6 +10,7 @@ use Input;
use Session; use Session;
use Redirect; use Redirect;
use App\Models\Activity;
use App\Models\Client; use App\Models\Client;
use App\Models\Contact; use App\Models\Contact;
use App\Models\Invoice; use App\Models\Invoice;

2
resources/views/clients/show.blade.php
View File

@ -21,7 +21,7 @@
->withAttributes(['class'=>'normalDropDown']) ->withAttributes(['class'=>'normalDropDown'])
->withContents([ ->withContents([
['label' => trans('texts.edit_client'), 'url' => URL::to('clients/' . $client->public_id . '/edit')], ['label' => trans('texts.edit_client'), 'url' => URL::to('clients/' . $client->public_id . '/edit')],
Navigation::NAVIGATION_DIVIDER, DropdownButton::DIVIDER,
['label' => trans('texts.archive_client'), 'url' => "javascript:onArchiveClick()"], ['label' => trans('texts.archive_client'), 'url' => "javascript:onArchiveClick()"],
['label' => trans('texts.delete_client'), 'url' => "javascript:onDeleteClick()"], ['label' => trans('texts.delete_client'), 'url' => "javascript:onDeleteClick()"],
] ]

4
resources/views/datatable.blade.php
View File

@ -53,10 +53,10 @@
} ], } ],
@endif @endif
@foreach ($options as $k => $o) @foreach ($options as $k => $o)
{{ json_encode($k) }}: {{ json_encode($o) }}, {!! json_encode($k) !!}: {!! json_encode($o) !!},
@endforeach @endforeach
@foreach ($callbacks as $k => $o) @foreach ($callbacks as $k => $o)
{{ json_encode($k) }}: {{ $o }}, {!! json_encode($k) !!}: {!! $o !!},
@endforeach @endforeach
"fnDrawCallback": function(oSettings) { "fnDrawCallback": function(oSettings) {
if (window.onDatatableReady) { if (window.onDatatableReady) {

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

@ -201,12 +201,11 @@
@endif @endif
<!-- <!--
Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice-ninja', 'open source', array('target'=>'_blank')) }}, email us at {{ link_to('mailto:contact@invoiceninja.com', 'contact@invoiceninja.com') }}. Want something changed? We're {!! link_to('https://github.com/hillelcoren/invoice-ninja', 'open source', array('target'=>'_blank')) !!}, email us at {!! link_to('mailto:contact@invoiceninja.com', 'contact@invoiceninja.com') !!}.
--> -->
</div> </div>
</div> </div>
</div>
@if (!Auth::check() || !Auth::user()->registered) @if (!Auth::check() || !Auth::user()->registered)
@ -381,9 +380,6 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice
<p>&nbsp;</p> <p>&nbsp;</p>
</body>
<script type="text/javascript"> <script type="text/javascript">
function setTheme(id) function setTheme(id)

14
resources/views/master.blade.php
View File

@ -2,17 +2,17 @@
<html lang="en"> <html lang="en">
<head> <head>
<title>Invoice Ninja | {{ isset($title) ? $title : ' ' . trans('public.title') }}</title> <title>Invoice Ninja | {{ isset($title) ? $title : ' ' . trans('public.title') }}</title>
<meta name="description" content="{{ isset($description) ? $description : trans('public.description') }}"></meta> <meta name="description" content="{{ isset($description) ? $description : trans('public.description') }}" />
<!-- Source: https://github.com/hillelcoren/invoice-ninja --> <!-- Source: https://github.com/hillelcoren/invoice-ninja -->
<!-- Version: {{ NINJA_VERSION }} --> <!-- Version: {{ NINJA_VERSION }} -->
<meta charset="utf-8"> <meta charset="utf-8">
<meta property="og:site_name" content="Invoice Ninja"></meta> <meta property="og:site_name" content="Invoice Ninja" />
<meta property="og:url" content="{{ SITE_URL }}"></meta> <meta property="og:url" content="{{ SITE_URL }}" />
<meta property="og:title" content="Invoice Ninja"></meta> <meta property="og:title" content="Invoice Ninja" />
<meta property="og:image" content="{{ SITE_URL }}/images/social.jpg"></meta> <meta property="og:image" content="{{ SITE_URL }}/images/social.jpg" />
<meta property="og:description" content="Simple, Intuitive Invoicing."></meta> <meta property="og:description" content="Simple, Intuitive Invoicing." />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="csrf-token" content="<?= csrf_token() ?>"> <meta name="csrf-token" content="<?= csrf_token() ?>">
@ -21,7 +21,7 @@
<link href="//fonts.googleapis.com/css?family=Roboto:400,700,900,100" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Roboto:400,700,900,100" rel="stylesheet" type="text/css">
<link href="//fonts.googleapis.com/css?family=Roboto+Slab:400,300,700" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Roboto+Slab:400,300,700" rel="stylesheet" type="text/css">
<link href="{{ asset('favicon.png') }}" rel="shortcut icon"> <link href="{{ asset('favicon.png') }}" rel="shortcut icon">
<link rel="canonical" href="{{ NINJA_APP_URL }}/{{ Request::path() }}"></link> <link rel="canonical" href="{{ NINJA_APP_URL }}/{{ Request::path() }}" />
<script src="{{ asset('built.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script> <script src="{{ asset('built.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>