diff --git a/admin/dashboard.php b/admin/dashboard.php index 5272f8a..a9a2297 100644 --- a/admin/dashboard.php +++ b/admin/dashboard.php @@ -36,13 +36,13 @@ Template::render_header(_("Dashboard"), true);

-
+

-
+
" value="" required> - "> - + "> +
@@ -83,8 +83,8 @@ Template::render_header(_("Dashboard"), true);
: get_username(); ?> :  - " value=""> - + " value=""> +
diff --git a/admin/lost-password.php b/admin/lost-password.php index f919933..c9cfe2a 100644 --- a/admin/lost-password.php +++ b/admin/lost-password.php @@ -38,10 +38,10 @@ Template::render_header(_("Lost password")); -
+
" type="email" required> - +
" type="password" class="form-control" name="password"> " type="password" class="form-control" name="password_repeat"> - + diff --git a/admin/new-user.php b/admin/new-user.php index 92b95b0..54ce434 100644 --- a/admin/new-user.php +++ b/admin/new-user.php @@ -43,5 +43,5 @@ Template::render_header(_("New user"), true); ?>
- + \ No newline at end of file diff --git a/admin/options.php b/admin/options.php index ac7ed0f..c557e8b 100644 --- a/admin/options.php +++ b/admin/options.php @@ -182,5 +182,5 @@ Template::render_header(_("Options"), true); - + \ No newline at end of file diff --git a/admin/service-group.php b/admin/service-group.php index 6bc4261..655fb42 100644 --- a/admin/service-group.php +++ b/admin/service-group.php @@ -84,5 +84,5 @@ if (!$boolEdit) { echo ''; } ?> - + \ No newline at end of file diff --git a/admin/service.php b/admin/service.php index 0a7a543..8c07488 100644 --- a/admin/service.php +++ b/admin/service.php @@ -85,5 +85,5 @@ if (!$boolEdit) { echo ''; } ?> - + \ No newline at end of file diff --git a/admin/settings.php b/admin/settings.php index 45a09dc..4f2d7e8 100644 --- a/admin/settings.php +++ b/admin/settings.php @@ -18,17 +18,19 @@ if (isset($message)) {

-

- get_rank() <= 1) { ?> -
-
- -
-
- -
+
+
+ get_rank() <= 1) { ?> + + +
+
+

+
+
+
+
- @@ -51,7 +53,7 @@ if (isset($message)) { echo ""; if ($user->get_rank() <= 1) { - echo ''; + echo ''; } echo ""; } ?> @@ -61,83 +63,95 @@ if (isset($message)) {
-

- get_rank() <= 1) { ?> -
-
- -
- - -
-
" . $result['group_name'] . "
- - - - - - - - - get_rank() <= 1) { ?> - - - - - - query("SELECT sg.* , (SELECT COUNT(*) FROM services WHERE services.group_id = sg.id) AS counter FROM services_groups AS sg ORDER BY sg.id ASC"); - while ($result = $query->fetch_assoc()) { - echo ""; - //echo ""; - echo '"; - echo ""; - - if ($user->get_rank() <= 1) { - echo ''; - } - echo ""; - } ?> - -
".$result['id']."' . $result['name'] . ''; - echo ' ' . $result['counter'] . ''; - echo "" . $result['description'] . "" . $visibility[$result['visibility']] . "
+
+
+ get_rank() <= 1) { ?> + + +
+
+

+
+
+
+
+ + + + + + + + + + get_rank() <= 1) { ?> + + + + + + query("SELECT sg.* , (SELECT COUNT(*) FROM services WHERE services.group_id = sg.id) AS counter FROM services_groups AS sg ORDER BY sg.id ASC"); + while ($result = $query->fetch_assoc()) { + echo ""; + //echo ""; + echo '"; + echo ""; + + if ($user->get_rank() <= 1) { + echo ''; + } + echo ""; + } ?> + +
".$result['id']."' . $result['name'] . ''; + echo ' ' . $result['counter'] . ''; + echo "" . $result['description'] . "" . $visibility[$result['visibility']] . "
+
-
-

- get_rank() == 0) { ?> -
- - - - - - - - - - - - - - - query("SELECT * FROM users"); - while ($result = $query->fetch_assoc()) { - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - } ?> - -
Active
" . $result['id'] . "" . $result['username'] . "" . $result['name'] . "" . $result['surname'] . "" . $result['email'] . "" . $permissions[$result['permission']] . "
+
+
+ get_rank() == 0) { ?> + + +
+
+

+
+
+
+
+ + + + + + + + + + + + + + query("SELECT * FROM users"); + while ($result = $query->fetch_assoc()) { + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + } ?> + +
Active
" . $result['id'] . "" . $result['username'] . "" . $result['name'] . "" . $result['surname'] . "" . $result['email'] . "" . $permissions[$result['permission']] . "
+
\ No newline at end of file diff --git a/classes/incident.php b/classes/incident.php index 503d827..5cbd00e 100644 --- a/classes/incident.php +++ b/classes/incident.php @@ -186,12 +186,12 @@ class Incident implements JsonSerializable
title; ?> -
id . '" class="pull-right delete">'; + echo ''; } ?>
+
setBreaksEnabled(true)->text($this->text); ?> @@ -199,10 +199,10 @@ class Incident implements JsonSerializable
service_name as $value) { - echo '' . $value . ' '; + echo '
' . $value . ' '; } if (isset($this->end_date)) { ?> - end_date) > time() ? _("Ending") : _("Ended"); ?>:  + end_date) > time() ? _("Ending") : _("Ended"); ?>: 
diff --git a/classes/user.php b/classes/user.php index a1f3c6d..56b6fb2 100644 --- a/classes/user.php +++ b/classes/user.php @@ -311,7 +311,7 @@ class User
- +
- +
username . " "; - if ($user->get_rank() >= 1) { - echo ""; - } - } - ?> + if ($user->get_rank() >= 1) { + echo ""; + } + } + ?>
@@ -354,7 +354,7 @@ class User echo ""; } ?> - + rank]; @@ -371,7 +371,7 @@ class User
- +
@@ -401,7 +401,7 @@ class User " type="password" class="form-control" name="password"> " type="password" class="form-control" name="password_repeat"> - + diff --git a/css/main.css b/css/main.css index 457ec0c..8d34669 100644 --- a/css/main.css +++ b/css/main.css @@ -222,7 +222,7 @@ article.card textarea { } .new-service { - width: 40%; + width: 100%; min-width: 250px; } @@ -285,6 +285,14 @@ body h3 { margin-top: 18px; } +.settings-header { + padding-top: 20px; +} + +.settings-header .float-start h3 { + margin: 0; +} + .row.user .input-group { width: 100%; margin-bottom: 5px; diff --git a/install.php b/install.php index 81c37cc..55a177a 100644 --- a/install.php +++ b/install.php @@ -300,7 +300,7 @@ if (!empty($message)) {
" class="form-control" required>
- +