Merge remote-tracking branch 'upstream/master'

4 files changed, 73 insertions, 24 deletions

diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
index 0a77ef73c..ab190fc95 100755
--- a/view/tpl/admin_aside.tpl
+++ b/view/tpl/admin_aside.tpl
@@ -16,6 +16,7 @@
 	<li><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
 	<li><a href='{{$admin.users.0}}'>{{$admin.users.1}}<span id='pending-update' title='{{$h_pending}}'></span></a></li>
 	<li><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li>
+	<li><a href='{{$admin.security.0}}'>{{$admin.security.1}}</a></li>
 	<li><a href='{{$admin.queue.0}}'>{{$admin.queue.1}}</a></li>
 	<li><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
 	<li><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
new file mode 100755
index 000000000..691db2d88
--- /dev/null
+++ b/view/tpl/admin_security.tpl
@@ -0,0 +1,31 @@
+<div class="generic-content-wrapper-styled" id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+
+	<form action="{{$baseurl}}/admin/security" method="post">
+
+	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+
+	{{include file="field_checkbox.tpl" field=$block_public}}
+
+
+	{{include file="field_textarea.tpl" field=$whitelisted_sites}}
+	{{include file="field_textarea.tpl" field=$blacklisted_sites}}
+
+	{{include file="field_textarea.tpl" field=$whitelisted_channels}}
+	{{include file="field_textarea.tpl" field=$blacklisted_channels}}
+
+
+	{{include file="field_checkbox.tpl" field=$embed_coop}}
+
+	{{include file="field_textarea.tpl" field=$embed_allow}}
+	{{include file="field_textarea.tpl" field=$embed_deny}}
+
+
+	<div class="admin-submit-wrapper" >
+		<input type="submit" name="submit" class="admin-submit" value="{{$submit}}" />
+	</div>
+
+	</form>
+
+</div>
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 49c6af764..0c0cb984c 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -57,6 +57,7 @@
 							</button>
 						</div>
 						{{/if}}
+						{{$comment_buttons}}
 					</div>
 					<div class="btn-group pull-right" id="comment-edit-submit-wrapper-{{$id}}">
 						{{if $preview}}
diff --git a/view/tpl/poke_content.tpl b/view/tpl/poke_content.tpl
index 22a0b291f..f368cb024 100755
--- a/view/tpl/poke_content.tpl
+++ b/view/tpl/poke_content.tpl
@@ -1,32 +1,48 @@
-<h3>{{$title}}</h3>
 
-<div id="poke-desc">{{$desc}}</div>
+<div id="poke-content" class="generic-content-wrapper">
+    <div class="section-title-wrapper">
+    <h2>{{$title}}</h2>
+    </div>
+    <div class="section-content-wrapper">
 
-<form action="poke" method="get">
-<br />
-<br />
+	<div id="poke-desc">{{$desc}}</div>
 
-<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 />
+
+
+<form action="poke" method="get">
+
+
+<div class="form-group field input">
+	<label id="poke-recip-label" for="poke-recip">{{$clabel}}</label>
+	<input class="form-control" id="poke-recip" type="text" value="{{$name}}" name="pokename" autocomplete="off" />
+</div>
+
+	<input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" />
+	<input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
+
+
+{{if $poke_basic}}
+<input type="hidden" name="verb" value="poke" />
+{{else}}
+<div class="form-group field custom">
+	<label for="poke-verb-select" id="poke-verb-lbl">{{$choice}}</label>
+	<select class="form-control" name="verb" id="poke-verb-select" >
+	{{foreach $verbs as $v}}
+	<option value="{{$v.0}}">{{$v.1}}</option>
+	{{/foreach}}
+	</select>
+</div>
+{{/if}}
+
+{{if ! $parent}}
+{{include file="field_checkbox.tpl" field=$private}}
+{{/if}}
+
 <input type="submit" name="submit" value="{{$submit}}" />
 </form>
 
+
+    </div>
+</div>