Merge branch 'dev' into tags

2017-07-31 17:15:32 +02:00 · 2017-07-31 17:15:32 +02:00 · a38f79eaf5
Parent 7bd3b176c0 39d5f405a7
--- a/.travis.yml
+++ b/.travis.yml
@ -14,7 +14,7 @@ before_script:
 - go test -v ./...
 script:
 - overalls -project=github.com/NyaaPantsu/nyaa -covermode=count -debug
- goveralls -coverprofile="overalls.coverprofile" -service=travis-ci -repotoken $COVERALLS_TOKEN
+- goveralls -coverprofile="overalls.coverprofile" -service=travis-ci
 install:
 - export GOPATH="${TRAVIS_BUILD_DIR}/vendor:$GOPATH"
 - export PATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace/bin:$PATH"
@ -31,6 +31,3 @@ deploy:
  overwrite: true
  on:
    tags: true
-env:
-  global:
-    secure: JHYFZn9q7kO+c0uN31AUxL2OqMe6wDbRVjLzH4/kcXv5pV9hrA/2lZaplN3hFIsLWz6Y0ZoFqvlGtq1gVj+E5TvrRQtEzHwM2O9sPB5VD5iVMNaHDmtOQTkNWg5Dn/tQtgNq9gagE7Kvl7MeNVuai7eAs79OB5j+Wl/JcrCRUliPqBRVZDBqh/pg7jfvdAkRABg7/zSl7uVZJ0jrcM8M8QfLt9/JFg62vYnT+hDqlqLYAZeQw9LUESi4zW68rFsFXNjHC4xq1EnZeqKK4OadkCGImhwa69Z1H+ZcbCoeC/RgUWEO/8bcBmXU1us4HXw5ouPWPW9rLRjJ2cwTgLBVSiHX6Y3oeLCtSepOCWTr4t9GnzcaI26G9tuphI7nXbqzlPu7PZm3XEEwP8YW0qg6yk/f77blJX5tbTr/NdHXATuqwzZWaHdlAtXfPQfbt5kGUBAxSWIBthNbrykPi3uJL9sbT25+nZt8hHRfrZ9hEcZO0WSXSLvUdbib7/Cv2e0Uks97cctzNbfiNwMQIQcegQ+y1GDA/BB6N+31RVMBSp8mcv+udEnm8ED6Kr8luJajOxsdWISpNp2GVoFJ/hn4W6+ENA3US4TOAXZLqOSOeOfeyuhAy9+sRjbbiDp5YHjyO+kE7FeQutuEbTwp9a1W7U3zb8bPW0Xvx8eDdZ6cgqg=
--- a/public/css/g.css
+++ b/public/css/g.css
@ -47,7 +47,8 @@ a:hover {
    color: #676767;
 }
 .form-input.refine {
-    background: #FFE2B8;
+    background: #dff6ff;
+    border-color: #b9cdd5!important;
 }

 .header .h-user .user-avatar {
--- a/public/css/main.css
+++ b/public/css/main.css
@ -12,6 +12,8 @@ a {
    text-decoration: none;
 }

+body, .container { min-width: 400px;}
+
 .header, .pagination {
    -webkit-user-select: none;
    -moz-user-select: none;
@ -61,7 +63,7 @@ body {
 }

 .container {
-    max-width: 1080px;
+    max-width: 1100px;
    margin: 0 auto;
 }

@ -623,15 +625,17 @@ html, body {
        width: 58px;
    }
    .header .h-user .user-menu {
-        right: 100px;
+        right: 92px;
    }
    .header .h-user .user-info {
        display: none;
    }
    .header .h-user>.nav-btn {
-        padding: 0px;
-        width: 50px;
+        padding: 0 3px!important;
+		font-size: 85%;
+		width: 100%;
    }
+	.header .h-user>a.nav-btn { padding: 0!important; }
 }

@media (min-width: 960px) {
@ -654,6 +658,8 @@ html, body {
 }

@media (max-width: 810px) {
+    body { margin: 8px 0; }
+    .header .h-user .user-avatar { margin: 0;} 
    .torrent-info-row>td {
        display: block;
    }
@ -682,6 +688,7 @@ html, body {
    .header .h-user {
        width: 46px;
    }
+    .header .h-user .user-menu { right: 104px;}
    .box {
        padding: 7px;
    }
@ -697,12 +704,7 @@ html, body {
    .tr-links {
        width: 48px;
    }
-    .header .h-search input {
-        width: 90px !important;
-    }
-    .header .h-search input:focus {
-        width: 150px !important;
-    }
+    .header .h-search input { width: 84px !important; }
    .box {
        padding: 8px;
    }
@ -711,7 +713,8 @@ html, body {
    }
 }

-@media (max-width: 520px) {
+@media (max-width: 565px) {
+    .header .h-search input { width: 90px !important; }
    .form-input.language {
        width: 281px;
    }
@ -724,6 +727,11 @@ html, body {
    .hide-smol {
        display: none!important;
    }
+    .header .nav-btn { padding: 0px 6px!important;}
+    .form-input.form-category { width: 50px; margin-right: -5px;}
+}
+@media (max-width: 440px) {
+    .header .nav-btn { padding: 0px 3px!important;}
 }

 .up-input {
@ -1571,7 +1579,6 @@ details[open] summary:after {
    background-position: 0 -624px;
 }

-html[lang="ja-jp"] .header .nav-btn { padding: 0 8px;}

 .input-ui-list > .element {
    display: flex;
@ -1601,4 +1608,13 @@ span.tag {

 .tag a.tag-form.minus {
    content: '-';
-}
+}
+
+/* Language specific CSS */
+
+html[lang="ja-jp"] .header .nav-btn { padding: 0 8px;}
+@media (max-width: 1100px) {
+    html[lang="ja-jp"] .header .h-user>.nav-btn {
+		font-size: 75%;
+    }
+}
--- a/public/css/tomorrow.css
+++ b/public/css/tomorrow.css
@ -43,8 +43,8 @@ a:hover {
    color: #c5c8c6;
 }
 .form-input.refine {
-    border-color: #1c1c1c!important
-    background: #343434;
+    border-color: #1c1c1c!important;
+    background: #2b2b2b;
    color: #bbbbbb;
 }
 .header .h-user .user-avatar {
--- a/public/js/main.js
+++ b/public/js/main.js
@ -138,14 +138,17 @@ function playVoice() {
 }

 document.getElementsByClassName("form-input refine")[0].addEventListener("click", function (e) {
-  document.getElementsByClassName("box refine")[0].style.display = document.getElementsByClassName("box refine")[0].style.display == "none" ? "block" : "none"
-  if (document.getElementsByClassName("form-input refine-searchbox")[0].value != document.getElementsByClassName("form-input search-box")[0].value)
-    document.getElementsByClassName("form-input refine-searchbox")[0].value = document.getElementsByClassName("form-input search-box")[0].value
-  if (document.getElementsByClassName("form-input refine-category")[0].selectedIndex != document.getElementsByClassName("form-input form-category")[0].selectedIndex)
-    document.getElementsByClassName("form-input refine-category")[0].selectedIndex = document.getElementsByClassName("form-input form-category")[0].selectedIndex
-  e.preventDefault()
-  if (document.getElementsByClassName("box refine")[0].style.display == "block")
-    scrollTo(0, 0)
+  if(document.getElementsByClassName("form-input search-box")[0].value == "" || location.pathname != "/")
+  {
+    document.getElementsByClassName("box refine")[0].style.display = document.getElementsByClassName("box refine")[0].style.display == "none" ? "block" : "none"
+    if (document.getElementsByClassName("form-input refine-searchbox")[0].value != document.getElementsByClassName("form-input search-box")[0].value)
+      document.getElementsByClassName("form-input refine-searchbox")[0].value = document.getElementsByClassName("form-input search-box")[0].value
+    if (document.getElementsByClassName("form-input refine-category")[0].selectedIndex != document.getElementsByClassName("form-input form-category")[0].selectedIndex)
+      document.getElementsByClassName("form-input refine-category")[0].selectedIndex = document.getElementsByClassName("form-input form-category")[0].selectedIndex
+    if (document.getElementsByClassName("box refine")[0].style.display == "block")
+      scrollTo(0, 0)
+    e.preventDefault()
+  }
 })

 function humanFileSize(bytes, si) {
--- a/templates/layouts/partials/helpers/search.jet.html
+++ b/templates/layouts/partials/helpers/search.jet.html
@ -1,6 +1,6 @@
 {{ import "flags" }}
 {{block search_common()}}
-<select name="c" class="form-input hide-xs form-category">
+<select name="c" class="form-input form-category">
  <option value="_">{{ T("all_categories")}}</option>
  {{ range _, cat := GetCategories(true, true) }}
  <option value="{{ cat.ID }}" {{if Search.Category == cat.ID }}selected{{end}}>{{ T(cat.Name) }}</option>
--- a/translations/fr-fr.all.json
+++ b/translations/fr-fr.all.json
@ -931,6 +931,10 @@
    "id": "delete_report",
    "translation": "Supprimer le signalement"
  },
+  {
+    "id": "comment_deleted",
+    "translation": "Le commentaire a été supprimé."
+  },
  {
    "id": "comment_deleted_by",
    "translation": "Le commentaire n° %s de %s a été supprimé par %s."
@ -939,6 +943,14 @@
    "id": "comment_edited_by",
    "translation": "Le commentaire n° %s de %s a été édité par %s."
  },
+  {
+    "id": "oauth_client_deleted",
+    "translation": "Le client OAuth de l'API a été supprimé."
+  },
+  {
+    "id": "oauth_client_deleted_by",
+    "translation": "Le client OAuth de l'API n° %s de %s a été supprimé par %s."
+  },
  {
    "id": "no_action_exist",
    "translation": "L'action %s n'existe pas."
@ -1835,6 +1847,82 @@
    "id": "torrent_preview",
    "translation": "Prévisualisez votre torrent"
  },
+  {
+    "id": "update_client_failed",
+    "translation": "La mise à jour du client a échoué."
+  },
+  {
+    "id": "update_client_success",
+    "translation": "Le client a été mis à jour avec succès !"
+  },
+  {
+    "id": "update_client_panel",
+    "translation": "Mettre un jour un client"
+  },
+  {
+    "id": "create_client_success",
+    "translation": "Vous avez crée le client avec succès !"
+  },
+  {
+    "id": "create_client_failed",
+    "translation": "La création du client a échoué."
+  },
+  {
+    "id": "create_client_panel",
+    "translation": "Créer un nouveau client"
+  },
+  {
+    "id": "redirect_uri",
+    "translation": "URI de redirection"
+  },
+  {
+    "id": "grant_types",
+    "translation": "Grant Types"
+  },
+  {
+    "id": "response_types",
+    "translation": "Response Types"
+  },
+  {
+    "id": "scope",
+    "translation": "Scopes"
+  },
+  {
+    "id": "owner",
+    "translation": "Propriétaire"
+  },
+  {
+    "id": "policy_uri",
+    "translation": "Politique de l'URI"
+  },
+  {
+    "id": "tos_uri",
+    "translation": "Conditions d'utilisation de l'URI"
+  },
+  {
+    "id": "logo_uri",
+    "translation": "Logo de l'URI"
+  },
+  {
+    "id": "contacts",
+    "translation": "Adresses email du propriétaire"
+  },
+  {
+    "id": "clients_list",
+    "translation": "Clients OAuth de l'API"
+  },
+  {
+    "id": "add",
+    "translation": "Ajouter"
+  },
+  {
+    "id": "remove",
+    "translation": "Supprimer"
+  },
+  {
+    "id": "secret",
+    "translation": "Secret client"
+  },
  {
    "id": "torrent_age",
    "translation": "Il y a {1} jour(s) et {2} heure(s)"
--- a/translations/ja-jp.all.json
+++ b/translations/ja-jp.all.json
@ -41,7 +41,7 @@
  },
  {
    "id": "signup_box_title",
-    "translation": "アカウント登録 <small>ずっと無料です</small>"
+    "translation": "アカウント登録をしましょう。ずっと無料です"
  },
  {
    "id": "username",
@ -931,6 +931,10 @@
    "id": "delete_report",
    "translation": "レポートを削除"
  },
+  {
+    "id": "comment_deleted",
+    "translation": "コメントが削除されました。"
+  },
  {
    "id": "comment_deleted_by",
    "translation": "コメント #%s (%s 投稿) は %s によって削除されました。"
@ -939,6 +943,14 @@
    "id": "comment_edited_by",
    "translation": "コメント #%s (%s 投稿) は %s によって編集されました。"
  },
+  {
+    "id": "oauth_client_deleted",
+    "translation": "OAuth API クライアントが削除されました。"
+  },
+  {
+    "id": "oauth_client_deleted_by",
+    "translation": "OAuth API クライアント #%s (%s 作成) は %s によって削除されました。"
+  },
  {
    "id": "no_action_exist",
    "translation": "アクション %s は存在しません。"
@ -1068,8 +1080,8 @@
    "translation": "なし"
  },
  {
-    "id": "mark_as_hidden",
-    "translation": "非表示としてマークする"
+    "id": "upload_as_anon",
+    "translation": "匿名でアップロードする"
  },
  {
    "id": "cookies",
@ -1312,8 +1324,8 @@
    "translation": "Torrent の言語"
  },
  {
-    "id": "select_a_torrent_language",
-    "translation": "-- Torrent の言語を選択 --"
+    "id": "language_not_mandatory",
+    "translation": "言語は必須ではなくなりました"
  },
  {
    "id": "language_en-us_name",
@ -1653,7 +1665,7 @@
  },
  {
    "id": "username_taken",
-    "translation": "ユーザー名は既に取得されています。以下から選ぶことができます: %s"
+    "translation": "ユーザー名は既に取得されています。以下は利用可能です: %s"
  },
  {
    "id": "email_in_db",
@ -1813,7 +1825,7 @@
  },
  {
    "id": "remux",
-    "translation": "他のアップロード者のオリジナルリリースのリミックス"
+    "translation": "他のアップロード者のオリジナルリリースの詰め合わせ"
  },
  {
    "id": "reupload",
@ -1835,6 +1847,82 @@
    "id": "torrent_preview",
    "translation": "Torrent のプレビュー"
  },
+  {
+    "id": "update_client_failed",
+    "translation": "クライアントの更新に失敗しました。"
+  },
+  {
+    "id": "update_client_success",
+    "translation": "正常にクライアントが更新されました。"
+  },
+  {
+    "id": "update_client_panel",
+    "translation": "クライアントの更新"
+  },
+  {
+    "id": "create_client_success",
+    "translation": "正常にクライアントが作成されました。"
+  },
+  {
+    "id": "create_client_failed",
+    "translation": "クライアントの作成に失敗しました。"
+  },
+  {
+    "id": "create_client_panel",
+    "translation": "新規クライアントの作成"
+  },
+  {
+    "id": "redirect_uri",
+    "translation": "リダイレクト URI"
+  },
+  {
+    "id": "grant_types",
+    "translation": "グラント種別"
+  },
+  {
+    "id": "response_types",
+    "translation": "レスポンスタイプ"
+  },
+  {
+    "id": "scope",
+    "translation": "スコープ"
+  },
+  {
+    "id": "owner",
+    "translation": "オーナー"
+  },
+  {
+    "id": "policy_uri",
+    "translation": "ポリシー URI"
+  },
+  {
+    "id": "tos_uri",
+    "translation": "利用規約 URI"
+  },
+  {
+    "id": "logo_uri",
+    "translation": "ロゴ URI"
+  },
+  {
+    "id": "contacts",
+    "translation": "オーナーのメールアドレス"
+  },
+  {
+    "id": "clients_list",
+    "translation": "OAuth API クライアント"
+  },
+  {
+    "id": "add",
+    "translation": "追加"
+  },
+  {
+    "id": "remove",
+    "translation": "削除"
+  },
+  {
+    "id": "secret",
+    "translation": "クライアント シークレット"
+  },
  {
    "id": "torrent_age",
    "translation": "{1} 日 {2} 時間前"