add the tag hijacking preference to Diaspora settings

2 files changed, 10 insertions, 3 deletions

diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index 6af091c8f..2dcd7d2d8 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -1,10 +1,10 @@
-#dspr-pubcomment-label {
+#dspr-pubcomment-label, #dspr-hijack-label {
     float: left;
     width: 350px;
     margin-bottom: 25px;
 }
 
-#dspr-pubcomment-checkbox {
+#dspr-pubcomment-checkbox, #dspr-hijack-checkbox {
     float: left;
 }
 
diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl
index a18f57658..a41f4802b 100755
--- a/view/tpl/settings_addons.tpl
+++ b/view/tpl/settings_addons.tpl
@@ -11,7 +11,14 @@
 <div id="dspr-settings-wrapper">
 <label id="dspr-pubcomment-label" for="dspr-pubcomment-checkbox">{{$dsprhelp}}</label>
 <input id="dspr-pubcomment-checkbox" type="checkbox" name="dspr_pubcomment" value="1" ' . {{if $pubcomments}} checked="checked" {{/if}} />
-</div><div class="clear"></div>
+<div class="clear"></div>
+<label id="dspr-hijack-label" for="dspr-hijack-checkbox">{{$dsprhijack}}</label>
+<input id="dspr-hijack-checkbox" type="checkbox" name="dspr_hijack" value="1" ' . {{if $hijacking}} checked="checked" {{/if}} />
+<div class="clear"></div>
+</div>
+
+
+
 <div class="settings-submit-wrapper" ><input type="submit" name="dspr-submit" class="settings-submit" value="{{$dsprsubmit}}" /></div></div></div>
 {{/if}}
 {{$settings_addons}}