From 392d8414b95a4d85bea68c4e37cbe44abcdd6ee7 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 19 Nov 2013 12:39:26 +0100 Subject: [PATCH 1/4] CAL: one closing div to much --- cal/cal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cal/cal.php b/cal/cal.php index 8841be43..858e5a54 100644 --- a/cal/cal.php +++ b/cal/cal.php @@ -185,7 +185,7 @@ function cal_addon_settings ( &$a, &$s ) $s .= ''; $s .= '
'; $s .= '
'; - $s .= '
'; + $s .= '
'; } From e2cb4a9e74a845b1b6774cff3179fc87e0700d2e Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 19 Nov 2013 13:43:58 +0100 Subject: [PATCH 2/4] Wording submit -> save settings --- altpager/altpager.php | 4 ++-- blackout/blackout.php | 2 +- blockem/blockem.php | 2 +- blogger/blogger.php | 2 +- cal/cal.php | 2 +- curweather/curweather.php | 2 +- defaultfeatures/defaultfeatures.php | 2 +- dwpost/dwpost.php | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/altpager/altpager.php b/altpager/altpager.php index c6f537bd..f185e4fe 100755 --- a/altpager/altpager.php +++ b/altpager/altpager.php @@ -88,14 +88,14 @@ function altpager_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } function altpager_plugin_admin(&$a, &$o){ $t = get_markup_template( "admin.tpl", "addon/altpager/" ); $o = replace_macros($t, array( - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), '$global' => array('altpagerchoice', t('Global'), 1, t('Force global use of the alternate pager'), get_config('alt_pager', 'global') == 1), '$individual' => array('altpagerchoice', t('Individual'), 2, t('Each user chooses whether to use the alternate pager'), get_config('alt_pager', 'global') == 0) )); diff --git a/blackout/blackout.php b/blackout/blackout.php index e629b7a3..3678969e 100644 --- a/blackout/blackout.php +++ b/blackout/blackout.php @@ -96,7 +96,7 @@ function blackout_plugin_admin(&$a, &$o) { $t = get_markup_template( "admin.tpl", "addon/blackout/" ); $o = replace_macros($t, array( - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), '$rurl' => array("rurl", "Redirect URL", $myurl, "all your visitors from the web will be redirected to this URL"), '$startdate' => array("startdate", "Begin of the Blackout
(YYYY-MM-DD hh:mm)", $mystart, "format is YYYY year, MM month, DD day, hh hour and mm minute"), '$enddate' => array("enddate", "End of the Blackout
(YYYY-MM-DD hh:mm)", $myend, ""), diff --git a/blockem/blockem.php b/blockem/blockem.php index f0962578..0276e2de 100755 --- a/blockem/blockem.php +++ b/blockem/blockem.php @@ -56,7 +56,7 @@ function blockem_addon_settings(&$a,&$s) { $s .= ''; $s .= '
'; - $s .= '
'; + $s .= '
'; return; diff --git a/blogger/blogger.php b/blogger/blogger.php index aa1b9add..67aae4a1 100755 --- a/blogger/blogger.php +++ b/blogger/blogger.php @@ -99,7 +99,7 @@ function blogger_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/cal/cal.php b/cal/cal.php index 858e5a54..79fbffd5 100644 --- a/cal/cal.php +++ b/cal/cal.php @@ -184,7 +184,7 @@ function cal_addon_settings ( &$a, &$s ) $s .= ''; $s .= ''; $s .= '
'; - $s .= '
'; + $s .= '
'; $s .= '
'; } diff --git a/curweather/curweather.php b/curweather/curweather.php index c935eb57..bd0d6c75 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -101,7 +101,7 @@ function curweather_plugin_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/defaultfeatures/defaultfeatures.php b/defaultfeatures/defaultfeatures.php index fbed22ee..dfe4a067 100755 --- a/defaultfeatures/defaultfeatures.php +++ b/defaultfeatures/defaultfeatures.php @@ -52,7 +52,7 @@ function defaultfeatures_plugin_admin (&$a, &$o) { //logger("Features: " . print_r($arr,true)); $o = replace_macros($t, array( - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), '$features' => $arr, '$form_security_token' => $token )); diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php index 2391b571..0c2e699a 100644 --- a/dwpost/dwpost.php +++ b/dwpost/dwpost.php @@ -90,7 +90,7 @@ function dwpost_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } From ccc6c2b78593101a6812a682a4bf8d93663769c5 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 19 Nov 2013 13:57:51 +0100 Subject: [PATCH 3/4] wording submit -> save settings --- editplain/editplain.php | 2 +- facebook/facebook.php | 2 +- fbpost/fbpost.php | 2 +- forumlist/forumlist.php | 2 +- fromapp/fromapp.php | 4 ++-- fromgplus/fromgplus.php | 2 +- geonames/geonames.php | 2 +- gpluspost/gpluspost.php | 2 +- gravatar/gravatar.php | 2 +- group_text/group_text.php | 2 +- ijpost/ijpost.php | 2 +- impressum/impressum.php | 2 +- jappixmini/jappixmini.php | 2 +- libertree/libertree.php | 2 +- libravatar/libravatar.php | 2 +- ljpost/ljpost.php | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/editplain/editplain.php b/editplain/editplain.php index 966e2d8f..caa0f29d 100755 --- a/editplain/editplain.php +++ b/editplain/editplain.php @@ -81,6 +81,6 @@ function editplain_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/facebook/facebook.php b/facebook/facebook.php index 4c1c0a14..ff9b52ea 100644 --- a/facebook/facebook.php +++ b/facebook/facebook.php @@ -618,7 +618,7 @@ function facebook_content(&$a) { $o .= '
'; $o .= '
'; - $o .= ''; + $o .= ''; } return $o; diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php index fb6ebcda..419055ac 100644 --- a/fbpost/fbpost.php +++ b/fbpost/fbpost.php @@ -279,7 +279,7 @@ function fbpost_content(&$a) { $o .= ""; - $o .= '

'; + $o .= '

'; } diff --git a/forumlist/forumlist.php b/forumlist/forumlist.php index 95ae9890..3e6648f9 100644 --- a/forumlist/forumlist.php +++ b/forumlist/forumlist.php @@ -175,7 +175,7 @@ function forumlist_plugin_settings(&$a,&$s) { /* provide a submit button */ - $s .= '

'; + $s .= '
'; } diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php index 9a9fa12b..7a920dd3 100644 --- a/fromapp/fromapp.php +++ b/fromapp/fromapp.php @@ -74,7 +74,7 @@ function fromapp_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } @@ -98,4 +98,4 @@ function fromapp_post_hook(&$a,&$item) { $item['app'] = trim($apps[mt_rand(0,count($apps)-1)]); return; -} \ No newline at end of file +} diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php index a6d3d84f..058c6e40 100644 --- a/fromgplus/fromgplus.php +++ b/fromgplus/fromgplus.php @@ -45,7 +45,7 @@ function fromgplus_addon_settings(&$a,&$s) { $s .= '
'; $s .= '
'; +class="settings-submit" value="' . t('Save Settings') . '" />'; $s .= ''; return; diff --git a/geonames/geonames.php b/geonames/geonames.php index 19725bef..c10653a7 100755 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -184,6 +184,6 @@ function geonames_plugin_admin(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/gpluspost/gpluspost.php b/gpluspost/gpluspost.php index 08bb1423..802ccb5b 100644 --- a/gpluspost/gpluspost.php +++ b/gpluspost/gpluspost.php @@ -82,7 +82,7 @@ function gpluspost_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; $s .= '

Register an account at Hootsuite, add your G+ page and add the feed-url there.
'; $s .= 'Feed-url: '.$a->get_baseurl().'/gpluspost/'.urlencode($a->user["nickname"]).'

'; } diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php index 12a8e44f..c23d1b30 100644 --- a/gravatar/gravatar.php +++ b/gravatar/gravatar.php @@ -92,7 +92,7 @@ function gravatar_plugin_admin (&$a, &$o) { // output Gravatar settings $o .= ''; $o .= replace_macros( $t, array( - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), '$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars), '$rating' => array('rating', t('Rating of images'), $rating, t('Select the appropriate avatar rating for your site. See README'), $ratings), )); diff --git a/group_text/group_text.php b/group_text/group_text.php index 5ec5c9c2..29b0675f 100755 --- a/group_text/group_text.php +++ b/group_text/group_text.php @@ -81,6 +81,6 @@ function group_text_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php index d6861f46..9d7732f1 100644 --- a/ijpost/ijpost.php +++ b/ijpost/ijpost.php @@ -90,7 +90,7 @@ function ijpost_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/impressum/impressum.php b/impressum/impressum.php index 6714dfc1..dcd6acff 100755 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -88,7 +88,7 @@ function impressum_plugin_admin_post (&$a) { function impressum_plugin_admin (&$a, &$o) { $t = get_markup_template( "admin.tpl", "addon/impressum/" ); $o = replace_macros($t, array( - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), '$owner' => array('owner', t('Site Owner'), get_config('impressum','owner'), t('The page operators name.')), '$ownerprofile' => array('ownerprofile', t('Site Owners Profile'), get_config('impressum','ownerprofile'), t('Profile address of the operator.')), '$postal' => array('postal', t('Postal Address'), get_config('impressum','postal'), t('How to contact the operator via snail mail. You can use BBCode here.')), diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index 5f5c53e3..7b8b8596 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -340,7 +340,7 @@ function jappixmini_settings(&$a, &$s) { $s .= '
'; if ($info_text) $s .= '
Configuration help:

'.$info_text.'

'; $s .= '
Status:

Addon knows '.$address_cnt.' Jabber addresses of '.$contact_cnt.' Friendica contacts (takes some time, usually 10 minutes, to update).

'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= ''; diff --git a/libertree/libertree.php b/libertree/libertree.php index 6a875bb7..3029c60a 100755 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -87,7 +87,7 @@ function libertree_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php index 8cbf1e98..d958dba4 100644 --- a/libravatar/libravatar.php +++ b/libravatar/libravatar.php @@ -96,7 +96,7 @@ function libravatar_plugin_admin (&$a, &$o) { // output Libravatar settings $o .= ''; $o .= replace_macros( $t, array( - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), '$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found. See README'), $default_avatars), )); } diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php index dc17e83f..c8690c26 100755 --- a/ljpost/ljpost.php +++ b/ljpost/ljpost.php @@ -90,7 +90,7 @@ function ljpost_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } From 5c5c23acb062960dff33bf5fe86f32ff20515389 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 19 Nov 2013 14:10:27 +0100 Subject: [PATCH 4/4] wording submit -> save settings --- fbsync/fbsync.php | 2 +- gnot/gnot.php | 2 +- irc/irc.php | 2 +- mailstream/mailstream.php | 4 ++-- mathjax/mathjax.php | 4 ++-- notimeline/notimeline.php | 2 +- nsfw/nsfw.php | 2 +- numfriends/numfriends.php | 2 +- openstreetmap/openstreetmap.php | 2 +- page/page.php | 2 +- pageheader/pageheader.php | 2 +- piwik/piwik.php | 2 +- planets/planets.php | 2 +- posterous/posterous.php | 2 +- pumpio/pumpio.php | 2 +- qcomment/qcomment.php | 2 +- randplace/randplace.php | 2 +- remote_permissions/remote_permissions.php | 4 ++-- retriever/retriever.php | 4 ++-- showmore/showmore.php | 2 +- smileybutton/smileybutton.php | 2 +- snautofollow/snautofollow.php | 2 +- startpage/startpage.php | 2 +- statusnet/statusnet.php | 12 ++++++------ superblock/superblock.php | 2 +- tumblr/tumblr.php | 2 +- twitter/twitter.php | 6 +++--- uhremotestorage/uhremotestorage.php | 2 +- webrtc/webrtc.php | 2 +- wppost/wppost.php | 2 +- yourls/yourls.php | 2 +- 31 files changed, 42 insertions(+), 42 deletions(-) diff --git a/fbsync/fbsync.php b/fbsync/fbsync.php index 13a504dc..d8b1c0c7 100644 --- a/fbsync/fbsync.php +++ b/fbsync/fbsync.php @@ -134,7 +134,7 @@ function fbsync_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/gnot/gnot.php b/gnot/gnot.php index fd8fdfd9..fcdc7319 100755 --- a/gnot/gnot.php +++ b/gnot/gnot.php @@ -85,7 +85,7 @@ function gnot_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/irc/irc.php b/irc/irc.php index bd7444a9..ef9c3fda 100644 --- a/irc/irc.php +++ b/irc/irc.php @@ -52,7 +52,7 @@ function irc_addon_settings(&$a,&$s) { $s .= ''; $s .= '
'; - $s .= '
'; + $s .= '
'; return; diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index 04760385..5e476784 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -57,7 +57,7 @@ function mailstream_plugin_admin(&$a,&$o) { t('Email address that stream items will appear to be from.')); $o .= replace_macros($template, array( '$frommail' => $config, - '$submit' => t('Submit'))); + '$submit' => t('Save Settings'))); } function mailstream_plugin_admin_post ($a) { @@ -279,7 +279,7 @@ function mailstream_plugin_settings(&$a,&$s) { t('Enabled'), $enabled), '$title' => t('Mail Stream Settings'), - '$submit' => t('Submit'))); + '$submit' => t('Save Settings'))); } function mailstream_plugin_settings_post($a,$post) { diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php index d97e9649..045f4c6a 100644 --- a/mathjax/mathjax.php +++ b/mathjax/mathjax.php @@ -39,7 +39,7 @@ function mathjax_settings (&$a, &$s) { $s .= ''; $s .= '
'; - $s .= '
'; + $s .= '
'; $s .= ''; } /* we need to add one JavaScript include command to the html output @@ -72,7 +72,7 @@ function mathjax_plugin_admin (&$a, &$o) { } $o = replace_macros( $t, array( - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), '$baseurl' => array('baseurl', t('MathJax Base URL'), get_config('mathjax','baseurl' ), t('The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax.')), )); } diff --git a/notimeline/notimeline.php b/notimeline/notimeline.php index 7e26bf92..c2bca211 100644 --- a/notimeline/notimeline.php +++ b/notimeline/notimeline.php @@ -61,6 +61,6 @@ function notimeline_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php index 3f00a2f2..5e7d4e9f 100755 --- a/nsfw/nsfw.php +++ b/nsfw/nsfw.php @@ -85,7 +85,7 @@ function nsfw_addon_settings(&$a,&$s) { $s .= ''; $s .= '
'; - $s .= '
'; + $s .= '
'; $s .= '
' . t('Use /expression/ to provide regular expressions') . '
'; return; diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php index 6ca7b395..2f48a0d7 100755 --- a/numfriends/numfriends.php +++ b/numfriends/numfriends.php @@ -82,6 +82,6 @@ function numfriends_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php index 2c5975eb..ccb177ab 100755 --- a/openstreetmap/openstreetmap.php +++ b/openstreetmap/openstreetmap.php @@ -91,7 +91,7 @@ function openstreetmap_plugin_admin (&$a, &$o) { $zoom = 17; $o = replace_macros( $t, array( - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), '$tmsserver' => array('tmsserver', t('Tile Server URL'), $tmsserver, t('A list of public tile servers')), '$zoom' => array('zoom', t('Default zoom'), $zoom, t('The default zoom level. (1:world, 18:highest)')), )); diff --git a/page/page.php b/page/page.php index 21a83e16..86607e81 100755 --- a/page/page.php +++ b/page/page.php @@ -208,7 +208,7 @@ function page_plugin_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php index cf92204a..947926cd 100755 --- a/pageheader/pageheader.php +++ b/pageheader/pageheader.php @@ -52,7 +52,7 @@ function pageheader_addon_settings(&$a,&$s) { $s .= ''; $s .= '
'; - $s .= '
'; + $s .= '
'; return; diff --git a/piwik/piwik.php b/piwik/piwik.php index a2086bdc..21bc7af2 100755 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -84,7 +84,7 @@ function piwik_analytics($a,&$b) { function piwik_plugin_admin (&$a, &$o) { $t = get_markup_template( "admin.tpl", "addon/piwik/" ); $o = replace_macros( $t, array( - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), '$baseurl' => array('baseurl', t('Piwik Base URL'), get_config('piwik','baseurl' ), t('Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)')), '$siteid' => array('siteid', t('Site ID'), get_config('piwik','siteid' ), ''), '$optout' => array('optout', t('Show opt-out cookie link?'), get_config('piwik','optout' ), ''), diff --git a/planets/planets.php b/planets/planets.php index 0df91d7c..72698cb9 100755 --- a/planets/planets.php +++ b/planets/planets.php @@ -155,6 +155,6 @@ function planets_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/posterous/posterous.php b/posterous/posterous.php index 7ff95948..af8e72b9 100755 --- a/posterous/posterous.php +++ b/posterous/posterous.php @@ -100,7 +100,7 @@ function posterous_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 1f76c100..9b7f80ed 100755 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -278,7 +278,7 @@ function pumpio_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php index 6b372579..2c98cba7 100755 --- a/qcomment/qcomment.php +++ b/qcomment/qcomment.php @@ -58,7 +58,7 @@ function qcomment_addon_settings(&$a,&$s) { $s .= ''; $s .= '
'; - $s .= '
'; + $s .= '
'; $s .= ''; return; diff --git a/randplace/randplace.php b/randplace/randplace.php index b70c02d9..27589b1c 100755 --- a/randplace/randplace.php +++ b/randplace/randplace.php @@ -174,6 +174,6 @@ function randplace_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php index 8955130f..5cba005a 100644 --- a/remote_permissions/remote_permissions.php +++ b/remote_permissions/remote_permissions.php @@ -45,7 +45,7 @@ function remote_permissions_settings(&$a,&$o) { '$remote_perms_title' => t('Remote Permissions Settings'), '$remote_perms_label' => t('Allow recipients of your private posts to see the other recipients of the posts'), '$checked' => (($remote_perms == 1) ? 'checked="checked"' : ''), - '$submit' => t('Submit') + '$submit' => t('Save Settings') )); } @@ -193,7 +193,7 @@ function remote_permissions_content($a, $item_copy) { function remote_permissions_plugin_admin(&$a, &$o){ $t = get_markup_template( "admin.tpl", "addon/remote_permissions/" ); $o = replace_macros($t, array( - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), '$global' => array('remotepermschoice', t('Global'), 1, t('The posts of every user on this server show the post recipients'), get_config('remote_perms', 'global') == 1), '$individual' => array('remotepermschoice', t('Individual'), 2, t('Each user chooses whether his/her posts show the post recipients'), get_config('remote_perms', 'global') == 0) )); diff --git a/retriever/retriever.php b/retriever/retriever.php index 1090c8b5..04834018 100644 --- a/retriever/retriever.php +++ b/retriever/retriever.php @@ -674,7 +674,7 @@ function retriever_content($a) { t('Reapply the rules to this number of posts')), '$title' => t('Retrieve Feed Content'), '$help' => $a->get_baseurl() . '/retriever/help', - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), '$id' => ($retriever["id"] ? $retriever["id"] : "create"), '$tag_t' => t('Tag'), '$attribute_t' => t('Attribute'), @@ -718,7 +718,7 @@ function retriever_plugin_settings(&$a,&$s) { $all_photos_mu = ($all_photos == 'on') ? ' checked="true"' : ''; $template = get_markup_template('/settings.tpl', 'addon/retriever/'); $s .= replace_macros($template, array( - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), '$title' => t('Retriever Settings'), '$help' => $a->get_baseurl() . '/retriever/help', '$all_photos' => $all_photos_mu, diff --git a/showmore/showmore.php b/showmore/showmore.php index 1f40b027..60932ed3 100755 --- a/showmore/showmore.php +++ b/showmore/showmore.php @@ -45,7 +45,7 @@ function showmore_addon_settings(&$a,&$s) { $s .= ''; $s .= '
'; - $s .= '
'; + $s .= '
'; // $s .= '
' . t('Use /expression/ to provide regular expressions') . '
'; $s .= ''; diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php index 87db098b..d53794b9 100755 --- a/smileybutton/smileybutton.php +++ b/smileybutton/smileybutton.php @@ -278,6 +278,6 @@ function smileybutton_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/snautofollow/snautofollow.php b/snautofollow/snautofollow.php index 2efc2128..4555ab1c 100644 --- a/snautofollow/snautofollow.php +++ b/snautofollow/snautofollow.php @@ -61,6 +61,6 @@ function snautofollow_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/startpage/startpage.php b/startpage/startpage.php index 85988298..6a95310e 100644 --- a/startpage/startpage.php +++ b/startpage/startpage.php @@ -89,6 +89,6 @@ function startpage_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index b16dedf8..4a6f440c 100755 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -300,7 +300,7 @@ function statusnet_settings(&$a,&$s) { $s .= ''. $asn['sitename'] .'
'; } $s .= '

'; - $s .= '
'; + $s .= '
'; } $s .= '

' . t('Provide your own OAuth Credentials') . '

'; $s .= '

'. t('No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation.') .'

'; @@ -317,7 +317,7 @@ function statusnet_settings(&$a,&$s) { $s .= ''; $s .= '
'; $s .= '

'; - $s .= '
'; + $s .= '
'; $s .= ''; } else { /*** @@ -344,14 +344,14 @@ function statusnet_settings(&$a,&$s) { $s .= ''; $s .= ''; $s .= '
'; - $s .= '
'; + $s .= '
'; $s .= '

'.t('Cancel Connection Process').'

'; $s .= '
'; $s .= '

'.t('Current StatusNet API is').': '.$api.'

'; $s .= ''; $s .= ''; $s .= '
'; - $s .= '
'; + $s .= '
'; } else { /*** * we have an OAuth key / secret pair for the user @@ -388,7 +388,7 @@ function statusnet_settings(&$a,&$s) { $s .= ''; $s .= ''; $s .= '
'; - $s .= '
'; + $s .= '
'; } } $s .= '
'; @@ -814,7 +814,7 @@ function statusnet_plugin_admin(&$a, &$o){ $t = get_markup_template( "admin.tpl", "addon/statusnet/" ); $o = replace_macros($t, array( - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), '$sites' => $sitesform, )); } diff --git a/superblock/superblock.php b/superblock/superblock.php index 7363c139..1462c184 100755 --- a/superblock/superblock.php +++ b/superblock/superblock.php @@ -55,7 +55,7 @@ function superblock_addon_settings(&$a,&$s) { $s .= ''; $s .= '
'; - $s .= '
'; + $s .= '
'; return; diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index 35004033..b4db1055 100755 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -231,7 +231,7 @@ function tumblr_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/twitter/twitter.php b/twitter/twitter.php index e90f36df..42a373b8 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -264,7 +264,7 @@ function twitter_settings(&$a,&$s) { $s .= ''; $s .= ''; $s .= '
'; - $s .= '
'; + $s .= '
'; } else { /*** * we have an OAuth key / secret pair for the user @@ -310,7 +310,7 @@ function twitter_settings(&$a,&$s) { $s .= ''; $s .= ''; $s .= '
'; - $s .= '
'; + $s .= '
'; } } $s .= '
'; @@ -863,7 +863,7 @@ function twitter_plugin_admin(&$a, &$o){ $t = get_markup_template( "admin.tpl", "addon/twitter/" ); $o = replace_macros($t, array( - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), // name, label, value, help, [extra values] '$consumerkey' => array('consumerkey', t('Consumer key'), get_config('twitter', 'consumerkey' ), ''), '$consumersecret' => array('consumersecret', t('Consumer secret'), get_config('twitter', 'consumersecret' ), ''), diff --git a/uhremotestorage/uhremotestorage.php b/uhremotestorage/uhremotestorage.php index 85d6b13e..8dfecc74 100755 --- a/uhremotestorage/uhremotestorage.php +++ b/uhremotestorage/uhremotestorage.php @@ -86,7 +86,7 @@ function uhremotestorage_settings($a, &$s){ '$auth' => array( 'unhoestedauth', t('OAuth end-point'), $auth, 'If your are using ownCloud, your OAuth endpoint will be like http://HOST/apps/remoteStorage/auth.php/USER'), '$api' => array( 'unhoestedapi', t('Api'), $api, 'If your are using ownCloud, your api will be WebDAV', $arr_api), - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), )); } diff --git a/webrtc/webrtc.php b/webrtc/webrtc.php index e0d33393..8b3a243e 100644 --- a/webrtc/webrtc.php +++ b/webrtc/webrtc.php @@ -23,7 +23,7 @@ function webrtc_app_menu($a,&$b) { function webrtc_plugin_admin (&$a, &$o) { $t = get_markup_template( "admin.tpl", "addon/webrtc/" ); $o = replace_macros( $t, array( - '$submit' => t('Submit'), + '$submit' => t('Save Settings'), '$webrtcurl' => array('webrtcurl', t('WebRTC Base URL'), get_config('webrtc','webrtcurl' ), t('Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .')), )); } diff --git a/wppost/wppost.php b/wppost/wppost.php index a6574cc2..18656879 100755 --- a/wppost/wppost.php +++ b/wppost/wppost.php @@ -107,7 +107,7 @@ function wppost_settings(&$a,&$s) { /* provide a submit button */ - $s .= '
'; + $s .= '
'; } diff --git a/yourls/yourls.php b/yourls/yourls.php index c0d5e6ce..06397cbb 100755 --- a/yourls/yourls.php +++ b/yourls/yourls.php @@ -73,7 +73,7 @@ $yourls_ssl = get_config('yourls', 'ssl1'); $s .= ''; $s .= '
'; - $s .= '
'; + $s .= '
'; return;