From 55379ed9c8dd5bb642ac03be00654622ff52714d Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Thu, 16 Feb 2012 00:53:58 +0600 Subject: [PATCH] [refs #194] first steps --- app/views/issues/_sidebar.html.haml | 118 ++++++++++++++++++++++++++++ app/views/issues/index.html.haml | 25 +----- config/application.rb | 2 +- config/locales/en.yml | 47 ----------- config/locales/issues/issues.en.yml | 38 +++++++++ config/locales/issues/issues.ru.yml | 37 +++++++++ config/locales/ru.yml | 30 ------- 7 files changed, 197 insertions(+), 100 deletions(-) create mode 100644 app/views/issues/_sidebar.html.haml create mode 100644 config/locales/issues/issues.en.yml create mode 100644 config/locales/issues/issues.ru.yml diff --git a/app/views/issues/_sidebar.html.haml b/app/views/issues/_sidebar.html.haml new file mode 100644 index 000000000..22070beed --- /dev/null +++ b/app/views/issues/_sidebar.html.haml @@ -0,0 +1,118 @@ +-content_for :sidebar do + .bordered.nopadding + %h3=t("layout.issues.accessory") + %table + %tr + %td.width18 + %input#myradio1.niceRadio{:checked => "checked", :name => "myradio", :tabindex => "1", :type => "radio"} + %td.width135 + =t("layout.issues.all") + %td.width30.right + = @project.issues.count + %tr + %td + %input#myradio2.niceRadio{:name => "myradio", :tabindex => "2", :type => "radio"} + %td + =t("layout.issues.mine") + %td.width30.right + = @project.issues.where(:user_id => current_user).count + .bordered.bpadding20 + %input.gray{:onClick => "if(this.value=='Найти задачу...'){this.value='';this.className='black';}", :onblur => "if(this.value==''){this.value='Найти задачу...';this.className='gray';}", :type => "text", :value => "Найти задачу..."}/ + .bordered.nopadding + %h3.bmargin10 Добавить задачу + %a.button{:href => "#"} Добавить + .block + %h3 Метки + #labels-edit{:style => "display: none;"} + #label-delete1.label.edit + .labeltext.edit{:style => "background: #39b54a;"} + .text 2-3 stable + #delete1.delete + %img{:alt => "x", :src => "pics/x-label.png"}/ + .both + #label-delete2.label.edit + .labeltext.edit{:style => "background: #ed1c24;"} + .text 3-0 stable + #delete2.delete + %img{:alt => "x", :src => "pics/x-label.png"}/ + .both + #label-delete3.label.edit + .labeltext.edit{:style => "background: #ed145b;"} + .text actionpack + #delete3.delete + %img{:alt => "x", :src => "pics/x-label.png"}/ + .both + #label-delete4.label.edit + .labeltext.edit{:style => "background: #92278f;"} + .text activemodel + #delete4.delete + %img{:alt => "x", :src => "pics/x-label.png"}/ + .both + %input.gray{:onClick => "if(this.value=='Название новой метки'){this.value='';this.className='black';}", :onblur => "if(this.value==''){this.value='Название новой метки';this.className='gray';}", :type => "text", :value => "Название новой метки"}/ + .colors + .color{:style => "background: #0054a6;"} + #choose1.choose.selected + .color{:style => "background: #00a651;"} + #choose2.choose + .color{:style => "background: #ed1c24;"} + #choose3.choose + .color{:style => "background: #e65c00;"} + #choose4.choose + .color{:style => "background: #9e005d;"} + #choose5.choose + .color{:style => "background: #464646;"} + #choose6.choose + .color{:style => "background: #8c6239;"} + #choose7.choose + .both + .lefter + %a{:href => "#"} Custom color + .righter + %a.button{:href => "#"} Добавить + .both + #labels-stock + #label-2-3-stable.div-tracker-lables{:name => "label"} + .div-label-left + .label + #flag-2-3-stable.flag{:style => "background-color: #39b54a;"} + .labeltext + 2-3 stable + .both + .div-label-right + 15 + .both + .both + #label-3-0-stable.div-tracker-lables{:name => "label"} + .div-label-left + .label + #flag-3-0-stable.flag{:style => "background-color: #ed1c24;"} + .labeltext + 3-0 stable + .both + .div-label-right + 100 + .both + .both + #label-actionpack.div-tracker-lables{:name => "label"} + .div-label-left + .label + #flag-actionpack.flag{:style => "background-color: #ed145b;"} + .labeltext + actionpack + .both + .div-label-right + 22 + .both + .both + #label-activemodel.div-tracker-lables{:name => "label"} + .div-label-left + .label + #flag-activemodel.flag{:style => "background-color: #92278f;"} + .labeltext + activemodel + .both + .div-label-right + 3 + .both + .both + %a#manage-labels.button.tmargin10{:href => "#"} Manage \ No newline at end of file diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index 9f1c6306d..2b49a31ef 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -1,22 +1,3 @@ -.block - .secondary-navigation - %ul.wat-cf - %li.first.active= link_to t("layout.issues.list"), project_issues_path(@project) - %li= link_to t("layout.issues.new"), new_project_issue_path(@project) if can? :new, Issue.new(:project_id => @project.id) - .secondary-navigation - %ul.wat-cf - %li{:class => "first " + (params[:status].blank? ? "active" : "")} - = link_to t("layout.issues.statuses.any"), project_issues_path(@project) - %li{:class => "first " + (params[:status] == 'open' ? "active" : "")} - = link_to t("layout.issues.statuses.open"), project_issues_path(@project, :status => 'open') - %li{:class => "first " + (params[:status] == 'closed' ? "active" : "")} - = link_to t("layout.issues.statuses.closed"), project_issues_path(@project, :status => 'closed') - .content - %h2.title - = t("layout.issues.list_header") - .inner - = render :partial => 'shared/search_form' - = render :partial => 'issues/list' - .actions-bar.wat-cf - .actions - = will_paginate @issues#, :param_name => :issue_page +-render :partial => 'projects/submenu' +-render :partial => 'issues/sidebar' + diff --git a/config/application.rb b/config/application.rb index 7729c9f09..99fbb1300 100644 --- a/config/application.rb +++ b/config/application.rb @@ -37,7 +37,7 @@ module Rosa # config.time_zone = 'Central Time (US & Canada)' # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] + config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**/*.yml').to_s] config.i18n.default_locale = :en config.action_view.javascript_expansions[:defaults] = %w() diff --git a/config/locales/en.yml b/config/locales/en.yml index 8806dd1db..7545e255c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -108,23 +108,6 @@ en: edit_header: Edit category confirm_delete: Are you sure to delete this category? - issues: - list: List - edit: Edit - comments_header: Comments - new: New task - list_header: List - confirm_delete: Are you sure to delete this task? - edit_header: Task edit - new_header: New task - statuses: - open: Opened - closed: Closed - any: Any - subscribe: Subscribe - subscribe_btn: Subscribe - unsubscribe_btn: Unsubscribe - comments: confirm_delete: Are you sure to delete the comment? new_header: New comment @@ -413,23 +396,6 @@ en: edit_header: Edit category confirm_delete: Are you sure to delete this category? - issues: - list: List - edit: Edit - comments_header: Comments - new: New task - list_header: List - confirm_delete: Are you sure to delete this task? - edit_header: Task edit - new_header: New task - statuses: - open: Opened - closed: Closed - any: Any - subscribe: Subscribe - subscribe_btn: Subscribe - unsubscribe_btn: Unsubscribe - commits: subscribe_btn: Subscribe to commit unsubscribe_btn: Unsubscribe from commit @@ -593,11 +559,6 @@ en: save_error: Comment saves error destroyed: Comment deleted - issue: - saved: Task saved - save_error: Task saves error - destroyed: Task deleted - project: saved: Project saved save_error: Project saves error @@ -739,14 +700,6 @@ en: body: Content user: Author - issue: - title: Title - body: Content - user: Assigned - user_id: Assigned - project: Project - status: Status - private_user: login: Login password: Password diff --git a/config/locales/issues/issues.en.yml b/config/locales/issues/issues.en.yml new file mode 100644 index 000000000..5dae44b66 --- /dev/null +++ b/config/locales/issues/issues.en.yml @@ -0,0 +1,38 @@ +en: + activerecord: + attributes: + issue: + title: Title + body: Content + user: Assigned + user_id: Assigned + project: Project + status: Status + + layout: + issues: + accessory: Accessory issues + list: List + all: All + mine: Assigned to me + edit: Edit + comments_header: Comments + new: New task + list_header: List + confirm_delete: Are you sure to delete this task? + edit_header: Task edit + new_header: New task + statuses: + open: Opened + closed: Closed + any: Any + subscribe: Subscribe + subscribe_btn: Subscribe + unsubscribe_btn: Unsubscribe + + flash: + issue: + saved: Task saved + save_error: Task saves error + destroyed: Task deleted + diff --git a/config/locales/issues/issues.ru.yml b/config/locales/issues/issues.ru.yml new file mode 100644 index 000000000..8cc772e75 --- /dev/null +++ b/config/locales/issues/issues.ru.yml @@ -0,0 +1,37 @@ +ru: + activerecord: + attributes: + issue: + title: Заголовок + body: Содержание + user: Назначена + user_id: Назначена + project: Проект + status: Статус + + layout: + issues: + accessory: Принадлежность заданий + list: Список + all: Все + mine: Назначенные мне + edit: Редактировать + comments_header: Комментарии + new: Новая задача + list_header: Список + confirm_delete: Вы уверены, что хотите удалить эту задачу? + edit_header: Редактирование задачи + new_header: Новая задача + statuses: + open: Открытые + closed: Закрытые + any: Все + subscribe: Подписка на уведомления + subscribe_btn: Подписаться + unsubscribe_btn: Отписаться + + flash: + issue: + saved: Задача успешно сохранена + save_error: Не удалось сохранить задачу + destroyed: Задача успешно удалена \ No newline at end of file diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 8c8fac327..0a923a31b 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -108,23 +108,6 @@ ru: edit_header: Редактировать категорию confirm_delete: Вы уверены, что хотите удалить эту категорию? - issues: - list: Список - edit: Редактировать - comments_header: Комментарии - new: Новая задача - list_header: Список - confirm_delete: Вы уверены, что хотите удалить эту задачу? - edit_header: Редактирование задачи - new_header: Новая задача - statuses: - open: Открытые - closed: Закрытые - any: Все - subscribe: Подписка на уведомления - subscribe_btn: Подписаться - unsubscribe_btn: Отписаться - comments: confirm_delete: Вы уверены, что хотите удалить комментарий? new_header: Новый комментарий @@ -465,11 +448,6 @@ ru: save_error: Ошибка сохранения комментария destroyed: Комментарий удален - issue: - saved: Задача успешно сохранена - save_error: Не удалось сохранить задачу - destroyed: Задача успешно удалена - project: saved: Проект успешно сохранен save_error: Не удалось сохранить проект @@ -601,14 +579,6 @@ ru: body: Содержание user: Автор - issue: - title: Заголовок - body: Содержание - user: Назначена - user_id: Назначена - project: Проект - status: Статус - private_user: login: Логин password: Пароль