Diff
Deleted: trunk/app/views/blobs/_license.rhtml (2149 => 2150)
--- trunk/app/views/blobs/_license.rhtml 2009-03-29 22:11:35 UTC (rev 2149)
+++ trunk/app/views/blobs/_license.rhtml 2009-03-30 21:16:39 UTC (rev 2150)
@@ -1,108 +0,0 @@
-<% case (blob.license.to_s); when "by-nd" %>
-
-<!--
-
-<rdf:RDF xmlns="http://web.resource.org/cc/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<Work rdf:about="">
- <dc:title><%= blob.title %></dc:title>
- <dc:date><%= blob.created_at %></dc:date>
- <dc:description><%= blob.body_html %></dc:description>
- <dc:creator><Agent>
- <dc:title><%= contributor(blob.contribution.contributor_id, blob.contribution.contributor_type, link=false) %></dc:title>
- </Agent></dc:creator>
- <dc:rights><Agent>
- <dc:title><%= contributor(blob.contribution.contributor_id, blob.contribution.contributor_type, link=false) %></dc:title>
- </Agent></dc:rights>
- <dc:type rdf:resource="http://purl.org/dc/dcmitype/Data" />
- <dc:source rdf:resource="<%= Conf.base_uri %><%= request.request_uri %>"/>
- <license rdf:resource="http://creativecommons.org/licenses/by-nd/3.0/" />
-</Work>
-
-<License rdf:about="http://creativecommons.org/licenses/by-nd/3.0/">
- <permits rdf:resource="http://web.resource.org/cc/Reproduction" />
- <permits rdf:resource="http://web.resource.org/cc/Distribution" />
- <requires rdf:resource="http://web.resource.org/cc/Notice" />
- <requires rdf:resource="http://web.resource.org/cc/Attribution" />
- <prohibits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-</License>
-
-</rdf:RDF>
-
--->
-
-<% when "by-sa" %>
-
-<!--
-
-<rdf:RDF xmlns="http://web.resource.org/cc/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<Work rdf:about="">
- <dc:title><%= blob.title %></dc:title>
- <dc:date><%= blob.created_at %></dc:date>
- <dc:description><%= blob.body_html %></dc:description>
- <dc:creator><Agent>
- <dc:title><%= contributor(blob.contribution.contributor_id, blob.contribution.contributor_type, link=false) %></dc:title>
- </Agent></dc:creator>
- <dc:rights><Agent>
- <dc:title><%= contributor(blob.contribution.contributor_id, blob.contribution.contributor_type, link=false) %></dc:title>
- </Agent></dc:rights>
- <dc:type rdf:resource="http://purl.org/dc/dcmitype/Data" />
- <dc:source rdf:resource="<%= Conf.base_uri %><%= request.request_uri %>"/>
- <license rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
-</Work>
-
-<License rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
- <permits rdf:resource="http://web.resource.org/cc/Reproduction" />
- <permits rdf:resource="http://web.resource.org/cc/Distribution" />
- <requires rdf:resource="http://web.resource.org/cc/Notice" />
- <requires rdf:resource="http://web.resource.org/cc/Attribution" />
- <permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
- <requires rdf:resource="http://web.resource.org/cc/ShareAlike" />
-</License>
-
-</rdf:RDF>
-
--->
-
-<% when "by" %>
-
-<!--
-
-<rdf:RDF xmlns="http://web.resource.org/cc/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<Work rdf:about="">
- <dc:title><%= blob.title %></dc:title>
- <dc:date><%= blob.created_at %></dc:date>
- <dc:description><%= blob.body_html %></dc:description>
- <dc:creator><Agent>
- <dc:title><%= contributor(blob.contribution.contributor_id, blob.contribution.contributor_type, link=false) %></dc:title>
- </Agent></dc:creator>
- <dc:rights><Agent>
- <dc:title><%= contributor(blob.contribution.contributor_id, blob.contribution.contributor_type, link=false) %></dc:title>
- </Agent></dc:rights>
- <dc:type rdf:resource="http://purl.org/dc/dcmitype/Data" />
- <dc:source rdf:resource="<%= Conf.base_uri %><%= request.request_uri %>"/>
- <license rdf:resource="http://creativecommons.org/licenses/by/3.0/" />
-</Work>
-
-<License rdf:about="http://creativecommons.org/licenses/by/3.0/">
- <permits rdf:resource="http://web.resource.org/cc/Reproduction" />
- <permits rdf:resource="http://web.resource.org/cc/Distribution" />
- <requires rdf:resource="http://web.resource.org/cc/Notice" />
- <requires rdf:resource="http://web.resource.org/cc/Attribution" />
- <permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-</License>
-
-</rdf:RDF>
-
--->
-
-<% end %>
-
-<p>
- All versions of this File are licensed under the <%= license_link blob.license.to_s %>.
-</p>
Modified: trunk/app/views/contributions/_license_box.rhtml (2149 => 2150)
--- trunk/app/views/contributions/_license_box.rhtml 2009-03-29 22:11:35 UTC (rev 2149)
+++ trunk/app/views/contributions/_license_box.rhtml 2009-03-30 21:16:39 UTC (rev 2150)
@@ -6,12 +6,129 @@
License
<a name="license"></a>
</p>
+
+
+<% dc_title = contributable.title %>
+<% dc_description = contributable.respond_to?('description_html') ? contributable.description_html : contributable.body_html %>
+<% dc_date = contributable.created_at %>
+<% dc_creator = contributor(contributable.contribution.contributor_id, contributable.contribution.contributor_type, link=false) %>
+<% dc_source = Conf.base_uri + request.request_uri %>
+
+
+<% case (contributable.license.to_s); when "by-nd" %>
+
+<!--
+
+<rdf:RDF xmlns="http://web.resource.org/cc/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<Work rdf:about="">
+ <dc:title><%= dc_title %></dc:title>
+ <dc:date><%= dc_date %></dc:date>
+ <dc:description><%= dc_description %></dc:description>
+ <dc:creator><Agent>
+ <dc:title><%= dc_creator %></dc:title>
+ </Agent></dc:creator>
+ <dc:rights><Agent>
+ <dc:title><%= dc_creator %></dc:title>
+ </Agent></dc:rights>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/Data" />
+ <dc:source rdf:resource="<%= dc_source -%>"/>
+ <license rdf:resource="http://creativecommons.org/licenses/by-nd/3.0/" />
+</Work>
+
+<License rdf:about="http://creativecommons.org/licenses/by-nd/3.0/">
+ <permits rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <permits rdf:resource="http://web.resource.org/cc/Distribution" />
+ <requires rdf:resource="http://web.resource.org/cc/Notice" />
+ <requires rdf:resource="http://web.resource.org/cc/Attribution" />
+ <prohibits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+</License>
+
+</rdf:RDF>
+
+-->
+
+<% when "by-sa" %>
+
+<!--
+
+<rdf:RDF xmlns="http://web.resource.org/cc/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<Work rdf:about="">
+ <dc:title><%= dc_title %></dc:title>
+ <dc:date><%= dc_date %></dc:date>
+ <dc:description><%= dc_description %></dc:description>
+ <dc:creator><Agent>
+ <dc:title><%= dc_creator %></dc:title>
+ </Agent></dc:creator>
+ <dc:rights><Agent>
+ <dc:title><%= dc_creator %></dc:title>
+ </Agent></dc:rights>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/Data" />
+ <dc:source rdf:resource="<%= dc_source -%>"/>
+ <license rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+</Work>
+
+<License rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+ <permits rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <permits rdf:resource="http://web.resource.org/cc/Distribution" />
+ <requires rdf:resource="http://web.resource.org/cc/Notice" />
+ <requires rdf:resource="http://web.resource.org/cc/Attribution" />
+ <permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <requires rdf:resource="http://web.resource.org/cc/ShareAlike" />
+</License>
+
+</rdf:RDF>
+
+-->
+
+<% when "by" %>
+
+<!--
+
+<rdf:RDF xmlns="http://web.resource.org/cc/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<Work rdf:about="">
+ <dc:title><%= dc_title %></dc:title>
+ <dc:date><%= dc_date %></dc:date>
+ <dc:description><%= dc_description %></dc:description>
+ <dc:creator><Agent>
+ <dc:title><%= dc_creator %></dc:title>
+ </Agent></dc:creator>
+ <dc:rights><Agent>
+ <dc:title><%= dc_creator %></dc:title>
+ </Agent></dc:rights>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/Data" />
+ <dc:source rdf:resource="<%= dc_source -%>"/>
+ <license rdf:resource="http://creativecommons.org/licenses/by/3.0/" />
+</Work>
+
+<License rdf:about="http://creativecommons.org/licenses/by/3.0/">
+ <permits rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <permits rdf:resource="http://web.resource.org/cc/Distribution" />
+ <requires rdf:resource="http://web.resource.org/cc/Notice" />
+ <requires rdf:resource="http://web.resource.org/cc/Attribution" />
+ <permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+</License>
+
+</rdf:RDF>
+
+-->
+
+<% end %>
+
+ <div class="contribution_currentlicense">
+ <p>
+ <% if contributable.respond_to?('versions') %>
+ All versions of this <%= visible_name(contributable) -%> are
+ <% else %>
+ This <%= visible_name(contributable) -%> is
+ <% end %>
+ licensed under the <%= license_link contributable.license.to_s %>.
+ </p>
+ </div>
- <div class="contribution_currentlicense">
- <% if contributable.class.to_s.downcase == "workflow" %>
- <%= render :partial => "workflows/license", :locals => { :workflow => contributable } %>
- <% elsif contributable.class.to_s.downcase == "blob" %>
- <%= render :partial => "blobs/license", :locals => { :blob => contributable } %>
- <% end %>
- </div>
-</div>
\ No newline at end of file
+</div>
Deleted: trunk/app/views/workflows/_license.rhtml (2149 => 2150)
--- trunk/app/views/workflows/_license.rhtml 2009-03-29 22:11:35 UTC (rev 2149)
+++ trunk/app/views/workflows/_license.rhtml 2009-03-30 21:16:39 UTC (rev 2150)
@@ -1,108 +0,0 @@
-<% case (workflow.license.to_s); when "by-nd" %>
-
-<!--
-
-<rdf:RDF xmlns="http://web.resource.org/cc/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<Work rdf:about="">
- <dc:title><%= workflow.title %></dc:title>
- <dc:date><%= workflow.created_at %></dc:date>
- <dc:description><%= workflow.body_html %></dc:description>
- <dc:creator><Agent>
- <dc:title><%= contributor(workflow.contribution.contributor_id, workflow.contribution.contributor_type, link=false) %></dc:title>
- </Agent></dc:creator>
- <dc:rights><Agent>
- <dc:title><%= contributor(workflow.contribution.contributor_id, workflow.contribution.contributor_type, link=false) %></dc:title>
- </Agent></dc:rights>
- <dc:type rdf:resource="http://purl.org/dc/dcmitype/Data" />
- <dc:source rdf:resource="<%= Conf.base_uri %><%= request.request_uri %>"/>
- <license rdf:resource="http://creativecommons.org/licenses/by-nd/3.0/" />
-</Work>
-
-<License rdf:about="http://creativecommons.org/licenses/by-nd/3.0/">
- <permits rdf:resource="http://web.resource.org/cc/Reproduction" />
- <permits rdf:resource="http://web.resource.org/cc/Distribution" />
- <requires rdf:resource="http://web.resource.org/cc/Notice" />
- <requires rdf:resource="http://web.resource.org/cc/Attribution" />
- <prohibits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-</License>
-
-</rdf:RDF>
-
--->
-
-<% when "by-sa" %>
-
-<!--
-
-<rdf:RDF xmlns="http://web.resource.org/cc/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<Work rdf:about="">
- <dc:title><%= workflow.title %></dc:title>
- <dc:date><%= workflow.created_at %></dc:date>
- <dc:description><%= workflow.body_html %></dc:description>
- <dc:creator><Agent>
- <dc:title><%= contributor(workflow.contribution.contributor_id, workflow.contribution.contributor_type, link=false) %></dc:title>
- </Agent></dc:creator>
- <dc:rights><Agent>
- <dc:title><%= contributor(workflow.contribution.contributor_id, workflow.contribution.contributor_type, link=false) %></dc:title>
- </Agent></dc:rights>
- <dc:type rdf:resource="http://purl.org/dc/dcmitype/Data" />
- <dc:source rdf:resource="<%= Conf.base_uri %><%= request.request_uri %>"/>
- <license rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
-</Work>
-
-<License rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
- <permits rdf:resource="http://web.resource.org/cc/Reproduction" />
- <permits rdf:resource="http://web.resource.org/cc/Distribution" />
- <requires rdf:resource="http://web.resource.org/cc/Notice" />
- <requires rdf:resource="http://web.resource.org/cc/Attribution" />
- <permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
- <requires rdf:resource="http://web.resource.org/cc/ShareAlike" />
-</License>
-
-</rdf:RDF>
-
--->
-
-<% when "by" %>
-
-<!--
-
-<rdf:RDF xmlns="http://web.resource.org/cc/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<Work rdf:about="">
- <dc:title><%= workflow.title %></dc:title>
- <dc:date><%= workflow.created_at %></dc:date>
- <dc:description><%= workflow.body_html %></dc:description>
- <dc:creator><Agent>
- <dc:title><%= contributor(workflow.contribution.contributor_id, workflow.contribution.contributor_type, link=false) %></dc:title>
- </Agent></dc:creator>
- <dc:rights><Agent>
- <dc:title><%= contributor(workflow.contribution.contributor_id, workflow.contribution.contributor_type, link=false) %></dc:title>
- </Agent></dc:rights>
- <dc:type rdf:resource="http://purl.org/dc/dcmitype/Data" />
- <dc:source rdf:resource="<%= Conf.base_uri %><%= request.request_uri %>"/>
- <license rdf:resource="http://creativecommons.org/licenses/by/3.0/" />
-</Work>
-
-<License rdf:about="http://creativecommons.org/licenses/by/3.0/">
- <permits rdf:resource="http://web.resource.org/cc/Reproduction" />
- <permits rdf:resource="http://web.resource.org/cc/Distribution" />
- <requires rdf:resource="http://web.resource.org/cc/Notice" />
- <requires rdf:resource="http://web.resource.org/cc/Attribution" />
- <permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-</License>
-
-</rdf:RDF>
-
--->
-
-<% end %>
-
-<p>
- All versions of this Workflow are licensed under the <%= license_link workflow.license.to_s %>.
-</p>