From c979a7da022e8cbc4a01156350a1aacdabf305bd Mon Sep 17 00:00:00 2001 From: Wim Brand Date: Wed, 10 Apr 2019 20:33:14 +0200 Subject: [PATCH] It's wednesday my dudes --- res/static/img/checker_wednesday.png | Bin 0 -> 2115 bytes res/static/img/wednesday.xcf | Bin 0 -> 15817 bytes res/static/style/layout.css | 17 ++++++++++++++++- res/template/admin.html | 2 +- res/template/fragments/bgpattern.html | 4 ++-- webcontroller/template_manager.go | 21 +++++++++++++-------- 6 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 res/static/img/checker_wednesday.png create mode 100644 res/static/img/wednesday.xcf diff --git a/res/static/img/checker_wednesday.png b/res/static/img/checker_wednesday.png new file mode 100644 index 0000000000000000000000000000000000000000..c4c140538286b10c4aefc427df91a93f372b91c2 GIT binary patch literal 2115 zcmY*adpOg58~<&{lCr$Y%G4CK^&-k)YB8JB=B)J6V<-_1GjkYX%t%p4iJqM0IBy84 zSD8s!QRbl*O!JDsQ@rDFfx&RYEn(XI{M_EyVr=(`dxUr=r0EphH7OAtpo1zVQ+C(T2 zUgB#ni$?h^!)G8+0q?<=MVe94v~$0PrXE9nnI@+$)N~w?(~oAA9;ckrwpHp|&Li_= z2bkv}h*t`)YeQ-C%mQ=3Z01CS91;oj^Y8XviixI0)3%C&q*A$>jPSPkGikP9S$2lm zc}4(${?ToN#8g-?z(d7IlB2bvSYAo>04jDRZUO*yxRIM^DZmxg` zpmBYfSy{i&uAou?Kjjp-NA3-rV7yfy9B}L3y@RuF%Hv@jv%>mk=PT4;TGg`$$(U8H zN>Afm{{t|shYrUcI#t=-dxK+jb`qN}>BST&_L}t@DO9Lsit*%~d^*p}_MSE>g=Lru zx{Wp_5sKnp^kQ{xY>FN@t@koWL`?DaM8&ZO;~c40zY5?C<%yWnN})fZRim zkH4c$LRF+p#s)qY!3m%*pl_ujhYe>p>bmCY-~2sheN0ufJ}N_Bf?5&+r0E$-S_nySyO~yG|ya1449loT{)nE z3R#vhK|*C{qk9@G9THR+mF<6k!+Cw>Dc&=8tl+V(JxmK#@u_5)>2qz)1Z^4s5(QWi zS>Urv*YiI|Jy}Fmya_QOy1R!_)Gs3lnO>)VyN zQGUPC4XVgPcR!2`EUh7Lzl9QDNF;J>W=1KB^7!+wrK1w@`ue5l4nTBbIpxk;Ml^=b2lIRswiePj!f%)5fuTj@{qM;Xt*l zOx1-^d*vZHZXWu1Aa!wmM6av+gCd2ArM2~41;xd+t#x42ZEmb37h5D=F+lj9DJ-iC zUcP?r)%6u6GUkH2La$kR84C`LEjlV#dQzpvDdqUW`1$sSB7SbvC;TfdO(Y_ zpXalHLxaZCCfG~E38IjBrzT^ExuK?O(TrZ|7sZOh^n5Z!~RBM7wA(En$l%M?>CS z9T4ST{?w=|Z^=qdPA=R?@Cja4=o);)#e=+ZcD9f58PmHy<&5Uf{EZ>*fiC1Hi?UQF z(+zH2@UX8pH$JVWr>C&@X6JUR-qTJ3nJ+8!G~ylC+G@Bwhi&|OeemG1iZ?Mh8zdi< z^4}iG5)Lf>Aa)+9soAlF+gM%ntK#~4?jQX8`N7_H)6eQ2O*)5qB#tWzU&<{=s_|Q! z6uCL>&}hqihBPZP^T*UKSG6E`J^ME|rIzWr1labIDWY?eXk+ApPf6wfqlZt7^he>T zaVg+icJl6cShd6I&$Tr(hh+uT)N$_*ff{Y0b5GZyls}}gMSiD#3$a>dGU)WD7bPMH z*uw9xvWG%awMmix8LBjm`(LDL%yztOG!E#NWW4X@m@gm_XupEVvLFG+Ha1BHzTFbX fkGDqi6E-0~HA2md`ekk4hXatTovi8zzU;pMNiFv2 literal 0 HcmV?d00001 diff --git a/res/static/img/wednesday.xcf b/res/static/img/wednesday.xcf new file mode 100644 index 0000000000000000000000000000000000000000..18a2a401994aace85f8b18921f5f32111f0815c9 GIT binary patch literal 15817 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 T&HD(Y41c$An5-9G%}Ib literal 0 HcmV?d00001 diff --git a/res/static/style/layout.css b/res/static/style/layout.css index 3590028..b724e69 100644 --- a/res/static/style/layout.css +++ b/res/static/style/layout.css @@ -55,6 +55,7 @@ html{height: 100%;} body{ + background-color: #0d0d0d; /* Fallback */ background-color: var(--background_color); background-repeat: repeat; font-family: 'Ubuntu'; @@ -63,6 +64,7 @@ body{ line-height: 1.5em; height: 100%; overflow-x: hidden; + color: #bfbfbf; /* Fallback */ color: var(--text_color); } @@ -87,6 +89,7 @@ body{ margin-top: 30px; margin-bottom: 30px; text-align: left; + box-shadow: #000000 8px 8px 50px, 5px; box-shadow: var(--shadow_color) 8px 8px var(--shadow_spread) var(--shadow_intensity); z-index: 1; word-break: break-word; @@ -95,6 +98,7 @@ body{ .navigation a { float: none; display: inline-block; + color: #bfbfbf; /* Fallback */ color: var(--text_color); text-align: center; padding: 4px 6px; @@ -106,8 +110,11 @@ body{ transition: box-shadow 5s; } .navigation a:hover { + background: linear-gradient(#82c13e, #6da234); background: linear-gradient(var(--highlight_color), var(--highlight_color_dark)); + box-shadow: #82c13e, 2px 2px 8px #000000; box-shadow: var(--highlight_border), 2px 2px 8px var(--shadow_color); + color: #000000; color: var(--highlight_text_color); transition: box-shadow 0.5s; text-decoration: none; @@ -263,6 +270,7 @@ pre{ overflow: hidden; box-shadow: 0px 0px 6px 2px var(--file_background_color); background-color: var(--file_background_color); + color: #bfbfbf; /* Fallback */ color: var(--text_color); word-break: break-all; text-align: left; @@ -273,6 +281,7 @@ pre{ .file_button:hover{ box-shadow: 0px 0px 10px 3px var(--highlight_color), inset 0px 0px 6px 1px var(--highlight_color); text-decoration: none; + color: #bfbfbf; /* Fallback */ color: var(--text_color); } .file_button > img{ @@ -307,6 +316,7 @@ select{ overflow: hidden; line-height: 1; text-decoration: none; + color: #bfbfbf; /* Fallback */ color: var(--input_text_color); outline: 0; vertical-align: middle; @@ -325,6 +335,7 @@ input[type="submit"]:focus, input[type="button"]:focus, input[type="color"]:focus, select:focus{ + color: #bfbfbf; /* Fallback */ color: var(--input_text_color); text-decoration: none; box-shadow: var(--highlight_border), 2px 2px 8px var(--shadow_color); @@ -346,7 +357,11 @@ select:active{ .button_red:active {background: linear-gradient(var(--danger_color_dark), var(--danger_color)) !important;} /* Dropdown list of the select tag */ -option{background-color: var(--input_color_dark); color: var(--text_color)} +option{ + background-color: var(--input_color_dark); + color: #bfbfbf; /* Fallback */ + color: var(--text_color); +} /* TEXT FIELDS */ textarea, diff --git a/res/template/admin.html b/res/template/admin.html index 5f818af..6ef85d7 100644 --- a/res/template/admin.html +++ b/res/template/admin.html @@ -1,4 +1,4 @@ -{{define "widgets"}} +{{define "admin_panel"}} diff --git a/res/template/fragments/bgpattern.html b/res/template/fragments/bgpattern.html index a46edf6..3f0f4d4 100644 --- a/res/template/fragments/bgpattern.html +++ b/res/template/fragments/bgpattern.html @@ -1,3 +1,3 @@ {{define "bgpattern"}} - -{{end}} \ No newline at end of file + +{{end}} diff --git a/webcontroller/template_manager.go b/webcontroller/template_manager.go index ed04d7b..74bc005 100644 --- a/webcontroller/template_manager.go +++ b/webcontroller/template_manager.go @@ -1,6 +1,7 @@ package webcontroller import ( + "fmt" "html/template" "os" "path/filepath" @@ -73,17 +74,21 @@ func (tm *TemplateManager) Get() *template.Template { func (tm *TemplateManager) funcMap() template.FuncMap { return template.FuncMap{ - "bgPatternCount": tm.bgPatternCount, - "debugMode": tm.debugMode, - "apiUrl": tm.apiURL, - "pageNr": tm.pageNr, - "add": tm.add, - "sub": tm.sub, + "bgPattern": tm.bgPattern, + "debugMode": tm.debugMode, + "apiUrl": tm.apiURL, + "pageNr": tm.pageNr, + "add": tm.add, + "sub": tm.sub, } } -func (tm *TemplateManager) bgPatternCount() uint8 { - return uint8(time.Now().UnixNano() % 17) +func (tm *TemplateManager) bgPattern() string { + var now = time.Now() + if now.Weekday() == time.Wednesday && now.UnixNano()%10 == 0 { + return "checker_wednesday.png" + } + return fmt.Sprintf("checker%d.png", now.UnixNano()%17) } func (tm *TemplateManager) debugMode() bool { return tm.debugModeEnabled