diff --git a/app/views/projects/destroy.rhtml b/app/views/projects/destroy.rhtml index 4531cb84..a1913c11 100644 --- a/app/views/projects/destroy.rhtml +++ b/app/views/projects/destroy.rhtml @@ -1,14 +1,16 @@

<%=l(:label_confirmation)%>

-
-
-

<%=h @project_to_destroy.name %>
-<%=l(:text_project_destroy_confirmation)%>

+
+

<%=h @project_to_destroy %>
+<%=l(:text_project_destroy_confirmation)%> +<% if @project_to_destroy.children.any? %> +
<%= l(:text_subprojects_destroy_warning, content_tag('strong', h(@project_to_destroy.children.sort.collect{|p| p.to_s}.join(', ')))) %> +<% end %> +

<% form_tag({:controller => 'projects', :action => 'destroy', :id => @project_to_destroy}) do %> - <%= hidden_field_tag "confirm", 1 %> + <%= submit_tag l(:button_delete) %> <% end %>

-
-
\ No newline at end of file + diff --git a/lang/bg.yml b/lang/bg.yml index d1a60fe4..b341d989 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -617,3 +617,4 @@ label_overall_activity: Цялостна дейност setting_default_projects_public: Новите проекти са публични по подразбиране error_scm_annotate: "Обектът не съществува или не може да бъде анотиран." label_planning: Планиране +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/cs.yml b/lang/cs.yml index 60fcb8d1..250c602c 100644 --- a/lang/cs.yml +++ b/lang/cs.yml @@ -622,3 +622,4 @@ enumeration_doc_categories: Kategorie dokumentů enumeration_activities: Aktivity (sledování času) error_scm_annotate: "Položka neexistuje nebo nemůže být komentována." label_planning: Plánování +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/da.yml b/lang/da.yml index b0a6764b..ff2ed982 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -619,3 +619,4 @@ label_overall_activity: Overordnet aktivitet setting_default_projects_public: Nye projekter er offentlige som default error_scm_annotate: "The entry does not exist or can not be annotated." label_planning: Planlægning +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/de.yml b/lang/de.yml index 323859ae..77184cf8 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -618,3 +618,4 @@ default_activity_development: Entwicklung enumeration_issue_priorities: Ticket-Prioritäten enumeration_doc_categories: Dokumentenkategorien enumeration_activities: Aktivitäten (Zeiterfassung) +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/en.yml b/lang/en.yml index 8264ba90..e39aec30 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -557,6 +557,7 @@ text_select_mail_notifications: Select actions for which email notifications sho text_regexp_info: eg. ^[A-Z0-9]+$ text_min_max_length_info: 0 means no restriction text_project_destroy_confirmation: Are you sure you want to delete this project and related data ? +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' text_workflow_edit: Select a role and a tracker to edit the workflow text_are_you_sure: Are you sure ? text_journal_changed: changed from %s to %s diff --git a/lang/es.yml b/lang/es.yml index 3f13716d..7ce4a7a8 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -620,3 +620,4 @@ label_overall_activity: Actividad global setting_default_projects_public: Los proyectos nuevos son públicos por defecto error_scm_annotate: "No existe la entrada o no ha podido ser anotada" label_planning: Planificación +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/fi.yml b/lang/fi.yml index 0b47aee7..68b6c20d 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -617,3 +617,4 @@ setting_default_projects_public: Uudet projektit ovat oletuksena julkisia label_overall_activity: Kokonaishistoria error_scm_annotate: "Merkintää ei ole tai siihen ei voi lisätä selityksiä." label_planning: Suunnittelu +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/fr.yml b/lang/fr.yml index 602b3c8e..cbdda4f3 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -556,7 +556,8 @@ status_locked: vérouillé text_select_mail_notifications: Actions pour lesquelles une notification par e-mail est envoyée text_regexp_info: ex. ^[A-Z0-9]+$ text_min_max_length_info: 0 pour aucune restriction -text_project_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce projet et tout ce qui lui est rattaché ? +text_project_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce projet et toutes ses données ? +text_subprojects_destroy_warning: 'Ses sous-projets: %s seront également supprimés.' text_workflow_edit: Sélectionner un tracker et un rôle pour éditer le workflow text_are_you_sure: Etes-vous sûr ? text_journal_changed: changé de %s à %s diff --git a/lang/he.yml b/lang/he.yml index 0cde264f..a611c8c3 100644 --- a/lang/he.yml +++ b/lang/he.yml @@ -617,3 +617,4 @@ label_overall_activity: פעילות כוללת setting_default_projects_public: פרויקטים חדשים הינם פומביים כברירת מחדל error_scm_annotate: "הכניסה לא קיימת או שלא ניתן לתאר אותה." label_planning: תכנון +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/it.yml b/lang/it.yml index 7e9345b3..3d1dea09 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -617,3 +617,4 @@ label_overall_activity: Overall activity setting_default_projects_public: New projects are public by default error_scm_annotate: "The entry does not exist or can not be annotated." label_planning: Planning +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/ja.yml b/lang/ja.yml index 44d0c3eb..680d2983 100644 --- a/lang/ja.yml +++ b/lang/ja.yml @@ -618,3 +618,4 @@ label_overall_activity: 全ての活動 setting_default_projects_public: デフォルトで新しいプロジェクトは公開にする error_scm_annotate: "エントリが存在しない、もしくはアノテートできません。" label_planning: 計画 +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/ko.yml b/lang/ko.yml index a8b10585..4281f388 100644 --- a/lang/ko.yml +++ b/lang/ko.yml @@ -617,3 +617,4 @@ label_overall_activity: Overall activity setting_default_projects_public: New projects are public by default error_scm_annotate: "The entry does not exist or can not be annotated." label_planning: Planning +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/lt.yml b/lang/lt.yml index 5db73d30..df7cd960 100644 --- a/lang/lt.yml +++ b/lang/lt.yml @@ -618,3 +618,4 @@ label_overall_activity: Overall activity setting_default_projects_public: New projects are public by default error_scm_annotate: "The entry does not exist or can not be annotated." label_planning: Planning +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/nl.yml b/lang/nl.yml index 6494eae0..e487a7a6 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -618,3 +618,4 @@ label_overall_activity: Overall activity setting_default_projects_public: New projects are public by default error_scm_annotate: "The entry does not exist or can not be annotated." label_planning: Planning +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/no.yml b/lang/no.yml index 25f4047a..9ee42600 100644 --- a/lang/no.yml +++ b/lang/no.yml @@ -618,3 +618,4 @@ default_activity_development: Utvikling enumeration_issue_priorities: Sakssprioriteringer enumeration_doc_categories: Dokument-kategorier enumeration_activities: Aktiviteter (tidssporing) +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/pl.yml b/lang/pl.yml index fdb8afaa..81f03a62 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -617,3 +617,4 @@ label_overall_activity: Ogólna aktywność setting_default_projects_public: Nowe projekty są domyślnie publiczne error_scm_annotate: "Wpis nie istnieje lub nie można do niego dodawać adnotacji." label_planning: Planning +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/pt-br.yml b/lang/pt-br.yml index 218cbab5..9facd8d1 100644 --- a/lang/pt-br.yml +++ b/lang/pt-br.yml @@ -617,3 +617,4 @@ label_overall_activity: Overall activity setting_default_projects_public: New projects are public by default error_scm_annotate: "The entry does not exist or can not be annotated." label_planning: Planning +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/pt.yml b/lang/pt.yml index e82176c5..6f51c8ed 100644 --- a/lang/pt.yml +++ b/lang/pt.yml @@ -617,3 +617,4 @@ label_overall_activity: Overall activity setting_default_projects_public: New projects are public by default error_scm_annotate: "The entry does not exist or can not be annotated." label_planning: Planning +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/ro.yml b/lang/ro.yml index 4d26ab10..59edfeb7 100644 --- a/lang/ro.yml +++ b/lang/ro.yml @@ -617,3 +617,4 @@ label_overall_activity: Overall activity setting_default_projects_public: New projects are public by default error_scm_annotate: "The entry does not exist or can not be annotated." label_planning: Planning +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/ru.yml b/lang/ru.yml index 310ded30..f6900984 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -621,3 +621,4 @@ label_overall_activity: Сводная активность setting_default_projects_public: Новые проекты являются публичными error_scm_annotate: "Данные отсутствуют или не могут быть подписаны." label_planning: Планирование +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/sr.yml b/lang/sr.yml index fa4ecd8d..d9869c36 100644 --- a/lang/sr.yml +++ b/lang/sr.yml @@ -618,3 +618,4 @@ label_overall_activity: Overall activity setting_default_projects_public: New projects are public by default error_scm_annotate: "The entry does not exist or can not be annotated." label_planning: Planning +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/sv.yml b/lang/sv.yml index e1ac6b4b..c0f69123 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -618,3 +618,4 @@ label_overall_activity: Overall activity setting_default_projects_public: New projects are public by default error_scm_annotate: "The entry does not exist or can not be annotated." label_planning: Planning +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/uk.yml b/lang/uk.yml index 8fc418e6..a52a0560 100644 --- a/lang/uk.yml +++ b/lang/uk.yml @@ -619,3 +619,4 @@ label_overall_activity: Overall activity setting_default_projects_public: New projects are public by default error_scm_annotate: "The entry does not exist or can not be annotated." label_planning: Planning +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml index e16fbe59..a0c7fafb 100644 --- a/lang/zh-tw.yml +++ b/lang/zh-tw.yml @@ -618,3 +618,4 @@ default_activity_development: 開發 enumeration_issue_priorities: 項目優先權 enumeration_doc_categories: 文件分類 enumeration_activities: 活動 (時間追蹤) +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/lang/zh.yml b/lang/zh.yml index bff45a2e..12fb8cb3 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -618,3 +618,4 @@ default_activity_development: 开发 enumeration_issue_priorities: 问题优先级 enumeration_doc_categories: 文档类别 enumeration_activities: 活动（时间跟踪） +text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1df5b213..26f66f0b 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -259,7 +259,7 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; } a.feed { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; } /***** Flash & error messages ****/ -#errorExplanation, div.flash, .nodata { +#errorExplanation, div.flash, .nodata, .warning { padding: 4px 4px 4px 30px; margin-bottom: 12px; font-size: 1.1em; @@ -282,7 +282,7 @@ div.flash.notice { color: #005f00; } -.nodata { +.nodata, .warning { text-align: center; background-color: #FFEBC1; border-color: #FDBF3B;