rollback the rollback (#1554)
* rollback the rollback * fix classic.css padding * remove </img> tag * Update torrents.jet.html * Fix html tag * fix footer & ad showing over the TOS * move setting & add it's explanation * Update en-us.all.json * include nav in listing directly instead of refine * Update search.jet.html * remove now useless css rules * Update main.css * Update base.jet.html * exclude old navigation cookie from deletion * add torrent uploaded total size to user profile
Cette révision appartient à :
kilo
GitHub
Parent
9f36485b1e
révision
65772d8654
12 fichiers modifiés avec 81 ajouts et 86 suppressions
|
|
@ -64,7 +64,7 @@ th.tr-name a {
|
|||
text-align: right;
|
||||
}
|
||||
.tr-links .icon-magnet::before {
|
||||
margin-right: 2px;
|
||||
margin-right: 2px;
|
||||
}
|
||||
.tr-links a {
|
||||
display: block;
|
||||
|
|
@ -75,7 +75,7 @@ th.tr-name a {
|
|||
|
||||
.comment-count {
|
||||
display: inline!important;
|
||||
font-weight: bold;
|
||||
font-weight: bold;
|
||||
}
|
||||
.tr-cs a{
|
||||
display: none;
|
||||
|
|
@ -195,45 +195,45 @@ select.form-input {
|
|||
color: #FBFBFB;
|
||||
}
|
||||
.website-nav .pagination p {
|
||||
display: none;
|
||||
display: none;
|
||||
}
|
||||
.website-nav {
|
||||
padding-bottom: 4px!important;
|
||||
padding-bottom: 4px!important;
|
||||
padding-top: 4px!important;
|
||||
}
|
||||
.website-nav .pagination {
|
||||
padding: .5rem;
|
||||
font-size: 1em;
|
||||
padding: .5rem;
|
||||
font-size: 1em;
|
||||
}
|
||||
.website-nav .pagination a {
|
||||
display: inline!important;
|
||||
display: inline!important;
|
||||
}
|
||||
.website-nav .pagination span {
|
||||
min-width: auto;
|
||||
min-width: auto;
|
||||
}
|
||||
.website-nav #page-prev{
|
||||
float: left;
|
||||
float: left;
|
||||
}
|
||||
.website-nav #page-next{
|
||||
float: right;
|
||||
float: right;
|
||||
}
|
||||
|
||||
#description-box code {
|
||||
font-size: 1.3em;
|
||||
font-size: 1.3em;
|
||||
}
|
||||
|
||||
.user-form input[type="text"],.user-form input[type="email"],.user-form input[type="password"] {
|
||||
width: 173px;
|
||||
width: 173px;
|
||||
|
||||
}
|
||||
.user-form input.form-control {
|
||||
width: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
.user-form h2 {
|
||||
font-size: 0.9em;
|
||||
font-size: 0.9em;
|
||||
}
|
||||
.user-form .input-label {
|
||||
font-size: 1em;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
.results.box {
|
||||
|
|
@ -255,23 +255,23 @@ select.form-input {
|
|||
}
|
||||
|
||||
span.comment-index+p {
|
||||
margin-top: 0;
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
span.comment-index+p a {
|
||||
font-weight: bold;
|
||||
font-weight: bold;
|
||||
padding-top: 2px;
|
||||
font-size: .9em;
|
||||
color: black;
|
||||
text-decoration: none;
|
||||
color: black;
|
||||
text-decoration: none;
|
||||
line-height: 22px;
|
||||
}
|
||||
span.comment-index+p a:hover {
|
||||
text-decoration: underline;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.comment-index {
|
||||
margin: 3px 0 0 0;
|
||||
margin: 3px 0 0 0;
|
||||
}
|
||||
|
||||
#solution {
|
||||
|
|
@ -279,29 +279,29 @@ span.comment-index+p a:hover {
|
|||
}
|
||||
|
||||
.comment-index a::before {
|
||||
content: '';
|
||||
content: '';
|
||||
}
|
||||
.comment-index a {
|
||||
font-weight: bold;
|
||||
color: black;
|
||||
font-weight: bold;
|
||||
color: black;
|
||||
float: right;
|
||||
margin-left: 9px;
|
||||
}
|
||||
.comment-index a:hover {
|
||||
color: #44A0A0;
|
||||
color: #44A0A0;
|
||||
}
|
||||
|
||||
|
||||
.comment-submit {
|
||||
border: none;
|
||||
background: none;
|
||||
border: none;
|
||||
background: none;
|
||||
margin-top: 15px!important;
|
||||
}
|
||||
.comment-submit .comment-form {
|
||||
margin: 0;
|
||||
margin: 0;
|
||||
}
|
||||
.comment-form h3 {
|
||||
margin-top: 20px;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.comment-submit textarea{
|
||||
|
|
@ -334,11 +334,11 @@ span.comment-index+p a:hover {
|
|||
font-style: italic;
|
||||
}
|
||||
.torrent-info-data.uploader-link a, .torrent-info-data.uploader-anon a{
|
||||
color: green;
|
||||
color: green;
|
||||
}
|
||||
|
||||
#torrent-description-hr {
|
||||
margin-top: 40px;
|
||||
margin-top: 40px;
|
||||
}
|
||||
|
||||
.comment-submit h3 {
|
||||
|
|
@ -389,18 +389,18 @@ span.comment-index+p a:hover {
|
|||
text-decoration: none;
|
||||
}
|
||||
.torrent-buttons div {
|
||||
margin-right: 0!important;
|
||||
margin-right: 0!important;
|
||||
}
|
||||
.torrent-buttons [class*="icon-"]::before {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#comments {
|
||||
margin-bottom: 15px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
#no-comment-message {
|
||||
font-size: .9em;
|
||||
font-size: .9em;
|
||||
}
|
||||
|
||||
th, th a {
|
||||
|
|
@ -497,13 +497,9 @@ a.nav-btn.log-in {
|
|||
.box.refine {
|
||||
border-radius: 4px 4px 0 0;
|
||||
border-bottom: none;
|
||||
display:block!important;
|
||||
padding: 8px;
|
||||
padding-bottom: 11px;
|
||||
}
|
||||
.box.refine.refine-not-search {
|
||||
display: none!important;
|
||||
}
|
||||
|
||||
.refine h3 {
|
||||
display: none;
|
||||
|
|
@ -536,7 +532,7 @@ a.nav-btn.log-in {
|
|||
display: none!important;
|
||||
}
|
||||
.box.profile-panel {
|
||||
border-right: none;
|
||||
border-right: none;
|
||||
}
|
||||
.profile-panel .btn-green {
|
||||
min-height: 22px;
|
||||
|
|
|
|||
|
|
@ -644,7 +644,7 @@ textarea {
|
|||
text-align: center;
|
||||
padding: 1rem 0 1.2rem 0;
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.footer-opt {
|
||||
|
|
@ -1906,26 +1906,12 @@ span.tag {
|
|||
display: none;
|
||||
}
|
||||
|
||||
#ad-container {
|
||||
z-index: 4;
|
||||
position: relative;
|
||||
padding: 0 5%;
|
||||
max-height: 93px;
|
||||
overflow: hidden;
|
||||
display: block!important;
|
||||
}
|
||||
#ad-container * {
|
||||
width: 728px;
|
||||
iframe {
|
||||
max-width: 100%;
|
||||
width: 728px;
|
||||
height: 90px;
|
||||
border: none;
|
||||
overflow: hidden;
|
||||
display: block;
|
||||
}
|
||||
#ad-blocked {
|
||||
height: 62px;
|
||||
border: 1px solid;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
#admin-header {
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ parseAllDates()
|
|||
//called if no Commit cookie is set or if the website has a newer commit than the one in cookie
|
||||
function resetCookies() {
|
||||
var cookies = document.cookie.split(";")
|
||||
var excludedCookies = ["mascot", "theme", "theme2", "mascot_url", "lang", "csrf_token", "altColors", "EU_Cookie"]
|
||||
var excludedCookies = ["mascot", "theme", "theme2", "mascot_url", "lang", "csrf_token", "altColors", "EU_Cookie", "oldNav"]
|
||||
|
||||
//Remove all cookies but exclude those in the above array
|
||||
for (var i = 0; i < cookies.length; i++) {
|
||||
|
|
|
|||
|
|
@ -80,11 +80,9 @@
|
|||
{{end}}
|
||||
<div class="container pagination">
|
||||
{{ genNav(Navigation, URL, 15)|raw }}
|
||||
</div>
|
||||
<center class="container" id="ad-container">
|
||||
{{ adId = Sukebei() ? 634159 : 634157 }}
|
||||
<iframe data-aa='{{adId}}' src='//ad.a-ads.com/{{adId}}?size=728x90'></iframe>
|
||||
</center>
|
||||
</div>
|
||||
<footer id="footer">
|
||||
<div class="container footer center">
|
||||
<div class="footer-opt">
|
||||
|
|
|
|||
|
|
@ -12,10 +12,7 @@
|
|||
<button type="submit" class="form-input icon-search"></button><button type="submit" class="form-input refine" name="refine" value="1">{{ T("refine")}}</button>
|
||||
{{end}}
|
||||
{{block search_refine(url="") }}
|
||||
{{ if OldNav && (URL.String() == "/" || kilo_strcmp(URL.String(), "/search", 7, 1) )}}
|
||||
{{ include "layouts/partials/helpers/oldNav" }}
|
||||
{{ else }}
|
||||
<div {{ if !Search.ShowRefine }}style="display: none;"{{end}} class="box refine{{if URL.String() != "/" && !kilo_strcmp(URL.String(), "/search", 7, 1) }} refine-not-search{{end}}">
|
||||
<div {{ if !Search.ShowRefine }}style="display: none;"{{end}} class="box refine">
|
||||
<form method="GET" action="{{ url }}">
|
||||
<h3>{{ T("refine_search") }}</h3>
|
||||
<div>
|
||||
|
|
@ -102,4 +99,3 @@
|
|||
</form>
|
||||
</div>
|
||||
{{end}}
|
||||
{{end}}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,12 @@
|
|||
{{UserProfile.GetRole()}}
|
||||
</p>
|
||||
<p class="profile-usertitle-uploadcount">{{ T("torrents_uploaded") }}:<span>{{ NbTorrents }}</span></p>
|
||||
{{ TorrentUploadedSize := 0}}
|
||||
{{ range i, t := UserProfile.Torrents }}
|
||||
{{ torrent := t.ToJSON() }}
|
||||
{{ TorrentUploadedSize = TorrentUploadedSize + torrent.Filesize}}
|
||||
{{ end }}
|
||||
<p>{{ fileSize(TorrentUploadedSize, T)}} uploaded</p>
|
||||
</div>
|
||||
<!-- END SIDEBAR USER TITLE -->
|
||||
<!-- SIDEBAR BUTTONS -->
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@
|
|||
{{block title()}}{{ T("home")}}{{end}}
|
||||
{{block contclass()}}{{if User.HasAdmin() }}content-admin{{end}}{{end}}
|
||||
{{block content_body()}}
|
||||
{{ if OldNav }}
|
||||
{{ include "layouts/partials/helpers/oldNav" }}
|
||||
{{ end }}
|
||||
<!-- Contain the table within a grid, as for better sizing -->
|
||||
<div class="results box">
|
||||
<table>
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
{{ range _, language := Torrent.Languages}}
|
||||
{{ if language != "" }}
|
||||
<span {{ if len(Torrent.Languages) > 5 }}class="big"{{ end }}>
|
||||
<img src="/img/blank.gif" alt="{{ LanguageNameFromCode(language, T) }}" class="flag flag-{{ FlagCode(language) }}" title="{{ LanguageNameFromCode(language, T) }}"></img>
|
||||
<img src="/img/blank.gif" alt="{{ LanguageNameFromCode(language, T) }}" class="flag flag-{{ FlagCode(language) }}" title="{{ LanguageNameFromCode(language, T) }}">
|
||||
{{ LanguageNameFromCode(language, T) }}
|
||||
</span>
|
||||
{{end}}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,16 @@
|
|||
<option value="classic_colors"{{ if Theme == "classic_colors" }} selected{{end}}>Classic Colors</option>
|
||||
</select>
|
||||
</span>
|
||||
|
||||
<span class="form-group">
|
||||
<h3>{{ T("old_nav") }}</h3>
|
||||
<p>{{ T("old_nav_explanation") }}</p>
|
||||
<select id="oldNav-selector" name="oldNav" class="form-input">
|
||||
<option value="false">Disabled</option>
|
||||
<option value="true" {{if OldNav}}selected{{end}}>Enabled</option>
|
||||
</select>
|
||||
<br/>
|
||||
</span>
|
||||
|
||||
<span class="form-group">
|
||||
<h3>{{ T("mascot")}}</h3>
|
||||
|
|
@ -49,15 +59,6 @@
|
|||
</select>
|
||||
<br/>
|
||||
</span>
|
||||
|
||||
<span class="form-group">
|
||||
<h3>{{ T("old_nav") }}</h3>
|
||||
<select id="oldNav-selector" name="oldNav" class="form-input">
|
||||
<option value="false">Disabled</option>
|
||||
<option value="true" {{if OldNav}}selected{{end}}>Enabled</option>
|
||||
</select>
|
||||
<br/>
|
||||
</span>
|
||||
|
||||
<p>{{ T("cookies")}}</p>
|
||||
<button type="submit" class="form-input btn">{{ T("save_changes")}}</button>
|
||||
|
|
|
|||
|
|
@ -50,10 +50,9 @@
|
|||
<nav class="torrentNav" aria-label="Page navigation">
|
||||
<ul class="pagination">
|
||||
<a href="/search?userID={{ UserProfile.ID }}" aria-label="Next">
|
||||
<li>
|
||||
<span class="glyphicon glyphicon-add"></span>
|
||||
<span>
|
||||
{{ T("see_more_torrents_from", UserProfile.Username) }}
|
||||
</li>
|
||||
</span>
|
||||
</a>
|
||||
</ul>
|
||||
</nav>
|
||||
|
|
|
|||
|
|
@ -131,15 +131,20 @@ func genSortArrows(currentURL *url.URL, sortBy string) template.HTML {
|
|||
return template.HTML(arrows)
|
||||
}
|
||||
|
||||
|
||||
func genNav(nav Navigation, currentURL *url.URL, pagesSelectable int) template.HTML {
|
||||
var ret = ""
|
||||
if nav.TotalItem > 0 {
|
||||
maxPages := math.Ceil(float64(nav.TotalItem) / float64(nav.MaxItemPerPage))
|
||||
|
||||
href := ""
|
||||
display := " style=\"display:none;\""
|
||||
if nav.CurrentPage-1 > 0 {
|
||||
url := "/" + nav.Route + "/1"
|
||||
ret = ret + "<a id=\"page-prev\" href=\"" + url + "?" + currentURL.RawQuery + "\" aria-label=\"Previous\"><li><span aria-hidden=\"true\">«</span></li></a>"
|
||||
display = ""
|
||||
href = " href=\"" + "/" + nav.Route + "/1" + "?" + currentURL.RawQuery + "\""
|
||||
}
|
||||
ret = ret + "<a id=\"page-prev\"" + display + href + " aria-label=\"Previous\"><span aria-hidden=\"true\">«</span></a>"
|
||||
|
||||
startValue := 1
|
||||
if nav.CurrentPage > pagesSelectable/2 {
|
||||
startValue = (int(math.Min((float64(nav.CurrentPage)+math.Floor(float64(pagesSelectable)/2)), maxPages)) - pagesSelectable + 1)
|
||||
|
|
@ -154,16 +159,21 @@ func genNav(nav Navigation, currentURL *url.URL, pagesSelectable int) template.H
|
|||
for i := startValue; i <= endValue; i++ {
|
||||
pageNum := strconv.Itoa(i)
|
||||
url := "/" + nav.Route + "/" + pageNum
|
||||
ret = ret + "<a aria-label=\"Page " + strconv.Itoa(i) + "\" href=\"" + url + "?" + currentURL.RawQuery + "\">" + "<li"
|
||||
ret = ret + "<a aria-label=\"Page " + strconv.Itoa(i) + "\" href=\"" + url + "?" + currentURL.RawQuery + "\">" + "<span"
|
||||
if i == nav.CurrentPage {
|
||||
ret = ret + " class=\"active\""
|
||||
}
|
||||
ret = ret + ">" + strconv.Itoa(i) + "</li></a>"
|
||||
ret = ret + ">" + strconv.Itoa(i) + "</span></a>"
|
||||
}
|
||||
|
||||
href = ""
|
||||
display = " style=\"display:none;\""
|
||||
if nav.CurrentPage < int(maxPages) {
|
||||
url := "/" + nav.Route + "/" + strconv.Itoa(nav.CurrentPage+1)
|
||||
ret = ret + "<a id=\"page-next\" href=\"" + url + "?" + currentURL.RawQuery + "\" aria-label=\"Next\"><li><span aria-hidden=\"true\">»</span></li></a>"
|
||||
display = ""
|
||||
href = " href=\"" + "/" + nav.Route + "/" + strconv.Itoa(nav.CurrentPage+1) + "?" + currentURL.RawQuery + "\""
|
||||
}
|
||||
ret = ret + "<a id=\"page-next\"" + display + href +" aria-label=\"Next\"><span aria-hidden=\"true\">»</span></a>"
|
||||
|
||||
itemsThisPageStart := nav.MaxItemPerPage*(nav.CurrentPage-1) + 1
|
||||
itemsThisPageEnd := nav.MaxItemPerPage * nav.CurrentPage
|
||||
if nav.TotalItem < itemsThisPageEnd {
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@
|
|||
},
|
||||
{
|
||||
"id": "terms_conditions_full",
|
||||
"translation": "<h2>NyaaPantsu Terms and Conditions/h2><h3>1. Terms</h3><p>By accessing the website at <a href='https://pantsu.cat'>https://pantsu.cat</a>, you are agreeing to be bound by these terms of service, all applicable laws and regulations, and agree that you are responsible for compliance with any applicable local laws. If you do not agree with any of these terms, you are prohibited from using or accessing this site. The materials contained in this website are protected by applicable copyright and trademark law.</p><h3>2. Disclaimer</h3><ol type='a'><li>The materials on NyaaPantsu Lda's website are provided on an 'as is' basis. NyaaPantsu Lda makes no warranties, expressed or implied, and hereby disclaims and negates all other warranties including, without limitation, implied warranties or conditions of merchantability, fitness for a particular purpose, or non-infringement of intellectual property or other violation of rights.</li><li>Further, NyaaPantsu Lda does not warrant or make any representations concerning the accuracy, likely results, or reliability of the use of the materials on its website or otherwise relating to such materials or on any sites linked to this site.</li></ol><h3>3. Limitations</h3><p>In no event shall NyaaPantsu Lda or its suppliers be liable for any damages (including, without limitation, damages for loss of data or profit, or due to business interruption) arising out of the use or inability to use the materials on NyaaPantsu Lda's website, even if NyaaPantsu Lda or a NyaaPantsu Lda authorized representative has been notified orally or in writing of the possibility of such damage. Because some jurisdictions do not allow limitations on implied warranties, or limitations of liability for consequential or incidental damages, these limitations may not apply to you.</p><h3>4. Accuracy of materials</h3><p>The materials appearing on NyaaPantsu Lda website could include technical, typographical, or photographic errors. NyaaPantsu Lda does not warrant that any of the materials on its website are accurate, complete or current. NyaaPantsu Lda may make changes to the materials contained on its website at any time without notice. However NyaaPantsu Lda does not make any commitment to update the materials.</p><h3>5. Links</h3><p>NyaaPantsu Lda has not reviewed all of the sites linked to its website and is not responsible for the contents of any such linked site. The inclusion of any link does not imply endorsement by NyaaPantsu Lda of the site. Use of any such linked website is at the user's own risk.</p><h3>6. Modifications</h3><p>NyaaPantsu Lda may revise these terms of service for its website at any time without notice. By using this website you are agreeing to be bound by the then current version of these terms of service.</p><h3>7. Governing Law</h3><p>These terms and conditions are governed by and construed in accordance with the laws of Portugal and you irrevocably submit to the exclusive jurisdiction of the courts in that State or location.</p>"
|
||||
"translation": "<h2>NyaaPantsu Terms and Conditions</h2><h3>1. Terms</h3><p>By accessing the website at <a href='https://pantsu.cat'>https://pantsu.cat</a>, you are agreeing to be bound by these terms of service, all applicable laws and regulations, and agree that you are responsible for compliance with any applicable local laws. If you do not agree with any of these terms, you are prohibited from using or accessing this site. The materials contained in this website are protected by applicable copyright and trademark law.</p><h3>2. Disclaimer</h3><ol type='a'><li>The materials on NyaaPantsu Lda's website are provided on an 'as is' basis. NyaaPantsu Lda makes no warranties, expressed or implied, and hereby disclaims and negates all other warranties including, without limitation, implied warranties or conditions of merchantability, fitness for a particular purpose, or non-infringement of intellectual property or other violation of rights.</li><li>Further, NyaaPantsu Lda does not warrant or make any representations concerning the accuracy, likely results, or reliability of the use of the materials on its website or otherwise relating to such materials or on any sites linked to this site.</li></ol><h3>3. Limitations</h3><p>In no event shall NyaaPantsu Lda or its suppliers be liable for any damages (including, without limitation, damages for loss of data or profit, or due to business interruption) arising out of the use or inability to use the materials on NyaaPantsu Lda's website, even if NyaaPantsu Lda or a NyaaPantsu Lda authorized representative has been notified orally or in writing of the possibility of such damage. Because some jurisdictions do not allow limitations on implied warranties, or limitations of liability for consequential or incidental damages, these limitations may not apply to you.</p><h3>4. Accuracy of materials</h3><p>The materials appearing on NyaaPantsu Lda website could include technical, typographical, or photographic errors. NyaaPantsu Lda does not warrant that any of the materials on its website are accurate, complete or current. NyaaPantsu Lda may make changes to the materials contained on its website at any time without notice. However NyaaPantsu Lda does not make any commitment to update the materials.</p><h3>5. Links</h3><p>NyaaPantsu Lda has not reviewed all of the sites linked to its website and is not responsible for the contents of any such linked site. The inclusion of any link does not imply endorsement by NyaaPantsu Lda of the site. Use of any such linked website is at the user's own risk.</p><h3>6. Modifications</h3><p>NyaaPantsu Lda may revise these terms of service for its website at any time without notice. By using this website you are agreeing to be bound by the then current version of these terms of service.</p><h3>7. Governing Law</h3><p>These terms and conditions are governed by and construed in accordance with the laws of Portugal and you irrevocably submit to the exclusive jurisdiction of the courts in that State or location.</p>"
|
||||
},
|
||||
{
|
||||
"id": "remember_me",
|
||||
|
|
@ -1329,7 +1329,7 @@
|
|||
},
|
||||
{
|
||||
"id": "old_nav_explanation",
|
||||
"translation": "Shows main categories and page numbers at the top of the page during a search, just like nyaa.se. Replaces refine."
|
||||
"translation": "Shows main categories and page numbers at the top of the page during a search, just like nyaa.se."
|
||||
},
|
||||
{
|
||||
"id": "no_notifications",
|
||||
|
|
|
|||
Référencer dans un nouveau ticket