Skip to content

Commit 3afce00

Browse files
tdtdstdtds
authored
Merge pull request #203 from tdiary/flickr_disable_input_support
disable input support of flickr if the user wants
2 parents a0252f5 + 629c726 commit 3afce00

2 files changed

Lines changed: 49 additions & 40 deletions

File tree

‎plugin/flickr.rb‎

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -129,47 +129,49 @@ def flickr_clear_cache
129129
end
130130

131131
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>
146172
</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
173175
end
174176

175177
def flickr_slideshow(tag, id = nil)

‎plugin/ja/flickr.rb‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
if @mode == 'saveconf'
66
@conf['flickr.default_size'] = @cgi.params['flickr.default_size'][0]
77
@conf['flickr.user_id'] = @cgi.params['flickr.user_id'][0]
8+
@conf['flickr.input_support'] = !!(@cgi.params['flickr.input_support'][0] == "true")
89
if @cgi.params['flickr.clear'][0] == "true"
910
flickr_clear_cache
1011
end
@@ -52,6 +53,12 @@
5253
<li>「本文に追加」ボタンを押すと、日記中にこの写真を表示するための記述（プラグイン）が追記されます。</li>
5354
</ol>
5455
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+
5562
<h3>キャッシュファイルの削除</h3>
5663
<p>Flickrプラグインが使用しているキャッシュを削除します。</p>
5764
<p>

0 commit comments

Comments
 (0)