Warn user that subprojects are also deleted when deleting a project (#1111) and add...

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1359 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/projects/destroy.rhtml b/app/views/projects/destroy.rhtml
index 4531cb845d32904dd604147cc52619357f24855b..a1913c115b56e79da79688e6eae4a635785e3801 100644 (file)
--- a/app/views/projects/destroy.rhtml
+++ b/app/views/projects/destroy.rhtml
@@ -1,14 +1,16 @@
 <h2><%=l(:label_confirmation)%></h2>
-<div class="box">
-<center>
-<p><strong><%=h @project_to_destroy.name %></strong><br />
-<%=l(:text_project_destroy_confirmation)%></p>
+<div class="warning">
+<p><strong><%=h @project_to_destroy %></strong><br />
+<%=l(:text_project_destroy_confirmation)%>
 
+<% if @project_to_destroy.children.any? %>
+<br /><%= l(:text_subprojects_destroy_warning, content_tag('strong', h(@project_to_destroy.children.sort.collect{|p| p.to_s}.join(', ')))) %>
+<% end %>
+</p>
 <p>
     <% form_tag({:controller => 'projects', :action => 'destroy', :id => @project_to_destroy}) do %>
-    <%= hidden_field_tag "confirm", 1 %>
+    <label><%= check_box_tag 'confirm', 1 %> <%= l(:general_text_Yes) %></label>
     <%= submit_tag l(:button_delete) %>
     <% end %>
 </p>
-</center>
-</div>
\ No newline at end of file
+</div>

diff --git a/lang/bg.yml b/lang/bg.yml
index d1a60fe43802074daceb87ec41964408e83a5fab..b341d989fee16cc940baab622977c30b9b722b9b 100644 (file)
--- 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 60fcb8d116ccdcf758f9c9d3d9240650cb5fd58c..250c602c2f2bf80ca127e724c5f051f370ef17e5 100644 (file)
--- 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 b0a6764bb845dc04a6bf2998bdb831fb054999f3..ff2ed982df6d73282fc76824b854e641c90a0b1f 100644 (file)
--- 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 323859ae4e5148f691a59547f1b8c77a4cd181fa..77184cf88a89b5053a413a0ac530dda4cb26eaf1 100644 (file)
--- 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 8264ba908b95e9acb12dd38a198e750c37e925c7..e39aec301488d87c9ed5858aa8d714b84dbc86c4 100644 (file)
--- 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 3f13716dfbaa0d598b68752852617b74d343dd5a..7ce4a7a8ae9321f96ea5707ca3abafc55869e496 100644 (file)
--- 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 0b47aee7f5b7938245d603c3c48a2141bab7daaa..68b6c20d7019f8df085ec8cea76d1be03fbb8671 100644 (file)
--- 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 602b3c8e1bef0fbe3613c3de66d496dd4bd246e0..cbdda4f3d0bcc372f43360234d0869f9347cc73f 100644 (file)
--- 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 0cde264f7f108c5c826908854d9eba9d968367f7..a611c8c390eac0cdfd4e62ca561bbe18ef5a7a07 100644 (file)
--- 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 7e9345b30aadc661d05aecafd24dd6d879160ce6..3d1dea09e0fcb46c8f710d270e0a32d3069bfd45 100644 (file)
--- 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 44d0c3ebd9cfa3f574f06eac0cb94048997909a6..680d29836d3cbe4bec8b43a3be4d45661cce8030 100644 (file)
--- 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 a8b1058552db64c24a6efa6350677b28d9737869..4281f3881e501f509ae2b60aee515526b99453cd 100644 (file)
--- 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 5db73d3002a1e65fc03b5f1e45b9032e1ddb5ba8..df7cd960b199e7b8decfe8cf7e915b88ff05977d 100644 (file)
--- 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 6494eae07c6548cd6bde6dba157e917a5698804e..e487a7a6d4c6f3afa1920aebe08eef65a2535a4f 100644 (file)
--- 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 25f4047ab8fb79c8c8d33f2147404f5130d63b31..9ee42600bf001e46cf54c48a977c2de659279699 100644 (file)
--- 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 fdb8afaa2571e531d46343952cc970cfeb3c30f6..81f03a62f78ad20af80c99316c7f2bd9a43e98df 100644 (file)
--- 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 218cbab51f997e7a2f19782a2b9ae68f70e3f6ad..9facd8d193f1b9e804bbb8c8ff77308232bacd8a 100644 (file)
--- 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\r
 error_scm_annotate: "The entry does not exist or can not be annotated."\r
 label_planning: Planning\r
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'\r

diff --git a/lang/pt.yml b/lang/pt.yml
index e82176c563a76aa16748d8cd941548e7ff19e6df..6f51c8ed2f3d048748ec0fa4a90e26d306b00713 100644 (file)
--- 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 4d26ab1034c64edab7c2e2f2194c7a0449d706ea..59edfeb706ec76470ed7bcaaddf8b29e4e021c68 100644 (file)
--- 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 310ded30d9a838077744b35d551ce256e59b80c0..f690098475128496220a01dbfa1220757edae487 100644 (file)
--- 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 fa4ecd8de66e893621e1d48b5d88d8bb02ea6a97..d9869c362fece4a02529825bbe585846bc2301be 100644 (file)
--- 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 e1ac6b4bc201055a25b702491279153d56c2f30f..c0f691230408e4879f7adbd92c3c12f308337086 100644 (file)
--- 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 8fc418e676752d8dc566520baaf96640ca70b7aa..a52a056038472098308004fb4fcd3286a7ec75e5 100644 (file)
--- 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 e16fbe591a271862129fbefb2b510a2bcac9bdde..a0c7fafb356a27c44a0e29126bb7edb39318999c 100644 (file)
--- 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 bff45a2ec6266b2fda73f48e0055d340bed0f912..12fb8cb3e422647914500cb624ffbac202049a54 100644 (file)
--- 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 1df5b213cca1aee9c57fe141609d602ac33e0fd5..26f66f0b81cdbaa3bcfbadb3ac2f2727ba545592 100644 (file)
--- 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;