pettanr_unknown_v01_licenses 0.0.4 → 0.0.5
Sign up to get free protection for your applications and to get access to all the features.
- data/app/controllers/pettanr_unknown_v01_licenses/attributes_controller.rb +1 -0
- data/app/views/pettanr_unknown_v01_licenses/attributes/_confirm.html.erb +5 -18
- data/app/views/pettanr_unknown_v01_licenses/attributes/_credit.html.erb +20 -13
- data/app/views/pettanr_unknown_v01_licenses/attributes/_full_credit.html.erb +36 -0
- data/db/b2.png +0 -0
- data/db/pettanr_unknown_v01_license.json +1 -1
- data/db/pettanr_unknown_v01_license.yml +4 -3
- data/lib/pettanr_unknown_v01_licenses/version.rb +1 -1
- metadata +8 -6
|
@@ -25,6 +25,7 @@ module PettanrUnknownV01Licenses
|
|
|
25
25
|
@license = License.show @unknown_license.license_id
|
|
26
26
|
@resource_picture = @original_picture.resource_picture || ResourcePicture.new
|
|
27
27
|
@resource_picture.attributes = @unknown_license.resource_picture_attributes @original_picture
|
|
28
|
+
@resource_picture.overwrite @original_picture
|
|
28
29
|
respond_to do |format|
|
|
29
30
|
if @unknown_license.valid?
|
|
30
31
|
format.html { render main_app.new_resource_picture_path }
|
|
@@ -1,21 +1,8 @@
|
|
|
1
|
+
<div>
|
|
2
|
+
<h2>digest credit</h2>
|
|
1
3
|
<%= render @resource_picture.credit_template, :picture => @resource_picture %>
|
|
4
|
+
</div>
|
|
2
5
|
<div>
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
<td>License Group</td>
|
|
6
|
-
<td><%= h @license_group.caption -%></td>
|
|
7
|
-
</tr>
|
|
8
|
-
<tr>
|
|
9
|
-
<td>License</td>
|
|
10
|
-
<td><%= h @license.caption -%></td>
|
|
11
|
-
</tr>
|
|
12
|
-
<tr>
|
|
13
|
-
<td>source picture's url</td>
|
|
14
|
-
<td><%= h @resource_picture.credit_data['source_url'] -%></td>
|
|
15
|
-
</tr>
|
|
16
|
-
<tr>
|
|
17
|
-
<td>note</td>
|
|
18
|
-
<td><%= h @resource_picture.credit_data['note'] -%></td>
|
|
19
|
-
</tr>
|
|
20
|
-
</table>
|
|
6
|
+
<h2>full credit</h2>
|
|
7
|
+
<%= render @resource_picture.full_credit_template, :picture => @resource_picture %>
|
|
21
8
|
</div>
|
|
@@ -1,22 +1,29 @@
|
|
|
1
1
|
<table class="no-border">
|
|
2
2
|
<tr>
|
|
3
3
|
<td width="1px">
|
|
4
|
-
<%=
|
|
5
|
-
tag(:img, :src => picture.license.system_picture.url, :alt => h(picture.license.
|
|
6
|
-
|
|
4
|
+
<%= link_to(
|
|
5
|
+
tag(:img, :src => picture.license.system_picture.url, :alt => h(picture.license.caption.to_s), :width => picture.license.system_picture.width, :height => picture.license.system_picture.height),
|
|
6
|
+
picture.license.url )
|
|
7
7
|
%>
|
|
8
8
|
</td>
|
|
9
9
|
<td>
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
10
|
+
<div class="md5">
|
|
11
|
+
<% if picture.credit_data['source_url'].blank? %>
|
|
12
|
+
<% source_url_off_btn = SystemPicture.find(picture.license.credit_pictures_attr['source_url_off_btn_id']) %>
|
|
13
|
+
<%=
|
|
14
|
+
tag(:img, :src => source_url_off_btn.url, :alt => 'no source', :width => source_url_off_btn.width, :height => source_url_off_btn.height)
|
|
15
|
+
%>
|
|
16
|
+
<% else %>
|
|
17
|
+
<% source_url_btn = SystemPicture.find(picture.license.credit_pictures_attr['source_url_btn_id']) %>
|
|
18
|
+
<%= link_to(
|
|
19
|
+
tag(:img, :src => source_url_btn.url, :alt => 'source url', :width => source_url_btn.width, :height => source_url_btn.height),
|
|
20
|
+
picture.credit_data['source_url'] )
|
|
21
|
+
%>
|
|
22
|
+
<% end %>
|
|
23
|
+
</div>
|
|
24
|
+
<div class="md5">
|
|
25
|
+
<%= h(truncate(picture.credit_data['note'], :length => 12)) %>
|
|
26
|
+
</div>
|
|
20
27
|
</td>
|
|
21
28
|
</tr>
|
|
22
29
|
<tr>
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
<table class="no-border">
|
|
2
|
+
<tr>
|
|
3
|
+
<td colspan="2">
|
|
4
|
+
<%= link_to(
|
|
5
|
+
tag(:img, :src => picture.license.system_picture.url, :alt => h(picture.license.license_group.caption.to_s + '[' + picture.license.caption.to_s + ']'), :width => picture.license.system_picture.width, :height => picture.license.system_picture.height),
|
|
6
|
+
picture.license.url )
|
|
7
|
+
%>
|
|
8
|
+
</td>
|
|
9
|
+
</tr>
|
|
10
|
+
<tr>
|
|
11
|
+
<td colspan="2">
|
|
12
|
+
<div class="md5">MD5:<%= picture.md5 %></div>
|
|
13
|
+
</td>
|
|
14
|
+
</tr>
|
|
15
|
+
<tr>
|
|
16
|
+
<td>License Group</td>
|
|
17
|
+
<td><%= link_to(h(picture.license.license_group.caption), picture.license.license_group.url) -%></td>
|
|
18
|
+
</tr>
|
|
19
|
+
<tr>
|
|
20
|
+
<td>License</td>
|
|
21
|
+
<td><%= link_to(h(picture.license.caption), picture.license.url) -%></td>
|
|
22
|
+
</tr>
|
|
23
|
+
<tr>
|
|
24
|
+
<td>source picture's url</td>
|
|
25
|
+
<td>
|
|
26
|
+
<% if picture.credit_data['source_url'].blank? %>
|
|
27
|
+
<% else %>
|
|
28
|
+
<%= link_to(h(picture.credit_data['source_url']), picture.credit_data['source_url']) -%></td>
|
|
29
|
+
<% end %>
|
|
30
|
+
</td>
|
|
31
|
+
</tr>
|
|
32
|
+
<tr>
|
|
33
|
+
<td>note</td>
|
|
34
|
+
<td><%= h picture.credit_data['note'] -%></td>
|
|
35
|
+
</tr>
|
|
36
|
+
</table>
|
data/db/b2.png
ADDED
|
Binary file
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"UnknownV01License@pettanr":{"classname":"PettanrUnknownV01License","caption":"Unknown 0.1","url":"
|
|
1
|
+
{"UnknownV01License@pettanr":{"classname":"PettanrUnknownV01License","caption":"Unknown 0.1","url":"https://github.com/yasushiito/pettanr_unknown_v01_licenses/wiki","licenses_attributes":{"UnknownV01License:UK@pettanr":{"caption":"Unknown","url":"https://github.com/yasushiito/pettanr_unknown_v01_licenses/wiki/Unknown","credit_pictures":{"source_url_btn_id":{"text":"iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAIAAAC0D9CtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAA1SURBVDhPY3j/ZAOpiIFUDUD1OPV0MIjiMm5UD55wwxMHoHADBisagmvAKjUap1ROo3jiBwCmiapYhZeQ8QAAAABJRU5ErkJggg=="},"source_url_off_btn_id":{"text":"iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAYAAAA7bUf6AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAABISURBVDhPY3z//v1/BgoBE4X6wdoJGnKqO4OgPQQNIWgCMS4ZgYYwUiOdgA3BFY1mpTPg4YpPDVVcQjCdjCY2YhI5phqqxA4An6wclAZTJpkAAAAASUVORK5CYII="}},"settings":"{\"open\":0,\"commercial\":1,\"official\":0,\"attribution\":-1,\"derive\":-1,\"thumbnail\":1,\"gif_convert\":1,\"reverse\":1,\"resize\":1,\"sync_vh\":1,\"overlap\":1,\"trackback\":0}","system_picture_id":{"text":"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"}}}}}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
UnknownV01License@pettanr:
|
|
2
2
|
classname: PettanrUnknownV01License
|
|
3
3
|
caption: Unknown 0.1
|
|
4
|
-
url:
|
|
4
|
+
url: https://github.com/yasushiito/pettanr_unknown_v01_licenses/wiki
|
|
5
5
|
licenses_attributes:
|
|
6
6
|
UnknownV01License:UK@pettanr:
|
|
7
7
|
caption: Unknown
|
|
8
|
-
url:
|
|
8
|
+
url: https://github.com/yasushiito/pettanr_unknown_v01_licenses/wiki/Unknown
|
|
9
9
|
system_picture_file: ./Unknown.png
|
|
10
10
|
credit_pictures:
|
|
11
|
-
|
|
11
|
+
source_url_btn_id: ./b1.png
|
|
12
|
+
source_url_off_btn_id: ./b2.png
|
|
12
13
|
settings:
|
|
13
14
|
open: 0
|
|
14
15
|
commercial: 1
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: pettanr_unknown_v01_licenses
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.5
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,11 +9,11 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2012-10-
|
|
12
|
+
date: 2012-10-25 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rails
|
|
16
|
-
requirement: &
|
|
16
|
+
requirement: &26577624 !ruby/object:Gem::Requirement
|
|
17
17
|
none: false
|
|
18
18
|
requirements:
|
|
19
19
|
- - ~>
|
|
@@ -21,10 +21,10 @@ dependencies:
|
|
|
21
21
|
version: 3.1.1
|
|
22
22
|
type: :runtime
|
|
23
23
|
prerelease: false
|
|
24
|
-
version_requirements: *
|
|
24
|
+
version_requirements: *26577624
|
|
25
25
|
- !ruby/object:Gem::Dependency
|
|
26
26
|
name: sqlite3
|
|
27
|
-
requirement: &
|
|
27
|
+
requirement: &26576904 !ruby/object:Gem::Requirement
|
|
28
28
|
none: false
|
|
29
29
|
requirements:
|
|
30
30
|
- - ! '>='
|
|
@@ -32,7 +32,7 @@ dependencies:
|
|
|
32
32
|
version: '0'
|
|
33
33
|
type: :development
|
|
34
34
|
prerelease: false
|
|
35
|
-
version_requirements: *
|
|
35
|
+
version_requirements: *26576904
|
|
36
36
|
description: This software is a license plugin for PettanR
|
|
37
37
|
email:
|
|
38
38
|
- yasusiito@gmail.com
|
|
@@ -53,9 +53,11 @@ files:
|
|
|
53
53
|
- app/views/pettanr_unknown_v01_licenses/attributes/_confirm.html.erb
|
|
54
54
|
- app/views/pettanr_unknown_v01_licenses/attributes/_credit.html.erb
|
|
55
55
|
- app/views/pettanr_unknown_v01_licenses/attributes/_form.html.erb
|
|
56
|
+
- app/views/pettanr_unknown_v01_licenses/attributes/_full_credit.html.erb
|
|
56
57
|
- app/views/pettanr_unknown_v01_licenses/attributes/_note.html.erb
|
|
57
58
|
- config/routes.rb
|
|
58
59
|
- db/b1.png
|
|
60
|
+
- db/b2.png
|
|
59
61
|
- db/migrate/20121007054509_create_pettanr_unknown_v01_licenses_attributes.rb
|
|
60
62
|
- db/pettanr_unknown_v01_license.json
|
|
61
63
|
- db/pettanr_unknown_v01_license.yml
|