- get('columns')) as $columnNumber): ?>
+ get('columns')) as $columnNumber) : ?>
getColumnChildren($columnNumber) as $module) : ?>
diff --git a/src/Template/Scaffold/edit.ctp b/templates/scaffold/edit.php
similarity index 100%
rename from src/Template/Scaffold/edit.ctp
rename to templates/scaffold/edit.php
diff --git a/templates/scaffold/index.php b/templates/scaffold/index.php
new file mode 100644
index 00000000..9cee9b1c
--- /dev/null
+++ b/templates/scaffold/index.php
@@ -0,0 +1,52 @@
+fetch('before_index'); ?>
+
+
+
+ exists('search')) {
+ $this->start('search');
+ echo $this->element('search');
+ $this->end();
+ }
+ ?>
+ element('action-header') ?>
+
+ fetch('search'); ?>
+
+
+
+ element('index/bulk_actions/form_start', compact('bulkActions')); ?>
+
+ element('index/finder_scopes', compact('indexFinderScopes')); ?>
+
+ $fields,
+ 'actions' => $actions,
+ 'bulkActions' => $bulkActions,
+ 'primaryKey' => $primaryKey,
+ 'singularVar' => $singularVar,
+ 'viewVar' => $viewVar,
+ $viewVar => ${$viewVar},
+ ];
+ switch ($indexType) {
+ case 'table':
+ echo $this->element('index/table', $_data);
+ break;
+ case 'gallery':
+ echo $this->element('index/gallery', $_data);
+ break;
+ case 'blog':
+ echo $this->element('index/blog', $_data);
+ break;
+ default:
+ echo $this->element($indexType, $_data);
+ break;
+ }
+ ?>
+
+ element('index/bulk_actions/form_end', compact('bulkActions')); ?>
+ element('index/pagination'); ?>
+
+
+fetch('after_index'); ?>
diff --git a/src/Template/Scaffold/view.ctp b/templates/scaffold/view.php
similarity index 67%
rename from src/Template/Scaffold/view.ctp
rename to templates/scaffold/view.php
index ec140cee..aed328a5 100644
--- a/src/Template/Scaffold/view.ctp
+++ b/templates/scaffold/view.php
@@ -1,5 +1,5 @@
extract('foreignKey')->toArray()) :
@@ -12,16 +12,16 @@
CrudView->setContext(${$viewVar});
foreach ($fields as $field => $options) {
- if (in_array($field, array($primaryKey))) {
+ if (in_array($field, [$primaryKey], true)) {
continue;
}
echo '
';
- printf("| %s | ", array_key_exists($field, $assocMap) ?
+ printf('%s | ', array_key_exists($field, $assocMap) ?
Inflector::singularize(Inflector::humanize(Inflector::underscore($assocMap[$field]))) :
- (isset($options['title']) ? $options['title'] : Inflector::humanize($field)));
- printf("%s | ", $this->CrudView->process($field, ${$viewVar}, $options) ?: " ");
+ ($options['title'] ?? Inflector::humanize($field)));
+ printf('%s | ', $this->CrudView->process($field, ${$viewVar}, $options) ?: ' ');
echo '
';
}
diff --git a/tests/TestCase/Dashboard/DashboardTest.php b/tests/TestCase/Dashboard/DashboardTest.php
index 3e53eba0..576e600d 100644
--- a/tests/TestCase/Dashboard/DashboardTest.php
+++ b/tests/TestCase/Dashboard/DashboardTest.php
@@ -1,6 +1,10 @@
assertEquals($expected, $dashboard->get('title'));
@@ -27,22 +31,21 @@ public function testConstruct()
$this->assertEquals($expected, $dashboard->get('title'));
}
- /**
- * @expectedException InvalidArgumentException
- * @expectedExceptionMessage Valid columns value must be one of [1, 2, 3, 4, 6, 12]
- */
public function testInvalidConstruct()
{
- $dashboard = new Dashboard(null, 0);
+ $this->expectException(\InvalidArgumentException::class);
+ $this->expectExceptionMessage('Valid columns value must be one of [1, 2, 3, 4, 6, 12]');
+
+ new Dashboard(null, 0);
}
public function testColumnChildren()
{
- $dashboard = new Dashboard;
+ $dashboard = new Dashboard();
$expected = [];
$this->assertEquals($expected, $dashboard->getColumnChildren(1));
- $cell = new DashboardTableCell;
+ $cell = new DashboardTableCell(new ServerRequest(), new Response());
$return = $dashboard->addToColumn($cell);
$this->assertEquals($dashboard, $return);
$this->assertEquals([$cell], $dashboard->getColumnChildren(1));
diff --git a/tests/TestCase/Dashboard/Module/ActionLinkItemTest.php b/tests/TestCase/Dashboard/Module/ActionLinkItemTest.php
index 95140b6f..de33ff56 100644
--- a/tests/TestCase/Dashboard/Module/ActionLinkItemTest.php
+++ b/tests/TestCase/Dashboard/Module/ActionLinkItemTest.php
@@ -1,4 +1,6 @@
assertEquals($expected, $item->get('actions'));
$actions = $item->get('actions');
- $expected = ['class' => ['btn btn-default']];
+ $expected = ['class' => ['btn btn-secondary']];
$this->assertEquals($expected, $actions[0]->get('options'));
}
}
diff --git a/tests/TestCase/Dashboard/Module/LinkItemTest.php b/tests/TestCase/Dashboard/Module/LinkItemTest.php
index cbcd82b0..2cdeaebd 100644
--- a/tests/TestCase/Dashboard/Module/LinkItemTest.php
+++ b/tests/TestCase/Dashboard/Module/LinkItemTest.php
@@ -1,4 +1,6 @@
assertEquals($expected, $item->get('options'));
}
- /**
- * @expectedException InvalidArgumentException
- * @expectedExceptionMessage Missing title for LinkItem action
- */
public function testInvalidTitle()
{
- $item = new LinkItem('', null);
+ $this->expectException(\InvalidArgumentException::class);
+ $this->expectExceptionMessage('Missing title for LinkItem action');
+
+ new LinkItem('', null);
}
- /**
- * @expectedException InvalidArgumentException
- * @expectedExceptionMessage Invalid url specified for LinkItem
- */
public function testInvalidNullUrl()
{
- $item = new LinkItem('Title', null);
+ $this->expectException(\InvalidArgumentException::class);
+ $this->expectExceptionMessage('Invalid url specified for LinkItem');
+
+ new LinkItem('Title', null);
}
- /**
- * @expectedException InvalidArgumentException
- * @expectedExceptionMessage Invalid url specified for LinkItem
- */
public function testInvalidEmptyUrl()
{
- $item = new LinkItem('Title', '');
+ $this->expectException(\InvalidArgumentException::class);
+ $this->expectExceptionMessage('Invalid url specified for LinkItem');
+
+ new LinkItem('Title', '');
}
public function testOptions()
diff --git a/tests/TestCase/View/CrudViewTest.php b/tests/TestCase/View/CrudViewTest.php
index d059d288..cee98ee4 100644
--- a/tests/TestCase/View/CrudViewTest.php
+++ b/tests/TestCase/View/CrudViewTest.php
@@ -1,13 +1,15 @@
[
'CrudView' => [
'className' => 'CrudView.CrudView',
- 'fieldFormatters' => ['datetime' => 'formatTime']
- ]
- ]
+ 'fieldFormatters' => ['datetime' => 'formatTime'],
+ ],
+ ],
]
);
diff --git a/tests/TestCase/View/Helper/CrudViewHelperTest.php b/tests/TestCase/View/Helper/CrudViewHelperTest.php
index e22a9b93..70998e9a 100644
--- a/tests/TestCase/View/Helper/CrudViewHelperTest.php
+++ b/tests/TestCase/View/Helper/CrudViewHelperTest.php
@@ -1,7 +1,10 @@
CrudView = $this->getMockBuilder(CrudViewHelper::class)
->setConstructorArgs([$this->View])
- ->setMethods(['columnType'])
+ ->setMethods(['columnType', 'getContext'])
->getMock();
+ $this->CrudView
+ ->expects($this->any())
+ ->method('getContext')
+ ->will($this->returnValue(new Entity()));
+
$this->CrudView
->expects($this->any())
->method('columnType')
diff --git a/tests/TestCase/View/Widget/DateTimeWidgetTest.php b/tests/TestCase/View/Widget/DateTimeWidgetTest.php
index 2f73da4d..c5b6e203 100644
--- a/tests/TestCase/View/Widget/DateTimeWidgetTest.php
+++ b/tests/TestCase/View/Widget/DateTimeWidgetTest.php
@@ -1,7 +1,10 @@
initComparePath();
+ Configure::write('CrudView.datetimePicker', []);
}
/**
@@ -32,7 +37,9 @@ public function setUp()
public function testRenderSimple($compareFileName, $data)
{
$context = $this->getMockBuilder(ContextInterface::class)->getMock();
- $templates = new StringTemplate();
+ $templates = new StringTemplate([
+ 'input' => '
',
+ ]);
$selectBox = new SelectBoxWidget($templates);
$instance = new DateTimeWidget($templates, $selectBox);
@@ -52,16 +59,56 @@ public function renderProvider()
return [
[
'simple.html',
- ['id' => 'the-id', 'name' => 'the-name', 'val' => '', 'type' => 'x', 'required' => false]
+ [
+ 'id' => 'the-id',
+ 'name' => 'the-name',
+ 'val' => '',
+ 'type' => 'date',
+ 'required' => false,
+ ],
],
[
'with-string-value.html',
- ['id' => 'the-id', 'name' => 'the-name', 'val' => '2000-01-01', 'type' => 'x', 'required' => false]
+ [
+ 'id' => 'the-id2',
+ 'name' => 'the-name2',
+ 'val' => '2000-01-01',
+ 'type' => 'date',
+ 'required' => false,
+ ],
],
[
'with-date-value.html',
- ['id' => 'the-id', 'name' => 'the-name', 'val' => (new FrozenTime(strtotime('2000-01-01'))), 'type' => 'x', 'required' => false]
- ]
+ [
+ 'id' => 'the-id3',
+ 'name' => 'the-name3',
+ 'val' => new FrozenDate('2000-01-01'),
+ 'type' => 'date',
+ 'required' => false,
+ ],
+ ],
+ [
+ 'no-datetime-picker.html',
+ [
+ 'id' => 'the-id4',
+ 'name' => 'the-name4',
+ 'val' => '',
+ 'type' => 'date',
+ 'required' => false,
+ 'datetimePicker' => false,
+ ],
+ ],
+ [
+ 'no-wrap.html',
+ [
+ 'id' => 'the-id5',
+ 'name' => 'the-name5',
+ 'val' => '',
+ 'type' => 'date',
+ 'required' => false,
+ 'datetimePicker' => ['data-wrap' => 'false'],
+ ],
+ ],
];
}
}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 4f4d373d..edfce42b 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,4 +1,6 @@
dirname(dirname(__FILE__)) . DS]);
+Plugin::getCollection()->add(new \CrudView\Plugin());
diff --git a/tests/comparisons/View/Widget/DateTimeWidget/no-datetime-picker.html b/tests/comparisons/View/Widget/DateTimeWidget/no-datetime-picker.html
new file mode 100644
index 00000000..8a6205a9
--- /dev/null
+++ b/tests/comparisons/View/Widget/DateTimeWidget/no-datetime-picker.html
@@ -0,0 +1,6 @@
+
diff --git a/tests/comparisons/View/Widget/DateTimeWidget/no-wrap.html b/tests/comparisons/View/Widget/DateTimeWidget/no-wrap.html
new file mode 100644
index 00000000..b9d556ba
--- /dev/null
+++ b/tests/comparisons/View/Widget/DateTimeWidget/no-wrap.html
@@ -0,0 +1,10 @@
+
diff --git a/tests/comparisons/View/Widget/DateTimeWidget/simple.html b/tests/comparisons/View/Widget/DateTimeWidget/simple.html
index b68d94cf..b1f84ce4 100644
--- a/tests/comparisons/View/Widget/DateTimeWidget/simple.html
+++ b/tests/comparisons/View/Widget/DateTimeWidget/simple.html
@@ -1,19 +1,51 @@
diff --git a/tests/comparisons/View/Widget/DateTimeWidget/with-date-value.html b/tests/comparisons/View/Widget/DateTimeWidget/with-date-value.html
index f4723f39..1ae26bdb 100644
--- a/tests/comparisons/View/Widget/DateTimeWidget/with-date-value.html
+++ b/tests/comparisons/View/Widget/DateTimeWidget/with-date-value.html
@@ -1,19 +1,51 @@
diff --git a/tests/comparisons/View/Widget/DateTimeWidget/with-string-value.html b/tests/comparisons/View/Widget/DateTimeWidget/with-string-value.html
index 6776043d..f5056d18 100644
--- a/tests/comparisons/View/Widget/DateTimeWidget/with-string-value.html
+++ b/tests/comparisons/View/Widget/DateTimeWidget/with-string-value.html
@@ -1,19 +1,51 @@
diff --git a/webroot/css/local.css b/webroot/css/local.css
index 367a419c..94b1ad82 100644
--- a/webroot/css/local.css
+++ b/webroot/css/local.css
@@ -1,37 +1,28 @@
-/******************************************************************************
- * Use cloudflare's glyphicons
- *****************************************************************************/
-@font-face {
- font-family: 'Glyphicons Halflings';
-
- src: url('https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/fonts/glyphicons-halflings-regular.eot');
- src: url('https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
- url('https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/fonts/glyphicons-halflings-regular.woff2') format('woff2'),
- url('https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/fonts/glyphicons-halflings-regular.woff') format('woff'),
- url('https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/fonts/glyphicons-halflings-regular.ttf') format('truetype'),
- url('https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
-}
-
-
/******************************************************************************
* Generic form hacks
*****************************************************************************/
+
.bulk-action {
width: 32px;
}
+
.bulk-action .checkbox {
margin-bottom: 0;
}
+
.bulk-action-submit {
width: 50%;
}
+
.bulk-action-submit label {
width: auto;
}
+
.bulk-action-submit select {
display: inline-block;
width: 50%;
}
+
.bulk-action-submit input {
width: auto;
}
@@ -48,68 +39,68 @@ div.input {
margin-bottom: 10px
}
-.btn {
- margin-left: 5px
-}
h2 .actions {
margin-left: 15px;
}
-.search-filters .form-inline .form-group {
- padding-left:10px;
-}
-
-.search-filters .form-inline .form-group label {
- padding-right:10px;
+.search-filters .form-inline .form-group label,
+.search-filters .form-inline .btn {
+ margin-right: .25rem !important;
}
-.search-filters .form-inline .form-control {
- min-width:90px !important;
+.search-filters .form-inline .form-group {
+ margin-right: .5rem !important;
}
-.search-filters .form-inline .form-control input, .search-filters .form-inline .form-control select {
- min-width:90px !important;
+.search-filters .form-inline .form-group {
+ margin-bottom: 1rem !important;
}
-.selectize-input.items.full {
- padding-right:33px;
+.search-filters .form-inline .form-control input {
+ min-width: 90px !important;
}
-div.actions-wrapper {
- margin: 10px 0;
+.search-filters .form-inline select.autocomplete {
+ min-width: 150px;
}
.text-truncate {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
+
.gallery-content {
text-align: center;
}
+
.pagination-wrapper {
clear: both;
margin: 20px 0;
text-align: center;
}
+
.download-links {
float: left;
}
+
.pagination-container {
float: right
}
+
.pagination-container .pagination {
margin: 0;
}
+
table tr td.actions {
white-space: nowrap;
width: 1px;
}
.nav > li > .nav-header {
- border-radius: 4px;
- display: block;
- font-weight: bold;
- padding: 10px 15px;
- position: relative;
+ border-radius: 4px;
+ display: block;
+ font-weight: bold;
+ padding: 10px 15px;
+ position: relative;
}
diff --git a/webroot/js/local.js b/webroot/js/local.js
index 3de938e0..ebe5b895 100644
--- a/webroot/js/local.js
+++ b/webroot/js/local.js
@@ -13,71 +13,65 @@ var CrudView = {
}
},
- datePicker: function (selector) {
- $(selector).each(function() {
- var picker = $(this);
- var date = null;
-
- if (picker.data('timestamp') && picker.data('timezone-offset')) {
- var timezoneOffset = picker.data('timezone-offset');
- date = new Date(picker.data('timestamp') * 1000);
-
- picker.parents('form').on('submit', function () {
- var timezoneDiff = timezoneOffset + date.getTimezoneOffset();
- var currentDate = picker.data('DateTimePicker').date();
- var convertedDate = currentDate.add(timezoneDiff, 'minutes');
- picker.data('DateTimePicker').date(convertedDate);
- });
+ flatpickr: function (selector) {
+ $(selector).flatpickr();
+ },
+
+ select2: function (selector) {
+ $(selector).each(function () {
+ var $this = $(this),
+ config = {theme: 'bootstrap4'};
+
+ if (!$this.prop('multiple') && $this.find('option:first').val() === '') {
+ config.allowClear = true;
+ config.placeholder = '';
}
- picker.datetimepicker({
- locale: $(this).data('locale'),
- format: $(this).data('format'),
- date: date ? date : picker.val()
- });
+ $(this).select2(config);
});
},
- selectize: function (selector) {
- $(selector).selectize({plugins: ['remove_button']});
- },
-
autocomplete: function (selector) {
- $(selector).each(function (i, e) {
- e = $(e);
- e.selectize({
- maxItems: e.data('max-items') || 1,
- maxOptions: e.data('max-options') || 10,
- hideSelected: e.data('hide-selected'),
- closeAfterSelect: e.data('close-after-select'),
- create: !e.data('exact-match'),
- persist: false,
- render: {
- 'option_create': function(data, escape) {
- return '
🔍 ' + escape(data.input) + '…
';
- }
- },
- load: function (query, callback) {
- var data = {};
+ $(selector).each(function (i, ele) {
+ var $ele = $(ele);
- data[e.data('filter-field') || e.attr('name')] = query;
+ $ele.select2({
+ theme: 'bootstrap4',
+ minimumInputLength: 1,
+ ajax: {
+ delay: 250,
+ url: $ele.data('url'),
+ dataType: 'json',
+ data: function (params) {
+ var query = {};
+ query[$ele.data('filter-field') || $ele.attr('name')] = params.term;
- if (e.data('dependent-on') && $('#' + e.data('dependent-on')).val()) {
- data[e.data('dependent-on-field')] = $('#' + e.data('dependent-on')).val();
- }
- $.ajax({
- url: e.data('url'),
- dataType: 'json',
- data: data,
- error: function() {
- callback();
- },
- success: function(res) {
- callback($.map(res.data, function (name, id) {
- return {value: id, text: name};
- }));
+ if ($ele.data('dependent-on') && $('#' + $ele.data('dependent-on')).val()) {
+ data[$ele.data('dependent-on-field')] = $('#' + $ele.data('dependent-on')).val();
}
- });
+
+ return query;
+ },
+ processResults: function (data, params) {
+ var results = [],
+ inputType = $ele.data('inputType'),
+ term = params.term.toLowerCase();
+
+ if (data.data) {
+ $.each(data.data, function(id, text) {
+ if (text.toLowerCase().indexOf(term) > -1) {
+ results.push({
+ id: inputType === 'text' ? text : id,
+ text: text
+ });
+ }
+ });
+ }
+
+ return {
+ results: results
+ };
+ }
}
});
});
@@ -100,16 +94,21 @@ var CrudView = {
})
},
- initialize: function() {
+ tooltip: function () {
+ $('[data-toggle="tooltip"]').tooltip();
+ },
+
+ initialize: function () {
this.bulkActionForm('.bulk-actions');
- this.datePicker('[role=datetime-picker]');
- this.selectize('select:not(.autocomplete, .no-selectize)');
+ this.flatpickr('.flatpickr');
+ this.select2('select[multiple]:not(.no-select2), select.select2');
this.autocomplete('input.autocomplete, select.autocomplete');
this.dirtyForms();
this.dropdown();
+ this.tooltip();
}
};
-$(function() {
+$(function () {
CrudView.initialize();
});