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.

Sign up for GitHub

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

NEW: Improved task runner UI. #9540

Merged
merged 10 commits into from
Aug 25, 2020
Merged

NEW: Improved task runner UI. #9540

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c9f7ec2
NEW: Improved task runner UI.
mfendeksilverstripe Jun 8, 2020
339fe39
PR fixes
mfendeksilverstripe Jun 22, 2020
156f9fb
PR fixes.
mfendeksilverstripe Jul 16, 2020
78c0bcf
PR fixes.
mfendeksilverstripe Jul 17, 2020
f5f002c
PR fixes
mfendeksilverstripe Jul 17, 2020
2438a3d
Spacing corrections.
mfendeksilverstripe Jul 19, 2020
8585aea
Unwanted line-breaks removed.
mfendeksilverstripe Jul 20, 2020
dfd007a
Update client/styles/task-runner.css
mfendeksilverstripe Jul 20, 2020
8bd25e7
Code cleanup.
mfendeksilverstripe Jul 20, 2020
471e127
PR fixes
mfendeksilverstripe Jul 31, 2020
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
61 changes: 61 additions & 0 deletions client/styles/task-runner.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/* This file is manually maintained, it is not generated from SCSS sources */

.task {
padding-top: 20px;
}

.task__panel {
padding: 0 15px 15px 15px;
}

@media (min-width:992px) {
.task__list {
display: grid;
grid-template-columns: 1fr 1fr;
column-gap: 100px;
row-gap: 30px;
}
}

.task__item {
padding-bottom: 30px;
}

@media (min-width:992px) {
.task__item {
padding-bottom: 0;
}
}

.task__item:last-child {
padding-bottom: 0;
}

.task__title {
color: #303b4d;
mfendeksilverstripe marked this conversation as resolved.
Show resolved Hide resolved
}

.task__description {
color: #43536d;
margin-bottom: 20px;
sachajudd marked this conversation as resolved.
Show resolved Hide resolved
}

.task__button {
border: 1px solid #ced5e1;
border-radius: 5px;
background-color: #f6f7f8;
color: #43536d;
display: inline-block;
margin-right: 10px;
padding: 6px 10px;
text-decoration: none;
transition: background-color 0.2s;
}

.task__button:last-child {
margin-right: 0;
}

.task__button:hover {
mfendeksilverstripe marked this conversation as resolved.
Show resolved Hide resolved
mfendeksilverstripe marked this conversation as resolved.
Show resolved Hide resolved
background-color: #ced5e1;
}
61 changes: 40 additions & 21 deletions src/Dev/TaskRunner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,19 @@

namespace SilverStripe\Dev;

use ReflectionClass;
use SilverStripe\Control\Controller;
use SilverStripe\Control\Director;
use SilverStripe\Control\HTTPRequest;
use SilverStripe\Core\ClassInfo;
use SilverStripe\Core\Convert;
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Core\Manifest\ModuleResourceLoader;
use SilverStripe\ORM\ArrayList;
use SilverStripe\Security\Permission;
use SilverStripe\Security\Security;
use ReflectionClass;
use SilverStripe\View\ArrayData;
use SilverStripe\View\ViewableData;

class TaskRunner extends Controller
{
Expand Down Expand Up @@ -44,33 +48,48 @@ protected function init()

public function index()
{
$baseUrl = Director::absoluteBaseURL();
$tasks = $this->getTasks();

// Web mode
if (!Director::is_cli()) {
$renderer = new DebugView();
echo $renderer->renderHeader();
echo $renderer->renderInfo("SilverStripe Development Tools: Tasks", Director::absoluteBaseURL());
$base = Director::absoluteBaseURL();
if (Director::is_cli()) {
// CLI mode
$output = 'SILVERSTRIPE DEVELOPMENT TOOLS: Tasks' . PHP_EOL . '--------------------------' . PHP_EOL . PHP_EOL;

echo "<div class=\"options\">";
echo "<ul>";
foreach ($tasks as $task) {
echo "<li><p>";
echo "<a href=\"{$base}dev/tasks/" . $task['segment'] . "\">" . $task['title'] . "</a><br />";
echo "<span class=\"description\">" . $task['description'] . "</span>";
echo "</p></li>\n";
$output .= sprintf(' * %s: sake dev/tasks/%s%s', $task['title'], $task['segment'], PHP_EOL);
}
echo "</ul></div>";

echo $renderer->renderFooter();
// CLI mode
} else {
echo "SILVERSTRIPE DEVELOPMENT TOOLS: Tasks\n--------------------------\n\n";
foreach ($tasks as $task) {
echo " * $task[title]: sake dev/tasks/" . $task['segment'] . "\n";
}
return $output;
}

$list = ArrayList::create();

foreach ($tasks as $task) {
$list->push(ArrayData::create([
'TaskLink' => $baseUrl . 'dev/tasks/' . $task['segment'],
'Title' => $task['title'],
'Description' => $task['description'],
]));
}

$renderer = DebugView::create();
$header = $renderer->renderHeader();
$cssPath = ModuleResourceLoader::singleton()->resolveURL(
'silverstripe/framework:client/styles/task-runner.css'
);

// inject task runner CSS into the heaader
$cssInclude = sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssPath);
$header = str_replace('</head>', $cssInclude . '</head>', $header);

$data = [
'Tasks' => $list,
'Header' => $header,
'Footer' => $renderer->renderFooter(),
'Info' => $renderer->renderInfo('SilverStripe Development Tools: Tasks', $baseUrl),
];

return ViewableData::create()->renderWith(static::class, $data);
}

/**
Expand Down
24 changes: 24 additions & 0 deletions templates/SilverStripe/Dev/TaskRunner.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
$Header.RAW
$Info.RAW

<div class="task">
<div class="task__panel">
<% if $Tasks.Count > 0 %>
<div class="task__list">
<% loop $Tasks %>
<div class="task__item">
<div>
<h3 class="task__title">$Title</h3>
<p class="task__description">$Description</p>
</div>
<div>
<a href="{$TaskLink.ATT}" class="task__button">Run task</a>
</div>
</div>
<% end_loop %>
</div>
<% end_if %>
</div>
</div>

$Footer.RAW