From dcb3c5df1080121f8dc3f690b3ad5bb01c307e6e Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 2 Sep 2022 11:29:03 -0400 Subject: [PATCH] More progress on moving to the box layout --- webcit-ng/caldav_reports.c | 12 +++++++++--- webcit-ng/static/css/webcit.css | 33 +++++++++++++++++++++------------ webcit-ng/static/index.html | 23 +++++++++++++++-------- 3 files changed, 45 insertions(+), 23 deletions(-) diff --git a/webcit-ng/caldav_reports.c b/webcit-ng/caldav_reports.c index ce98e918c..9bcca613f 100644 --- a/webcit-ng/caldav_reports.c +++ b/webcit-ng/caldav_reports.c @@ -160,8 +160,9 @@ void caldav_response(struct http_transaction *h, struct ctdlsession *c, StrBuf * } char *unescaped_euid = strdup(euid); - if (!unescaped_euid) + if (!unescaped_euid) { return; + } unescape_input(unescaped_euid); StrBufAppendPrintf(ReportOut, ""); @@ -240,8 +241,13 @@ void caldav_report(struct http_transaction *h, struct ctdlsession *c) { // Now begin the REPORT. syslog(LOG_DEBUG, "CalDAV REPORT type is: %d", crp.report_type); StrBuf *ReportOut = NewStrBuf(); - StrBufAppendPrintf(ReportOut, "" - ""); + StrBufAppendPrintf(ReportOut, + "" + "" + ); if (crp.Hrefs != NULL) { // Output all qualifying calendar items! StrBuf *ThisHref = NewStrBuf(); diff --git a/webcit-ng/static/css/webcit.css b/webcit-ng/static/css/webcit.css index a9a99f7ca..f4dd27364 100644 --- a/webcit-ng/static/css/webcit.css +++ b/webcit-ng/static/css/webcit.css @@ -12,10 +12,12 @@ .ctdl-grid-banner-item { /* These grid items will be referenced in the grid container */ grid-area: header; + background-color: #282a35; } .ctdl-grid-navbar-item { grid-area: menu; + background-color: GhostWhite; } .ctdl-grid-main-item { @@ -26,30 +28,37 @@ .ctdl-main-grid-container { /* This is so mind-bogglingly simple I can't believe it works */ display: grid; + grid-template-rows: 100px auto; + grid-template-columns: 200px auto; grid-template-areas: - 'header header header header header header' - 'menu main main main main main' - 'menu main main main main main' - 'menu main main main main main' - 'menu main main main main main' - 'menu main main main main main' - 'menu main main main main main' - 'menu main main main main main'; + 'header header' + 'menu main'; gap: 3px; - background-color: #456789; /* This is the color of the lines between the boxes */ + background-color: #456789; /* This is the color of the lines between the boxes, and also the boxes themselves if not overridden */ padding: 0; /* This is the border around the edges of the screen */ width: 100vw; height: 100vh; } .ctdl-main-grid-container > div { - background-color: #DDEEFF; text-align: left; padding: 10px 0; } +.ctdl-banner-buttons li { /* Buttons that appear in the top banner are list items that reference this class */ + float: left; + display: block; + padding: 8px; + background-color: #282a35; + color: white; +} + +.ctdl-banner-buttons li:hover { /* Buttons that appear in the top banner also reference this class when hovered over */ + background-color: black; +} + html,body,h1,h2,h3,h4,h5 { - font-family: verdana, sans-serif + font-family: sans-serif } .ctdl-modal { @@ -64,7 +73,7 @@ html,body,h1,h2,h3,h4,h5 { justify-content: center; align-items: center; padding: 10px; - background-color: #DDDDDD; + background-color: #BBBBBB; } .ctdl-sidebar-class button { diff --git a/webcit-ng/static/index.html b/webcit-ng/static/index.html index fff7dc870..a2f5b1c87 100644 --- a/webcit-ng/static/index.html +++ b/webcit-ng/static/index.html @@ -21,15 +21,22 @@ MODAL LOADING
+