Illuna-Minetest/vanilla-application-yaga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved actions controller to action controller for consistency

Browse Source
This commit is contained in:
Zachary Doll 2013-11-12 10:16:31 -06:00
parent 85384c5417
commit 83c2553832
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
controllers/class.actionscontroller.php → controllers/class.actioncontroller.php
View File

@ -2,12 +2,12 @@
/* Copyright 2013 Zachary Doll */
/**
* All is the base class for controllers throughout the gamification applicati0n.
* Manage actions that are available for reactions
*
* @since 1.0
* @package Yaga
*/
class ActionsController extends DashboardController {
class ActionController extends DashboardController {
/** @var array List of objects to prep. They will be available as $this->$Name. */
public $Uses = array('Form', 'ActionModel');
@ -42,7 +42,7 @@ class ActionsController extends DashboardController {
public function Settings($Page = '') {
$this->Permission('Yaga.Reactions.Manage');
$this->AddSideMenu('actions/settings');
$this->AddSideMenu('action/settings');
$this->Title('Manage Reactions');
@ -54,7 +54,7 @@ class ActionsController extends DashboardController {
public function Edit($ActionID = NULL) {
$this->Permission('Yaga.Reactions.Manage');
$this->AddSideMenu('actions/settings');
$this->AddSideMenu('action/settings');
$this->Form->SetModel($this->ActionModel);
$Edit = FALSE;
@ -83,7 +83,7 @@ class ActionsController extends DashboardController {
$NewActionRow .= "<td>$Action->Description</td>";
$NewActionRow .= "<td>$Action->Tooltip</td>";
$NewActionRow .= "<td>$Action->AwardValue</td>";
$NewActionRow .= '<td>' . Anchor(T('Edit'), 'yaga/actions/edit/' . $Action->ActionID, array('class' => 'Popup SmallButton')) . Anchor(T('Delete'), 'yaga/actions/delete/' . $Action->ActionID, array('class' => 'Hijack SmallButton')) . '</td>';
$NewActionRow .= '<td>' . Anchor(T('Edit'), 'yaga/action/edit/' . $Action->ActionID, array('class' => 'Popup SmallButton')) . Anchor(T('Delete'), 'yaga/action/delete/' . $Action->ActionID, array('class' => 'Hijack SmallButton')) . '</td>';
$NewActionRow .= '</tr>';
if($Edit) {
$this->JsonTarget('#ActionID_' . $this->Action->ActionID, $NewActionRow, 'ReplaceWith');
@ -108,7 +108,7 @@ class ActionsController extends DashboardController {
throw PermissionException('Javascript');
}
$this->Permission('Yaga.Reactions.Manage');
$this->AddSideMenu('actions/settings');
$this->AddSideMenu('action/settings');
$this->ActionModel->DeleteAction($ActionID);

0
views/actions/add.php → views/action/add.php
View File

4
views/actions/settings.php → views/action/settings.php
View File

@ -3,7 +3,7 @@
echo Wrap($this->Title(), 'h1');
echo Wrap(Wrap('Add or edit the available actions that can be used as reactions.', 'div'), 'div', array('class' => 'Wrap'));
echo Wrap(Anchor('Add Action', 'yaga/actions/add', array('class' => 'Popup SmallButton')), 'div', array('class' => 'Wrap'));
echo Wrap(Anchor('Add Action', 'yaga/action/add', array('class' => 'Popup SmallButton')), 'div', array('class' => 'Wrap'));
?>
<table id="Actions" class="AltRows">
@ -27,7 +27,7 @@ echo Wrap(Anchor('Add Action', 'yaga/actions/add', array('class' => 'Popup Small
echo "<td>$Action->Description</td>";
echo "<td>$Action->Tooltip</td>";
echo "<td>$Action->AwardValue</td>";
echo '<td>' . Anchor(T('Edit'), 'yaga/actions/edit/' . $Action->ActionID, array('class' => 'Popup SmallButton')) . Anchor(T('Delete'), 'yaga/actions/delete/' . $Action->ActionID, array('class' => 'Hijack SmallButton')) . '</td>';
echo '<td>' . Anchor(T('Edit'), 'yaga/action/edit/' . $Action->ActionID, array('class' => 'Popup SmallButton')) . Anchor(T('Delete'), 'yaga/action/delete/' . $Action->ActionID, array('class' => 'Hijack SmallButton')) . '</td>';
echo '</tr>';
}
?>