Make UI consistent with other Apps
This commit is contained in:
parent
d88ad20665
commit
3bc6a6f357
@ -75,4 +75,5 @@ define("STRINGS", [
|
|||||||
"task deleted" => "Task deleted.",
|
"task deleted" => "Task deleted.",
|
||||||
"finished on" => "Finished on: {date}",
|
"finished on" => "Finished on: {date}",
|
||||||
"started on" => "Started on: {date}",
|
"started on" => "Started on: {date}",
|
||||||
|
"add task" => "Add Task"
|
||||||
]);
|
]);
|
||||||
@ -3,65 +3,81 @@ require_once __DIR__ . '/../required.php';
|
|||||||
|
|
||||||
redirectifnotloggedin();
|
redirectifnotloggedin();
|
||||||
?>
|
?>
|
||||||
<h1 class="page-header"><?php lang("edit task") ?></h1>
|
<div class="panel panel-blue">
|
||||||
<?php
|
<div class="panel-heading">
|
||||||
include_once __DIR__ . "/../lib/userinfo.php";
|
<h3 class="panel-title">
|
||||||
include_once __DIR__ . "/../lib/manage.php";
|
<i class="fa fa-pencil-square-o"></i> <?php
|
||||||
|
if (is_empty($VARS['taskid'])) {
|
||||||
|
lang("add task");
|
||||||
|
} else {
|
||||||
|
lang("edit task");
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
|
||||||
if (!is_empty($VARS['taskid'])) {
|
<?php
|
||||||
$taskid = $VARS['taskid'];
|
include_once __DIR__ . "/../lib/userinfo.php";
|
||||||
|
include_once __DIR__ . "/../lib/manage.php";
|
||||||
|
|
||||||
$managed_uids = getManagedUIDs($_SESSION['uid']);
|
if (!is_empty($VARS['taskid'])) {
|
||||||
// There needs to be at least one entry otherwise the SQL query craps itself
|
$taskid = $VARS['taskid'];
|
||||||
if (count($managed_uids) < 1) {
|
|
||||||
$managed_uids = [-1];
|
$managed_uids = getManagedUIDs($_SESSION['uid']);
|
||||||
|
// There needs to be at least one entry otherwise the SQL query craps itself
|
||||||
|
if (count($managed_uids) < 1) {
|
||||||
|
$managed_uids = [-1];
|
||||||
|
}
|
||||||
|
$allowed = $database->has('tasks', [
|
||||||
|
'[>]assigned_tasks' => [
|
||||||
|
'taskid' => 'taskid'
|
||||||
|
]
|
||||||
|
], [
|
||||||
|
"AND" => [
|
||||||
|
"OR" => [
|
||||||
|
'tasks.taskcreatoruid' => $_SESSION['uid'],
|
||||||
|
'assigned_tasks.userid' => $managed_uids
|
||||||
|
],
|
||||||
|
"tasks.taskid" => $taskid
|
||||||
|
]]);
|
||||||
|
|
||||||
|
if (!$allowed) {
|
||||||
|
header("Location: app.php?page=edittask&msg=task_edit_not_allowed");
|
||||||
|
die(lang("task edit not allowed", false));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$allowed = $database->has('tasks', [
|
|
||||||
'[>]assigned_tasks' => [
|
|
||||||
'taskid' => 'taskid'
|
|
||||||
]
|
|
||||||
], [
|
|
||||||
"AND" => [
|
|
||||||
"OR" => [
|
|
||||||
'tasks.taskcreatoruid' => $_SESSION['uid'],
|
|
||||||
'assigned_tasks.userid' => $managed_uids
|
|
||||||
],
|
|
||||||
"tasks.taskid" => $taskid
|
|
||||||
]]);
|
|
||||||
|
|
||||||
if (!$allowed) {
|
if (!is_empty($taskid)) {
|
||||||
header("Location: app.php?page=edittask&msg=task_edit_not_allowed");
|
$task = $database->select('tasks', '*', ['taskid' => $taskid])[0];
|
||||||
die(lang("task edit not allowed", false));
|
|
||||||
}
|
}
|
||||||
}
|
if (!is_empty($taskid) && $database->has('assigned_tasks', ['taskid' => $taskid])) {
|
||||||
|
$tass = $database->select('assigned_tasks', '*', ['taskid' => $taskid])[0];
|
||||||
if (!is_empty($taskid)) {
|
} else {
|
||||||
$task = $database->select('tasks', '*', ['taskid' => $taskid])[0];
|
$tass['userid'] = null;
|
||||||
}
|
}
|
||||||
if (!is_empty($taskid) && $database->has('assigned_tasks', ['taskid' => $taskid])) {
|
?>
|
||||||
$tass = $database->select('assigned_tasks', '*', ['taskid' => $taskid])[0];
|
<form action="action.php" method="GET" onsubmit="prettysave();">
|
||||||
} else {
|
<div class="panel-body">
|
||||||
$tass['userid'] = null;
|
<input type="hidden" name="action" value="edittask" />
|
||||||
}
|
<?php if (!is_empty($taskid)) { ?>
|
||||||
?>
|
<input type="hidden" name="taskid" value="<?php echo $taskid; ?>" />
|
||||||
<form action="action.php" method="GET" onsubmit="prettysave();">
|
<?php } ?>
|
||||||
<input type="hidden" name="action" value="edittask" />
|
<?php lang("task title") ?>: <input type="text" name="tasktitle" placeholder="<?php lang("task title") ?>" required="required" class="form-control" value="<?php echo $task['tasktitle']; ?>"/>
|
||||||
<?php if (!is_empty($taskid)) { ?>
|
<br />
|
||||||
<input type="hidden" name="taskid" value="<?php echo $taskid; ?>" />
|
<?php lang("task description") ?>:<br />
|
||||||
<?php } ?>
|
<textarea name="taskdesc" id="taskdesc" class="form-control"><?php echo $task['taskdesc']; ?></textarea>
|
||||||
<?php lang("task title") ?>: <input type="text" name="tasktitle" placeholder="<?php lang("task title") ?>" required="required" class="form-control" value="<?php echo $task['tasktitle']; ?>"/>
|
<br />
|
||||||
<br />
|
<?php lang("assigned to") ?>:
|
||||||
<?php lang("task description") ?>:<br />
|
<input type="text" id="assigned-to-box" name="assignedto" class="form-control" autocomplete="off" value="<?php echo (is_null($tass['userid']) ? "" : getUserByID($tass['userid'])['username'] ); ?>" placeholder="<?php lang("nobody") ?>" />
|
||||||
<textarea name="taskdesc" id="taskdesc" class="form-control"><?php echo $task['taskdesc']; ?></textarea>
|
<br />
|
||||||
<br />
|
<?php lang("assigned on 2") ?>: <input type="datetime-local" class="form-control" id="assigned-on-box" name="taskassignedon" value="<?php echo (is_empty($task['taskassignedon']) ? "" : date('o-m-d\TH:i:s', strtotime($task['taskassignedon']))); ?>" />
|
||||||
<?php lang("assigned to") ?>:
|
<!--<p><i class="fa fa-info-circle"></i> <?php lang("use now tip") ?></p>-->
|
||||||
<input type="text" id="assigned-to-box" name="assignedto" class="form-control" autocomplete="off" value="<?php echo (is_null($tass['userid']) ? "" : getUserByID($tass['userid'])['username'] ); ?>" placeholder="<?php lang("nobody") ?>" />
|
<br />
|
||||||
<br />
|
<?php lang("due by 2") ?>: <input type="datetime-local" class="form-control" id="due-by-box" name="taskdueby" value="<?php echo (is_empty($task['taskdueby']) ? "" : date('o-m-d\TH:i:s', strtotime($task['taskdueby']))); ?>"/>
|
||||||
<?php lang("assigned on 2") ?>: <input type="datetime-local" class="form-control" id="assigned-on-box" name="taskassignedon" value="<?php echo (is_empty($task['taskassignedon']) ? "" : date('o-m-d\TH:i:s', strtotime($task['taskassignedon']))); ?>" />
|
</div>
|
||||||
<!--<p><i class="fa fa-info-circle"></i> <?php lang("use now tip") ?></p>-->
|
<div class="panel-footer">
|
||||||
<br />
|
<button id="savebtn" type="submit" class="btn btn-success"><i class="fa fa-floppy-o"></i> <?php lang("save task") ?></button>
|
||||||
<?php lang("due by 2") ?>: <input type="datetime-local" class="form-control" id="due-by-box" name="taskdueby" value="<?php echo (is_empty($task['taskdueby']) ? "" : date('o-m-d\TH:i:s', strtotime($task['taskdueby']))); ?>"/>
|
<a class="btn btn-warning pull-right" href="app.php?page=taskman"><i class="fa fa-times"></i> <?php lang("exit") ?></a>
|
||||||
<br />
|
</div>
|
||||||
<button id="savebtn" type="submit" class="btn btn-success"><i class="fa fa-floppy-o"></i> <?php lang("save task") ?></button>
|
</form>
|
||||||
<a class="btn btn-warning" href="app.php?page=taskman"><i class="fa fa-times"></i> <?php lang("exit") ?></a>
|
</div>
|
||||||
</form>
|
|
||||||
|
|||||||
@ -5,13 +5,31 @@ redirectifnotloggedin();
|
|||||||
?>
|
?>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
|
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
|
||||||
<?php
|
<div class="panel panel-default">
|
||||||
include __DIR__ . '/mytasks.php';
|
<div class="panel-heading">
|
||||||
?>
|
<h3 class="panel-title">
|
||||||
|
<i class="fa fa-th-list"></i> <?php lang("my tasks") ?>
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
<div class="panel-body">
|
||||||
|
<?php
|
||||||
|
include __DIR__ . '/mytasks.php';
|
||||||
|
?>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
|
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
|
||||||
<?php
|
<div class="panel panel-primary">
|
||||||
include __DIR__ . '/messages.php';
|
<div class="panel-heading">
|
||||||
?>
|
<h3 class="panel-title">
|
||||||
|
<i class="fa fa-comments"></i> <?php lang("messages") ?>
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
<div class="panel-body">
|
||||||
|
<?php
|
||||||
|
include __DIR__ . '/messages.php';
|
||||||
|
?>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -3,9 +3,6 @@ require_once __DIR__ . '/../required.php';
|
|||||||
|
|
||||||
redirectifnotloggedin();
|
redirectifnotloggedin();
|
||||||
?>
|
?>
|
||||||
<h2 class="page-header">
|
|
||||||
<?php lang("messages") ?>
|
|
||||||
</h2>
|
|
||||||
<form action="action.php" method="POST" class="form-horizontal" id="msgsendform">
|
<form action="action.php" method="POST" class="form-horizontal" id="msgsendform">
|
||||||
<input type="hidden" name="action" value="sendmsg" />
|
<input type="hidden" name="action" value="sendmsg" />
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
|
|||||||
@ -3,7 +3,6 @@ require_once __DIR__ . '/../required.php';
|
|||||||
|
|
||||||
redirectifnotloggedin();
|
redirectifnotloggedin();
|
||||||
?>
|
?>
|
||||||
<h2 class="page-header"><?php lang("my tasks") ?></h2>
|
|
||||||
<div id="tasksdispdiv" class="row<?php
|
<div id="tasksdispdiv" class="row<?php
|
||||||
if ($pageid != "mytasks") {
|
if ($pageid != "mytasks") {
|
||||||
echo ' home-list-container"';
|
echo ' home-list-container"';
|
||||||
|
|||||||
@ -3,9 +3,8 @@ require_once __DIR__ . '/../required.php';
|
|||||||
|
|
||||||
redirectifnotloggedin();
|
redirectifnotloggedin();
|
||||||
?>
|
?>
|
||||||
<h1 class="page-header"><?php lang("task manager") ?></h1>
|
<div class="btn-group mgn-btm-10px">
|
||||||
<div class="well well-sm">
|
<a href="app.php?page=edittask" class="btn btn-success"><i class="fa fa-plus"></i> <?php lang("new task") ?></a>
|
||||||
<a href="app.php?page=edittask" class="btn btn-primary"><i class="fa fa-plus"></i> <?php lang("new task") ?></a>
|
|
||||||
</div>
|
</div>
|
||||||
<div id="tasksdispdiv" class="row<?php
|
<div id="tasksdispdiv" class="row<?php
|
||||||
if ($pageid != "taskman") {
|
if ($pageid != "taskman") {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user