Diff
Modified: branches/event_logging/app/views/layouts/_blob.rxml (1987 => 1988)
--- branches/event_logging/app/views/layouts/_blob.rxml 2008-11-19 11:53:44 UTC (rev 1987)
+++ branches/event_logging/app/views/layouts/_blob.rxml 2008-11-19 13:28:28 UTC (rev 1988)
@@ -2,6 +2,7 @@
# (these will only be passed in if non-standard behaviour is required -
# for example, when the partial is called from pack_items.rss instead of
# /files.rss)
+hide_description ||= nil
extra_metadata ||= nil
overriden_pubDate ||= nil
overriden_author ||= nil
@@ -28,7 +29,10 @@
desc += "<br/><br/><b>Uploader: </b>" + link_to(uploader_name, uploader_path)
desc += "<br/><b>Uploaded on: </b>" + blob.contribution.created_at.strftime('%d/%m/%Y @ %H:%M:%S')
- desc += "<br/><br/><b>Description: </b><br/><blockquote>" + ((blob.body_html.nil? || blob.body_html.blank?) ? "<i>No description</i>" : blob.body_html) + "</blockquote>"
+ unless hide_description
+ desc += "<br/><br/><b>Description: </b><br/><blockquote>" + ((blob.body_html.nil? || blob.body_html.blank?) ? "<i>No description</i>" : blob.body_html) + "</blockquote>"
+ end
+
unless extra_metadata.nil?
desc += extra_metadata
end
Modified: branches/event_logging/app/views/layouts/_pack.rxml (1987 => 1988)
--- branches/event_logging/app/views/layouts/_pack.rxml 2008-11-19 11:53:44 UTC (rev 1987)
+++ branches/event_logging/app/views/layouts/_pack.rxml 2008-11-19 13:28:28 UTC (rev 1988)
@@ -2,6 +2,7 @@
# (these will only be passed in if non-standard behaviour is required -
# for example, when the partial is called from pack_items.rss instead of
# /packs.rss)
+hide_description ||= nil
extra_metadata ||= nil
overriden_pubDate ||= nil
overriden_author ||= nil
@@ -26,7 +27,10 @@
desc += "<br/><br/><b>Creator: </b>" + link_to(creator_name, creator_path)
desc += "<br/><b>Created on: </b>" + pack.contribution.created_at.strftime('%d/%m/%Y @ %H:%M:%S')
- desc += "<br/><br/><b>Description: </b><br/><blockquote>" + ((pack.description_html.nil? || pack.description_html.blank?) ? "<i>No description</i>" : pack.description_html) + "</blockquote>"
+ unless hide_description
+ desc += "<br/><br/><b>Description: </b><br/><blockquote>" + ((pack.description_html.nil? || pack.description_html.blank?) ? "<i>No description</i>" : pack.description_html) + "</blockquote>"
+ end
+
unless extra_metadata.nil?
desc += extra_metadata
end
Modified: branches/event_logging/app/views/layouts/_pack_items.rxml (1987 => 1988)
--- branches/event_logging/app/views/layouts/_pack_items.rxml 2008-11-19 11:53:44 UTC (rev 1987)
+++ branches/event_logging/app/views/layouts/_pack_items.rxml 2008-11-19 13:28:28 UTC (rev 1988)
@@ -4,15 +4,16 @@
if show
- # Description
- desc = "<div style='border-left: 4px dotted; padding-left: 1em;'>"
+ # Descriptionborder-left: 4px dotted; padding-left: 1em;
+ desc = "<div style='margin-top: 1em; border-left: 3px solid #CFCFCF; padding-left: 1em;'>"
desc += "<b>Added to pack by: </b>" + link_to(h(e.user.name), user_url(e.user.id))
desc += "<br/><b>Added to pack on: </b>" + e.created_at.strftime('%d/%m/%Y @ %H:%M:%S')
desc += "<br/><b>Comment (in pack):</b><blockquote>#{e.comment.blank? ? "<i>No comment</i>" : h(e.comment)}</blockquote>"
desc += "</div>"
render(:partial => "layouts/#{e.contributable_type.to_s.downcase}", :object => item_instance,
- :locals => { :xm => xm,
+ :locals => { :xm => xm,
+ :hide_description => true,
:extra_metadata => desc,
:overriden_pubDate => e.created_at.rfc822,
:overriden_author => h(e.user.name),
Modified: branches/event_logging/app/views/layouts/_workflow.rxml (1987 => 1988)
--- branches/event_logging/app/views/layouts/_workflow.rxml 2008-11-19 11:53:44 UTC (rev 1987)
+++ branches/event_logging/app/views/layouts/_workflow.rxml 2008-11-19 13:28:28 UTC (rev 1988)
@@ -2,6 +2,7 @@
# (these will only be passed in if non-standard behaviour is required -
# for example, when the partial is called from pack_items.rss instead of
# /workflows.rss)
+hide_description ||= nil
overriden_version ||= nil
extra_metadata ||= nil
overriden_pubDate ||= nil
@@ -44,7 +45,10 @@
desc += "<br/><b>Version uploaded by: </b>" + link_to(version_uploader_name, version_uploader_path)
end
- desc += "<br/><br/><b>Description: </b><br/><blockquote>" + ((workflow.body_html.nil? || workflow.body_html.blank?) ? "<i>No description</i>" : workflow.body_html) + "</blockquote>"
+ unless hide_description
+ desc += "<br/><br/><b>Description: </b><br/><blockquote>" + ((workflow.body_html.nil? || workflow.body_html.blank?) ? "<i>No description</i>" : workflow.body_html) + "</blockquote>"
+ end
+
unless extra_metadata.nil?
desc += extra_metadata
end