From 37e6d3e7ce9f61244467a2e26e74e00854924ae4 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Tue, 30 Jan 2018 22:24:00 -0700 Subject: [PATCH] Upgrade to Bootstrap 4.0, FontAwesome 5.0, jQuery 3.3.1 --- app.php | 247 +- index.php | 131 +- lib/getjobhistorytable.php | 6 +- lib/getpunchtable.php | 4 +- lib/getshifttable.php | 2 +- pages.php | 30 +- pages/404.php | 4 +- pages/assignshift.php | 34 +- pages/editjob.php | 46 +- pages/editjobhistory.php | 44 +- pages/editjobs.php | 14 +- pages/editpunch.php | 47 +- pages/editshift.php | 98 +- pages/export.php | 113 +- pages/home.php | 68 +- pages/jobs.php | 30 +- pages/punches.php | 70 +- pages/shifts.php | 53 +- static/css/app.css | 164 +- static/css/app.old.css | 159 + static/css/bootstrap-datetimepicker.min.css | 5 - static/css/bootstrap.min.css | 16 +- static/css/datatables.min.css | 10 +- static/css/fa-svg-with-js.css | 343 +++ static/css/font-awesome.min.css | 4 - static/css/index.css | 11 + static/css/material-color | 2 +- static/css/tables.css | 32 +- static/css/tempusdominus-bootstrap-4.min.css | 204 ++ static/fonts/FontAwesome.otf | Bin 134808 -> 0 bytes static/fonts/fontawesome-webfont.eot | Bin 165742 -> 0 bytes static/fonts/fontawesome-webfont.svg | 2671 ----------------- static/fonts/fontawesome-webfont.ttf | Bin 165548 -> 0 bytes static/fonts/fontawesome-webfont.woff | Bin 98024 -> 0 bytes static/fonts/fontawesome-webfont.woff2 | Bin 77160 -> 0 bytes static/fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes static/fonts/glyphicons-halflings-regular.svg | 288 -- static/fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes static/img/minus-square.svg | 1 + static/img/search-plus.svg | 1 + static/js/addshift.js | 14 - static/js/assignshift.js | 6 +- static/js/bootstrap-datetimepicker.min.js | 2 - static/js/bootstrap.min.js | 12 +- static/js/datatables.min.js | 431 +-- static/js/editjob.js | 7 +- static/js/editjobhistory.js | 16 +- static/js/editpunch.js | 16 +- static/js/editshift.js | 26 + static/js/export.js | 18 +- static/js/fontawesome-all.min.js | 5 + static/js/jquery-3.2.1.min.js | 4 - static/js/jquery-3.3.1.min.js | 2 + static/js/tempusdominus-bootstrap-4.min.js | 7 + 56 files changed, 1576 insertions(+), 3942 deletions(-) create mode 100644 static/css/app.old.css delete mode 100644 static/css/bootstrap-datetimepicker.min.css create mode 100644 static/css/fa-svg-with-js.css delete mode 100644 static/css/font-awesome.min.css create mode 100644 static/css/index.css create mode 100644 static/css/tempusdominus-bootstrap-4.min.css delete mode 100644 static/fonts/FontAwesome.otf delete mode 100644 static/fonts/fontawesome-webfont.eot delete mode 100644 static/fonts/fontawesome-webfont.svg delete mode 100644 static/fonts/fontawesome-webfont.ttf delete mode 100644 static/fonts/fontawesome-webfont.woff delete mode 100644 static/fonts/fontawesome-webfont.woff2 delete mode 100644 static/fonts/glyphicons-halflings-regular.eot delete mode 100644 static/fonts/glyphicons-halflings-regular.svg delete mode 100644 static/fonts/glyphicons-halflings-regular.ttf delete mode 100644 static/fonts/glyphicons-halflings-regular.woff delete mode 100644 static/fonts/glyphicons-halflings-regular.woff2 create mode 100644 static/img/minus-square.svg create mode 100644 static/img/search-plus.svg delete mode 100644 static/js/addshift.js delete mode 100644 static/js/bootstrap-datetimepicker.min.js create mode 100644 static/js/editshift.js create mode 100644 static/js/fontawesome-all.min.js delete mode 100644 static/js/jquery-3.2.1.min.js create mode 100644 static/js/jquery-3.3.1.min.js create mode 100644 static/js/tempusdominus-bootstrap-4.min.js diff --git a/app.php b/app.php index 3bcfad7..7da8d4a 100644 --- a/app.php +++ b/app.php @@ -1,11 +1,10 @@ - + + + -
-
-
- - - + + strip_tags($_GET['arg'])], false); + } + $alerttype = MESSAGES[$_GET['msg']]['type']; + $alerticon = "square-o"; + switch (MESSAGES[$_GET['msg']]['type']) { + case "danger": + $alerticon = "times"; + break; + case "warning": + $alerticon = "exclamation-triangle"; + break; + case "info": + $alerticon = "info-circle"; + break; + case "success": + $alerticon = "check"; + break; + } + echo << +
+
+ + $alertmsg +
- + +
- + \n"; diff --git a/index.php b/index.php index b1eb534..0072492 100644 --- a/index.php +++ b/index.php @@ -1,15 +1,10 @@ - - + -
-
-
-
+
+
+ +
+
+
+
+
+
+
- - -
-
-
-

-
-
- - -
- -
- + +
+ - " required="required" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" autofocus />
- " required="required" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
- -
-
- - - -
- -
- " required="required" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" autofocus />
- - - - - -
-
+ if ($multiauth != true) { + ?> + " required="required" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" autofocus />
+ " required="required" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
+ +
+
+ + + +
+ +
+ " required="required" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" autofocus />
+ + + + +
-
-
- Copyright © -
- - - +
+
+ Copyright © +
+
+ + + \ No newline at end of file diff --git a/lib/getjobhistorytable.php b/lib/getjobhistorytable.php index 59307d7..8357a63 100644 --- a/lib/getjobhistorytable.php +++ b/lib/getjobhistorytable.php @@ -112,16 +112,16 @@ for ($i = 0; $i < count($jobs); $i++) { $jobs[$i][0] = ""; if ($_SESSION['uid'] == $jobs[$i]['uid']) { if ($editself) { - $jobs[$i][1] = ' ' . lang("edit", false) . ''; + $jobs[$i][1] = ' ' . lang("edit", false) . ''; } else { $jobs[$i][1] = ""; } } else if ($showmanaged) { - $jobs[$i][1] = ' ' . lang("edit", false) . ''; + $jobs[$i][1] = ' ' . lang("edit", false) . ''; } else { $jobs[$i][1] = ""; } - $jobs[$i][2] = '   ' . ($jobs[$i]['deleted'] == 1 ? "" : "") . $jobs[$i]['jobname'] . ($jobs[$i]['deleted'] == 1 ? "" : ""); + $jobs[$i][2] = '  ' . ($jobs[$i]['deleted'] == 1 ? "" : "") . $jobs[$i]['jobname'] . ($jobs[$i]['deleted'] == 1 ? "" : ""); $jobs[$i][3] = date(DATETIME_FORMAT, strtotime($jobs[$i]['start'])); if (is_null($jobs[$i]['end'])) { $jobs[$i][4] = lang("na", false); diff --git a/lib/getpunchtable.php b/lib/getpunchtable.php index 13e133b..2e5f930 100644 --- a/lib/getpunchtable.php +++ b/lib/getpunchtable.php @@ -106,12 +106,12 @@ for ($i = 0; $i < count($punches); $i++) { $punches[$i][0] = ""; if ($_SESSION['uid'] == $punches[$i]['uid']) { if ($editself) { - $punches[$i][1] = ' ' . lang("edit", false) . ''; + $punches[$i][1] = ' ' . lang("edit", false) . ''; } else { $punches[$i][1] = ""; } } else if ($showmanaged) { - $punches[$i][1] = ' ' . lang("edit", false) . ''; + $punches[$i][1] = ' ' . lang("edit", false) . ''; } else { $punches[$i][1] = ""; } diff --git a/lib/getshifttable.php b/lib/getshifttable.php index d086c04..fd5ef10 100644 --- a/lib/getshifttable.php +++ b/lib/getshifttable.php @@ -108,7 +108,7 @@ $showeditbtn = account_has_permission($_SESSION['username'], "QWIKCLOCK_MANAGE") for ($i = 0; $i < count($shifts); $i++) { $shifts[$i][0] = ""; if ($showeditbtn) { - $shifts[$i][1] = ' ' . lang("edit", false) . ''; + $shifts[$i][1] = ' ' . lang("edit", false) . ''; } else { $shifts[$i][1] = ""; } diff --git a/pages.php b/pages.php index 9d211b5..e157edc 100644 --- a/pages.php +++ b/pages.php @@ -10,7 +10,7 @@ define("PAGES", [ "home" => [ "title" => "home", "navbar" => true, - "icon" => "home", + "icon" => "fas fa-home", "scripts" => [ "static/js/home.js" ] @@ -21,7 +21,7 @@ define("PAGES", [ "punches" => [ "title" => "punches", "navbar" => true, - "icon" => "clock-o", + "icon" => "fas fa-clock", "styles" => [ "static/css/datatables.min.css", "static/css/tables.css" @@ -34,7 +34,7 @@ define("PAGES", [ "jobs" => [ "title" => "jobs", "navbar" => true, - "icon" => "briefcase", + "icon" => "fas fa-briefcase", "styles" => [ "static/css/datatables.min.css", "static/css/tables.css" @@ -47,7 +47,7 @@ define("PAGES", [ "editjobs" => [ "title" => "jobs", "navbar" => false, - "icon" => "briefcase", + "icon" => "fas fa-briefcase", "styles" => [ "static/css/datatables.min.css", "static/css/tables.css" @@ -68,12 +68,12 @@ define("PAGES", [ "title" => "edit job", "navbar" => false, "styles" => [ - "static/css/bootstrap-datetimepicker.min.css", + "static/css/tempusdominus-bootstrap-4.min.css", "static/css/easy-autocomplete.min.css" ], "scripts" => [ "static/js/moment.min.js", - "static/js/bootstrap-datetimepicker.min.js", + "static/js/tempusdominus-bootstrap-4.min.js", "static/js/jquery.easy-autocomplete.min.js", "static/js/editjobhistory.js" ] @@ -81,7 +81,7 @@ define("PAGES", [ "shifts" => [ "title" => "shifts", "navbar" => true, - "icon" => "calendar", + "icon" => "fas fa-calendar", "styles" => [ "static/css/datatables.min.css", "static/css/tables.css" @@ -95,24 +95,24 @@ define("PAGES", [ "title" => "new shift", "navbar" => false, "styles" => [ - "static/css/bootstrap-datetimepicker.min.css" + "static/css/tempusdominus-bootstrap-4.min.css" ], "scripts" => [ "static/js/moment.min.js", - "static/js/bootstrap-datetimepicker.min.js", - "static/js/addshift.js" + "static/js/tempusdominus-bootstrap-4.min.js", + "static/js/editshift.js" ] ], "editpunch" => [ "title" => "edit punch", "navbar" => false, "styles" => [ - "static/css/bootstrap-datetimepicker.min.css", + "static/css/tempusdominus-bootstrap-4.min.css", "static/css/easy-autocomplete.min.css" ], "scripts" => [ "static/js/moment.min.js", - "static/js/bootstrap-datetimepicker.min.js", + "static/js/tempusdominus-bootstrap-4.min.js", "static/js/jquery.easy-autocomplete.min.js", "static/js/editpunch.js" ] @@ -120,14 +120,14 @@ define("PAGES", [ "export" => [ "title" => "reports", "navbar" => true, - "icon" => "download", + "icon" => "fas fa-download", "styles" => [ - "static/css/bootstrap-datetimepicker.min.css", + "static/css/tempusdominus-bootstrap-4.min.css", "static/css/easy-autocomplete.min.css" ], "scripts" => [ "static/js/moment.min.js", - "static/js/bootstrap-datetimepicker.min.js", + "static/js/tempusdominus-bootstrap-4.min.js", "static/js/jquery.easy-autocomplete.min.js", "static/js/export.js" ] diff --git a/pages/404.php b/pages/404.php index f14ee30..21110a2 100644 --- a/pages/404.php +++ b/pages/404.php @@ -5,8 +5,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ?> -
-
+
+

\ No newline at end of file diff --git a/pages/assignshift.php b/pages/assignshift.php index e9d441d..c088106 100644 --- a/pages/assignshift.php +++ b/pages/assignshift.php @@ -27,17 +27,15 @@ if ($VARS['shift'] && $database->has('shifts', ['shiftid' => $VARS['shift']])) { ?>
-
-
-

- +
+

+

-
-
+
-
+
-
+
" /> -
-
- +
+ +
@@ -70,7 +68,7 @@ if ($VARS['shift'] && $database->has('shifts', ['shiftid' => $VARS['shift']])) { foreach ($assigned as $user) { ?>
-
+
has('shifts', ['shiftid' => $VARS['shift']])) { -
- +
+
\ No newline at end of file diff --git a/pages/editjob.php b/pages/editjob.php index d29637c..fecf815 100644 --- a/pages/editjob.php +++ b/pages/editjob.php @@ -30,31 +30,29 @@ if (isset($VARS['job']) && $database->has('jobs', ['jobid' => $VARS['job']])) { ?>
-
-
-

- - - - - -

-
-
+
+

+ + + + + +

+
-
+
-
+
-
+
has('jobs', ['jobid' => $VARS['job']])) {
-
+

-
-
+
-
-
- +
+
-
+
select('job_groups', ['groupid (id)'], ['jobid' => $data['jobid']]); @@ -132,7 +128,7 @@ if (isset($VARS['job']) && $database->has('jobs', ['jobid' => $VARS['job']])) { } ?>
-
+
has('jobs', ['jobid' => $VARS['job']])) { -
- +
+ - + diff --git a/pages/editjobhistory.php b/pages/editjobhistory.php index 4f32b56..f4cc113 100644 --- a/pages/editjobhistory.php +++ b/pages/editjobhistory.php @@ -30,21 +30,19 @@ if (isset($VARS['job']) && $database->has('job_tracking', ['id' => $VARS['job']] ?> -
-
-

- - - - - -

-
-
+
+

+ + + + + +

+
-
+
- +
-
+
- - " required /> + + " required />
-
+
- - " /> + + " />
@@ -89,12 +87,12 @@ if (isset($VARS['job']) && $database->has('job_tracking', ['id' => $VARS['job']] -
- +
+ - + diff --git a/pages/editjobs.php b/pages/editjobs.php index 574785b..f5457da 100644 --- a/pages/editjobs.php +++ b/pages/editjobs.php @@ -7,7 +7,7 @@ require_once __DIR__ . '/../required.php'; redirectifnotloggedin(); ?> -
+
@@ -17,20 +17,20 @@ redirectifnotloggedin(); ?>
- +
- - + + select('jobs', ['jobid (id)', 'jobname (name)', 'jobcode (code)', 'color'], ['deleted' => 0]); foreach ($jobs as $j) { - echo ""; + echo ""; } ?> @@ -38,8 +38,8 @@ redirectifnotloggedin(); - - + +
" . ' ' . lang("edit", false) . '' . "" . '   ' . $j['name'] . "" . $j['code'] . "
" . ' ' . lang("edit", false) . '' . "" . '  ' . $j['name'] . "" . $j['code'] . "
\ No newline at end of file diff --git a/pages/editpunch.php b/pages/editpunch.php index 2cccf51..3fc9df7 100644 --- a/pages/editpunch.php +++ b/pages/editpunch.php @@ -1,5 +1,4 @@ -
-
-

- - - - - -

-
-
+
+

+ + + + + +

+
-
+
- +
-
+
- - " /> + + " />
-
+
- - " /> + + " />
-
+
- +
@@ -105,12 +102,12 @@ if ($data['uid'] != "") { -
- +
+ - + diff --git a/pages/editshift.php b/pages/editshift.php index f92f5b6..0dfaf27 100644 --- a/pages/editshift.php +++ b/pages/editshift.php @@ -1,5 +1,4 @@ has('shifts', ['shiftid' => $VARS['id']])) ?> -
-
-

- - - - - -

-
-
+
+

+ + + + + +

+
-
+
- +
-
+
- - + +
-
+
- - + +
-
+
- +
-
- +
+ > +
-
- +
+ > +
-
- +
+ > +
-
- +
+ > +
-
- +
+ > +
-
- +
+ > +
-
- +
+ > +
@@ -109,17 +99,17 @@ if (isset($VARS['id']) && $database->has('shifts', ['shiftid' => $VARS['id']]))
- + -
- +
+ - + diff --git a/pages/export.php b/pages/export.php index 9d33a07..6fa7139 100644 --- a/pages/export.php +++ b/pages/export.php @@ -15,14 +15,12 @@ if (!account_has_permission($_SESSION['username'], "QWIKCLOCK_MANAGE") && !accou ?>
-
+
-
-
-
-

-
-
+
+
+
+

@@ -47,60 +43,61 @@ if (!account_has_permission($_SESSION['username'], "QWIKCLOCK_MANAGE") && !accou
+
+ +
-
-
-
-

-
-
-
-
- -
-
-