diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-05 16:54:39 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-05 16:54:39 +0100 |
| commit | 91f751d10531e73078f7efb4efa1f5e215a8f871 (patch) | |
| tree | bbe0b1b7fdd1c2c69a6ed2e001decc735111bc50 /mod | |
| parent | 07bd396837426fbe4cf3ecd189513d50a14081a1 (diff) | |
| parent | 0db5a8673d57088ab394cdaf372fb81dbd78bcbb (diff) | |
| download | volse-hubzilla-91f751d10531e73078f7efb4efa1f5e215a8f871.tar.gz volse-hubzilla-91f751d10531e73078f7efb4efa1f5e215a8f871.tar.bz2 volse-hubzilla-91f751d10531e73078f7efb4efa1f5e215a8f871.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/ffsapi.php | 4 | ||||
| -rw-r--r-- | mod/settings.php | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mod/ffsapi.php b/mod/ffsapi.php index a75e60bcc..de47408bd 100644 --- a/mod/ffsapi.php +++ b/mod/ffsapi.php @@ -55,10 +55,10 @@ function activate(node) { } </script> -<button onclick="activate(this)" title="activate the demo provider">$activate</button> +<button onclick="activate(this)" title="activate the demo provider" class="btn btn-primary">$activate</button> EOT; return $s; -}
\ No newline at end of file +} 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); |