diff --git a/app/Item.php b/app/Item.php index a80cb579..cb247f45 100644 --- a/app/Item.php +++ b/app/Item.php @@ -29,6 +29,7 @@ class Item extends Model 'AirSonic' => \App\SupportedApps\AirSonic::class, 'Cardigann' => \App\SupportedApps\Cardigann::class, 'CouchPotato' => \App\SupportedApps\CouchPotato::class, + 'Booksonic' => \App\SupportedApps\Booksonic::class, 'Deluge' => \App\SupportedApps\Deluge::class, 'Dokuwiki' => \App\SupportedApps\Dokuwiki::class, 'Duplicati' => \App\SupportedApps\Duplicati::class, @@ -41,9 +42,11 @@ class Item extends Model 'Jackett' => \App\SupportedApps\Jackett::class, 'Jdownloader' => \App\SupportedApps\Jdownloader::class, 'Krusader' => \App\SupportedApps\Krusader::class, + 'LibreNMS' => \App\SupportedApps\LibreNMS::class, 'Lidarr' => \App\SupportedApps\Lidarr::class, 'Mcmyadmin' => \App\SupportedApps\Mcmyadmin::class, 'Medusa' => \App\SupportedApps\Medusa::class, + 'MusicBrainz' => \App\SupportedApps\MusicBrainz::class, 'NZBGet' => \App\SupportedApps\Nzbget::class, 'Netdata' => \App\SupportedApps\Netdata::class, 'Nextcloud' => \App\SupportedApps\Nextcloud::class, @@ -60,6 +63,7 @@ class Item extends Model 'Portainer' => \App\SupportedApps\Portainer::class, 'Proxmox' => \App\SupportedApps\Proxmox::class, 'Radarr' => \App\SupportedApps\Radarr::class, + 'Rancher' => \App\SupportedApps\Rancher::class, 'Runeaudio' => \App\SupportedApps\Runeaudio::class, 'Sabnzbd' => \App\SupportedApps\Sabnzbd::class, 'Sickrage' => \App\SupportedApps\Sickrage::class, @@ -165,10 +169,12 @@ class Item extends Model public function getLinkTargetAttribute() { - if((int)$this->type === 1) { + $target = Setting::fetch('window_target'); + + if((int)$this->type === 1 || $target === 'current') { return ''; } else { - return ' target="heimdallapp"'; + return ' target="' . $target . '"'; } } diff --git a/app/SupportedApps/Booksonic.php b/app/SupportedApps/Booksonic.php new file mode 100644 index 00000000..63b94887 --- /dev/null +++ b/app/SupportedApps/Booksonic.php @@ -0,0 +1,12 @@ +config->url; + $config = $this->config; + $url = $config->url; + $url = rtrim($url, '/'); - $apiUrl = $url.'/transmission/rpc'; - return $apiUrl; + $api_url = $url.'/transmission/rpc'; + + return $api_url; } } diff --git a/database/seeds/SettingsSeeder.php b/database/seeds/SettingsSeeder.php index ab8ab8f3..fd6d636b 100644 --- a/database/seeds/SettingsSeeder.php +++ b/database/seeds/SettingsSeeder.php @@ -151,6 +151,27 @@ class SettingsSeeder extends Seeder $setting->save(); } - + $window_target_options = json_encode([ + 'current' => 'app.settings.window_target.current', + 'heimdall' => 'app.settings.window_target.one', + '_blank' => 'app.settings.window_target.new', + ]); + + if(!$setting = Setting::find(7)) { + + $setting = new Setting; + $setting->id = 7; + $setting->group_id = 3; + $setting->key = 'window_target'; + $setting->type = 'select'; + $setting->options = $window_target_options; + $setting->label = 'app.settings.window_target'; + $setting->value = 'heimdall'; + $setting->save(); + } else { + $setting->options = $window_target_options; + $setting->label = 'app.settings.window_target'; + $setting->save(); + } } } diff --git a/readme.md b/readme.md index 0fedf8cb..ef6d17e5 100644 --- a/readme.md +++ b/readme.md @@ -42,6 +42,7 @@ Supported applications are recognized by the title of the application as entered **Foundation** - AirSonic +- Booksonic - Cardigann - Deluge - DokuWiki @@ -52,9 +53,11 @@ Supported applications are recognized by the title of the application as entered - Graylog - Jdownloader - Krusader +- LibreNMS - Lidarr - McMyAdmin - Medusa +- MusicBrainz - NZBhydra & NZBhydra2 - Netdata - Nextcloud @@ -65,6 +68,7 @@ Supported applications are recognized by the title of the application as entered - Plexrequests - Portainer - Radarr +- Rancher - SickRage - Sonarr - TT-RSS diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php index 2f393208..e55499a2 100644 --- a/resources/lang/en/app.php +++ b/resources/lang/en/app.php @@ -16,6 +16,10 @@ return [ 'settings.version' => 'Version', 'settings.background_image' => 'Background Image', 'settings.trianglify' => 'Trianglify', + 'settings.window_target' => 'Link opens in', + 'settings.window_target.current' => 'Open in this tab', + 'settings.window_target.one' => 'Open in the same tab', + 'settings.window_target.new' => 'Open in a new tab', 'settings.homepage_search' => 'Homepage Search', 'settings.search_provider' => 'Search Provider', 'settings.language' => 'Language', @@ -23,12 +27,12 @@ return [ 'settings.remove' => 'Remove', 'settings.search' => 'search', 'settings.no_items' => 'No items found', - - 'settings.label' => 'Label', - 'settings.value' => 'Value', - 'settings.edit' => 'Edit', - 'settings.view' => 'View', + + 'settings.label' => 'Label', + 'settings.value' => 'Value', + 'settings.edit' => 'Edit', + 'settings.view' => 'View', 'options.none' => '- not set -', 'options.google' => 'Google', @@ -61,7 +65,7 @@ return [ 'apps.username' => 'Username', 'apps.password' => 'Password', 'apps.config' => 'Config', - 'apps.apikey' => 'Api Key', + 'apps.apikey' => 'API Key', 'apps.enable' => 'Enable', 'apps.tag_list' => 'Tags list', 'apps.add_tag' => 'Add tag', @@ -69,11 +73,11 @@ return [ 'apps.tags' => 'Tags', 'apps.override' => 'If different to main url', - 'url' => 'Url', + 'url' => 'URL', 'title' => 'Title', - 'delete' => 'Delete', - 'optional' => 'Optional', - 'restore' => 'Restore', + 'delete' => 'Delete', + 'optional' => 'Optional', + 'restore' => 'Restore', 'alert.success.item_created' => 'Item created successfully', 'alert.success.item_updated' => 'Item updated successfully', @@ -85,8 +89,8 @@ return [ 'alert.success.tag_deleted' => 'Tag deleted successfully', 'alert.success.tag_restored' => 'Tag restored successfully', - 'alert.success.setting_updated' => 'You have successfully edited this Setting', - 'alert.error.not_exist' => 'This Setting does not exist.', + 'alert.success.setting_updated' => 'You have successfully edited this setting', + 'alert.error.not_exist' => 'This setting does not exist.', ]; diff --git a/resources/views/supportedapps/transmission.blade.php b/resources/views/supportedapps/transmission.blade.php index be547b54..bfb3612f 100644 --- a/resources/views/supportedapps/transmission.blade.php +++ b/resources/views/supportedapps/transmission.blade.php @@ -2,6 +2,10 @@
+
+ + {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!} +
{!! Form::text('config[username]', null, array('placeholder' => __('app.apps.username'), 'data-config' => 'username', 'class' => 'form-control config-item')) !!} diff --git a/storage/app/public/supportedapps/booksonic.png b/storage/app/public/supportedapps/booksonic.png new file mode 100644 index 00000000..4232ac91 Binary files /dev/null and b/storage/app/public/supportedapps/booksonic.png differ diff --git a/storage/app/public/supportedapps/librenms.png b/storage/app/public/supportedapps/librenms.png new file mode 100644 index 00000000..085a676e Binary files /dev/null and b/storage/app/public/supportedapps/librenms.png differ diff --git a/storage/app/public/supportedapps/musicbrainz.png b/storage/app/public/supportedapps/musicbrainz.png new file mode 100644 index 00000000..12f97b79 Binary files /dev/null and b/storage/app/public/supportedapps/musicbrainz.png differ diff --git a/storage/app/public/supportedapps/rancher.png b/storage/app/public/supportedapps/rancher.png new file mode 100644 index 00000000..1455e835 Binary files /dev/null and b/storage/app/public/supportedapps/rancher.png differ