jakevan/jvb.git

			@@ -662,7 +662,7 @@
			return;
			}
			?>
			<div class="radio-options view row">
			<div class="radio-options view row left">
			<span class="label">View:</span>
			<?php
			$views = [
			@@ -683,7 +683,7 @@
			<label for="view-<?=$view?>"
			title="<?=$views[$view]['label']?>">
			<?= jvbDashIcon($views[$view]['icon']) ?>
			<span class="screen-reader-text"><?=$views[$view]['label']?></span>
			<span class="label"><?=$views[$view]['label']?></span>
			</label>
			<?php
			}
			@@ -698,7 +698,7 @@
			return;
			}
			?>
			<div class="radio-options status row">
			<div class="radio-options status row left">
			<span class="label">Status:</span>
			<?php
			$i = 1;
			@@ -713,6 +713,7 @@
			<input type="radio" class="btn" data-filter="status" value="<?=$status?>" name="status" id="<?=$status?>"<?=$checked?>>
			<label for="<?=$status?>" title="<?=$config['label']?>">
			<?= jvbDashIcon($config['icon']) ?>
			<span class="label"><?= $config['label'] ?></span>
			</label>
			<?php
			$i++;
			@@ -729,12 +730,33 @@
			<?php
			$order = [
			'orderby' => [
			'date' => 'Order by date created',
			'alphabetical' => 'Order alphabetically'
			[
			'slug' => 'date',
			'label' => 'Date Created',
			'icon' => 'calendar'
			],
			[
			'slug' => 'alphabetical',
			'label' => 'Alphabetically',
			'icon' => 'alphabetical',
			],
			[
			'slug' => 'date_modified',
			'icon' => 'clock-clockwise',
			'label' => 'Date Modified',
			],
			],
			'order' => [
			'sort-ascending' => 'In ascending order (Z-A, oldest to newest)',
			'sort-descending' => 'In descending order (A-Z, newest to oldest)'
			[
			'slug' => 'desc',
			'icon' => 'sort-descending',
			'label' => 'Descending (A-Z, 1-10)'
			],
			[
			'slug' => 'asc',
			'icon' => 'sort-ascending',
			'label' => 'Ascending (Z-A, 10-1)'
			]
			]
			];

			@@ -743,16 +765,13 @@
			<div class="row left">
			<span class="label"><?= ucfirst($o)?>:</span>
			<?php
			$title = $o === 'orderby' ? 'Order by ' : 'Sort ';
			$i = 0;
			foreach ($option as $opt => $label) {
			$icon = $opt === 'date' ? 'calendar' : $opt;
			$value = $opt;
			$value = ($value === 'sort-ascending') ? 'asc' : $value;
			$value = ($value === 'sort-descending') ? 'desc' : $value;
			foreach ($option as $conf) {
			?>
			<input id="<?=$opt?>" class="btn" type="radio" name="<?=$o?>" data-filter="<?=$o?>" value="<?=$value?>"<?=$i===0 ? ' checked':''?>>
			<input id="<?=$o.'-'.$conf['slug'] ?>" class="btn" type="radio" name="<?=$o?>" data-filter="<?=$o?>" value="<?=$conf['slug']?>"<?=$i===0 ? ' checked':''?>>

			<label for="<?=$opt?>" title="<?=$label?>"><?=jvbDashIcon($icon)?></label>
			<label for="<?=$o.'-'.$conf['slug']?>" title="<?=$title.' '.$conf['label']?>"><?=jvbDashIcon($conf['icon'])?><span class="label"><?= $conf['label'] ?></span></label>
			<?php
			$i++;
			}
			@@ -1560,7 +1579,7 @@
			<input type="hidden" name="content" value="<?=$this->dataType?>" />
			<div class="fields">
			<?php
			if (!empty($this->statuses)) {
			if (empty($this->sections) && !empty($this->statuses)) {
			echo Form::render('post_status', '', $this->getStatusFieldConfig('edit-'));
			}

			@@ -1574,8 +1593,9 @@
			'icon' => $config['icon']
			];
			}

			$tabs[$slug] = array_merge([
			'title' => $config['label'],
			'title' => $config['title'],
			'content' => '',
			'description' => $config['description']??'',
			], $section);
			@@ -1585,13 +1605,18 @@
			}

			$fields = $this->fields;

			if (!$this->isTimeline) {
			$first = ['post_thumbnail', 'post_title', 'price'];
			$first = $this->registrar->getType() === 'post' ?
			['post_thumbnail', 'post_title', 'price'] :
			( $this->registrar->getType() === 'term' ?
			['name', 'thumbnail', 'description'] :
			['username', 'display_name', 'description']);

			foreach ($first as $f) {
			if (array_key_exists($f, $fields)) {
			if ($tabs) {
			$tabs['basic']['content'] .= Form::render($f, '', $fields[$f]);
			$tabs['main']['content'] .= Form::render($f, '', $fields[$f]);
			} else {
			echo Form::render($f, '', $fields[$f]);
			}
			@@ -1636,12 +1661,13 @@

			$fields = $this->nonTimelineFields;
			}

			foreach ($fields as $n => $config) {
			if (in_array($config['type'], ['taxonomy', 'selector'])) {
			$config = array_merge($config, $this->taxConfig($config['taxonomy'], $config['label']));
			}
			if ($tabs) {
			$section = (array_key_exists('section', $config)) ? $config['section'] : 'basic';
			$section = (array_key_exists('section', $config)) && !empty($config['section']) ? $config['section'] : 'main';
			$tabs[$section]['content'] .= Form::render($n, '', $config);
			} else {
			echo Form::render($n, '', $config);
			@@ -1790,4 +1816,31 @@
			$out = ob_get_clean();
			echo Form::fieldWrap('post_status', $out, ['type'=>'group']);
			}


			public static function searchFilter():string
			{
			$self = new self();
			$self->hasSearch = true;
			ob_start();
			$self->renderSearch();
			return ob_get_clean();
			}

			public static function viewFilter(array $views):string
			{
			$self = new self();
			$self->views = $views;
			ob_start();
			$self->renderViewControls();
			return ob_get_clean();
			}

			public static function orderFilter(bool $random = false):string
			{
			$self = new self();
			ob_start();
			$self->renderOrderControls();
			return ob_get_clean();
			}
			}