Diff
Modified: branches/neiss/app/models/map.rb (2446 => 2447)
--- branches/neiss/app/models/map.rb 2010-06-23 10:02:26 UTC (rev 2446)
+++ branches/neiss/app/models/map.rb 2010-06-23 10:20:25 UTC (rev 2447)
@@ -29,8 +29,6 @@
:boost => "rank",
:include => [ :comments ]) if Conf.solr_enable
- belongs_to :license
- validates_presence_of :license_id
validates_presence_of :title
format_attribute :description
Deleted: branches/neiss/app/views/maps/_license_form.rhtml (2446 => 2447)
--- branches/neiss/app/views/maps/_license_form.rhtml 2010-06-23 10:02:26 UTC (rev 2446)
+++ branches/neiss/app/views/maps/_license_form.rhtml 2010-06-23 10:20:25 UTC (rev 2447)
@@ -1,46 +0,0 @@
-<% if params[:map] && !params[:map][:license_id].blank? %>
- <% @license = License.find(params[:map][:license_id]) %>
-<% elsif edit %>
- <% @license = License.find(@map.license_id) %>
-<% else %>
- <% @license = License.find(2) %>
-<% end %>
-
-<div class="fold">
- <div class="foldTitle">
- <%= info_icon_with_tooltip("This section allows you to specify the <strong>rights</strong> that people have when they download and use this Map, by setting the license. <br/><br/>By default, the license specifies that people are allowed to build on this Map as long as they give the original author credit and share their resulting work under the same conditions.") %>
- License/Rights
- <% if edit %>
- <hr />
- <small>Current: <%= @license.title %> (<%= link_to h(@license.url), @license.url %>) </small>
- <% else %>
- <hr />
- <small>Default: <%= @license.title %> (<%= link_to h(@license.url), @license.url %>)</small>
- <% end %>
- </div>
- <div class="foldContent" style="display: none;">
- <p class="box_infotext">
- This section allows you to specify the <strong>rights</strong> that people have when they download and use this Map, by setting the license.
- </p>
- <br />
- <p>
- <strong>What license do you want people to adhere to if they download and use this Map?</strong>
- </p>
- <div style="padding-left: 1em;">
- <%= select(:map, :license_id, License.find(:all).collect {|l| [l.title, l.id] },
- { :selected => @license.id },
- { : remote_function(:update => 'license_info',
- :url ="" {:controller => 'licenses', :action="" 'update_license_info' },
- :with => "'license_id=' + escape(value)")}) %>
-
- </div>
- <hr/>
- <div id="license_info" style="padding: 0 20px;">
- <%= render :partial => "licenses/view", :locals => { :license => @license } %>
- </div>
- </div>
-</div>
-
-
-
-
Modified: branches/neiss/app/views/maps/_table.rhtml (2446 => 2447)
--- branches/neiss/app/views/maps/_table.rhtml 2010-06-23 10:02:26 UTC (rev 2446)
+++ branches/neiss/app/views/maps/_table.rhtml 2010-06-23 10:20:25 UTC (rev 2447)
@@ -60,8 +60,6 @@
</p>
<% end %>
- <p style="font-size:85%;"><b>License: </b><% @license = License.find(map.license_id) %><%= link_to h(@license.title), license_path(@license) %></p>
-
<div class="desc" style="font-size: 85%;">
<% if map.description and map.description.length > 0 %>
<% desc = truncate(strip_html(map.description), 500) %>
Modified: branches/neiss/app/views/maps/edit.rhtml (2446 => 2447)
--- branches/neiss/app/views/maps/edit.rhtml 2010-06-23 10:02:26 UTC (rev 2446)
+++ branches/neiss/app/views/maps/edit.rhtml 2010-06-23 10:20:25 UTC (rev 2447)
@@ -52,7 +52,6 @@
<% if @map.owner?(current_user) %>
<%= render :partial => "contributions/sharing_form", :locals => { :edit => true, :contributable => @map, :update_perms => true } %>
- <%= render :partial => "maps/license_form", :locals => { :edit => true } %>
<% end %>
<p>
Modified: branches/neiss/app/views/maps/new.rhtml (2446 => 2447)
--- branches/neiss/app/views/maps/new.rhtml 2010-06-23 10:02:26 UTC (rev 2446)
+++ branches/neiss/app/views/maps/new.rhtml 2010-06-23 10:20:25 UTC (rev 2447)
@@ -52,8 +52,6 @@
<%= render :partial => "contributions/sharing_form", :locals => { :edit => false, :contributable => @map, :update_perms => true } %>
- <%= render :partial => "maps/license_form", :locals => { :edit => false } %>
-
<%= render :partial => 'contributions/terms_and_conditions' %>
<br/>
Modified: branches/neiss/app/views/maps/show.rhtml (2446 => 2447)
--- branches/neiss/app/views/maps/show.rhtml 2010-06-23 10:02:26 UTC (rev 2446)
+++ branches/neiss/app/views/maps/show.rhtml 2010-06-23 10:20:25 UTC (rev 2447)
@@ -16,8 +16,6 @@
<div class="contribution_mini_nav">
|
- <%= link_to "License", "#license" %>
- |
<%= link_to "Credits (address@hidden)", "#credits" %>
|
<%= link_to "Attributions (address@hidden)", "#attributions" %>
@@ -125,8 +123,6 @@
<div class="contribution_right_box">
<%= render :partial => "contributions/uploader_box", :locals => { :contributable => @map } %>
- <%= render :partial => "contributions/license_box", :locals => { :contributable => @map } %>
-
<%= render :partial => "contributions/credits_attributions_box", :locals => { :contributable => @map, :edit_path => edit_map_path(@map) } %>
<%= render :partial => "contributions/curation_box", :locals => { :contributable => @map } %>
Modified: branches/neiss/config/schema.d/neiss.xml (2446 => 2447)
--- branches/neiss/config/schema.d/neiss.xml 2010-06-23 10:02:26 UTC (rev 2446)
+++ branches/neiss/config/schema.d/neiss.xml 2010-06-23 10:20:25 UTC (rev 2447)
@@ -16,7 +16,6 @@
<column type="float" name="latitude"/>
<column type="float" name="longitude"/>
<column type="integer" name="zoom"/>
- <column type="integer" name="license_id"/>
<column type="datetime" name="created_at"/>
<column type="datetime" name="updated_at"/>
Modified: branches/neiss/config/tables.xml
(Binary files differ)
Modified: branches/neiss/lib/rest.rb (2446 => 2447)
--- branches/neiss/lib/rest.rb 2010-06-23 10:02:26 UTC (rev 2446)
+++ branches/neiss/lib/rest.rb 2010-06-23 10:20:25 UTC (rev 2447)
@@ -1835,8 +1835,6 @@
data = ""
- license_type = parse_element(data, :text, '/map/license-type')
-
ob.title = parse_element(data, :text, '/map/title')
ob.description = parse_element(data, :text, '/map/description')
ob.api_key = parse_element(data, :text, '/map/api_key')
@@ -1847,7 +1845,6 @@
ob.latitude = parse_element(data, :text, '/map/latitude')
ob.longitude = parse_element(data, :text, '/map/longitude')
ob.zoom = parse_element(data, :text, '/map/zoom')
- ob.license = License.find_by_unique_name(license_type) if license_type
return rest_response(400, :object => ob) unless ob.save
end