From d585978550375ccdaab3728a1f72cfdc44fbba5d Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Thu, 14 Feb 2013 22:59:52 +0600 Subject: [PATCH 1/2] #921 modify task monitoring page --- app/assets/stylesheets/design/custom.scss | 15 ++++++++++++++- app/helpers/build_lists_helper.rb | 7 ++++++- .../projects/build_lists/_build_list.html.haml | 4 +++- app/views/projects/build_lists/index.html.haml | 3 ++- config/locales/models/build_list.en.yml | 1 + config/locales/models/build_list.ru.yml | 1 + 6 files changed, 27 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/design/custom.scss b/app/assets/stylesheets/design/custom.scss index 53714a750..8080b15a6 100644 --- a/app/assets/stylesheets/design/custom.scss +++ b/app/assets/stylesheets/design/custom.scss @@ -1765,4 +1765,17 @@ table#myTable thead tr.search th form.button_to div input { .CodeMirror { border: 1px solid #DDDDDD; -} \ No newline at end of file +} + +table.tablesorter th.lpadding6 { + padding-left: 6px; +} + +div.right.slim { + padding-right: 5px; + width: 705px; + + table.tablesorter { + font-size: 10px; + } +} diff --git a/app/helpers/build_lists_helper.rb b/app/helpers/build_lists_helper.rb index 9bfd54c1b..98676fc48 100644 --- a/app/helpers/build_lists_helper.rb +++ b/app/helpers/build_lists_helper.rb @@ -51,7 +51,7 @@ module BuildListsHelper else '' end - end + end def build_list_version_link(bl, str_version = false) hash_size=5 @@ -94,4 +94,9 @@ module BuildListsHelper def log_reload_lines_options options_for_select([100, 200, 500, 1000, 1500, 2000], 1000).html_safe end + + def get_version_release build_list + pkg = build_list.packages.where(:package_type => 'source', :project_id => build_list.project_id).first + "#{pkg.version}-#{pkg.release}" if pkg.present? + end end diff --git a/app/views/projects/build_lists/_build_list.html.haml b/app/views/projects/build_lists/_build_list.html.haml index a5daa5d67..7a511e5f5 100644 --- a/app/views/projects/build_lists/_build_list.html.haml +++ b/app/views/projects/build_lists/_build_list.html.haml @@ -15,6 +15,8 @@ %td= build_list_version_link(build_list) - else %td.centered{:colspan => 2}= t("layout.projects.unexisted_project") - %td= link_to "#{build_list.save_to_platform.name}/#{build_list.save_to_repository.name}", [build_list.save_to_platform, build_list.save_to_repository] + %td= get_version_release build_list + -build_for=" (#{build_list.build_for_platform.name})" if build_list.build_for_platform.personal? + %td= link_to "#{build_list.save_to_platform.name}/#{build_list.save_to_repository.name}#{build_for}", [build_list.save_to_platform, build_list.save_to_repository] %td= build_list.arch.try(:name) || t("layout.arches.unexisted_arch") %td= link_to build_list.user.try(:fullname), build_list.user diff --git a/app/views/projects/build_lists/index.html.haml b/app/views/projects/build_lists/index.html.haml index 27fa5c909..98849964c 100644 --- a/app/views/projects/build_lists/index.html.haml +++ b/app/views/projects/build_lists/index.html.haml @@ -14,8 +14,9 @@ %th.lpadding16= t("activerecord.attributes.build_list.status") %th.lpadding16= t("activerecord.attributes.build_list.project") %th.lpadding16= t("diff") + %th.lpadding16= t("activerecord.attributes.build_list.project_version") %th.lpadding16= t("activerecord.attributes.build_list.save_to_repository") - %th.lpadding16= t("activerecord.attributes.build_list.arch") + %th.lpadding6= t("activerecord.attributes.build_list.arch_short") %th.lpadding16= t("activerecord.attributes.build_list.user") %tbody= render :partial => 'projects/build_lists/build_list', :collection => @build_lists .both diff --git a/config/locales/models/build_list.en.yml b/config/locales/models/build_list.en.yml index be882a1fe..9b4682266 100644 --- a/config/locales/models/build_list.en.yml +++ b/config/locales/models/build_list.en.yml @@ -12,6 +12,7 @@ en: project_id: Project project: Project arch_id: Architecture + arch_short: Arch arch: Architecture new_core: New core is_circle: Recurrent build diff --git a/config/locales/models/build_list.ru.yml b/config/locales/models/build_list.ru.yml index 40ce16dc3..1cf1026a1 100644 --- a/config/locales/models/build_list.ru.yml +++ b/config/locales/models/build_list.ru.yml @@ -13,6 +13,7 @@ ru: project: Проект arch_id: Архитектура arch: Архитектура + arch_short: Архит-ра new_core: Новое ядро is_circle: Циклическая сборка updated_at: Информация получена From 97f41f58a1b34c930ad06ac22b1c5751c911e39b Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Fri, 15 Feb 2013 15:56:13 +0600 Subject: [PATCH 2/2] #921 smaller id --- app/assets/stylesheets/design/custom.scss | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/design/custom.scss b/app/assets/stylesheets/design/custom.scss index 8080b15a6..2cba2c275 100644 --- a/app/assets/stylesheets/design/custom.scss +++ b/app/assets/stylesheets/design/custom.scss @@ -1767,8 +1767,14 @@ table#myTable thead tr.search th form.button_to div input { border: 1px solid #DDDDDD; } -table.tablesorter th.lpadding6 { - padding-left: 6px; +table.tablesorter { + th.lpadding6 { + padding-left: 6px; + } + + td a { + font-size: 10px; + } } div.right.slim {