diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-11-05 16:28:54 -0800 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-05 16:28:54 -0800 |
commit | 5b42edb42aa69267d5cd96d18c321791d0660d37 (patch) | |
tree | 6b6133939bbe1964f6b872676d129296bfad7bd3 | |
parent | a26d8609a9d8bb9e905050f42cd20ab24a58e61d (diff) | |
parent | 94437a8fcd0b0b15b49deceeacef7602b801dac1 (diff) | |
download | volse-hubzilla-5b42edb42aa69267d5cd96d18c321791d0660d37.tar.gz volse-hubzilla-5b42edb42aa69267d5cd96d18c321791d0660d37.tar.bz2 volse-hubzilla-5b42edb42aa69267d5cd96d18c321791d0660d37.zip |
Merge https://github.com/redmatrix/hubzilla into pending_merge
-rw-r--r-- | app/firefoxshare.apd | 4 | ||||
-rw-r--r-- | app/firefoxshare.png | bin | 0 -> 3170 bytes | |||
-rw-r--r-- | images/hz-bookmark-32.png | bin | 0 -> 973 bytes | |||
-rw-r--r-- | mod/ffsapi.php | 7 |
4 files changed, 8 insertions, 3 deletions
diff --git a/app/firefoxshare.apd b/app/firefoxshare.apd new file mode 100644 index 000000000..5e0f38b4e --- /dev/null +++ b/app/firefoxshare.apd @@ -0,0 +1,4 @@ +url: $baseurl/ffsapi +requires: local_channel +name: Firefox Share +photo: $baseurl/app/firefoxshare.png diff --git a/app/firefoxshare.png b/app/firefoxshare.png Binary files differnew file mode 100644 index 000000000..755952284 --- /dev/null +++ b/app/firefoxshare.png diff --git a/images/hz-bookmark-32.png b/images/hz-bookmark-32.png Binary files differnew file mode 100644 index 000000000..f3a09d9b4 --- /dev/null +++ b/images/hz-bookmark-32.png diff --git a/mod/ffsapi.php b/mod/ffsapi.php index de47408bd..3822a8e94 100644 --- a/mod/ffsapi.php +++ b/mod/ffsapi.php @@ -4,7 +4,7 @@ function ffsapi_content(&$a) { $baseurl = z_root(); -$name = sprintf( t('Social Provider on %1$s'), get_config('system','sitename')); +$name = sprintf( t('%1$s'), get_config('system','sitename')); $description = t('Share content from Firefox to $Projectname'); $author = 'Mike Macgirvin'; $homepage = 'http://hubzilla.org'; @@ -35,8 +35,9 @@ var data = { // social bookmarks are available in Firefox 26 "markURL": baseurl+"/rbmark?f=&url=%{url}&title=%{title}", // icons should be 32x32 pixels - "markedIcon": baseurl+"/images/checkbox-checked-32.png", - "unmarkedIcon": baseurl+"/images/checkbox-unchecked-32.png", + // "markedIcon": baseurl+"/images/checkbox-checked-32.png", + // "unmarkedIcon": baseurl+"/images/checkbox-unchecked-32.png", + "unmarkedIcon": baseurl+"/images/hz-bookmark-32.png", // should be available for display purposes "description": '$description', |