Browse Source

Merge pull request #200 from ullbergm/Add-option-to-open-links-in-current-window-or-new-tab

WIP: Add option to open links in current window or new tab
ullbergm/trianglify^2
KodeStar 6 years ago
committed by GitHub
parent
commit
51776e2aa3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      app/Item.php
  2. 23
      database/seeds/SettingsSeeder.php
  3. 4
      resources/lang/en/app.php

6
app/Item.php

@ -169,10 +169,12 @@ class Item extends Model
public function getLinkTargetAttribute() public function getLinkTargetAttribute()
{ {
if((int)$this->type === 1) { $target = Setting::fetch('window_target');
if((int)$this->type === 1 || $target === 'current') {
return ''; return '';
} else { } else {
return ' target="heimdallapp"'; return ' target="' . $target . '"';
} }
} }

23
database/seeds/SettingsSeeder.php

@ -138,6 +138,27 @@ class SettingsSeeder extends Seeder
$setting->save(); $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();
}
} }
} }

4
resources/lang/en/app.php

@ -15,6 +15,10 @@ return [
'settings.version' => 'Version', 'settings.version' => 'Version',
'settings.background_image' => 'Background Image', 'settings.background_image' => 'Background Image',
'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.homepage_search' => 'Homepage Search',
'settings.search_provider' => 'Search Provider', 'settings.search_provider' => 'Search Provider',
'settings.language' => 'Language', 'settings.language' => 'Language',

Loading…
Cancel
Save