From 97e2a5f737a596497a0b3157f59f0cafa4a1263e Mon Sep 17 00:00:00 2001 From: TDavis Date: Fri, 29 Mar 2019 15:45:26 -0300 Subject: fix --- static/css/txt/4am.css | 2 +- static/css/txt/amber.css | 2 +- static/css/txt/baisano.css | 2 +- static/css/txt/bbs.css | 2 +- static/css/txt/bios.css | 2 +- static/css/txt/cuteanarchy.css | 227 ++++++++++++++++++++--------------------- 6 files changed, 115 insertions(+), 122 deletions(-) diff --git a/static/css/txt/4am.css b/static/css/txt/4am.css index 49db7b3..723939c 100644 --- a/static/css/txt/4am.css +++ b/static/css/txt/4am.css @@ -32,7 +32,7 @@ a.thumb{margin-top:4px} .yt:hover{text-decoration:none} .deleted{color:#999;margin-bottom:24px} #q-p{background:#222;border:1px solid #999} -#q-p .msg,#q-p a.thumb{margin-bottom:8px} +#q-p .reply{margin-bottom:8px} .lastposts #n2{text-decoration:none} form .msg{background:#383838;border:1px dotted #000} #footer{color:#f7ca88} diff --git a/static/css/txt/amber.css b/static/css/txt/amber.css index 0f5a7ff..d45a28d 100644 --- a/static/css/txt/amber.css +++ b/static/css/txt/amber.css @@ -30,7 +30,7 @@ input[type=submit]:active,input[type=button]:active,button:active{background:#f9 form .msg{border:1px dotted #f9690e;background:#000;color:#f9690e} #q-p{border:1px solid #000;padding:0} #q-p .reply{border:3px double #f9690e} -#q-p .reply h4{padding:1px} +#q-p .reply h4{padding:0 1px} #footer a{color:#f9690e} #content{border:3px double #f9690e} #content.list #header{background:#451d04} diff --git a/static/css/txt/baisano.css b/static/css/txt/baisano.css index 352bfb2..6547b96 100644 --- a/static/css/txt/baisano.css +++ b/static/css/txt/baisano.css @@ -26,7 +26,7 @@ a.thumb{margin-top:4px} .yt{background:#DDD;border:1px solid #AAA} .deleted{color:#AFAFAF;margin-bottom:24px} #q-p{background:#EFEFEF;border:1px solid #999} -#q-p .msg,#q-p a.thumb{margin-bottom:8px} +#q-p .reply{margin-bottom:8px} #createbox{display:flex} #createbox .extrabox{border:1px inset #FFF;margin:7px 0 7px 7px;float:left;width:40px;height:auto;flex:0 1 40px;-webkit-flex:0 1 40px} #createbox .innerbox{flex:0 1 100%;-webkit-flex:0 1 100%} diff --git a/static/css/txt/bbs.css b/static/css/txt/bbs.css index e10ec50..19d0dba 100644 --- a/static/css/txt/bbs.css +++ b/static/css/txt/bbs.css @@ -70,7 +70,7 @@ form .msg{margin:0;padding:8px 2px;text-align:left} #content.list .row div.thread{padding:0}#content.list .row div.thread a{padding:5px} #content.list .pos,#content.list .com{text-align:right} #content.list #header div{font-weight:bold;text-align:center;white-space:nowrap} -#content.grid,#threadlist{display:-webkit-flex;display:-moz-flex;display:flex;-webkit-flex-flow:row wrap;-moz-flex-flow:row wrap;flex-flow:row wrap;justify-content:space-around} +#content.grid,#threadlist{display:-webkit-flex;display:-moz-flex;display:flex;-webkit-flex-flow:row wrap;-moz-flex-flow:row wrap;flex-flow:row wrap} #content.grid .row,#threadlist a{-webkit-flex:1 1 auto;-moz-flex:1 1 auto;flex:1 1 auto;padding:4px} #content.grid .row div{display:inline} @media(max-width:720px){ diff --git a/static/css/txt/bios.css b/static/css/txt/bios.css index b77f12e..1f19e25 100644 --- a/static/css/txt/bios.css +++ b/static/css/txt/bios.css @@ -34,7 +34,7 @@ h3 span{background:#00a;color:#FFF;padding:2px} .yt{border:1px solid #ff0} .yt:active{background:#f00;border:1px solid #f00;color:#FFF} #q-p{background:#00a;border:1px solid #FFF} -#q-p .msg,#q-p a.thumb{margin-bottom:8px} +#q-p .reply{border:0;padding:0} .lastposts{border-color:#FFF;border-style:double;border-width:0 4px;color:#00a;padding:.5em} .mainpage .threadlinks{margin-top:.75em} .threadpage .threadlinks{margin-top:0} diff --git a/static/css/txt/cuteanarchy.css b/static/css/txt/cuteanarchy.css index 8a9d9e1..9715342 100644 --- a/static/css/txt/cuteanarchy.css +++ b/static/css/txt/cuteanarchy.css @@ -1,302 +1,295 @@ /* 　　　　　　　　　 ､-'''"´￣￣｀"''''(´・ω・`) 　　　　　　　　／ 　　　　　　 　　　 と､　　） -　　　　　　　/　　　● ,,.　　.,, ●　　 （_ノ CuteAnarchy Redo 29/03/19 -　　 　 　 　 | 　　　　 （__人__）　　　　　｜ By Renard +　　　　　　　/　　　● ,,.　　.,, ●　　 （_ノ CuteAnarchy Redo 29/03/19 +　　 　 　 　 | 　　　　 （__人__）　　　　　｜ By Renard 　　　　　　　''-､､,,,,,,__＿＿＿＿,,,,,,､､-'´ */ body { - background: #ffd9c6; - color: #CED1CF + background:#ffd9c6; + color: #CED1CF } body.mainpage { - background-image: url('/static/css/img/shobon.png'); - background-repeat: no-repeat; - background-attachment: fixed; - background-position-x: calc(100%); - background-position-y: bottom; + background:#ffd9c6 url('/static/css/img/shobon.png') no-repeat fixed right bottom; } body.threadpage { - - background: #ffe8dc; - color: #5d475a; + background: #ffe8dc; + color: #5d475a; } h4 { - color: #ad9ecc; + color: #ad9ecc; } .msg a { - color: #827699; + color: #827699; } a:hover, a:focus, -#n2:active { - text-decoration: none; - color: #edc1e8; +#n2:hover { + text-decoration: none; + color: #edc1e8; } hr { - border: 1px inset #f4daf1 + border: 1px inset #f4daf1 } input[type="text"], input[type="submit"], input[type="button"], textarea { - background: #e2ffeb; - border: 1px solid #b4ccbc; - color: #5d475a + background: #e2ffeb; + border: 1px solid #b4ccbc; + color: #5d475a } input[type="submit"], input[type="button"] { - background: #e2ffeb; - padding: 2px 10px; - color: #5d475a; + background: #e2ffeb; + padding: 1px 9px; + color: #5d475a; } input[type="submit"]:active, input[type="button"]:active { - background: #f2d3df + background: #f2d3df } .threadlinks { - font-size: small; - text-align: center; - margin-top: 0.5em; + font-size: small; + text-align: center; + margin-top: 0.5em; } h1 { - color: #dc9656; - font-size: 26px; - margin-top: -5px; - text-align: center + color: #dc9656; + font-size: 26px; + margin-top: -5px; + text-align: center } h2 a { - color: #e9b2e3; + color: #e9b2e3; } h2 small { - color: #999; - font-size: inherit; - font-weight: normal + color: #999; + font-size: inherit; + font-weight: normal } h3 { - color: #ab4642 + color: #ab4642 } h3 span { - color: #999 + color: #999 } #main_nav { - background: #000; - color: #7cafc2 + background: #000; + color: #7cafc2; + z-index: 9; } .banner { - -webkit-filter: grayscale(60%); - filter: grayscale(60%) + -webkit-filter: grayscale(60%); + filter: grayscale(60%) } .outerbox { - margin: 0 auto; - margin-top: 1em; - margin-bottom: 1em; - max-width: 1000px; - background: #ffeae0; - border: 1px solid #ffa67a; - color: #777879 + margin: 1em auto; + max-width: 1000px; + background: #ffeae0; + border: 1px solid #ffa67a; + color: #777879 } #titlebox .threadnav { - margin: -6px + margin: -6px } #threadlist { - background: #ffd9c6; - border: 1px solid #ffb793 + background: #ffd9c6; + border: 1px solid #ffb793 } #threadlist a { - color: #d1a0cc; + border-right:1px solid #ffb793; + border-bottom:1px solid #ffb793; + color: #d1a0cc; } .mainpage .thread, #content { - margin: 0 auto; - margin-bottom: 2em; - background: #ffebe2; - border: 5px double #FFFFFF; - color: #5d475a; - max-width: 1000px; - box-shadow: #000 5px; - -webkit-box-shadow: 7px 7px 0px 0px rgba(204, 188, 180, 1); - -moz-box-shadow: 7px 7px 0px 0px rgba(204, 188, 180, 1); - box-shadow: 7px 7px 0px 0px rgba(204, 188, 180, 1); + margin: 0 auto 2em; + background: #ffebe2; + border: 5px double #FFF; + color: #5d475a; + max-width: 1000px; + box-shadow: #000 5px; + -webkit-box-shadow: 7px 7px 0px 0px rgba(204, 188, 180, 1); + -moz-box-shadow: 7px 7px 0px 0px rgba(204, 188, 180, 1); + box-shadow: 7px 7px 0px 0px rgba(204, 188, 180, 1); } .reply { - margin-bottom: 1em; + margin-bottom: 24px; } .threadpage .thread { - color: #5d475a + color: #5d475a } a, a .name, #n2 { - color: #e39edc; - text-decoration: none + color: #e39edc; + text-decoration: none } .name { - color: #7ca380; - font-weight: bold; - text-shadow: 2px 0px 11px #ffd7c6; - background: url('/static/css/img/bg1.gif'); + color: #7ca380; + text-shadow: 2px 0 11px #ffd7c6; + background-image: url('/static/css/img/bg1.gif'); } .name, .abbrev { - color: #e9b2c8 + color: #e9b2c8 } .name em { - color: #88f + color: #88f } .del a { - color: #ab4642 + color: #ab4642 } h4 .date { - font-size: small; - font-family: 'Courier New', Courier, monospace; + font-size: small; + font-family: 'Courier New', Courier, monospace; + vertical-align: middle; } h4 .date, .quoted { - color: #4e4e4e; + color: #4e4e4e; } .msg { - margin: 4px 40px 24px + margin: 4px 40px 0 } a.thumb { - margin-top: 4px + margin-top: 4px } .q { - color: #666 + color: #666 } .yt { - background: #ffe2e8; - border: 1px solid gray; - color: #998d87 + background: #ffe2e8; + border: 1px solid gray; + color: #998d87 } .yt:hover { - text-decoration: none + text-decoration: none } .deleted { - color: #999; - margin-bottom: 12px + color: #999; + margin-bottom: 12px } #q-p { - /*border: 1px solid #999*/ - background: #ffd9c6; - border: 1px solid #efc9d8; - border-radius: 3px; - color: #66564f; + /*border: 1px solid #999*/ + background: #ffd9c6; + border: 1px solid #efc9d8; + border-radius: 3px; + color: #66564f; } #q-p .msg, #q-p a.thumb { - margin-bottom: 8px + margin-bottom: 8px } .lastposts #n2 { - text-decoration: none + text-decoration: none } #size { - color: #e9b2c8 + color: #e9b2c8 } .end { - font-size: small; - font-family: monospace; + font-size: small; + font-family: monospace; } form .msg { - background: #383838; - border: 1px dotted #000 + background: #383838; + border: 1px dotted #000 } - .postform { - margin: 0 auto; - margin-left: 3em; + margin: 0 auto; + margin-left: 3em; } .mainpage .postform, .formpad { - padding-left: 0px !important; + padding-left: 0px; } .formpad { - margin: 0 auto; - padding-left: 0; - margin-top: 0.25em; + margin: 0 auto; + padding-left: 0; + margin-top: 0.25em; } #footer { - color: #FFF6C6 + color: #FFF6C6 } #footer::after { - content: "ヽ(*・ω・)ﾉ"; + content: "ヽ(*・ω・)ﾉ"; } .threads h1 { - text-align: left + text-align: left } #content.list #header div { - background: #111213 + background: #111213 } #content.list .row:nth-child(odd), #content.grid .row:hover { - background: #191B1D + background: #191B1D } #content.grid { - border: 1px solid #4B4E55; - padding: 1px + border: 1px solid #4B4E55; + padding: 1px } #content.grid .row { - border: 1px solid #4B4E55; - margin: 1px + border: 1px solid #4B4E55; + margin: 1px } @media(max-width:720px) { - .msg { - margin: 2px 8px 16px - } + h1 {font-size:18px} + .postform {margin-left:0} } \ No newline at end of file -- cgit v1.2.1-18-gbd029 From c34a0f2cd1d4b8008b17d55144a6b2bb6b008f27 Mon Sep 17 00:00:00 2001 From: TDavis Date: Fri, 29 Mar 2019 16:26:58 -0300 Subject: fix 2 --- static/css/txt/amber.css | 2 +- static/css/txt/ciber.css | 2 +- static/css/txt/cuteanarchy.css | 222 ++++++++++++++++++++--------------------- static/css/txt/futanari.css | 2 +- static/css/txt/ventanas.css | 4 +- 5 files changed, 116 insertions(+), 116 deletions(-) diff --git a/static/css/txt/amber.css b/static/css/txt/amber.css index d45a28d..62fe9de 100644 --- a/static/css/txt/amber.css +++ b/static/css/txt/amber.css @@ -29,7 +29,7 @@ input[type=submit]:active,input[type=button]:active,button:active{background:#f9 .formpad{padding:0} form .msg{border:1px dotted #f9690e;background:#000;color:#f9690e} #q-p{border:1px solid #000;padding:0} -#q-p .reply{border:3px double #f9690e} +#q-p .reply{border:3px double #f9690e;margin:0;padding-bottom:1em} #q-p .reply h4{padding:0 1px} #footer a{color:#f9690e} #content{border:3px double #f9690e} diff --git a/static/css/txt/ciber.css b/static/css/txt/ciber.css index 0563fd5..be5fada 100644 --- a/static/css/txt/ciber.css +++ b/static/css/txt/ciber.css @@ -38,7 +38,7 @@ input:active,input:focus,textarea:active,textarea:focus,button:active,button:act .formpad{padding:0} form .msg{border:1px dotted #2A4A75;color:#2A4A75} #q-p{border:1px solid #000;padding:0} -#q-p .reply{border:3px double #2A4A75} +#q-p .reply{border:3px double #2A4A75;margin:0;padding-bottom:1em} #q-p .reply h4{padding:1px} #footer{color:#0C0;text-shadow:0 0 5px #0F0} #footer a{color:#989898} diff --git a/static/css/txt/cuteanarchy.css b/static/css/txt/cuteanarchy.css index 9715342..1e93539 100644 --- a/static/css/txt/cuteanarchy.css +++ b/static/css/txt/cuteanarchy.css @@ -1,295 +1,295 @@ /* 　　　　　　　　　 ､-'''"´￣￣｀"''''(´・ω・`) 　　　　　　　　／ 　　　　　　 　　　 と､　　） -　　　　　　　/　　　● ,,.　　.,, ●　　 （_ノ CuteAnarchy Redo 29/03/19 -　　 　 　 　 | 　　　　 （__人__）　　　　　｜ By Renard +　　　　　　　/　　　● ,,.　　.,, ●　　 （_ノ CuteAnarchy Redo 29/03/19 +　　 　 　 　 | 　　　　 （__人__）　　　　　｜ By Renard 　　　　　　　''-､､,,,,,,__＿＿＿＿,,,,,,､､-'´ */ body { - background:#ffd9c6; - color: #CED1CF + background:#ffd9c6; + color: #CED1CF } body.mainpage { - background:#ffd9c6 url('/static/css/img/shobon.png') no-repeat fixed right bottom; + background:#ffd9c6 url('/static/css/img/shobon.png') no-repeat fixed right bottom; } body.threadpage { - background: #ffe8dc; - color: #5d475a; + background: #ffe8dc; + color: #5d475a; } h4 { - color: #ad9ecc; + color: #ad9ecc; } .msg a { - color: #827699; + color: #827699; } a:hover, a:focus, #n2:hover { - text-decoration: none; - color: #edc1e8; + text-decoration: none; + color: #edc1e8; } hr { - border: 1px inset #f4daf1 + border: 1px inset #f4daf1 } input[type="text"], input[type="submit"], input[type="button"], textarea { - background: #e2ffeb; - border: 1px solid #b4ccbc; - color: #5d475a + background: #e2ffeb; + border: 1px solid #b4ccbc; + color: #5d475a } input[type="submit"], input[type="button"] { - background: #e2ffeb; - padding: 1px 9px; - color: #5d475a; + background: #e2ffeb; + padding: 1px 9px; + color: #5d475a; } input[type="submit"]:active, input[type="button"]:active { - background: #f2d3df + background: #f2d3df } .threadlinks { - font-size: small; - text-align: center; - margin-top: 0.5em; + font-size: small; + text-align: center; + margin-top: 0.5em; } h1 { - color: #dc9656; - font-size: 26px; - margin-top: -5px; - text-align: center + color: #dc9656; + font-size: 26px; + margin-top: -5px; + text-align: center } h2 a { - color: #e9b2e3; + color: #e9b2e3; } h2 small { - color: #999; - font-size: inherit; - font-weight: normal + color: #999; + font-size: inherit; + font-weight: normal } h3 { - color: #ab4642 + color: #ab4642 } h3 span { - color: #999 + color: #999 } #main_nav { - background: #000; - color: #7cafc2; - z-index: 9; + background: #000; + color: #7cafc2; + z-index: 9; } .banner { - -webkit-filter: grayscale(60%); - filter: grayscale(60%) + -webkit-filter: grayscale(60%); + filter: grayscale(60%) } .outerbox { - margin: 1em auto; - max-width: 1000px; - background: #ffeae0; - border: 1px solid #ffa67a; - color: #777879 + margin: 1em auto; + max-width: 1000px; + background: #ffeae0; + border: 1px solid #ffa67a; + color: #777879 } #titlebox .threadnav { - margin: -6px + margin: -6px } #threadlist { - background: #ffd9c6; - border: 1px solid #ffb793 + background: #ffd9c6; + border: 1px solid #ffb793 } #threadlist a { - border-right:1px solid #ffb793; - border-bottom:1px solid #ffb793; - color: #d1a0cc; + border-right:1px solid #ffb793; + border-bottom:1px solid #ffb793; + color: #d1a0cc; } .mainpage .thread, #content { - margin: 0 auto 2em; - background: #ffebe2; - border: 5px double #FFF; - color: #5d475a; - max-width: 1000px; - box-shadow: #000 5px; - -webkit-box-shadow: 7px 7px 0px 0px rgba(204, 188, 180, 1); - -moz-box-shadow: 7px 7px 0px 0px rgba(204, 188, 180, 1); - box-shadow: 7px 7px 0px 0px rgba(204, 188, 180, 1); + margin: 0 auto 2em; + background: #ffebe2; + border: 5px double #FFF; + color: #5d475a; + max-width: 1000px; + box-shadow: #000 5px; + -webkit-box-shadow: 7px 7px 0px 0px rgba(204, 188, 180, 1); + -moz-box-shadow: 7px 7px 0px 0px rgba(204, 188, 180, 1); + box-shadow: 7px 7px 0px 0px rgba(204, 188, 180, 1); } .reply { - margin-bottom: 24px; + margin-bottom: 24px; } .threadpage .thread { - color: #5d475a + color: #5d475a } a, a .name, #n2 { - color: #e39edc; - text-decoration: none + color: #e39edc; + text-decoration: none } .name { - color: #7ca380; - text-shadow: 2px 0 11px #ffd7c6; - background-image: url('/static/css/img/bg1.gif'); + color: #7ca380; + text-shadow: 2px 0 11px #ffd7c6; + background-image: url('/static/css/img/bg1.gif'); } .name, .abbrev { - color: #e9b2c8 + color: #e9b2c8 } .name em { - color: #88f + color: #88f } .del a { - color: #ab4642 + color: #ab4642 } h4 .date { - font-size: small; - font-family: 'Courier New', Courier, monospace; - vertical-align: middle; + font-size: small; + font-family: 'Courier New', Courier, monospace; + vertical-align: middle; } h4 .date, .quoted { - color: #4e4e4e; + color: #4e4e4e; } .msg { - margin: 4px 40px 0 + margin: 4px 40px 0 } a.thumb { - margin-top: 4px + margin-top: 4px } .q { - color: #666 + color: #666 } .yt { - background: #ffe2e8; - border: 1px solid gray; - color: #998d87 + background: #ffe2e8; + border: 1px solid gray; + color: #998d87 } .yt:hover { - text-decoration: none + text-decoration: none } .deleted { - color: #999; - margin-bottom: 12px + color: #999; + margin-bottom: 12px } #q-p { - /*border: 1px solid #999*/ - background: #ffd9c6; - border: 1px solid #efc9d8; - border-radius: 3px; - color: #66564f; + /*border: 1px solid #999*/ + background: #ffd9c6; + border: 1px solid #efc9d8; + border-radius: 3px; + color: #66564f; } -#q-p .msg, -#q-p a.thumb { - margin-bottom: 8px +#q-p .reply { + margin: 0; + padding-bottom:1em } .lastposts #n2 { - text-decoration: none + text-decoration: none } #size { - color: #e9b2c8 + color: #e9b2c8 } .end { - font-size: small; - font-family: monospace; + font-size: small; + font-family: monospace; } form .msg { - background: #383838; - border: 1px dotted #000 + background: #383838; + border: 1px dotted #000 } .postform { - margin: 0 auto; - margin-left: 3em; + margin: 0 auto; + margin-left: 3em; } .mainpage .postform, .formpad { - padding-left: 0px; + padding-left: 0px; } .formpad { - margin: 0 auto; - padding-left: 0; - margin-top: 0.25em; + margin: 0 auto; + padding-left: 0; + margin-top: 0.25em; } #footer { - color: #FFF6C6 + color: #FFF6C6 } #footer::after { - content: "ヽ(*・ω・)ﾉ"; + content: "ヽ(*・ω・)ﾉ"; } .threads h1 { - text-align: left + text-align: left } #content.list #header div { - background: #111213 + background: #111213 } #content.list .row:nth-child(odd), #content.grid .row:hover { - background: #191B1D + background: #191B1D } #content.grid { - border: 1px solid #4B4E55; - padding: 1px + border: 1px solid #4B4E55; + padding: 1px } #content.grid .row { - border: 1px solid #4B4E55; - margin: 1px + border: 1px solid #4B4E55; + margin: 1px } @media(max-width:720px) { - h1 {font-size:18px} - .postform {margin-left:0} + h1 {font-size:18px} + .postform {margin-left:0} } \ No newline at end of file diff --git a/static/css/txt/futanari.css b/static/css/txt/futanari.css index 553d48f..63f62d2 100644 --- a/static/css/txt/futanari.css +++ b/static/css/txt/futanari.css @@ -36,7 +36,7 @@ input[type="submit"]:active,input[type="button"]:active,button:active{background .threadpage .threadlinks{margin:0 0 3px} form .msg{border:1px dashed #000;background:#1b3345} #q-p{background:#1b3345;border:1px solid #3b6b94} -#q-p .msg,#q-p a.thumb{margin-bottom:8px} +#q-p .reply{margin-bottom:1em} .lastposts{background:#5b8bb4;padding:8px} #content{padding:0 10px 10px} #content.list #header div{background:#3b6b94} diff --git a/static/css/txt/ventanas.css b/static/css/txt/ventanas.css index 2528918..6f7ea7a 100644 --- a/static/css/txt/ventanas.css +++ b/static/css/txt/ventanas.css @@ -36,8 +36,8 @@ input[type=text],textarea,.innerbox,#content,#threadlist{border-width:2px;border .yt{background:#FFF;border:1px inset #aaa;color:#000} .deleted{color:gray;margin-bottom:.5em;padding-top:.5em} #q-p{box-shadow:5px 5px #000;padding:0} -#q-p .reply{padding:.5em;margin-bottom:0} -#q-p a.thumb,#q-p .msg{margin-bottom:.5em} +#q-p .reply{padding:.5em;margin-bottom:.5em} +#q-p .reply:first-child h4{border:0;padding:0} .postform,.formpad{padding:0} form .msg{background:#FFFFE0;border:1px solid #000} #footer{color:#FFF} -- cgit v1.2.1-18-gbd029 From b12304fe60d5b2623e8218e8316977fdb55c1392 Mon Sep 17 00:00:00 2001 From: Renard Date: Fri, 29 Mar 2019 20:53:44 -0300 Subject: Nueva plantilla de acceso prohibido --- cgi/templates/banned.html | 108 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 80 insertions(+), 28 deletions(-) diff --git a/cgi/templates/banned.html b/cgi/templates/banned.html index 23b6636..72f2abe 100644 --- a/cgi/templates/banned.html +++ b/cgi/templates/banned.html @@ -1,34 +1,86 @@ - + + -Acceso prohibido@B.a.I. - - + Acceso prohibido@B.a.I. + + + -

Mensaje de Bienvenido a Internet BBS/IB

-

Se te ha prohibido el acceso :-(

-

¡Tu IP (o rango) ha sido bloqueado!

- -

La razón dejada fue: #{reason} y tu ban fue puesto el #{added} para las siguientes secciones: #{boards_str}

- -

No sabemos qué es lo que pudo causar tu ban, ¿qué hiciste?

-

Tu ban fue puesto el #{added} para las siguientes secciones: #{boards_str}

- - -

Pero no te preocupes, se te concederá nuevamente el acceso en la siguiente fecha y hora: #{expire}.

- -

Si tu expulsión fue puesta incorrectamente no dudes en contactarnos dando tu IP, razón y explicación de los hechos.

-

¡Gracias por usar Bienvenido a Internet BBS/IB!

-
-

En muchos casos a pesar de que hayas sido expulsado del sitio se concede el acceso a las secciones Meta y Anarkía. Bajo cualquier consulta o reclamo contáctanos.

-
-
Bienvenido a Internet 2010-2018
+
+
ERROR: Se te ha prohibido el acceso
+
Lo sentimos, tu IP (#{ip}) o red están en lista negra. + +
+

Si tu expulsión fue puesta incorrectamente no dudes en contáctanos dando tu IP, razón y explicación de los + hechos. +

+

P.S: En muchos casos a pesar de que hayas sido expulsado del sitio se concede el acceso a la sección Meta

+

¡Gracias por usar Bienvenido a Internet BBS/IB!

+
+
+ \ No newline at end of file -- cgit v1.2.1-18-gbd029 From 906800a6462237178e0872c55f8c22d27267ea6e Mon Sep 17 00:00:00 2001 From: TDavis Date: Sat, 30 Mar 2019 00:53:47 -0300 Subject: Mover hilos fix Mover hilos fix 2 Mover hilos fix INTENTO 3 Mover hilos fix 4 Test 1 Mover hilos fix 4 Test 2 Mover hilos fix 4 Test 3 Mover hilos fix 4 Test 4 Mover hilos fix 4 Test 5 Mover hilos fix 4 Test 6 Mover hilos fix 4 Test 7 Mover hilos fix 4 Test 8 Mover hilos fix 4 Test 9 Arreglando función para mover hilos y función para buscar posts por IP --- cgi/formatting.py | 12 ++++-------- cgi/manage.py | 49 +++++++++++++++++++++++++++++++++-------------- cgi/templates/banned.html | 30 ++++++++++------------------- 3 files changed, 49 insertions(+), 42 deletions(-) diff --git a/cgi/formatting.py b/cgi/formatting.py index d21bee2..6b2d8bc 100644 --- a/cgi/formatting.py +++ b/cgi/formatting.py @@ -121,11 +121,8 @@ def iphash(ip, post, t, useid, mobile, agent, cap_id, hide_end, has_countrycode) id = '???' else: day = int((current_t + (Settings.TIME_ZONE*3600)) / 86400) - word = ',' + str(day) - - # Make difference by thread - word += ',' + str(t) - + word = ',' + str(day) # IDs change every 24 hours + word += ',' + str(t) # IDs vary depending on thread id = hide_data(ip + word, 6, "id", Settings.SECRET) if hide_end: @@ -164,9 +161,8 @@ def iphash(ip, post, t, useid, mobile, agent, cap_id, hide_end, has_countrycode) if addressIsBanned(ip, ""): id += '#' - if (not has_countrycode and - not addressIsTor(ip) and - (addressIsProxy(ip) or not addressIsES(ip))): + elif (not has_countrycode and not addressIsTor(ip) and + (addressIsProxy(ip) or not addressIsES(ip))): id += '!' return id diff --git a/cgi/manage.py b/cgi/manage.py index 44731ba..71ed647 100644 --- a/cgi/manage.py +++ b/cgi/manage.py @@ -421,6 +421,7 @@ def manage(self, path_split): board = setBoard(oldboardid) oldboard = board['dir'] oldboardsubject = board['subject'] + oldboardname = board['anonymous'] # get old posts posts = FetchAll("SELECT * FROM `posts` WHERE (`id` = {0} OR `parentid` = {0}) AND `boardid` = {1} ORDER BY id ASC".format(oldthread, board['id'])) @@ -460,17 +461,30 @@ def manage(self, path_split): moved_thumbs.append(post['thumb']) if is_op: moved_cats.append(post['thumb']) - + # fix subject if necessary if post['subject'] and post['subject'] == oldboardsubject: post['subject'] = board['subject'] - + + # fix new default name + if post['name'] == oldboardname: + post['name'] = board['anonymous'] + + # fix date and (re)add post ID if necessary + post['timestamp_formatted'] = formatTimestamp(post['timestamp']) + if board["useid"] != '0': + if post["parentid"]: + tym = parent_time + else: + tym = post["timestamp"] + post['timestamp_formatted'] += ' ID:' + iphash(inet_ntoa(long(post['ip'])), post, tym, board["useid"], False, '', False, False, (board["countrycode"] in ['1', '2'])) + # insert new post and get its new ID new_id = post.insert() - + # save the reference (BBS = post number, IB = new ID) refs[old_id] = num if board['board_type'] == '1' else new_id - + # this was an OP message += "newthread = %s parentid = %s
" % (newthreadid, p['parentid']) if is_op: @@ -480,6 +494,7 @@ def manage(self, path_split): # BBS = new thread timestamp, IB = new thread ID newthread = post['timestamp'] if board['board_type'] == '1' else new_id + parent_time = post['timestamp'] # log it message += "%s -> %s
" % (old_id, new_id) @@ -523,6 +538,7 @@ def manage(self, path_split): # insert notice message if 'msg' in self.formdata: + leavemsg = True board = setBoard(oldboard) if board['board_type'] == '1': @@ -540,11 +556,13 @@ def manage(self, path_split): notice_post["timestamp_formatted"] = "Hilo movido" notice_post["bumped"] = oldbumped notice_post.insert() + regenerateFrontPages() + regenerateThreadPage(oldthread) - # regenerate + # regenerate again (fix?) + board = setBoard(newboardid) regenerateFrontPages() regenerateThreadPage(newthreadid) - regenerateThreadPage(oldthread) message += "done" @@ -1181,13 +1199,13 @@ def manage(self, path_split): posts = FetchAll('SELECT * FROM `posts` WHERE `boardid` = %s' % board['id']) self.output = "total: %d
" % len(posts) for post in posts: - new_timestamp_formatted = formatTimestamp(post['timestamp']) - tim = 0 - if board["useid"] != '0': - new_timestamp_formatted += ' ID:' + iphash(post['ip'], '', tim, '1', False, False, False, '0') - self.output += "%s - %s
" % (post['id'], new_timestamp_formatted) - query = "UPDATE `posts` SET timestamp_formatted = '%s' WHERE boardid = '%s' AND id = '%s'" % (new_timestamp_formatted, board['id'], post['id']) - UpdateDb(query) + new_timestamp_formatted = formatTimestamp(post['timestamp']) + tim = 0 + if board["useid"] != '0': + new_timestamp_formatted += ' ID:' + iphash(post['ip'], '', tim, '1', False, False, False, '0') + self.output += "%s - %s
" % (post['id'], new_timestamp_formatted) + query = "UPDATE `posts` SET timestamp_formatted = '%s' WHERE boardid = '%s' AND id = '%s'" % (new_timestamp_formatted, board['id'], post['id']) + UpdateDb(query) return elif path_split[2] == 'fixname': board = setBoard(path_split[3]) @@ -1686,7 +1704,10 @@ def manage(self, path_split): if self.formdata['ip'] != '': formatted_ip = str(inet_aton(self.formdata['ip'])) posts = FetchAll("SELECT posts.*, boards.dir, boards.board_type, boards.subject AS default_subject FROM `posts` JOIN `boards` ON boards.id = posts.boardid WHERE ip = '%s' ORDER BY posts.timestamp DESC" % _mysql.escape_string(formatted_ip)) - ip = self.formdata['ip'] + if '.' in self.formdata['ip']: + ip = self.formdata['ip'] + else: + ip = inet_ntoa(long(self.formdata['ip'])) template_filename = "ipshow.html" template_values = {"mode": 1, "ip": ip, "host": getHost(ip), "country": getCountry(ip), "tor": addressIsTor(ip), "posts": posts} logAction(staff_account['username'], "ipshow on {}".format(ip)) diff --git a/cgi/templates/banned.html b/cgi/templates/banned.html index 72f2abe..f63dd41 100644 --- a/cgi/templates/banned.html +++ b/cgi/templates/banned.html @@ -3,14 +3,11 @@ - Acceso prohibido@B.a.I. + Acceso prohibido@Bienvenido a Internet + @@ -77,8 +67,8 @@ href="mailto:burocracia@bienvenidoainternet.org">contáctanos dando tu IP, razón y explicación de los hechos.

-

P.S: En muchos casos a pesar de que hayas sido expulsado del sitio se concede el acceso a la sección Meta

-

¡Gracias por usar Bienvenido a Internet BBS/IB!

+

P.S: En muchos casos a pesar de que hayas sido expulsado del sitio se concede el acceso a la sección Meta

+

¡Gracias por usar Bienvenido a Internet BBS/IB!

-- cgit v1.2.1-18-gbd029