harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some work on feature/addon settings

Browse Source
This commit is contained in:
Mario Vavti 2015-03-12 10:19:56 +01:00
parent 76fedfe1f8
commit 8113ee1c4a
3 changed files with 32 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/settings.php
View File

@ -678,11 +678,9 @@ function settings_content(&$a) {
'$title' => t('Feature/Addon Settings'), '$title' => t('Feature/Addon Settings'),
'$diaspora_enabled' => $diaspora_enabled, '$diaspora_enabled' => $diaspora_enabled,
'$dsprdesc' => t('Settings for the built-in Diaspora emulator'), '$dsprdesc' => t('Settings for the built-in Diaspora emulator'),
'$pubcomments' => $pubcomments, '$pubcomments' => array('dspr_pubcomment', t('Allow any Diaspora member to comment on your public posts'), $pubcomments, '', $yes_no),
'$dsprtitle' => t('Diaspora Policy Settings'), '$dsprtitle' => t('Diaspora Policy Settings'),
'$dsprhelp' => t('Allow any Diaspora member to comment on your public posts.'), '$hijacking' => array('dspr_hijack', t('Prevent your hashtags from being redirected to other sites'), $hijacking, '', $yes_no),
'$dsprhijack' => t('Prevent your hashtags from being redirected to other sites'),
'$hijacking' => $hijacking,
'$dsprsubmit' => t('Submit Diaspora Policy Settings'), '$dsprsubmit' => t('Submit Diaspora Policy Settings'),
'$settings_addons' => $settings_addons '$settings_addons' => $settings_addons
)); ));

14
view/css/mod_settings.css
View File

@ -1,17 +1,3 @@
#dspr-pubcomment-label, #dspr-hijack-label {
float: left;
width: 350px;
margin-bottom: 25px;
}
#dspr-pubcomment-checkbox, #dspr-hijack-checkbox {
float: left;
}
#settings-dspr-wrapper {
margin-top: 15px;
}
.group { .group {
margin-left: 10px; margin-left: 10px;
} }

45
view/tpl/settings_addons.tpl
View File

@ -1,28 +1,33 @@
<div class="generic-content-wrapper-styled"> <div class="generic-content-wrapper">
<h1>{{$title}}</h1> <div class="section-title-wrapper">
<h2>{{$title}}</h2>
</div>
<form action="settings/featured" method="post" autocomplete="off"> <form action="settings/featured" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<div class="panel-group" id="settings" role="tablist">
{{if $diaspora_enabled}} {{if $diaspora_enabled}}
<div class="settings-block"> <div class="panel">
<button class="btn btn-default" data-target="#settings-dspr-wrapper" data-toggle="collapse" type="button">{{$dsprtitle}}</button> <div class="section-subtitle-wrapper" role="tab" id="dspr-settings">
<div id="settings-dspr-wrapper" class="collapse well"> <h3>
<div id="dspr-settings-wrapper"> <a title="{{$dsprdesc}}" data-toggle="collapse" data-parent="#settings" href="#dspr-settings-content" aria-controls="dspr-settings-content">
<label id="dspr-pubcomment-label" for="dspr-pubcomment-checkbox">{{$dsprhelp}}</label> {{$dsprtitle}}
<input id="dspr-pubcomment-checkbox" type="checkbox" name="dspr_pubcomment" value="1" ' . {{if $pubcomments}} checked="checked" {{/if}} /> </a>
<div class="clear"></div> </h3>
<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>
<div id="dspr-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="dspr-settings">
<div class="section-content-tools-wrapper">
{{include file="field_checkbox.tpl" field=$pubcomments}}
{{include file="field_checkbox.tpl" field=$hijacking}}
<div class="settings-submit-wrapper" >
<div class="settings-submit-wrapper" ><input type="submit" name="dspr-submit" class="settings-submit" value="{{$dsprsubmit}}" /></div></div></div> <button type="submit" name="dspr-submit" class="btn btn-primary" value="{{$dsprsubmit}}">{{$dsprsubmit}}</button>
</div>
</div>
</div>
</div>
{{/if}} {{/if}}
{{$settings_addons}} </div>
{{$settings_addons}}
</form> </form>
</div> </div>