diff --git a/.gitignore b/.gitignore index 7c0e119..2eb32ec 100644 --- a/.gitignore +++ b/.gitignore @@ -105,4 +105,4 @@ dist ## Above is Github's recommendations for Node.js. Below are my additions. ## package-lock.json -files/photos/* +files/* diff --git a/files/README.md b/files/README.md index b781cd7..df0856a 100644 --- a/files/README.md +++ b/files/README.md @@ -1,4 +1,4 @@ -# Hyperling.com - Files +# Hyperling.com - files/ Place files into this folder which should be used as static resources. Examples would be APKs, zip files, images, text files, etc. diff --git a/files/media/README.md b/files/media/README.md new file mode 100644 index 0000000..12506c7 --- /dev/null +++ b/files/media/README.md @@ -0,0 +1,3 @@ +# Hyperling.com - files/media/ + +Where other/miscellaneous files are stored for hidden reference or download. diff --git a/pages/about.php b/pages/about.php index fe6410c..d69d987 100755 --- a/pages/about.php +++ b/pages/about.php @@ -6,6 +6,11 @@

Who Am I?

+
+
+ +
+

diff --git a/pages/contact.php b/pages/contact.php index 74ccdce..6676479 100755 --- a/pages/contact.php +++ b/pages/contact.php @@ -7,7 +7,12 @@

Contact

-
+
+ +
+
+
+

Timely responses are not guarenteed, as I spend a majority of my time offline and enjoy traveling in signal-free zones. diff --git a/pages/helpers/banner.php b/pages/helpers/banner.php index 2b1d4b7..e3855e0 100755 --- a/pages/helpers/banner.php +++ b/pages/helpers/banner.php @@ -1,5 +1,5 @@ #!/usr/bin/php - +

diff --git a/pages/home.php b/pages/home.php index e2c5f6d..b99df63 100755 --- a/pages/home.php +++ b/pages/home.php @@ -9,6 +9,11 @@

Welcome!

+
+
+ +
+

diff --git a/pages/photos.sh b/pages/photos.sh index 28494b9..51b14cc 100755 --- a/pages/photos.sh +++ b/pages/photos.sh @@ -28,7 +28,7 @@ echo "" >> $mainpage # Give the page a description. echo -e "\t\t

" >> $mainpage -echo -e "\t\t\t

Media Albums

" >> $mainpage +echo -e "\t\t\t

Albums

" >> $mainpage echo -e "\t\t
" >> $mainpage echo -e "\t\t
" >> $mainpage @@ -74,7 +74,6 @@ ls $PHOTOS_DIR/ | sort -r | while read album; do echo -e "\t\t\t

$album_name

" >> $subpage echo -e "\t\t
" >> $subpage - echo -e "\t\t
" >> $subpage ls $PHOTOS_DIR/$album/* | sort | while read photo; do # Do not include the index page. if [[ $photo == *"index.html" ]]; then @@ -104,10 +103,20 @@ ls $PHOTOS_DIR/ | sort -r | while read album; do echo -e "" >> $mainpage fi - # Put in the subpage HTML. + ## Put in the subpage HTML ## + # Set the count if this is the first loop. + if [[ -z $count ]]; then + count=0 + fi + # Add a row for the next 2 images. + if (( $count % 2 == 0 )); then + echo -e "\t\t
" >> $subpage + fi + # Add the container for the image and its text. echo -e "\t\t\t
" >> $subpage echo -en "\t\t\t\t> $subpage echo -e "rel='noopener noreferrer'>" >> $subpage + # Determine what type of media it is, and how to display it. if [[ $photo == *".mp4" ]]; then echo -e "\t\t\t\t\t\n\t\t\t
" >> $subpage + # Close the row after an odd count. + if (( $count % 2 == 1 )); then + echo -e "\t\t
" >> $subpage + fi + count=$(( count + 1 )) done echo -e "\t\t
" >> $subpage diff --git a/pages/subpages/home/apps.php b/pages/subpages/home/apps.php index 1000301..302e737 100755 --- a/pages/subpages/home/apps.php +++ b/pages/subpages/home/apps.php @@ -44,35 +44,6 @@
-
-
- - 45minuterule -
-

45 Minute Rule

- -

- Determine a good bedtime for waking during light sleep. -

-

- [Play Store] - [APK] -

- -
-
-
- +
+ +
+
+
+ + 45minuterule +
+

45 Minute Rule

+ +

+ Determine a good bedtime for waking during light sleep. +

+

+ [Play Store] + [APK] +

+ +
+
+
diff --git a/pages/support.php b/pages/support.php index e886ce0..99476d9 100755 --- a/pages/support.php +++ b/pages/support.php @@ -10,6 +10,9 @@

Support

+
+ +

Your contributions are completely optional and very much diff --git a/pages/videos.php b/pages/videos.php index df0e7a1..058139a 100755 --- a/pages/videos.php +++ b/pages/videos.php @@ -6,54 +6,59 @@ include "helpers/body_open.php"; ?> -

-

Videos

-
-
-
-

- For the best viewing experience, please go directly to my channel here: -

- -

I also have a separate channel for reposting content, found here:

- -

There is also a backup of my content on Modern Day Wizards:

- -
-
+
+

Videos

+
+
+
+ +
+
+
+
+

+ For the best viewing experience, please go directly to my channel here: +

+ +

I also have a separate channel for reposting content, found here:

+ +

There is also a backup of my content on Modern Day Wizards:

+ +
+
-
-

Personal Media

-
-
-
-

- I don't have social media, so where do my photos and videos go? - Try right here! -

- -
-
+
+

Personal Media

+
+
+
+

+ I don't have social media, so where do my photos and videos go? + Try right here! +

+ +
+