From 679ab64e465f610ae70aff8a1b491191863f7033 Mon Sep 17 00:00:00 2001
From: Malf Furious <m@lfurio.us>
Date: Fri, 1 Apr 2016 00:56:34 -0400
Subject: Update setting modal, user tab to display user head image

Also restructured the web form a little and added the form-group to select a new image to upload
---
 app/view/common/setting.modal.view.php | 47 ++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 11 deletions(-)

(limited to 'app/view/common/setting.modal.view.php')

diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php
index 11adc69..2415e18 100644
--- a/app/view/common/setting.modal.view.php
+++ b/app/view/common/setting.modal.view.php
@@ -27,21 +27,46 @@
                     <div class="tab-pane fade in active" id="settUserTab">
                         <p>&nbsp;</p>
 
-                        <?php if ($mod->getCurrentUser()->admin == 1) { ?>
-                            <p class="pull-right"><span class="glyphicon glyphicon-sunglasses"></span> <?=$mod->getCurrentUser()->getDisplayName()?> is a Scrott Administrator</p>
-                        <?php } ?>
-
                         <form method="post" action="<?=$mod->ap()?>">
                             <input type="hidden" name="input[action]" value="common-setting-user" />
-                            <div class="form-group">
-                                <label>Username</label>
-                                <input type="text" class="form-control" value="<?=$mod->getCurrentUser()->name?>" disabled />
+
+                            <div class="row">
+                                <div class="col-md-8">
+                                    <?php if ($mod->getCurrentUser()->admin == 1) { ?>
+                                        <p class="pull-right"><span class="glyphicon glyphicon-sunglasses"></span> <?=$mod->getCurrentUser()->getDisplayName()?> is a Scrott Administrator</p>
+                                    <?php } ?>
+
+                                    <div class="form-group">
+                                        <label>Username</label>
+                                        <input type="text" class="form-control" value="<?=$mod->getCurrentUser()->name?>" disabled />
+                                    </div>
+
+                                    <div class="checkbox">
+                                        <label data-toggle="collapse" data-target="#inputUserPasswdCollapse">
+                                            <input type="checkbox" name="input[setPasswd]" value="1" /> Change Password
+                                        </label>
+                                    </div>
+                                </div>
+
+                                <div class="col-md-4 text-center">
+                                    <img src="<?=$mod->getCurrentUser()->getHeadImage()?>" alt="<?=$mod->getCurrentUser()->getDisplayName()?>" class="img-circle" height="100" />
+                                    <br />
+                                    <br />
+                                    <button type="button" class="btn btn-default btn-xs" data-toggle="collapse" data-target="#inputUserImageCollapse">
+                                        <span class="glyphicon glyphicon-camera"></span> Upload new image
+                                    </button>
+                                    <br />
+                                    <button type="button" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-remove"></span> Remove image
+                                    </button>
+                                </div>
                             </div>
 
-                            <div class="checkbox">
-                                <label data-toggle="collapse" data-target="#inputUserPasswdCollapse">
-                                    <input type="checkbox" name="input[setPasswd]" value="1" /> Change Password
-                                </label>
+                            <div class="collapse" id="inputUserImageCollapse">
+                                <div class="form-group">
+                                    <label>User Image</label>
+                                    <input type="file" name="inputf[image]" />
+                                </div>
                             </div>
 
                             <div class="collapse" id="inputUserPasswdCollapse">
-- 
cgit v1.2.3


From 0ad5c4d29ca5d4109a7fe33cdfc9b8e6b01ace6b Mon Sep 17 00:00:00 2001
From: Malf Furious <m@lfurio.us>
Date: Mon, 4 Apr 2016 23:35:23 -0400
Subject: Add view markup for showing user head images to the all users
 collapse panes

---
 app/view/common/setting.modal.view.php | 38 +++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

(limited to 'app/view/common/setting.modal.view.php')

diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php
index 2415e18..19bcf5c 100644
--- a/app/view/common/setting.modal.view.php
+++ b/app/view/common/setting.modal.view.php
@@ -223,15 +223,39 @@
                                                     <input type="hidden" name="input[action]" value="common-setting-allusers-edituser" />
                                                     <input type="hidden" name="input[guid]" value="<?=$user->guid?>" />
 
-                                                    <div class="form-group">
-                                                        <label>Username</label>
-                                                        <input type="text" class="form-control" value="<?=$user->name?>" disabled />
+                                                    <div class="row">
+                                                        <div class="col-md-8">
+                                                            <div class="form-group">
+                                                                <label>Username</label>
+                                                                <input type="text" class="form-control" value="<?=$user->name?>" disabled />
+                                                            </div>
+
+                                                            <div class="checkbox">
+                                                                <label data-toggle="collapse" data-target="#input<?=$user->guid?>PasswdCollapse">
+                                                                    <input type="checkbox" name="input[setPasswd]" value="1" /> Change Password
+                                                                </label>
+                                                            </div>
+                                                        </div>
+
+                                                        <div class="col-md-4 text-center">
+                                                            <img src="<?=$user->getHeadImage()?>" alt="<?=$user->getDisplayName()?>" class="img-circle" height="100" />
+                                                            <br />
+                                                            <br />
+                                                            <button type="button" class="btn btn-default btn-xs" data-toggle="collapse" data-target="#input<?=$user->guid?>ImageCollapse">
+                                                                <span class="glyphicon glyphicon-camera"></span> Upload new image
+                                                            </button>
+                                                            <br />
+                                                            <button type="button" class="btn btn-danger btn-xs">
+                                                                <span class="glyphicon glyphicon-remove"></span> Remove image
+                                                            </button>
+                                                        </div>
                                                     </div>
 
-                                                    <div class="checkbox">
-                                                        <label data-toggle="collapse" data-target="#input<?=$user->guid?>PasswdCollapse">
-                                                            <input type="checkbox" name="input[setPasswd]" value="1" /> Change Password
-                                                        </label>
+                                                    <div class="collapse" id="input<?=$user->guid?>ImageCollapse">
+                                                        <div class="form-group">
+                                                            <label>User Image</label>
+                                                            <input type="file" name="inputf[image]" />
+                                                        </div>
                                                     </div>
 
                                                     <div class="collapse" id="input<?=$user->guid?>PasswdCollapse">
-- 
cgit v1.2.3


From 423fa09e3f524c8139d18c3e8652f542bcf2cd44 Mon Sep 17 00:00:00 2001
From: Malf Furious <m@lfurio.us>
Date: Wed, 27 Apr 2016 23:38:49 -0400
Subject: Update form handler for common/setting-modal, user tab

Now supports file upload to replace the user's head image
---
 app/view/common/setting.modal.view.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/view/common/setting.modal.view.php')

diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php
index 19bcf5c..1d7951a 100644
--- a/app/view/common/setting.modal.view.php
+++ b/app/view/common/setting.modal.view.php
@@ -27,7 +27,7 @@
                     <div class="tab-pane fade in active" id="settUserTab">
                         <p>&nbsp;</p>
 
-                        <form method="post" action="<?=$mod->ap()?>">
+                        <form method="post" action="<?=$mod->ap()?>" enctype="multipart/form-data">
                             <input type="hidden" name="input[action]" value="common-setting-user" />
 
                             <div class="row">
@@ -65,7 +65,7 @@
                             <div class="collapse" id="inputUserImageCollapse">
                                 <div class="form-group">
                                     <label>User Image</label>
-                                    <input type="file" name="inputf[image]" />
+                                    <input type="file" name="attachment" />
                                 </div>
                             </div>
 
-- 
cgit v1.2.3


From be1a82affdaa1e87015a0a49979e9230cdc61b4d Mon Sep 17 00:00:00 2001
From: Malf Furious <m@lfurio.us>
Date: Sat, 30 Apr 2016 16:18:24 -0400
Subject: Update form handler for common/setting-modal, all users tab

Now supports file upload to replace the user's head image
---
 app/view/common/setting.modal.view.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/view/common/setting.modal.view.php')

diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php
index 1d7951a..369a789 100644
--- a/app/view/common/setting.modal.view.php
+++ b/app/view/common/setting.modal.view.php
@@ -219,7 +219,7 @@
 
                                         <div class="panel-collapse collapse" id="common-setting-allusers-<?=$user->guid?>-collapse">
                                             <div class="panel-body">
-                                                <form method="post" action="<?=$mod->ap()?>">
+                                                <form method="post" action="<?=$mod->ap()?>" enctype="multipart/form-data">
                                                     <input type="hidden" name="input[action]" value="common-setting-allusers-edituser" />
                                                     <input type="hidden" name="input[guid]" value="<?=$user->guid?>" />
 
@@ -254,7 +254,7 @@
                                                     <div class="collapse" id="input<?=$user->guid?>ImageCollapse">
                                                         <div class="form-group">
                                                             <label>User Image</label>
-                                                            <input type="file" name="inputf[image]" />
+                                                            <input type="file" name="attachment" />
                                                         </div>
                                                     </div>
 
-- 
cgit v1.2.3


From e9189928e1108d0c1330eb47cc5de20d67f5de51 Mon Sep 17 00:00:00 2001
From: Malf Furious <m@lfurio.us>
Date: Sat, 30 Apr 2016 22:34:01 -0400
Subject: Update setting modal to allow user to remove their own head image

---
 app/view/common/setting.modal.view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/view/common/setting.modal.view.php')

diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php
index 369a789..60063cf 100644
--- a/app/view/common/setting.modal.view.php
+++ b/app/view/common/setting.modal.view.php
@@ -56,7 +56,7 @@
                                         <span class="glyphicon glyphicon-camera"></span> Upload new image
                                     </button>
                                     <br />
-                                    <button type="button" class="btn btn-danger btn-xs">
+                                    <button type="submit" name="input[rmImage]" class="btn btn-danger btn-xs" onclick="return assertConfirm()">
                                         <span class="glyphicon glyphicon-remove"></span> Remove image
                                     </button>
                                 </div>
-- 
cgit v1.2.3


From 190a7d81155bc08fd9533f53f1f2154e2cca2c7a Mon Sep 17 00:00:00 2001
From: Malf Furious <m@lfurio.us>
Date: Sun, 1 May 2016 00:45:37 -0400
Subject: Update setting modal to allow admins to remove other users' head
 images

---
 app/view/common/setting.modal.view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/view/common/setting.modal.view.php')

diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php
index 60063cf..e43f723 100644
--- a/app/view/common/setting.modal.view.php
+++ b/app/view/common/setting.modal.view.php
@@ -245,7 +245,7 @@
                                                                 <span class="glyphicon glyphicon-camera"></span> Upload new image
                                                             </button>
                                                             <br />
-                                                            <button type="button" class="btn btn-danger btn-xs">
+                                                            <button type="submit" name="input[rmImage]" class="btn btn-danger btn-xs" onclick="return assertConfirm()">
                                                                 <span class="glyphicon glyphicon-remove"></span> Remove image
                                                             </button>
                                                         </div>
-- 
cgit v1.2.3