Merge branch 'dev' into torrent-btn-translation
Cette révision appartient à :
akuma06
GitHub
révision
cc376d88de
|
|
@ -103,7 +103,7 @@ a:hover {
|
|||
}
|
||||
|
||||
:target {
|
||||
background-color: #585b4f;
|
||||
background-color: #b294bb;
|
||||
}
|
||||
|
||||
/* style the dropdown member menu */
|
||||
|
|
@ -149,3 +149,14 @@ a:hover {
|
|||
background: #29363d;
|
||||
color: #cf9fff;
|
||||
}
|
||||
|
||||
/*Comments*/
|
||||
|
||||
.commentList .commentData {
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.commentList .commentBody {
|
||||
background: #29363d;
|
||||
color: #fff;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -403,3 +403,100 @@ select#bottom_language_selector {
|
|||
background: white;
|
||||
color: #cf9fff;
|
||||
}
|
||||
|
||||
/* Wordbreak fix*/
|
||||
|
||||
.break {
|
||||
word-break:break-all;
|
||||
-webkit-hyphens: auto;
|
||||
-moz-hyphens: auto;
|
||||
-ms-hyphens: auto;
|
||||
hyphens: auto;
|
||||
}
|
||||
|
||||
|
||||
/*Comments*/
|
||||
|
||||
.commentList::before,
|
||||
.commentList::after {
|
||||
content: "";
|
||||
display: table;
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.commentList ul {
|
||||
list-style-type: none;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.commentList img {
|
||||
opacity: 1;
|
||||
filter: Alpha(opacity=100);
|
||||
-webkit-border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
-o-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.commentList img.avatar {
|
||||
position: relative;
|
||||
float: left;
|
||||
margin-left: 0;
|
||||
margin-top: 0;
|
||||
width: 65px;
|
||||
height: 65px;
|
||||
}
|
||||
|
||||
.commentList .commentBody {
|
||||
border: 1px solid #eee;
|
||||
margin-bottom: 20px;
|
||||
margin-left: 85px;
|
||||
margin-right: 0px;
|
||||
padding: 10px 20px;
|
||||
position: relative;
|
||||
-webkit-border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
-o-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
background: #fff;
|
||||
color: #6b6e80;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.commentList .commentData {
|
||||
font-size: 13px;
|
||||
color: #aaaaaa;
|
||||
padding-bottom: 8px;
|
||||
margin-bottom: 10px !important;
|
||||
border-bottom: 1px solid #eee;
|
||||
height: 2.5em;
|
||||
}
|
||||
|
||||
.commentList ul.comments ul{
|
||||
list-style-type: none;
|
||||
padding: 0;
|
||||
margin-left: 85px;
|
||||
}
|
||||
|
||||
|
||||
.commentList h3 {
|
||||
margin-bottom: 40px;
|
||||
font-size: 26px;
|
||||
line-height: 30px;
|
||||
font-weight: 800;
|
||||
}
|
||||
|
||||
.comment {
|
||||
margin: 1em;
|
||||
padding: 1em;
|
||||
width: 75%;
|
||||
margin-left: 12%;
|
||||
}
|
||||
|
||||
@media only screen and (min-device-width : 320px) and (max-device-width : 480px) {
|
||||
|
||||
.comment {
|
||||
width: 100%;
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,6 +48,12 @@ for(var i in list) {
|
|||
e.innerText = date.toDateString() + " " + date.toLocaleTimeString();
|
||||
}
|
||||
|
||||
/*Fixed-Navbar offset fix*/
|
||||
window.onload = function() {
|
||||
var shiftWindow = function() { scrollBy(0, -70) };
|
||||
if (location.hash) shiftWindow();
|
||||
window.addEventListener("hashchange", shiftWindow);
|
||||
};
|
||||
function loadLanguages() {
|
||||
var xhr = new XMLHttpRequest();
|
||||
xhr.onreadystatechange = function() {
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ var FuncMap = template.FuncMap{
|
|||
},
|
||||
"genNav": func(nav Navigation, currentUrl *url.URL, pagesSelectable int) template.HTML {
|
||||
var ret = ""
|
||||
if (nav.TotalItem > 0) {
|
||||
if nav.TotalItem > 0 {
|
||||
maxPages := math.Ceil(float64(nav.TotalItem) / float64(nav.MaxItemPerPage))
|
||||
|
||||
if nav.CurrentPage-1 > 0 {
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@
|
|||
<a href="{{ genSearchWithOrdering .URL "1" }}">{{T "name"}}</a>
|
||||
</th>
|
||||
<th class="col-xs-1 hidden-xs">
|
||||
<a href="{{ genSearchWithOrdering .URL "4" }}">{{T "S"}}</a> /
|
||||
<a href="{{ genSearchWithOrdering .URL "4" }}">{{T "L"}}</a> /
|
||||
<a href="{{ genSearchWithOrdering .URL "3" }}">{{T "D"}}</a>
|
||||
<a href="{{ genSearchWithOrdering .URL "5" }}">{{T "S"}}</a> /
|
||||
<a href="{{ genSearchWithOrdering .URL "6" }}">{{T "L"}}</a> /
|
||||
<a href="{{ genSearchWithOrdering .URL "7" }}">{{T "D"}}</a>
|
||||
</th>
|
||||
<th class="col-xs-1 hidden-xs"><a href="{{ genSearchWithOrdering .URL "2" }}">{{T "date"}}</th></a>
|
||||
<th class="col-xs-1 hidden-xs"><a href="{{ genSearchWithOrdering .URL "4" }}">{{T "size"}}</a></th>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div class="content" style="margin-bottom: 2em;">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<h3 style="word-break:break-all" {{if eq .Status 2}}class="remake" {{end}} {{if eq .Status 3}}class="trusted" {{end}} {{if eq .Status 4}}class="aplus"{{end}}>{{.Name}}</h3>
|
||||
<h3 class="break" {{if eq .Status 2}}class="remake" {{end}} {{if eq .Status 3}}class="trusted" {{end}} {{if eq .Status 4}}class="aplus"{{end}}>{{.Name}}</h3>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
|
@ -18,8 +18,9 @@
|
|||
<div class="uploaded_by">
|
||||
<img style="float:left; margin-right: 1em;" src="{{$.URL.Parse (printf "/img/torrents/%s.png" .SubCategory) }}">
|
||||
<h4>{{ T "uploaded_by" }} <a href="{{$.URL.Parse (printf "/user/%d/-" .UploaderID) }}">{{.UploaderName}}</a></h4>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="float:right;">
|
||||
<a style="margin: 5px;" aria-label="Magnet Button" href="{{.Magnet}}" type="button" class="btn btn-lg btn-success">
|
||||
<span class="glyphicon glyphicon-magnet" aria-hidden="true"></span> {{ T "download_btn" }}
|
||||
|
|
@ -42,13 +43,13 @@
|
|||
</div>
|
||||
<div class="col-md-12">
|
||||
<h4>{{T "description"}}</h4>
|
||||
<div style="word-break:break-all;">{{.Description}}</div>
|
||||
<div class="break">{{.Description}}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<h4>{{T "hash"}}</h4>
|
||||
<p class="torrent-hash">{{.Hash}}</p>
|
||||
<p class="torrent-hash break">{{.Hash}}</p>
|
||||
<hr>
|
||||
<h4>{{T "date"}}</h4>
|
||||
<p class="date-full">{{.Date}}</p>
|
||||
|
|
@ -82,29 +83,52 @@
|
|||
</div>
|
||||
<div class="row" id="comments">
|
||||
<div class="col-md-12">
|
||||
<div class="commentList">
|
||||
<h4>{{T "comments"}}</h4>
|
||||
<hr/>
|
||||
<ul class="comments">
|
||||
{{ range $index, $element := .Comments }}
|
||||
<div class="row comment-row" id="comment_{{$index}}">
|
||||
<div class="col-md-2">
|
||||
<li class="clearfix comment jumptarget" id="comment_{{$index}}">
|
||||
{{/* The following line is wrong. Should be using the MD5 User hash but i don't knwo how to access it. */}}
|
||||
{{/* Changing Gravatar for something else, so it can stay like this. */}}
|
||||
<img src="https://www.gravatar.com/avatar/{{ .UserID }}?s=50" class="avatar" alt="">
|
||||
<div class="commentBody">
|
||||
<div class="commentData">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="row">
|
||||
<div class="col-sm-9">
|
||||
{{if eq .UserID -1}}
|
||||
<a href="#comment_{{$index}}">{{$index}}</a>
|
||||
{{.Username}}
|
||||
<a href="#comment_{{$index}}">#{{$index}}</a> by {{.Username}}
|
||||
{{else}}
|
||||
<a href="#comment_{{$index}}">{{$index}}</a>
|
||||
<a href="{{$.URL.Parse (printf "/user/%d/-" .UserID ) }}">{{.Username}}</a>
|
||||
<a href="#comment_{{$index}}">#{{$index}}</a>
|
||||
by <span class="break"><a href="{{$.URL.Parse (printf "/user/%d/-" .UserID ) }}">{{.Username}}</a></span>
|
||||
{{end}}
|
||||
</div>
|
||||
<div class="col-md-1 date-short comment-date">
|
||||
<div class="col-sm-3">
|
||||
<i class="pull-right date-short comment-date">
|
||||
<small>
|
||||
{{ .Date.Format ( Ts "date_format" ) }}
|
||||
{{/* output: "2017-05-01 15:30"
|
||||
Went with "Year-Month-Day" because it's the most unambiguous.
|
||||
If you want it to be determined by where you're from, be my guest. */}}
|
||||
</small>
|
||||
</i>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
{{.Content}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
{{end}}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -351,6 +351,10 @@
|
|||
"id": "all_categories",
|
||||
"translation": "Toutes les catégories"
|
||||
},
|
||||
{
|
||||
"id": "select_a_torrent_category",
|
||||
"translation": "Choisir une catégorie de torrents"
|
||||
},
|
||||
{
|
||||
"id": "anime",
|
||||
"translation": "Anime"
|
||||
|
|
@ -511,10 +515,6 @@
|
|||
"id": "personal_info",
|
||||
"translation": "Informations personnelles"
|
||||
},
|
||||
{
|
||||
"id": "email",
|
||||
"translation": "Adresse email"
|
||||
},
|
||||
{
|
||||
"id": "language",
|
||||
"translation": "Langue"
|
||||
|
|
@ -617,7 +617,11 @@
|
|||
},
|
||||
{
|
||||
"id": "completed",
|
||||
"translation": "Terminé"
|
||||
"translation": "Complété"
|
||||
},
|
||||
{
|
||||
"id": "change_language",
|
||||
"translation": "Changer la langue"
|
||||
},
|
||||
{
|
||||
"id": "language_name",
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@
|
|||
},
|
||||
{
|
||||
"id": "notice_keep_seeding",
|
||||
"translation": "ATTENZIONE: CONTINUA A SEEDARE I TORRENT E ABILITA IL DHT RITARDATO"
|
||||
"translation": "ATTENZIONE: CONTINUA A SEEDARE I TORRENT E ABILITA IL DHT IDIOTA"
|
||||
},
|
||||
{
|
||||
"id": "official_nyaapocalipse_faq",
|
||||
|
|
@ -317,7 +317,7 @@
|
|||
},
|
||||
{
|
||||
"id": "answer_how_can_i_help",
|
||||
"translation": "Se hai esperienza nel web design, vieni sul canale IRC #nyaapantsu su irc.rizon.net. Se hai dei database aggiornati, specialmente per sukebei, <b>CARICALI!</b>."
|
||||
"translation": "Se hai esperienza nel web design, vieni sul canale IRC #nyaapantsu su irc.rizon.net. Se hai dei database aggiornati, specialmente per sukebei,per favore caricali."
|
||||
},
|
||||
{
|
||||
"id": "your_design_sucks_found_a_bug",
|
||||
|
|
@ -351,6 +351,10 @@
|
|||
"id": "all_categories",
|
||||
"translation": "Tutte le categorie"
|
||||
},
|
||||
{
|
||||
"id": "select_a_torrent_category",
|
||||
"translation": "Seleziona una Categoria Torrent"
|
||||
},
|
||||
{
|
||||
"id": "anime",
|
||||
"translation": "Anime"
|
||||
|
|
@ -614,6 +618,10 @@
|
|||
{
|
||||
"id": "completed",
|
||||
"translation": "Completato"
|
||||
},
|
||||
{
|
||||
"id": "change_language",
|
||||
"translation": "Cambia Lingua"
|
||||
},
|
||||
{
|
||||
"id": "language_name",
|
||||
|
|
|
|||
Référencer dans un nouveau ticket