Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Datatables groundwork, minor tweaks. #99

Merged
merged 1 commit into from
Dec 1, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,7 @@ Loading up the sample data will give you an idea of how this should look, how yo
## Optional Development Stuff
### Set up the debugbar

In dev mode, I use the fabulous [Laravel Debugbar](https://github.com/barryvdh/laravel-debugbar) by @barryvdh. After you've installed/updated composer, you'll need to publish the assets for the debugbar:

php artisan debugbar:publish
In dev mode, I use the fabulous [Laravel Debugbar](https://github.com/barryvdh/laravel-debugbar) by @barryvdh.

The profiler is enabled by default if you have debug set to true in your app.php. You certainly don't have to use it, but it's pretty handy for troubleshooting queries, seeing how much memory your pages are using, etc.

Expand Down
4 changes: 4 additions & 0 deletions app/config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@

'Cartalyst\Sentry\SentryServiceProvider',

'Chumper\Datatable\DatatableServiceProvider',

),

/*
Expand Down Expand Up @@ -144,6 +146,8 @@

'Sentry' => 'Cartalyst\Sentry\Facades\Laravel\Sentry',

'Datatable' => 'Chumper\Datatable\Facades\Datatable',

),

);
6 changes: 3 additions & 3 deletions app/views/backend/layouts/default.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
<link rel="stylesheet" href="{{ asset('assets/css/compiled/form-showcase.css') }}" type="text/css" media="screen" />
<link rel="stylesheet" href="{{ asset('assets/css/lib/jquery.dataTables.css') }}" type="text/css" media="screen" />


<!-- global header javascripts -->
<script src="//code.jquery.com/jquery-latest.js"></script>
<script src="{{ asset('assets/js/jquery.dataTables.js') }}"></script>

<!-- open sans font -->
<link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
Expand Down Expand Up @@ -276,13 +278,11 @@
<!-- end main container -->

<!-- scripts -->
<script src="//code.jquery.com/jquery-latest.js"></script>
<script src="{{ asset('assets/js/bootstrap.min.js') }}"></script>
<script src="{{ asset('assets/js/jquery.knob.js') }}"></script>
<script src="{{ asset('assets/js/select2.min.js') }}"></script>
<script src="{{ asset('assets/js/jquery.uniform.min.js') }}"></script>
<script src="{{ asset('assets/js/bootstrap.datepicker.js') }}"></script>
<script src="{{ asset('assets/js/jquery.dataTables.js') }}"></script>
<script src="{{ asset('assets/js/theme.js') }}"></script>

<script type="text/javascript">
Expand Down
7 changes: 6 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"require": {
"laravel/framework": "4.0.*",
"cartalyst/sentry": "2.0.*",
"barryvdh/laravel-debugbar": "dev-master"
"barryvdh/laravel-debugbar": "dev-master",
"chumper/datatable": "dev-master"
},
"require-dev": {
"phpunit/phpunit": "*"
Expand All @@ -27,6 +28,10 @@
],
"post-update-cmd": [
"php artisan optimize"
"php artisan debugbar:publish"
],
"post-install-cmd": [
"php artisan debugbar:publish"
],
"post-create-project-cmd": [
"php artisan key:generate"
Expand Down
119 changes: 56 additions & 63 deletions composer.lock
100755 → 100644

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.