From 4ca716ec47863f3eef6c851de7a4f37650f8ea6e Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 26 Mar 2016 17:25:54 -0400
Subject: Move avatar actions to controller AvatarFile

---
 app/Template/avatar_file/show.php | 20 ++++++++++++++++++++
 app/Template/user/avatar.php      | 20 --------------------
 app/Template/user/sidebar.php     |  4 ++--
 3 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 app/Template/avatar_file/show.php
 delete mode 100644 app/Template/user/avatar.php

(limited to 'app/Template')

diff --git a/app/Template/avatar_file/show.php b/app/Template/avatar_file/show.php
new file mode 100644
index 00000000..266a2ccb
--- /dev/null
+++ b/app/Template/avatar_file/show.php
@@ -0,0 +1,20 @@
+<div class="page-header">
+    <h2><?= t('Avatar') ?></h2>
+</div>
+
+<?= $this->avatar->render($user['id'], $user['username'], $user['name'], $user['email'], $user['avatar_path'], '') ?>
+
+<form method="post" enctype="multipart/form-data" action="<?= $this->url->href('AvatarFile', 'upload', array('user_id' => $user['id'])) ?>">
+    <?= $this->form->csrf() ?>
+    <?= $this->form->label(t('Upload my avatar image'), 'avatar') ?>
+    <?= $this->form->file('avatar') ?>
+
+    <div class="form-actions">
+        <?php if (! empty($user['avatar_path'])): ?>
+            <?= $this->url->link(t('Remove my image'), 'AvatarFile', 'remove', array('user_id' => $user['id']), true, 'btn btn-red') ?>
+        <?php endif ?>
+        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
+        <?= t('or') ?>
+        <?= $this->url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?>
+    </div>
+</form>
diff --git a/app/Template/user/avatar.php b/app/Template/user/avatar.php
deleted file mode 100644
index c285f44d..00000000
--- a/app/Template/user/avatar.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Avatar') ?></h2>
-</div>
-
-<?= $this->avatar->render($user['id'], $user['username'], $user['name'], $user['email'], $user['avatar_path'], '') ?>
-
-<form method="post" enctype="multipart/form-data" action="<?= $this->url->href('user', 'uploadAvatar', array('user_id' => $user['id'])) ?>">
-    <?= $this->form->csrf() ?>
-    <?= $this->form->label(t('Upload my avatar image'), 'avatar') ?>
-    <?= $this->form->file('avatar') ?>
-
-    <div class="form-actions">
-        <?php if (! empty($user['avatar_path'])): ?>
-            <?= $this->url->link(t('Remove my image'), 'User', 'removeAvatar', array('user_id' => $user['id']), true, 'btn btn-red') ?>
-        <?php endif ?>
-        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-        <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?>
-    </div>
-</form>
diff --git a/app/Template/user/sidebar.php b/app/Template/user/sidebar.php
index ecadc60d..5ea2e355 100644
--- a/app/Template/user/sidebar.php
+++ b/app/Template/user/sidebar.php
@@ -37,8 +37,8 @@
                 <li <?= $this->app->checkMenuSelection('user', 'edit') ?>>
                     <?= $this->url->link(t('Edit profile'), 'user', 'edit', array('user_id' => $user['id'])) ?>
                 </li>
-                <li <?= $this->app->checkMenuSelection('user', 'avatar') ?>>
-                    <?= $this->url->link(t('Avatar'), 'user', 'avatar', array('user_id' => $user['id'])) ?>
+                <li <?= $this->app->checkMenuSelection('AvatarFile') ?>>
+                    <?= $this->url->link(t('Avatar'), 'AvatarFile', 'show', array('user_id' => $user['id'])) ?>
                 </li>
             <?php endif ?>
 
-- 
cgit v1.2.3