From d1e119bd170f41c3d2a4667f967301e5785f688a Mon Sep 17 00:00:00 2001 From: "sigonasr2, Sig, Sigo" Date: Thu, 5 May 2022 19:45:56 +0000 Subject: [PATCH] Implement javascript to handle expansion of articles --- out/DIRECTORY_LISTING | 12 ++++----- out/articles/DIRECTORY_LISTING | 6 ++--- out/articles/curabitur vel tempus ex.article | 4 +-- out/articles/sigplace1.article | 4 +-- out/articles/test articles/DIRECTORY_LISTING | 6 ++--- out/articles/test articles/test1.article | 4 +-- out/articles/test articles/test2.article | 4 +-- out/articles/test articles/test3.article | 4 +-- out/otherpage.html | 28 +++++++++++++------- out/sig.css | 17 ++++++++++-- ref/article.js | 8 ++++++ sigPlace.java | 15 +++++++++-- sitefiles/sig.css | 17 ++++++++++-- 13 files changed, 91 insertions(+), 38 deletions(-) create mode 100644 ref/article.js diff --git a/out/DIRECTORY_LISTING b/out/DIRECTORY_LISTING index ca27168..1018fae 100644 --- a/out/DIRECTORY_LISTING +++ b/out/DIRECTORY_LISTING @@ -18,12 +18,12 @@
-

Directory Listing for /

📁.. (Previous Directory)
📁articles 2022-05-05T12:57:24.310258Z gitpod 116
-
🗎codeBackground 2022-05-05T12:57:24.274258Z gitpod 2635
-
🗎otherpage.html 2022-05-05T12:57:24.302258Z gitpod 5877
-
🗎reset.css 2022-05-05T12:57:24.282258Z gitpod 1093
-
🗎sig.css 2022-05-05T12:57:24.290258Z gitpod 4314
-
🗎testfile.html 2022-05-05T12:57:24.306258Z gitpod 829
+

Directory Listing for /

📁.. (Previous Directory)
📁articles 2022-05-05T19:45:21.864003Z gitpod 116
+
🗎codeBackground 2022-05-05T19:45:21.824003Z gitpod 2635
+
🗎otherpage.html 2022-05-05T19:45:21.856003Z gitpod 6556
+
🗎reset.css 2022-05-05T19:45:21.832003Z gitpod 1093
+
🗎sig.css 2022-05-05T19:45:21.840003Z gitpod 4702
+
🗎testfile.html 2022-05-05T19:45:21.856003Z gitpod 829
diff --git a/out/articles/DIRECTORY_LISTING b/out/articles/DIRECTORY_LISTING index 4b15d97..e884f00 100644 --- a/out/articles/DIRECTORY_LISTING +++ b/out/articles/DIRECTORY_LISTING @@ -18,9 +18,9 @@
-

Directory Listing for /articles/

📁.. (Previous Directory)
🗎curabitur vel tempus ex.article 2022-05-05T12:57:24.258258Z gitpod 618
-
🗎sigplace1.article 2022-05-05T12:57:24.262258Z gitpod 1559
-
📁test articles 2022-05-05T12:57:24.190258Z gitpod 69
+

Directory Listing for /articles/

📁.. (Previous Directory)
🗎curabitur vel tempus ex.article 2022-05-05T19:45:21.812003Z gitpod 572
+
🗎sigplace1.article 2022-05-05T19:45:21.816003Z gitpod 1499
+
📁test articles 2022-05-05T19:45:21.748003Z gitpod 69
diff --git a/out/articles/curabitur vel tempus ex.article b/out/articles/curabitur vel tempus ex.article index 9e10e5f..9b659cb 100644 --- a/out/articles/curabitur vel tempus ex.article +++ b/out/articles/curabitur vel tempus ex.article @@ -1,3 +1,3 @@ -

Curabitur vel tempus ex

+

Curabitur vel tempus ex

Curabitur vel tempus ex. Duis cursus sapien nisl, ut pulvinar dui porttitor ut. Nullam odio purus, tristique non turpis sit amet, malesuada ultricies purus. Mauris ut nulla nisl. Aenean sit amet est egestas justo volutpat consequat. Suspendisse in sagittis augue, et mattis tortor. Nullam viverra metus et nibh fringilla iaculis. -
29 Apr 2022 7:37PM




⤈ Click to expand.
+
29 Apr 2022 7:37PM
%CONDITIONAL_EXPAND%
diff --git a/out/articles/sigplace1.article b/out/articles/sigplace1.article index 15053a2..4098863 100644 --- a/out/articles/sigplace1.article +++ b/out/articles/sigplace1.article @@ -1,6 +1,6 @@ -

Welcome to SigPlace!

+

Welcome to SigPlace!

This is a SigPlace article! It will contain information that is important (probably) and will be layed out as such. Paragraphs are automatically split up for readability and generated correctly via the parser. There's quite a bit of flexibility with the system and makes it easy to post updates should they be required. A lot of content management systems would do this by having a web interface and submitting content and managing it that way, but by coding my own management system and using the built-in OS' filesystem to handle the work, I save myself a lot of pains and headaches. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque volutpat mollis sem sit amet lacinia. Phasellus vitae varius elit. Proin at vestibulum nunc, in pellentesque orci. Vestibulum efficitur mi vel augue pellentesque eleifend. Aenean eu sem ullamcorper justo consectetur ornare. Donec molestie tincidunt dui eget venenatis. Sed varius est faucibus, blandit turpis non, rhoncus neque. Integer sem felis, cursus in elementum ac, mollis in justo. Pellentesque vel risus turpis. Curabitur lectus neque, lobortis in varius et, tristique convallis erat. Morbi id sodales leo. Cras bibendum bibendum lacus, eu ullamcorper sem tempus sed. Nam ut consectetur nulla. -
3 May 2022 10:25AM




⤈ Click to expand.
+
3 May 2022 10:25AM
%CONDITIONAL_EXPAND%
diff --git a/out/articles/test articles/DIRECTORY_LISTING b/out/articles/test articles/DIRECTORY_LISTING index 5923e0c..cbe845a 100644 --- a/out/articles/test articles/DIRECTORY_LISTING +++ b/out/articles/test articles/DIRECTORY_LISTING @@ -18,9 +18,9 @@
-

Directory Listing for /articles/test articles/

📁.. (Previous Directory)
🗎test1.article 2022-05-05T12:57:24.266258Z gitpod 1111
-
🗎test2.article 2022-05-05T12:57:24.266258Z gitpod 807
-
🗎test3.article 2022-05-05T12:57:24.266258Z gitpod 1020
+

Directory Listing for /articles/test articles/

📁.. (Previous Directory)
🗎test1.article 2022-05-05T19:45:21.816003Z gitpod 1061
+
🗎test2.article 2022-05-05T19:45:21.820003Z gitpod 757
+
🗎test3.article 2022-05-05T19:45:21.820003Z gitpod 970
diff --git a/out/articles/test articles/test1.article b/out/articles/test articles/test1.article index 666bb51..5f20413 100644 --- a/out/articles/test articles/test1.article +++ b/out/articles/test articles/test1.article @@ -1,3 +1,3 @@ -

A Test Title

+

A Test Title

In dolor erat, malesuada at elit cursus, convallis imperdiet turpis. Ut aliquet magna tellus, at viverra mauris ullamcorper vehicula. Nam quis urna semper magna ornare elementum sed id mauris. Suspendisse faucibus nunc ante, ac rhoncus nisl tristique sed. Vestibulum pretium odio eget scelerisque vestibulum. Aliquam viverra ex ac vestibulum interdum. Donec ligula nunc, dignissim a purus vitae, fermentum laoreet diam. Quisque nec auctor urna. Vestibulum sit amet ligula ullamcorper, congue ipsum et, accumsan ante. Phasellus fermentum, sapien nec pulvinar blandit, elit purus pretium urna, et dapibus orci urna eu metus. Nunc molestie dictum pharetra. Suspendisse luctus felis et ante tristique, vitae commodo diam porttitor. Aliquam orci eros, placerat ac justo vitae, bibendum efficitur metus. Phasellus eget bibendum mauris. -
2 May 2022 10:16AM




⤈ Click to expand.
+
2 May 2022 10:16AM
%CONDITIONAL_EXPAND%
diff --git a/out/articles/test articles/test2.article b/out/articles/test articles/test2.article index 7f8906c..636d2cd 100644 --- a/out/articles/test articles/test2.article +++ b/out/articles/test articles/test2.article @@ -1,3 +1,3 @@ -

Another test title

+

Another test title

Sed lobortis nisi id nunc tincidunt volutpat. Mauris cursus felis quis condimentum posuere. Pellentesque vitae dolor et justo suscipit ultrices. Integer dapibus leo id felis varius, ut volutpat massa bibendum. Quisque sed nunc arcu. In sit amet faucibus magna, non venenatis massa. Cras sed placerat risus, id consectetur est. Pellentesque in nunc dolor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Quisque eget lorem ac urna posuere accumsan. Quisque sed imperdiet nisi. -
1 May 2022 05:13AM




⤈ Click to expand.
+
1 May 2022 05:13AM
%CONDITIONAL_EXPAND%
diff --git a/out/articles/test articles/test3.article b/out/articles/test articles/test3.article index 046c231..7db8f6f 100644 --- a/out/articles/test articles/test3.article +++ b/out/articles/test articles/test3.article @@ -1,3 +1,3 @@ -

And More

+

And More

Curabitur suscipit quam tellus, non rhoncus diam vehicula in. Aliquam ut dapibus tortor. Cras accumsan arcu vel ante maximus ornare. Nam tempus fermentum leo maximus euismod. Donec vehicula pretium est a ultrices. Nunc blandit nibh lorem, nec blandit leo posuere quis. Sed mauris ligula, euismod eu aliquam vel, rhoncus eget magna. Proin eget tortor ut ligula suscipit mattis. Integer rutrum aliquet eleifend. Suspendisse leo libero, placerat nec mi id, sagittis malesuada felis. Quisque euismod ante cursus elit lobortis, eu tempus ligula condimentum. Mauris viverra metus et dignissim efficitur. Ut placerat nunc nunc, eu tempus neque ultrices nec. Suspendisse et magna risus. Phasellus in ullamcorper tortor. Sed lobortis ut mi in blandit. -
30 Apr 2022 6:14PM




⤈ Click to expand.
+
30 Apr 2022 6:14PM
%CONDITIONAL_EXPAND%
diff --git a/out/otherpage.html b/out/otherpage.html index 3bc246f..ad776ae 100644 --- a/out/otherpage.html +++ b/out/otherpage.html @@ -19,24 +19,32 @@
This is a different webpage.
-

Welcome to SigPlace!

+ +

Welcome to SigPlace!

This is a SigPlace article! It will contain information that is important (probably) and will be layed out as such. Paragraphs are automatically split up for readability and generated correctly via the parser. There's quite a bit of flexibility with the system and makes it easy to post updates should they be required. A lot of content management systems would do this by having a web interface and submitting content and managing it that way, but by coding my own management system and using the built-in OS' filesystem to handle the work, I save myself a lot of pains and headaches. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque volutpat mollis sem sit amet lacinia. Phasellus vitae varius elit. Proin at vestibulum nunc, in pellentesque orci. Vestibulum efficitur mi vel augue pellentesque eleifend. Aenean eu sem ullamcorper justo consectetur ornare. Donec molestie tincidunt dui eget venenatis. Sed varius est faucibus, blandit turpis non, rhoncus neque. Integer sem felis, cursus in elementum ac, mollis in justo. Pellentesque vel risus turpis. Curabitur lectus neque, lobortis in varius et, tristique convallis erat. Morbi id sodales leo. Cras bibendum bibendum lacus, eu ullamcorper sem tempus sed. Nam ut consectetur nulla. -
3 May 2022 10:25AM




⤈ Click to expand.
-

A Test Title

+
3 May 2022 10:25AM




⤈ Click to expand.
+

A Test Title

In dolor erat, malesuada at elit cursus, convallis imperdiet turpis. Ut aliquet magna tellus, at viverra mauris ullamcorper vehicula. Nam quis urna semper magna ornare elementum sed id mauris. Suspendisse faucibus nunc ante, ac rhoncus nisl tristique sed. Vestibulum pretium odio eget scelerisque vestibulum. Aliquam viverra ex ac vestibulum interdum. Donec ligula nunc, dignissim a purus vitae, fermentum laoreet diam. Quisque nec auctor urna. Vestibulum sit amet ligula ullamcorper, congue ipsum et, accumsan ante. Phasellus fermentum, sapien nec pulvinar blandit, elit purus pretium urna, et dapibus orci urna eu metus. Nunc molestie dictum pharetra. Suspendisse luctus felis et ante tristique, vitae commodo diam porttitor. Aliquam orci eros, placerat ac justo vitae, bibendum efficitur metus. Phasellus eget bibendum mauris. -
2 May 2022 10:16AM




⤈ Click to expand.
-

Another test title

+
2 May 2022 10:16AM




⤈ Click to expand.
+

Another test title

Sed lobortis nisi id nunc tincidunt volutpat. Mauris cursus felis quis condimentum posuere. Pellentesque vitae dolor et justo suscipit ultrices. Integer dapibus leo id felis varius, ut volutpat massa bibendum. Quisque sed nunc arcu. In sit amet faucibus magna, non venenatis massa. Cras sed placerat risus, id consectetur est. Pellentesque in nunc dolor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Quisque eget lorem ac urna posuere accumsan. Quisque sed imperdiet nisi. -
1 May 2022 05:13AM




⤈ Click to expand.
-

And More

+
1 May 2022 05:13AM




⤈ Click to expand.
+

And More

Curabitur suscipit quam tellus, non rhoncus diam vehicula in. Aliquam ut dapibus tortor. Cras accumsan arcu vel ante maximus ornare. Nam tempus fermentum leo maximus euismod. Donec vehicula pretium est a ultrices. Nunc blandit nibh lorem, nec blandit leo posuere quis. Sed mauris ligula, euismod eu aliquam vel, rhoncus eget magna. Proin eget tortor ut ligula suscipit mattis. Integer rutrum aliquet eleifend. Suspendisse leo libero, placerat nec mi id, sagittis malesuada felis. Quisque euismod ante cursus elit lobortis, eu tempus ligula condimentum. Mauris viverra metus et dignissim efficitur. Ut placerat nunc nunc, eu tempus neque ultrices nec. Suspendisse et magna risus. Phasellus in ullamcorper tortor. Sed lobortis ut mi in blandit. -
30 Apr 2022 6:14PM




⤈ Click to expand.
-

Curabitur vel tempus ex

+
30 Apr 2022 6:14PM




⤈ Click to expand.
+

Curabitur vel tempus ex

Curabitur vel tempus ex. Duis cursus sapien nisl, ut pulvinar dui porttitor ut. Nullam odio purus, tristique non turpis sit amet, malesuada ultricies purus. Mauris ut nulla nisl. Aenean sit amet est egestas justo volutpat consequat. Suspendisse in sagittis augue, et mattis tortor. Nullam viverra metus et nibh fringilla iaculis. -
29 Apr 2022 7:37PM




⤈ Click to expand.
+
29 Apr 2022 7:37PM




⤈ Click to expand.
diff --git a/out/sig.css b/out/sig.css index 4878af0..d40444b 100644 --- a/out/sig.css +++ b/out/sig.css @@ -116,7 +116,19 @@ body{ .contentBody .contentWrapper .content{ display: inline-block; - min-width:98vw; + min-width:97vw; + font-size:1.25em; + padding: 4px; + margin: 0px 4px 0px 4px; + background-color: rgba(255, 255, 255, .06); + z-index:0; + max-height:120px; + overflow:hidden; + } + + .contentBody .contentWrapper .expandedContent{ + display: inline-block; + min-width:97vw; font-size:1.25em; padding: 4px; margin: 0px 4px 0px 4px; @@ -154,7 +166,8 @@ body{ .contentBody .contentWrapper .unexpanded:hover{ bottom:-8px; - background: linear-gradient(180deg,rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 5%, rgba(32,32,32,1.0) 100%); + background: linear-gradient(180deg,rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 5%, rgba(64,64,64,1.0) 100%); + cursor:pointer; } .contentBody .filelisting{ diff --git a/ref/article.js b/ref/article.js new file mode 100644 index 0000000..e1365b7 --- /dev/null +++ b/ref/article.js @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/sigPlace.java b/sigPlace.java index 557d75e..b4dda9b 100644 --- a/sigPlace.java +++ b/sigPlace.java @@ -108,11 +108,11 @@ public class sigPlace { if (s.charAt(0)=='-') { //Start of a title piece. s=s.replace("-",map.get("$TITLE_CONTENT_START")); - s=s+map.get("$TITLE_CONTENT_END").replace("%ID%","id=\"content_"+i+"\""); + s=s+map.get("$TITLE_CONTENT_END").replace("%ID%","id=\"content_"+f+"\""); //Use ⤈ if there's more text to be shown than can fit. } else if (s.contains("===")) { - s=map.get("$CONTENT_END")+map.get("$DATE_CONTENT_START")+s.replace("===","")+map.get("$CONTENT_END")+"




⤈ Click to expand.
"+map.get("$CONTENT_END"); + s=map.get("$CONTENT_END")+map.get("$DATE_CONTENT_START")+s.replace("===","")+map.get("$CONTENT_END")+"%CONDITIONAL_EXPAND%"+map.get("$CONTENT_END"); } } for (String key : map.keySet()) { @@ -137,6 +137,7 @@ public class sigPlace { while (items.hasNext()) { Path f = items.next(); System.out.println(" Looking for Article References..."+f.getFileName()); + boolean articleJavascriptIncluded=false; if (Files.isRegularFile(f)&&isHTMLFile(f)) { System.out.println(" Searching "+f.getFileName()); try { @@ -153,9 +154,19 @@ public class sigPlace { for (int j=1;j



⤈ Click to expand."); + content.set(i+newData.size()-1,lastline);//




⤈ Click to expand.
"); } else { content.set(i,""); } + if (!articleJavascriptIncluded) { + List articlejs = Files.readAllLines(Paths.get(REFDIR,"article.js")); + for (int j=articlejs.size()-1;j>=0;j--) { + content.add(i,articlejs.get(j)); + } + articleJavascriptIncluded=true; + } } } Files.write(f,content); diff --git a/sitefiles/sig.css b/sitefiles/sig.css index 3d3b83c..897a801 100644 --- a/sitefiles/sig.css +++ b/sitefiles/sig.css @@ -116,7 +116,19 @@ body{ .contentBody .contentWrapper .content{ display: inline-block; - min-width:98vw; + min-width:97vw; + font-size:1.25em; + padding: 4px; + margin: 0px 4px 0px 4px; + background-color: rgba(255, 255, 255, .06); + z-index:0; + max-height:120px; + overflow:hidden; + } + + .contentBody .contentWrapper .expandedContent{ + display: inline-block; + min-width:97vw; font-size:1.25em; padding: 4px; margin: 0px 4px 0px 4px; @@ -154,7 +166,8 @@ body{ .contentBody .contentWrapper .unexpanded:hover{ bottom:-8px; - background: linear-gradient(180deg,rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 5%, rgba(32,32,32,1.0) 100%); + background: linear-gradient(180deg,rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 5%, rgba(64,64,64,1.0) 100%); + cursor:pointer; } .contentBody .filelisting{