diff --git a/doc/LICENSE.md b/doc/LICENSE.md index 5470082..9818518 100644 --- a/doc/LICENSE.md +++ b/doc/LICENSE.md @@ -12,7 +12,7 @@ the following license (the so-called "MIT License"). > subject to the following conditions: > The above copyright notice and this permission notice shall be -> included in all copies or substantial portions of the Software. +> included in all copies or substantial portions of the Software. > The software is provided "as is", without warranty of any kind, > express or implied, including but not limited to the warranties of @@ -23,11 +23,11 @@ the following license (the so-called "MIT License"). > connection with the software or the use or other dealings in the > software. ------ Portions of this software (everything in git committed before June 2015, or from a @lanl.gov email address) come with the following -notice: +notice. Please note that there is no assertion of copyright in this +notice. > This software has been authored by an employee or employees of Los > Alamos National Security, LLC, operator of the Los Alamos National @@ -42,3 +42,120 @@ notice: > software is modified to produce derivative works, such modified > software should be clearly marked, so as not to confuse it with the > version available from LANL. + + +Font Licenses +============= + +Dosis is: +> Copyright (c) 2011, Edgar Tolentino and Pablo Impallari (www.impallari.com|impallari@gmail.com), +> Copyright (c) 2011, Igino Marini. (www.ikern.com|mail@iginomarini.com), +> with Reserved Font Name "Dosis". + +Lato is: +> Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) +> with Reserved Font Name "Lato". + + +Both came with the following license: + +> This Font Software is licensed under the SIL Open Font License, Version 1.1. +> This license is copied below, and is also available with a FAQ at: +> http://scripts.sil.org/OFL +> +> +> ----------------------------------------------------------- +> SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +> ----------------------------------------------------------- +> +> PREAMBLE +> The goals of the Open Font License (OFL) are to stimulate worldwide +> development of collaborative font projects, to support the font creation +> efforts of academic and linguistic communities, and to provide a free and +> open framework in which fonts may be shared and improved in partnership +> with others. +> +> The OFL allows the licensed fonts to be used, studied, modified and +> redistributed freely as long as they are not sold by themselves. The +> fonts, including any derivative works, can be bundled, embedded, +> redistributed and/or sold with any software provided that any reserved +> names are not used by derivative works. The fonts and derivatives, +> however, cannot be released under any other type of license. The +> requirement for fonts to remain under this license does not apply +> to any document created using the fonts or their derivatives. +> +> DEFINITIONS +> "Font Software" refers to the set of files released by the Copyright +> Holder(s) under this license and clearly marked as such. This may +> include source files, build scripts and documentation. +> +> "Reserved Font Name" refers to any names specified as such after the +> copyright statement(s). +> +> "Original Version" refers to the collection of Font Software components as +> distributed by the Copyright Holder(s). +> +> "Modified Version" refers to any derivative made by adding to, deleting, +> or substituting -- in part or in whole -- any of the components of the +> Original Version, by changing formats or by porting the Font Software to a +> new environment. +> +> "Author" refers to any designer, engineer, programmer, technical +> writer or other person who contributed to the Font Software. +> +> PERMISSION & CONDITIONS +> Permission is hereby granted, free of charge, to any person obtaining +> a copy of the Font Software, to use, study, copy, merge, embed, modify, +> redistribute, and sell modified and unmodified copies of the Font +> Software, subject to the following conditions: +> +> 1) Neither the Font Software nor any of its individual components, +> in Original or Modified Versions, may be sold by itself. +> +> 2) Original or Modified Versions of the Font Software may be bundled, +> redistributed and/or sold with any software, provided that each copy +> contains the above copyright notice and this license. These can be +> included either as stand-alone text files, human-readable headers or +> in the appropriate machine-readable metadata fields within text or +> binary files as long as those fields can be easily viewed by the user. +> +> 3) No Modified Version of the Font Software may use the Reserved Font +> Name(s) unless explicit written permission is granted by the corresponding +> Copyright Holder. This restriction only applies to the primary font name as +> presented to the users. +> +> 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +> Software shall not be used to promote, endorse or advertise any +> Modified Version, except to acknowledge the contribution(s) of the +> Copyright Holder(s) and the Author(s) or with their explicit written +> permission. +> +> 5) The Font Software, modified or unmodified, in part or in whole, +> must be distributed entirely under this license, and must not be +> distributed under any other license. The requirement for fonts to +> remain under this license does not apply to any document created +> using the Font Software. +> +> TERMINATION +> This license becomes null and void if any of the above conditions are +> not met. +> +> DISCLAIMER +> THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +> EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +> MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +> OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +> COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +> INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +> DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +> FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +> OTHER DEALINGS IN THE FONT SOFTWARE. + + +Javascript MD5 Library +====================== + +Obtained from , which says: + +> The JavaScript MD5 script is released under the +> [MIT license](http://www.opensource.org/licenses/MIT). diff --git a/doc/OFL.txt b/doc/OFL.txt deleted file mode 100644 index f8ca7bc..0000000 --- a/doc/OFL.txt +++ /dev/null @@ -1,92 +0,0 @@ -Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato" -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/www/cgi-bin/puzzles.cgi b/www/cgi-bin/puzzles.cgi deleted file mode 100755 index 8a3882c..0000000 --- a/www/cgi-bin/puzzles.cgi +++ /dev/null @@ -1,57 +0,0 @@ -#! /usr/bin/env lua - -package.path = "?.lua;cgi-bin/?.lua;www/cgi-bin/?.lua" - -local koth = require "koth" - -local max_by_cat = {} - -local f = io.popen("ls " .. koth.path("packages")) -for cat in f:lines() do - max_by_cat[cat] = 0 -end -f:close() - - -for line in io.lines(koth.path("state/points.log")) do - local ts, team, cat, points, comment = line:match("^(%d+) (%w+) ([%w-]+) (%d+) ?(.*)") - points = tonumber(points) or 0 - - -- Skip scores for removed categories - if (max_by_cat[cat] ~= nil) then - max_by_cat[cat] = math.max(max_by_cat[cat], points) - end -end - -local body = "
\n" -for cat, biggest in pairs(max_by_cat) do - local points, dirname - - body = body .. "
" .. cat .. "
" - body = body .. "
" - for line in io.lines(koth.path("packages/" .. cat .. "/map.txt")) do - points, dirname = line:match("^(%d+) (.*)") - points = tonumber(points) - - body = body .. "" .. points .. " " - if (points > biggest) then - break - end - end - if (points == biggest) then - body = body .. "⁂" - end - body = body .. "
\n" -end -body = body .. "
\n" -body = body .. "
Sandia Token:" -body = body .. "

Example: sandia:5:xylep-radar-nanox

" -body = body .. "
" -body = body .. "Team Hash:
" -body = body .. "Token: " -body = body .. "" -body = body .. "
" -body = body .. "
" -body = body .. "

Reloading this page periodically may yield updated puzzle lists.

" - -koth.page("Open Puzzles", body) diff --git a/www/index.html b/www/index.html index 295482b..b88a8c2 100644 --- a/www/index.html +++ b/www/index.html @@ -13,6 +13,7 @@ + MOTH Dashboard diff --git a/www/res/Dosis-Bold.ttf b/www/res/Dosis-Bold.ttf new file mode 100644 index 0000000..d5e938e Binary files /dev/null and b/www/res/Dosis-Bold.ttf differ diff --git a/www/res/Dosis-ExtraBold.ttf b/www/res/Dosis-ExtraBold.ttf new file mode 100644 index 0000000..2144a25 Binary files /dev/null and b/www/res/Dosis-ExtraBold.ttf differ diff --git a/www/res/Dosis-ExtraLight.ttf b/www/res/Dosis-ExtraLight.ttf new file mode 100644 index 0000000..2e3bf1b Binary files /dev/null and b/www/res/Dosis-ExtraLight.ttf differ diff --git a/www/res/Dosis-Light.ttf b/www/res/Dosis-Light.ttf new file mode 100644 index 0000000..a22e7d7 Binary files /dev/null and b/www/res/Dosis-Light.ttf differ diff --git a/www/res/Dosis-Medium.ttf b/www/res/Dosis-Medium.ttf new file mode 100644 index 0000000..3254ef5 Binary files /dev/null and b/www/res/Dosis-Medium.ttf differ diff --git a/www/res/Dosis-Regular.ttf b/www/res/Dosis-Regular.ttf new file mode 100644 index 0000000..4b20862 Binary files /dev/null and b/www/res/Dosis-Regular.ttf differ diff --git a/www/res/Dosis-SemiBold.ttf b/www/res/Dosis-SemiBold.ttf new file mode 100644 index 0000000..5f48caf Binary files /dev/null and b/www/res/Dosis-SemiBold.ttf differ diff --git a/www/res/Dosis.css b/www/res/Dosis.css new file mode 100644 index 0000000..2945a7f --- /dev/null +++ b/www/res/Dosis.css @@ -0,0 +1,6 @@ +@font-face { + font-family: 'Dosis'; + font-style: normal; + font-weight: 400; + src: local('Dosis Regular'), local('Dosis-Regular'), url(Dosis-Regular.ttf) format('truetype'); +} diff --git a/www/res/md5.min.js b/www/res/md5.min.js new file mode 100644 index 0000000..3399bf4 --- /dev/null +++ b/www/res/md5.min.js @@ -0,0 +1,2 @@ +!function(n){"use strict";function t(n,t){var r=(65535&n)+(65535&t),e=(n>>16)+(t>>16)+(r>>16);return e<<16|65535&r}function r(n,t){return n<>>32-t}function e(n,e,o,u,c,f){return t(r(t(t(e,n),t(u,f)),c),o)}function o(n,t,r,o,u,c,f){return e(t&r|~t&o,n,t,u,c,f)}function u(n,t,r,o,u,c,f){return e(t&o|r&~o,n,t,u,c,f)}function c(n,t,r,o,u,c,f){return e(t^r^o,n,t,u,c,f)}function f(n,t,r,o,u,c,f){return e(r^(t|~o),n,t,u,c,f)}function i(n,r){n[r>>5]|=128<>>9<<4)+14]=r;var e,i,a,h,d,l=1732584193,g=-271733879,v=-1732584194,m=271733878;for(e=0;et;t+=8)r+=String.fromCharCode(n[t>>5]>>>t%32&255);return r}function h(n){var t,r=[];for(r[(n.length>>2)-1]=void 0,t=0;tt;t+=8)r[t>>5]|=(255&n.charCodeAt(t/8))<16&&(o=i(o,8*n.length)),r=0;16>r;r+=1)u[r]=909522486^o[r],c[r]=1549556828^o[r];return e=i(u.concat(h(t)),512+8*t.length),a(i(c.concat(e),640))}function g(n){var t,r,e="0123456789abcdef",o="";for(r=0;r>>4&15)+e.charAt(15&t);return o}function v(n){return unescape(encodeURIComponent(n))}function m(n){return d(v(n))}function p(n){return g(m(n))}function s(n,t){return l(v(n),v(t))}function C(n,t){return g(s(n,t))}function A(n,t,r){return t?r?s(t,n):C(t,n):r?m(n):p(n)}"function"==typeof define&&define.amd?define(function(){return A}):"object"==typeof module&&module.exports?module.exports=A:n.md5=A}(this); +//# sourceMappingURL=md5.min.js.map diff --git a/www/res/style.css b/www/res/style.css index 9c56119..687c624 100644 --- a/www/res/style.css +++ b/www/res/style.css @@ -1,6 +1,28 @@ -/* @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic); /* */ -/* @import "maven_pro.css"; /* */ -@import "Lato.css"; /* */ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 400; + src: local('Lato Regular'), local('Lato-Regular'), url(Lato-Regular.ttf) format('truetype'); +} +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 700; + src: local('Lato Bold'), local('Lato-Bold'), url(Lato-Bold.ttf) format('truetype'); +} +@font-face { + font-family: 'Lato'; + font-style: italic; + font-weight: 400; + src: local('Lato Italic'), local('Lato-Italic'), url(Lato-Italic.ttf) format('truetype'); +} +@font-face { + font-family: 'Dosis'; + font-style: normal; + font-weight: 400; + src: local('Dosis Regular'), local('Dosis-Regular'), url(Dosis-Regular.ttf) format('truetype'); +} + html { background: rgba(61, 50, 44, 0) url(brown-lines.jpg) no-repeat center center fixed; @@ -15,6 +37,10 @@ body { height: 100% } +pre, tt { + font-family: 'Dosis', monospace; +} + .terminal { background: rgba(80, 70, 60, 0.96); display: inline-block;