Skip to content

Commit

Permalink
issue #30
Browse files Browse the repository at this point in the history
Added new column type "Column\Editable" for edit data in place.
  • Loading branch information
butschster committed Mar 15, 2016
1 parent 235e292 commit 1f1b438
Show file tree
Hide file tree
Showing 27 changed files with 7,874 additions and 115 deletions.
8 changes: 7 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"metisMenu": "latest",
"datatables": "latest",
"colorbox": "latest",
"admin-lte": "latest"
"admin-lte": "latest",
"x-editable": "latest"
},
"install": {
"base": "public/default/libs",
Expand Down Expand Up @@ -96,6 +97,11 @@
"bower_components/colorbox/jquery.colorbox.js",
"bower_components/colorbox/jquery.colorbox-min.js",
"bower_components/colorbox/example3/images/*.*"
],
"x-editable": [
"bower_components/x-editable/dist/bootstrap3-editable/js/*.*",
"bower_components/x-editable/dist/bootstrap3-editable/css/*.*",
"bower_components/x-editable/dist/bootstrap3-editable/img/*.*"
]
}
}
Expand Down
31 changes: 16 additions & 15 deletions config/sleeping_owl.php
Original file line number Diff line number Diff line change
Expand Up @@ -123,20 +123,21 @@
*/

'aliases' => [
'Assets' => KodiCMS\Assets\Facades\Assets::class,
'PackageManager' => KodiCMS\Assets\Facades\PackageManager::class,
'Meta' => KodiCMS\Assets\Facades\Meta::class,
'Form' => Collective\Html\FormFacade::class,
'HTML' => Collective\Html\HtmlFacade::class,

'AdminSection' => SleepingOwl\Admin\Facades\Admin::class,
'AdminTemplate' => SleepingOwl\Admin\Facades\Template::class,
'AdminNavigation' => SleepingOwl\Admin\Facades\Navigation::class,
'AdminColumn' => SleepingOwl\Admin\Facades\TableColumn::class,
'AdminColumnFilter' => SleepingOwl\Admin\Facades\TableColumnFilter::class,
'AdminDisplayFilter' => SleepingOwl\Admin\Facades\DisplayFilter::class,
'AdminForm' => SleepingOwl\Admin\Facades\Form::class,
'AdminFormElement' => SleepingOwl\Admin\Facades\FormElement::class,
'AdminDisplay' => SleepingOwl\Admin\Facades\Display::class,
'Assets' => KodiCMS\Assets\Facades\Assets::class,
'PackageManager' => KodiCMS\Assets\Facades\PackageManager::class,
'Meta' => KodiCMS\Assets\Facades\Meta::class,
'Form' => Collective\Html\FormFacade::class,
'HTML' => Collective\Html\HtmlFacade::class,

'AdminSection' => SleepingOwl\Admin\Facades\Admin::class,
'AdminTemplate' => SleepingOwl\Admin\Facades\Template::class,
'AdminNavigation' => SleepingOwl\Admin\Facades\Navigation::class,
'AdminColumn' => SleepingOwl\Admin\Facades\TableColumn::class,
'AdminColumnEditable' => SleepingOwl\Admin\Facades\TableColumnEditable::class,
'AdminColumnFilter' => SleepingOwl\Admin\Facades\TableColumnFilter::class,
'AdminDisplayFilter' => SleepingOwl\Admin\Facades\DisplayFilter::class,
'AdminForm' => SleepingOwl\Admin\Facades\Form::class,
'AdminFormElement' => SleepingOwl\Admin\Facades\FormElement::class,
'AdminDisplay' => SleepingOwl\Admin\Facades\Display::class,
],
];
1 change: 1 addition & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ elixir(function(mix) {
'jquery-colorbox/js/jquery.colorbox-min.js',
'moment/js/moment-with-locales.min.js',
'underscore/js/underscore.js',
'x-editable/js/bootstrap-editable.min.js',
'../../../resources/assets/js/core.js'
], 'public/default/js/libraries.js', 'public/default/libs');

Expand Down
15 changes: 14 additions & 1 deletion public/default/css/common.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/default/js/admin-default.js

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

26 changes: 14 additions & 12 deletions public/default/js/libraries.js

Large diffs are not rendered by default.

Loading

0 comments on commit 1f1b438

Please sign in to comment.