Merge branch 'item-activities' of github.com:annando/friendica into item-activities

[friendica.git] / view / templates / poke_content.tpl

diff --git a/view/templates/poke_content.tpl b/view/templates/poke_content.tpl
index 06a3ec27c61e56c4a35fd0914e576ccad0ffee6f..18191de03fc4e633c7265fa644af4729a19a6e97 100644 (file)
--- a/view/templates/poke_content.tpl
+++ b/view/templates/poke_content.tpl
@@ -3,31 +3,33 @@
 
 <div id="poke-desc">{{$desc}}</div>
 
-<form action="poke" method="get">
-<br />
-<br />
-
-<div id="poke-recip-label">{{$clabel}}</div>
-<br />
-<input id="poke-recip" type="text" size="64" maxlength="255" value="{{$name}}" name="pokename" autocomplete="off" />
-<input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" />
-<input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
-<br />
-<br />
-<div id="poke-action-label">{{$choice}}</div>
-<br />
-<br />
-<select name="verb" id="poke-verb-select" >
-{{foreach $verbs as $v}}
-<option value="{{$v.0}}">{{$v.1}}</option>
-{{/foreach}}
-</select>
-<br />
-<br />
-<div id="poke-private-desc">{{$prv_desc}}</div>
-<input type="checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" />
-<br />
-<br />
-<input type="submit" name="submit" value="{{$submit}}" />
-</form>
+
+<div id="poke-wrapper">
+       <form action="poke" method="get">
+
+       <div id="poke-recipient">
+               <div id="poke-recip-label">{{$clabel}}</div>
+               <input id="poke-recip" type="text" size="64" maxlength="255" value="{{$name|escape:'html'}}" name="pokename" autocomplete="off" />
+               <input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" />
+               <input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
+       </div>
+
+       <div id="poke-action">
+               <div id="poke-action-label">{{$choice}}</div>
+               <select name="verb" id="poke-verb-select" >
+               {{foreach $verbs as $v}}
+               <option value="{{$v.0}}">{{$v.1}}</option>
+               {{/foreach}}
+               </select>
+       </div>
+
+       <div id="poke-privacy-settings">
+               <div id="poke-private-desc">{{$prv_desc}}</div>
+               <input type="checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" />
+       </div>
+
+       <input type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+
+       </form>
+</div>