diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-29 12:11:53 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-29 12:11:53 -0400 |
| commit | 1fc41a7bfc507e6f041e2db34ebf044a49e928a5 (patch) | |
| tree | b3e7b857536f2c0bdbc797152356a50e2fe59352 /apps | |
| parent | fcc9f506417647a5b38f3ae9398730f064177e27 (diff) | |
| download | nextcloud-server-1fc41a7bfc507e6f041e2db34ebf044a49e928a5.tar.gz nextcloud-server-1fc41a7bfc507e6f041e2db34ebf044a49e928a5.zip | |
Integrate sharing app with the new interface
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/appinfo/app.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/js/share.js | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 879bd1ea0eb..9d8057a6fe2 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -8,6 +8,6 @@ OC_APP::addNavigationEntry( array( "id" => "files_sharing_list", "order" => 10, "href" => OC_HELPER::linkTo( "files_sharing", "list.php" ), "name" => "Share", - "icon" => OC_HELPER::imagePath( "files_sharing", "share.png" ))); + "icon" => OC_HELPER::imagePath( "core", "actions/share.png" ))); ?>
\ No newline at end of file diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 32926c6811e..0562c3cb132 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -1,6 +1,5 @@ $(document).ready(function() { - $('.share').click(function(event) { - event.preventDefault(); + FileActions.register('all', 'Share', OC.imagePath('core', 'actions/share'), function(filename) { var html = "<div id='dialog' title='Share "+getSelectedFiles('name')+"' align='center'>"; html += "<label><input type='radio' name='share_type' value='private' checked='checked' /> Private</label>"; html += "<label><input type='radio' name='share_type' value='public' /> Public</label>"; |