tdiary-contrib 5.0.9 → 5.0.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/tdiary/contrib/version.rb +1 -1
  3. data/plugin/flickr.rb +42 -40
  4. data/plugin/ja/flickr.rb +7 -0
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8ee22d81638a67676a46950b6b5fd99200e2d297b2f231cb472ece17db32e0fb
4
- data.tar.gz: d61ceb27d570b6b6f8e77d5f117000f3ebbc124627003398d32248d4d02302e3
3
+ metadata.gz: bb143072e20a7214771fc7ef9c5013645bc2c621923429b3c5a3b47aee39acc9
4
+ data.tar.gz: 617526cb318ab965bb3d732dbaffec3a9deac985c720655fc85aca21743d6958
5
5
  SHA512:
6
- metadata.gz: b4daf824d46d3249e6ccc1e66a9a83c172fa772b7eaae0e570e3ad93a6c60ce5537a5993b3f3a9fc4e858367445c1145608e05c93bb6404d05efa7991c39bc54
7
- data.tar.gz: 573f697640ad4fbfae1c5f76e06b7ce3b84abab8077c6800df6c7767ee319614e7db3e82cd9e830f68476008c7449b135c960c27ad040113d90e78691d7d6e9f
6
+ metadata.gz: 979f6d4cd2cbcbd047ca38b6c00cd108061460df382a887d92de009a43c1e7bd95d38891f70c60814c2cf7b61885165dd1d4d86baea74f71b79dcea4ab9a5f6e
7
+ data.tar.gz: eba7b2744d29ca221453daa174b432ec23d07250463411336e3b8992fab1443f8facd97eb233b2ed7bb7631fdf8a0f8d9eb45039a037b2973be2800312098e0d
data/lib/tdiary/contrib/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module TDiary
2
2
  class Contrib
3
- VERSION = "5.0.9"
3
+ VERSION = "5.0.10"
4
4
  end
5
5
  end
data/plugin/flickr.rb CHANGED
@@ -129,47 +129,49 @@ def flickr_clear_cache
129
129
  end
130
130
 
131
131
  FLICKER_FORM_PID = 'plugin_flickr_pid'
132
- add_edit_proc do |date|
133
- <<-FORM
134
- <div id="flickr_form" style="margin: 1em 0">
135
- <div>
136
- Flickr: <input type="text" id="flickr_search_text">
137
- <select id="flickr_search_count">
138
- <option value="10">10</option>
139
- <option value="20">20</option>
140
- <option value="30">30</option>
141
- <option value="40">40</option>
142
- <option value="50">50</option>
143
- </select>
144
- 件
145
- <input id="flickr_search" type="button" value="Get flickr photos"></input>
132
+ if @conf['flickr.input_support']
133
+ add_edit_proc do |date|
134
+ <<-FORM
135
+ <div id="flickr_form" style="margin: 1em 0">
136
+ <div>
137
+ Flickr: <input type="text" id="flickr_search_text">
138
+ <select id="flickr_search_count">
139
+ <option value="10">10</option>
140
+ <option value="20">20</option>
141
+ <option value="30">30</option>
142
+ <option value="40">40</option>
143
+ <option value="50">50</option>
144
+ </select>
145
+ 件
146
+ <input id="flickr_search" type="button" value="Get flickr photos"></input>
147
+ </div>
148
+ <div id="flickr_photo_size">
149
+ Photo size:
150
+ <input type="radio" id="flickr_photo_size_square" name="flickr_photo_size" value="square">
151
+ <label for="flickr_photo_size_square">square</label>
152
+ <input type="radio" id="flickr_photo_size_large_square" name="flickr_photo_size" value="large square">
153
+ <label for="flickr_photo_size_large_square">large square</label>
154
+ <input type="radio" id="flickr_photo_size_thumbnail" name="flickr_photo_size" value="thumbnail">
155
+ <label for="flickr_photo_size_thumbnail">thumbnail</label>
156
+ <input type="radio" id="flickr_photo_size_small" name="flickr_photo_size" value="small">
157
+ <label for="flickr_photo_size_small">small</label>
158
+ <input type="radio" id="flickr_photo_size_small320" name="flickr_photo_size" value="small 320">
159
+ <label for="flickr_photo_size_small320">small 320</label>
160
+ <input type="radio" id="flickr_photo_size_medium" name="flickr_photo_size" value="medium" checked="true">
161
+ <label for="flickr_photo_size_medium">medium</label>
162
+ <input type="radio" id="flickr_photo_size_medium640" name="flickr_photo_size" value="medium 640">
163
+ <label for="flickr_photo_size_medium640">medium 640</label>
164
+ <input type="radio" id="flickr_photo_size_medium800" name="flickr_photo_size" value="medium 800">
165
+ <label for="flickr_photo_size_medium800">medium 800</label>
166
+ <input type="radio" id="flickr_photo_size_large" name="flickr_photo_size" value="large">
167
+ <label for="flickr_photo_size_large">large</label>
168
+ </div>
169
+ <div id="flickr_photos" style="margin: 1em">
170
+ <!-- <img src="dummy" height="100" width="100" title="dummy"> -->
171
+ </div>
146
172
  </div>
147
- <div id="flickr_photo_size">
148
- Photo size:
149
- <input type="radio" id="flickr_photo_size_square" name="flickr_photo_size" value="square">
150
- <label for="flickr_photo_size_square">square</label>
151
- <input type="radio" id="flickr_photo_size_large_square" name="flickr_photo_size" value="large square">
152
- <label for="flickr_photo_size_large_square">large square</label>
153
- <input type="radio" id="flickr_photo_size_thumbnail" name="flickr_photo_size" value="thumbnail">
154
- <label for="flickr_photo_size_thumbnail">thumbnail</label>
155
- <input type="radio" id="flickr_photo_size_small" name="flickr_photo_size" value="small">
156
- <label for="flickr_photo_size_small">small</label>
157
- <input type="radio" id="flickr_photo_size_small320" name="flickr_photo_size" value="small 320">
158
- <label for="flickr_photo_size_small320">small 320</label>
159
- <input type="radio" id="flickr_photo_size_medium" name="flickr_photo_size" value="medium" checked="true">
160
- <label for="flickr_photo_size_medium">medium</label>
161
- <input type="radio" id="flickr_photo_size_medium640" name="flickr_photo_size" value="medium 640">
162
- <label for="flickr_photo_size_medium640">medium 640</label>
163
- <input type="radio" id="flickr_photo_size_medium800" name="flickr_photo_size" value="medium 800">
164
- <label for="flickr_photo_size_medium800">medium 800</label>
165
- <input type="radio" id="flickr_photo_size_large" name="flickr_photo_size" value="large">
166
- <label for="flickr_photo_size_large">large</label>
167
- </div>
168
- <div id="flickr_photos" style="margin: 1em">
169
- <!-- <img src="dummy" height="100" width="100" title="dummy"> -->
170
- </div>
171
- </div>
172
- FORM
173
+ FORM
174
+ end
173
175
  end
174
176
 
175
177
  def flickr_slideshow(tag, id = nil)
data/plugin/ja/flickr.rb CHANGED
@@ -5,6 +5,7 @@ add_conf_proc('flickr', 'Flickr プラグイン') do
5
5
  if @mode == 'saveconf'
6
6
  @conf['flickr.default_size'] = @cgi.params['flickr.default_size'][0]
7
7
  @conf['flickr.user_id'] = @cgi.params['flickr.user_id'][0]
8
+ @conf['flickr.input_support'] = !!(@cgi.params['flickr.input_support'][0] == "true")
8
9
  if @cgi.params['flickr.clear'][0] == "true"
9
10
  flickr_clear_cache
10
11
  end
@@ -52,6 +53,12 @@ add_conf_proc('flickr', 'Flickr プラグイン') do
52
53
  <li>「本文に追加」ボタンを押すと、日記中にこの写真を表示するための記述（プラグイン）が追記されます。</li>
53
54
  </ol>
54
55
 
56
+ <h3>編集画面からの入力補助</h3>
57
+ <p>
58
+ <input type="checkbox" id="flickr.input_support" name="flickr.input_support" value="true" #{@conf['flickr.input_support'] ? "checked": ""}>
59
+ <label for="flickr.input_support">写真を一覧から選べるようにする</label>
60
+ </p>
61
+
55
62
  <h3>キャッシュファイルの削除</h3>
56
63
  <p>Flickrプラグインが使用しているキャッシュを削除します。</p>
57
64
  <p>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tdiary-contrib
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.0.9
4
+ version: 5.0.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - tDiary contributors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-06-29 00:00:00.000000000 Z
11
+ date: 2018-09-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: tdiary