Business/TaskFloor
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make UI consistent with other Apps

Browse Source
This commit is contained in:
Skylar Ittner 2017-11-19 01:27:43 -07:00
parent d88ad20665
commit 3bc6a6f357
6 changed files with 100 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/en_us.php
View File

@ -75,4 +75,5 @@ define("STRINGS", [
"task deleted" => "Task deleted.",
"finished on" => "Finished on: {date}",
"started on" => "Started on: {date}",
"add task" => "Add Task"
]);

22
pages/edittask.php
View File

@ -3,7 +3,19 @@ require_once __DIR__ . '/../required.php';
redirectifnotloggedin();
?>
<h1 class="page-header"><?php lang("edit task") ?></h1>
<div class="panel panel-blue">
<div class="panel-heading">
<h3 class="panel-title">
<i class="fa fa-pencil-square-o"></i> <?php
if (is_empty($VARS['taskid'])) {
lang("add task");
} else {
lang("edit task");
}
?>
</h3>
</div>
<?php
include_once __DIR__ . "/../lib/userinfo.php";
include_once __DIR__ . "/../lib/manage.php";
@ -45,6 +57,7 @@ if (!is_empty($taskid) && $database->has('assigned_tasks', ['taskid' => $taskid]
}
?>
<form action="action.php" method="GET" onsubmit="prettysave();">
<div class="panel-body">
<input type="hidden" name="action" value="edittask" />
<?php if (!is_empty($taskid)) { ?>
<input type="hidden" name="taskid" value="<?php echo $taskid; ?>" />
@ -61,7 +74,10 @@ if (!is_empty($taskid) && $database->has('assigned_tasks', ['taskid' => $taskid]
<!--<p><i class="fa fa-info-circle"></i> <?php lang("use now tip") ?></p>-->
<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']))); ?>"/>
<br />
</div>
<div class="panel-footer">
<button id="savebtn" type="submit" class="btn btn-success"><i class="fa fa-floppy-o"></i> <?php lang("save task") ?></button>
<a class="btn btn-warning" href="app.php?page=taskman"><i class="fa fa-times"></i> <?php lang("exit") ?></a>
<a class="btn btn-warning pull-right" href="app.php?page=taskman"><i class="fa fa-times"></i> <?php lang("exit") ?></a>
</div>
</form>
</div>

18
pages/home.php
View File

@ -5,13 +5,31 @@ redirectifnotloggedin();
?>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
<div class="panel panel-default">
<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 class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
<div class="panel panel-primary">
<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>

3
pages/messages.php
View File

@ -3,9 +3,6 @@ require_once __DIR__ . '/../required.php';
redirectifnotloggedin();
?>
<h2 class="page-header">
<?php lang("messages") ?>
</h2>
<form action="action.php" method="POST" class="form-horizontal" id="msgsendform">
<input type="hidden" name="action" value="sendmsg" />
<div class="form-group">

1
pages/mytasks.php
View File

@ -3,7 +3,6 @@ require_once __DIR__ . '/../required.php';
redirectifnotloggedin();
?>
<h2 class="page-header"><?php lang("my tasks") ?></h2>
<div id="tasksdispdiv" class="row<?php
if ($pageid != "mytasks") {
echo ' home-list-container"';

5
pages/taskman.php
View File

@ -3,9 +3,8 @@ require_once __DIR__ . '/../required.php';
redirectifnotloggedin();
?>
<h1 class="page-header"><?php lang("task manager") ?></h1>
<div class="well well-sm">
<a href="app.php?page=edittask" class="btn btn-primary"><i class="fa fa-plus"></i> <?php lang("new task") ?></a>
<div class="btn-group mgn-btm-10px">
<a href="app.php?page=edittask" class="btn btn-success"><i class="fa fa-plus"></i> <?php lang("new task") ?></a>
</div>
<div id="tasksdispdiv" class="row<?php
if ($pageid != "taskman") {