From 06289a5137346d175a4552ee1df271f5225296f7 Mon Sep 17 00:00:00 2001 From: 20xd6 <20xd6@airmail.cc> Date: Mon, 27 Jul 2020 17:20:23 -0400 Subject: [PATCH 1/3] Update README.md for new repository. The web front end git repository has been changed so I updated the URL for the repository to reflect that. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f1bfaa6..af7880a 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ Includes the abality to set the timezone you want if the one your browser chooes The time will appear not only on the main page but also in the page's title so you can leave the page and still keep an eye on the time. #### Requierments ``` -php - I'm running it on 5.6 so that or anything newer should work +php - I'm running it on a minimum of 5.6 so that or anything newer should work a webserver - I use apache. It's nice. A javascript interpriter - Basicaly a modernish webbrowser. ``` ### Install 1. git clone into a directory accessable by your webserver. - `git clone https://efrick.ddns.net/scm/git/WebClock` + `git clone https://efrick.ddns.net/git/20xd6/WebClock.git` 2. Optional steps 1. Edit `clock.php` to point to your root CSS files. _It points to a css file called `styles.css` in the root directory. If this is not your root css file please edit it._ 2. Add a symlink from `clock.php` to a file called `index.php`. From 05a1f50ce012b2b3d34d854d1ec5908b660e8996 Mon Sep 17 00:00:00 2001 From: 20xd6 <20xd6@airmail.cc> Date: Sun, 27 Sep 2020 16:37:52 -0400 Subject: [PATCH 2/3] Rebase master as true master. I had started a new feature on master. This is not how it should be done and I am now atoning for my mistakes. --- clock.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/clock.php b/clock.php index f1552b4..6ae0eb7 100644 --- a/clock.php +++ b/clock.php @@ -109,14 +109,13 @@
-

-

Timer

- Timer + From 7e3cf8ccd673646f6dbc349bca975c318cda2632 Mon Sep 17 00:00:00 2001 From: 20xd6 <20xd6@airmail.cc> Date: Sun, 27 Sep 2020 16:58:10 -0400 Subject: [PATCH 3/3] Fix https://efrick.ddns.net/git/20xd6/WebClock/issues/1 This should reslove the issue with the time not updating. It appears that an issue with conflicting options for the time formatting has been introduced. --- clock.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/clock.js b/clock.js index 98cc7eb..875acf5 100644 --- a/clock.js +++ b/clock.js @@ -18,14 +18,12 @@ function startTime(){ + current_time.toLocaleString('en-US', {timeZone: current_tz, hourCycle:'h24', - timeStyle:'long', hour: '2-digit', minute:'2-digit', second:'2-digit', timeZoneName:'short'}); document.getElementById('time_body').innerHTML = current_time.toLocaleString('en-EN' ,{ timeZone: current_tz, - dateStyle:'long', hourCycle:'h24', weekday:'short', month:'short', @@ -37,7 +35,6 @@ function startTime(){ if(original_tz){//Test if there is a non-null value for original_tz. If True then the part of the page this pertains to is being displayed. document.getElementById('time_original').innerHTML = current_time.toLocaleString('en-EN' ,{ timeZone: original_tz, - dateStyle:'long', hourCycle:'h24', weekday:'short', month:'short',