[refs #90] fixed translation of titles & headers

app/views/projects/pull_requests/new.html.haml

@@ -1,6 +1,6 @@
 -set_meta_tags :title => [title_object(@project), t('.title')]
 = render :partial => 'submenu'
-%h3.bpadding10= raw t '.new', {:base => @pull.base_ref, :head => @pull.head_ref}
+%h3.bpadding10= raw t '.header', {:base => @pull.base_ref, :head => @pull.head_ref}
 #repo-wrapper
   %ul.nav.nav-tabs
     %li

app/views/projects/pull_requests/show.html.haml

@@ -1,6 +1,6 @@
--set_meta_tags :title => [title_object(@project), t('.title')]
+-set_meta_tags :title => [title_object(@project), t('.title', :name => @pull.title.truncate(40), :user => @pull.user.uname)]
 = render :partial => 'submenu'
-%h3.bpadding10= raw t '.new', {:base => @pull.base_ref, :head => @pull.head_ref}
+%h3.bpadding10= raw t '.header', {:base => @pull.base_ref, :head => @pull.head_ref, :user => @pull.user.uname}
 #repo-wrapper
   %ul.nav.nav-tabs
     %li

config/locales/models/pull_request.en.yml

@@ -2,7 +2,7 @@ en:
   projects:
     pull_requests:
       new:
-        new: 'Create a pull request into <span class="label label-info font14">%{base}</span> from <span class="label label-info font14">%{head}</span>'
+        header: 'Create a pull request into <span class="label-bootstrap label-info font14">%{base}</span> from <span class="label-bootstrap label-info font14">%{head}</span>'
         base_ref: Base
         head_ref: Head
         refs: 'branch · tag · commit'
@@ -10,6 +10,8 @@ en:
         head_project: Head project
         submit: Send pull request
         update: Update commits
+      show:
+        header: 'Pull Request into <span class="label-bootstrap label-info font14">%{base}</span> from <span class="label-bootstrap label-info font14">%{head}</span> by %{user}'
       merge: Merge
       duplicate: 'There is already a pull request for %{head_ref}'
       up_to_date: 'The %{base_ref} branch is already up-to-date with %{head_ref}'

config/locales/models/pull_request.ru.yml

@@ -2,7 +2,7 @@ ru:
   projects:
     pull_requests:
       new:
-        new: 'Создать пул реквест в <span class="label label-info font14">%{base}</span> из <span class="label label-info font14">%{head}</span>'
+        header:  'Создать пул реквест в <span class="label-bootstrap label-info font14">%{base}</span> из <span class="label-bootstrap label-info font14">%{head}</span>'
         base_ref: База
         head_ref: Источник
         refs: 'branch · tag · commit'
@@ -10,6 +10,8 @@ ru:
         head_project: Проект-источник
         submit: Создать пул реквест
         update: Обновить коммиты
+      show:
+         header: 'Пул реквест в <span class="label-bootstrap label-info font14">%{base}</span> из <span class="label-bootstrap label-info font14">%{head}</span> от %{user}'
       merge: Мерж
       duplicate: 'Уже существует пул реквест %{head_ref}'
       up_to_date: 'Ветка %{base_ref} на данный момент уже содержит последние изменения %{head_ref}'

config/locales/title.en.yml

@@ -22,12 +22,14 @@ en:
         title: 'Compare Revisions'
       searching:
         title: 'Search in Wiki'
-  platforms:
-    product_build_lists:
-      index:
-        title: 'Products Monitoring'
     pull_requests:
       index:
         title: 'Pull Requests'
       new:
         title: 'Create a Pull Request'
+      show:
+        title: 'Pull Request: %{name} by %{user}'
+  platforms:
+    product_build_lists:
+      index:
+        title: 'Products Monitoring'

config/locales/title.ru.yml

@@ -25,9 +25,11 @@ ru:
     pull_requests:
       index:
         title: 'Пул реквесты'
+      new:
+        title: 'Создать пул реквест'
+      show:
+        title: 'Пул реквест %{name} от %{user}'
   platforms:
     product_build_lists:
       index:
         title: 'Мониторинг продуктов'
-    new:
-      title: 'Создать пул реквест'

vendor/assets/stylesheets/bootstrap.css

@@ -722,3 +722,73 @@
   border-color: #ddd #ddd #ddd transparent;
   *border-left-color: #ffffff;
 }
+
+.label-bootstrap,
+.badge {
+  font-size: 10.998px;
+  font-weight: bold;
+  line-height: 14px;
+  color: #ffffff;
+  vertical-align: baseline;
+  white-space: nowrap;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #999999;
+}
+.label-bootstrap {
+  padding: 1px 4px 2px;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.badge {
+  padding: 1px 9px 2px;
+  -webkit-border-radius: 9px;
+  -moz-border-radius: 9px;
+  border-radius: 9px;
+}
+a.label-bootstrap:hover,
+a.badge:hover {
+  color: #ffffff;
+  text-decoration: none;
+  cursor: pointer;
+}
+.label-important,
+.badge-important {
+  background-color: #b94a48;
+}
+.label-important[href],
+.badge-important[href] {
+  background-color: #953b39;
+}
+.label-warning,
+.badge-warning {
+  background-color: #f89406;
+}
+.label-warning[href],
+.badge-warning[href] {
+  background-color: #c67605;
+}
+.label-success,
+.badge-success {
+  background-color: #468847;
+}
+.label-success[href],
+.badge-success[href] {
+  background-color: #356635;
+}
+.label-info,
+.badge-info {
+  background-color: #3a87ad;
+}
+.label-info[href],
+.badge-info[href] {
+  background-color: #2d6987;
+}
+.label-inverse,
+.badge-inverse {
+  background-color: #333333;
+}
+.label-inverse[href],
+.badge-inverse[href] {
+  background-color: #1a1a1a;
+}