aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mod/settings.php5
-rw-r--r--view/css/mod_settings.css8
-rwxr-xr-xview/tpl/settings.tpl14
3 files changed, 20 insertions, 7 deletions
diff --git a/mod/settings.php b/mod/settings.php
index 8bfff3765..18bfaeb08 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1102,12 +1102,13 @@ function settings_content(&$a) {
'$expert' => feature_enabled(local_channel(),'expert'),
'$hint' => t('Please enable expert mode (in <a href="settings/features">Settings > Additional features</a>) to adjust!'),
'$lbl_misc' => t('Miscellaneous Settings'),
- '$photo_path' => array('photo_path', t('Default photo upload folder'), get_pconfig(local_channel(),'system','photo_path'), '%Y - current year, %m - current month'),
- '$attach_path' => array('attach_path', t('Default file upload folder'), get_pconfig(local_channel(),'system','attach_path'), '%Y - current year, %m - current month'),
+ '$photo_path' => array('photo_path', t('Default photo upload folder'), get_pconfig(local_channel(),'system','photo_path'), t('%Y - current year, %m - current month')),
+ '$attach_path' => array('attach_path', t('Default file upload folder'), get_pconfig(local_channel(),'system','attach_path'), t('%Y - current year, %m - current month')),
'$menus' => $menu,
'$menu_desc' => t('Personal menu to display in your channel pages'),
'$removeme' => t('Remove Channel'),
'$removechannel' => t('Remove this channel.'),
+ '$firefoxshare' => t('Firefox Share $Projectname provider'),
));
call_hooks('settings_form',$o);
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index 7eff8e45b..e81d115d4 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -1,3 +1,11 @@
.group {
margin-left: 10px;
}
+
+.ffsapilink {
+ margin: 10px 0;
+}
+
+.channel-menu {
+ margin-top: 24px;
+}
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index ab62ede45..7c1f4578d 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -136,7 +136,7 @@
</div>
</div>
</div>
- {{if $menus}}
+
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings">
<h3>
@@ -146,8 +146,12 @@
</h3>
</div>
<div id="miscellaneous-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous-settings">
- <div class="section-content-wrapper">
- <div class="form-group">
+ <div class="section-content-tools-wrapper">
+ <div class="ffsapilink">
+ <a type="button" class="btn btn-default" href="/ffsapi">{{$firefoxshare}}</a>
+ </div>
+ {{if $menus}}
+ <div class="form-group channel-menu">
<label for="channel_menu">{{$menu_desc}}</label>
<select name="channel_menu" class="form-control">
{{foreach $menus as $menu }}
@@ -156,12 +160,12 @@
</select>
</div>
<div class="settings-submit-wrapper" >
- <input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} />
+ <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
</div>
</div>
+ {{/if}}
</div>
</div>
- {{/if}}
</div>
</form>
</div>