]> source.dussan.org Git - redmine.git/commitdiff
Added related changesets messages on issue details view.
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 20 Jan 2008 15:38:11 +0000 (15:38 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 20 Jan 2008 15:38:11 +0000 (15:38 +0000)
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1085 e93f8b46-1217-0410-a6f0-8f06a7374b81

26 files changed:
app/views/issues/_changesets.rhtml [new file with mode: 0644]
app/views/issues/_pdf.rfpdf
app/views/issues/show.rhtml
lang/bg.yml
lang/cs.yml
lang/de.yml
lang/en.yml
lang/es.yml
lang/fi.yml
lang/fr.yml
lang/he.yml
lang/it.yml
lang/ja.yml
lang/ko.yml
lang/lt.yml
lang/nl.yml
lang/pl.yml
lang/pt-br.yml
lang/pt.yml
lang/ro.yml
lang/ru.yml
lang/sr.yml
lang/sv.yml
lang/zh-tw.yml
lang/zh.yml
public/stylesheets/application.css

diff --git a/app/views/issues/_changesets.rhtml b/app/views/issues/_changesets.rhtml
new file mode 100644 (file)
index 0000000..1a4c1a5
--- /dev/null
@@ -0,0 +1,8 @@
+<ul>
+<% changesets.each do |changeset| %>
+    <li class="<%= cycle('odd', 'even') %>"><%= link_to("#{l(:label_revision)} #{changeset.revision}",
+                    :controller => 'repositories', :action => 'revision', :id => @project, :rev => changeset.revision) %><br />
+        <em><%= changeset.committer %>, <%= format_time(changeset.committed_on) %></em>
+    <%= textilizable(changeset, :comments) %></li>
+<% end %>
+</ul>
index 558399abb1197800f9c017837ae9f73f95d3214e..6830506f65e21700161bbfc33c83c2235e86d3d8 100644 (file)
        pdf.Line(pdf.GetX, pdf.GetY, 170, pdf.GetY)\r
 \r
     pdf.Ln\r
-\r
-    pdf.SetFontStyle('B',9)\r
+    \r
+    if @issue.changesets.any? && User.current.allowed_to?(:view_changesets, issue.project)\r
+       pdf.SetFontStyle('B',9)\r
+           pdf.Cell(190,5, l(:label_associated_revisions), "B")\r
+           pdf.Ln      \r
+               for changeset in @issue.changesets\r
+                       pdf.SetFontStyle('B',8)\r
+                   pdf.Cell(190,5, format_time(changeset.committed_on) + " - " + changeset.committer)\r
+                   pdf.Ln\r
+                       unless changeset.comments.blank?\r
+                               pdf.SetFontStyle('',8)\r
+                               pdf.MultiCell(190,5, changeset.comments)\r
+                       end             \r
+                       pdf.Ln\r
+               end\r
+       end\r
+       \r
+       pdf.SetFontStyle('B',9)\r
     pdf.Cell(190,5, l(:label_history), "B")\r
     pdf.Ln     \r
        for journal in issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")\r
index 7208e37beb362bf144d0e2ff3262095a3618b308..45423a2e039c1735bc66dc11efde0f42b259194a 100644 (file)
@@ -57,12 +57,6 @@ end %>
 </table>
 <hr />
 
-<% if @issue.changesets.any? %>
-<div style="float:right;">
-  <em><%= l(:label_revision_plural) %>: <%= @issue.changesets.collect{|changeset| link_to(changeset.revision, :controller => 'repositories', :action => 'revision', :id => @project, :rev => changeset.revision)}.join(", ") %></em>
-</div>
-<% end %>
-
 <p><strong><%=l(:field_description)%></strong></p>
 <div class="wiki">
 <%= textilizable @issue, :description, :attachments => @issue.attachments %>
@@ -81,6 +75,13 @@ end %>
 
 </div>
 
+<% if @issue.changesets.any? && User.current.allowed_to?(:view_changesets, @project) %>
+<div id="issue-changesets">
+<h3><%=l(:label_associated_revisions)%></h3>
+<%= render :partial => 'changesets', :locals => { :changesets => @issue.changesets} %>
+</div>
+<% end %>
+
 <% if @journals.any? %>
 <div id="history">
 <h3><%=l(:label_history)%></h3>
index ae5630ecfa03c8a6759ad8f9a62eb84afea504aa..7f994acd404b3ed658132a37631c5125e5e4a4b2 100644 (file)
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
index 813dade3f1d8c7e7a19f3de847bc5bd8c18e445b..6e904c106eaaf4e0b6ef90c6b2c56d1fb9ad4238 100644 (file)
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
index 66028976837a73fcca2f5a400fbf5b83ed949c34..27ca40a3d774e11f1109aab87af82b0ca7209abc 100644 (file)
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
index 7d3912760e3bf26a2a464a85d7de0e6e91dfc778..6580d398aedd0aa56f7c06b4d933851a3e46e9e9 100644 (file)
@@ -359,6 +359,7 @@ label_modification: %d change
 label_modification_plural: %d changes
 label_revision: Revision
 label_revision_plural: Revisions
+label_associated_revisions: Associated revisions
 label_added: added
 label_modified: modified
 label_deleted: deleted
index 37821e1295f09a9163ac7f10059bd7a92162bb6f..1c6776555a4f6fc87750476f5010c159a37a8820 100644 (file)
@@ -564,3 +564,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
index 4aee95bb998c9b58cea3e5fff92b659677428b3e..7eba540a721d266bef68d212b55d5f957e1a090f 100644 (file)
@@ -566,3 +566,4 @@ default_activity_development: Kehitys
 enumeration_issue_priorities: Tapahtuman prioriteetit
 enumeration_doc_categories: Dokumentin luokat
 enumeration_activities: Aktiviteetit (ajan seuranta)
+label_associated_revisions: Associated revisions
index 841f132d406ac414f62f6d1ffba0bdc72386e15a..ce3817d3c861b46de7346a903a7e52f601c0ad80 100644 (file)
@@ -359,6 +359,7 @@ label_modification: %d modification
 label_modification_plural: %d modifications
 label_revision: Révision
 label_revision_plural: Révisions
+label_associated_revisions: Révisions associées
 label_added: ajouté
 label_modified: modifié
 label_deleted: supprimé
index 666675e753cd224ad1177bb3d165675a8aa189fa..928c68baacaf42ebfaeadc9ccb54d532891453e5 100644 (file)
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
index 24e39955aa4542cb5a9feb148f39e40f58fc71e9..a162281499760deee884208b6fb92434dcf17c26 100644 (file)
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
index d68013296469651588f3167af6a7e2ec6ba545a1..56f846947b4b2a3e5a15a8d69f734e0ed8e4e756 100644 (file)
@@ -562,3 +562,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
index 75a4bef4c10cb7316bdc68b55a7accf2819df6f6..7a509478e4c1841f49b503e5ba80132fb9a44519 100644 (file)
@@ -561,3 +561,4 @@ button_update: 변경사항기록
 label_change_properties: 속성 변경
 label_general: 일반
 label_repository_plural: 저장소들
+label_associated_revisions: Associated revisions
index 8cf573d1055e81710f65daec915b6ee5f652bd1a..8455260f178bc6b454421f22b0bf165c7e882f4d 100644 (file)
@@ -562,3 +562,4 @@ text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 label_repository_plural: Repositories
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+label_associated_revisions: Associated revisions
index 44633e4b40e3fe3ae44f1d2ffec3ea5c20e90b08..92e5a5971111ee05eb480bf66fb68541b6c250bc 100644 (file)
@@ -562,3 +562,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
index 3353333b82efe37add95f6197341e848f657b290..548917a363e539f77607660a1e17145344d18510 100644 (file)
@@ -561,3 +561,4 @@ button_update: Uaktualnij
 label_change_properties: Zmień właściwości
 label_general: Ogólne
 label_repository_plural: Repozytoria
+label_associated_revisions: Associated revisions
index 684b51daa3e5dadf9985744bb0f239bf5fd9747e..45e66cd528e15ed5efcdb96f88999cd2b8f7748b 100644 (file)
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties\r
 label_general: General\r
 label_repository_plural: Repositories\r
+label_associated_revisions: Associated revisions\r
index 0ce2d3471ef221b740c4bc8a506e06f01d8f6f2e..54b74c47cea64179d5e9d851c5ba740db216b5b7 100644 (file)
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
index 95e0ea318bc42ec4852c70f6a097cbaa0db89f78..c3427d26121c35b9d6e9a7abe13debbbccc0f60f 100644 (file)
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
index 131b5c77c0864c11a3994e625cd6220b287bd9cb..7bf47c8fce5f265d6daa448f6fad55360315fb57 100644 (file)
@@ -560,3 +560,4 @@ button_update: Обновить
 label_change_properties: Изменить свойства
 label_general: Общее
 label_repository_plural: Репозитории
+label_associated_revisions: Associated revisions
index ece6cf6e240266033f1a97b1d3059cca0630fb88..6c486a83f510a8349dc0b7f42ef3130379a58de6 100644 (file)
@@ -562,3 +562,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
index cf1e760f96a6a40b3873e0eb34de8afb456db8db..0cb9a2d67bc030a508e8f3df51769e09f1328aaa 100644 (file)
@@ -562,3 +562,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
index b0c258bcfa2f7977b64f421de56eff189f88fee0..465855b589410d2cf2e218562c5e86740e098a87 100644 (file)
@@ -562,3 +562,4 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目重要性
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
+label_associated_revisions: Associated revisions
index 2d537b2506acb3a3d1ecf0bb8460eebba1320085..c42c60face0fd0e2dcf61ddfb24ee5ad81667484 100644 (file)
@@ -564,3 +564,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
index 5bada6e068853a88f5bc59d3302fe0e17865f223..ec3ae159d060494db08eaa30582ec3d58c4dc2e0 100644 (file)
@@ -135,6 +135,11 @@ hr { width: 100%; height: 1px; background: #ccc; border: 0;}
 textarea.wiki-edit { width: 99%; }
 li p {margin-top: 0;}
 div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
+
+div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em;}
+div#issue-changesets ul {list-style-position: outside; list-style-type:none; margin: 0;  padding: 0;}
+div#issue-changesets li { padding: 4px; }
+
 .autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
 #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }