Browse Source

Merge 39b6a1fdff into c344de3f04

pull/204/merge
Birger J. Nordølum 7 years ago
committed by GitHub
parent
commit
0a3b7e0411
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      CHANGELOG.md
  2. 24
      app/Http/Controllers/ItemController.php
  3. 12
      app/Http/Controllers/SettingsController.php
  4. 6
      app/Http/Controllers/TagController.php
  5. 4
      app/Providers/AppServiceProvider.php
  6. 10
      app/Setting.php
  7. 2
      app/SupportedApps/Contracts/Applications.php
  8. 2
      app/SupportedApps/Contracts/Livestats.php
  9. 4
      app/SupportedApps/Glances.php
  10. 24
      app/SupportedApps/Grafana.php
  11. 2
      app/SupportedApps/Nzbget.php
  12. 2
      app/SupportedApps/Plexpy.php
  13. 1
      app/SupportedApps/Sabnzbd.php
  14. 2
      app/SupportedApps/Tautulli.php
  15. 2
      config/app.php
  16. 8
      database/seeds/SettingsSeeder.php
  17. 54
      resources/assets/sass/_app.scss
  18. 22
      resources/assets/sass/_huebee.scss
  19. 16
      resources/lang/it/app.php
  20. 16
      resources/lang/nl/app.php
  21. 16
      resources/lang/no/app.php
  22. 16
      resources/lang/pl/app.php
  23. 42
      resources/lang/tr/app.php
  24. 4
      resources/lang/tr/auth.php
  25. 6
      resources/lang/tr/pagination.php
  26. 6
      resources/lang/tr/passwords.php
  27. 12
      resources/lang/tr/validation.php
  28. 8
      resources/views/app.blade.php
  29. 2
      resources/views/item.blade.php
  30. 6
      resources/views/items/form.blade.php
  31. 2
      resources/views/settings/form.blade.php
  32. 2
      resources/views/supportedapps/nzbget.blade.php
  33. 2
      resources/views/supportedapps/pihole.blade.php
  34. 2
      resources/views/supportedapps/proxmox.blade.php
  35. 2
      resources/views/supportedapps/runeaudio.blade.php
  36. 2
      resources/views/supportedapps/sabnzbd.blade.php
  37. 6
      resources/views/tags/form.blade.php
  38. 2
      resources/views/tags/list.blade.php
  39. 2
      resources/views/tags/scripts.blade.php
  40. 2
      resources/views/tags/trash.blade.php
  41. 8
      resources/views/welcome.blade.php

2
CHANGELOG.md

@ -25,7 +25,7 @@
### Changed ### Changed
- Updated composer dependencies - Updated composer dependencies
- Added live stats to Nzbget supported application - Added live stats to Nzbget supported application
- Changed Pihole to an enhanced application - Changed Pihole to an enhanced application
- Changed NZBGet to an enhanced application - Changed NZBGet to an enhanced application

24
app/Http/Controllers/ItemController.php

@ -37,7 +37,7 @@ class ItemController extends Controller
$item->save(); $item->save();
} }
} }
/** /**
* Pin item on the dashboard. * Pin item on the dashboard.
@ -88,7 +88,7 @@ class ItemController extends Controller
} }
} }
/** /**
* Display a listing of the resource. * Display a listing of the resource.
* *
@ -149,7 +149,7 @@ class ItemController extends Controller
]); ]);
//die(print_r($request->input('config'))); //die(print_r($request->input('config')));
$item = Item::create($request->all()); $item = Item::create($request->all());
$item->parents()->sync($request->tags); $item->parents()->sync($request->tags);
@ -184,7 +184,7 @@ class ItemController extends Controller
$data['current_tags'] = $data['item']->parents; $data['current_tags'] = $data['item']->parents;
// show the edit form and pass the nerd // show the edit form and pass the nerd
return view('items.edit', $data); return view('items.edit', $data);
} }
/** /**
@ -207,7 +207,7 @@ class ItemController extends Controller
'icon' => $path 'icon' => $path
]); ]);
} }
$config = Item::checkConfig($request->input('config')); $config = Item::checkConfig($request->input('config'));
$request->merge([ $request->merge([
'description' => $config 'description' => $config
@ -242,7 +242,7 @@ class ItemController extends Controller
} }
$route = route('items.index', [], false); $route = route('items.index', [], false);
return redirect($route) return redirect($route)
->with('success',__('app.alert.success.item_deleted')); ->with('success',__('app.alert.success.item_deleted'));
} }
@ -257,8 +257,8 @@ class ItemController extends Controller
// //
Item::withTrashed() Item::withTrashed()
->where('id', $id) ->where('id', $id)
->restore(); ->restore();
$route = route('items.inded', [], false); $route = route('items.inded', [], false);
return redirect($route) return redirect($route)
->with('success',__('app.alert.success.item_restored')); ->with('success',__('app.alert.success.item_restored'));
@ -296,7 +296,7 @@ class ItemController extends Controller
$output['config'] = null; $output['config'] = null;
} }
} }
return json_encode($output); return json_encode($output);
} }
@ -304,7 +304,7 @@ class ItemController extends Controller
{ {
$data = $request->input('data'); $data = $request->input('data');
//$url = $data[array_search('url', array_column($data, 'name'))]['value']; //$url = $data[array_search('url', array_column($data, 'name'))]['value'];
$app = $data['type']; $app = $data['type'];
$app_details = new $app(); $app_details = new $app();
@ -326,8 +326,8 @@ class ItemController extends Controller
$app_details->config = $config; $app_details->config = $config;
echo $app_details->executeConfig(); echo $app_details->executeConfig();
} }
} }
} }

12
app/Http/Controllers/SettingsController.php

@ -40,7 +40,7 @@ class SettingsController extends Controller
]); ]);
} else { } else {
$route = route('settings.list', [], false); $route = route('settings.list', [], false);
return redirect($route) return redirect($route)
->with([ ->with([
'error' => __('app.alert.error.not_exist'), 'error' => __('app.alert.error.not_exist'),
]); ]);
@ -66,7 +66,7 @@ class SettingsController extends Controller
$path = $request->file('value')->store('backgrounds'); $path = $request->file('value')->store('backgrounds');
$setting->value = $path; $setting->value = $path;
} }
} else { } else {
@ -76,13 +76,13 @@ class SettingsController extends Controller
$setting->save(); $setting->save();
$route = route('settings.index', [], false); $route = route('settings.index', [], false);
return redirect($route) return redirect($route)
->with([ ->with([
'success' => __('app.alert.success.setting_updated'), 'success' => __('app.alert.success.setting_updated'),
]); ]);
} else { } else {
$route = route('settings.index', [], false); $route = route('settings.index', [], false);
return redirect($route) return redirect($route)
->with([ ->with([
'error' => __('app.alert.error.not_exist'), 'error' => __('app.alert.error.not_exist'),
]); ]);
@ -101,10 +101,10 @@ class SettingsController extends Controller
$setting->save(); $setting->save();
} }
$route = route('settings.index', [], false); $route = route('settings.index', [], false);
return redirect($route) return redirect($route)
->with([ ->with([
'success' => __('app.alert.success.setting_updated'), 'success' => __('app.alert.success.setting_updated'),
]); ]);
} }
} }

6
app/Http/Controllers/TagController.php

@ -99,7 +99,7 @@ class TagController extends Controller
// show the edit form and pass the nerd // show the edit form and pass the nerd
return view('tags.edit') return view('tags.edit')
->with('item', $item); ->with('item', $item);
} }
/** /**
@ -152,7 +152,7 @@ class TagController extends Controller
} else { } else {
Item::find($id)->delete(); Item::find($id)->delete();
} }
$route = route('tags.index', [], false); $route = route('tags.index', [], false);
return redirect($route) return redirect($route)
->with('success',__('app.alert.success.item_deleted')); ->with('success',__('app.alert.success.item_deleted'));
@ -169,7 +169,7 @@ class TagController extends Controller
// //
Item::withTrashed() Item::withTrashed()
->where('id', $id) ->where('id', $id)
->restore(); ->restore();
$route = route('tags.index', [], false); $route = route('tags.index', [], false);
return redirect($route) return redirect($route)
->with('success',__('app.alert.success.item_restored')); ->with('success',__('app.alert.success.item_restored'));

4
app/Providers/AppServiceProvider.php

@ -40,10 +40,10 @@ class AppServiceProvider extends ServiceProvider
$db_version = Setting::fetch('version'); $db_version = Setting::fetch('version');
$app_version = config('app.version'); $app_version = config('app.version');
if(version_compare($app_version, $db_version) == 1) { // app is higher than db, so need to run migrations etc if(version_compare($app_version, $db_version) == 1) { // app is higher than db, so need to run migrations etc
Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true)); Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true));
} }
} else { } else {
Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true)); Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true));
} }
$lang = Setting::fetch('language'); $lang = Setting::fetch('language');
\App::setLocale($lang); \App::setLocale($lang);

10
app/Setting.php

@ -52,14 +52,14 @@ class Setting extends Model
$value = '<a href="'.asset('storage/'.$this->value).'" title="'.__('app.settings.view').'" target="_blank">'.__('app.settings.view').'</a>'; $value = '<a href="'.asset('storage/'.$this->value).'" title="'.__('app.settings.view').'" target="_blank">'.__('app.settings.view').'</a>';
} else { } else {
$value = __('app.options.none'); $value = __('app.options.none');
} }
break; break;
case 'boolean': case 'boolean':
if((bool)$this->value === true) { if((bool)$this->value === true) {
$value = __('app.options.yes'); $value = __('app.options.yes');
} else { } else {
$value = __('app.options.no'); $value = __('app.options.no');
} }
break; break;
case 'select': case 'select':
if(!empty($this->value) && $this->value !== 'none') { if(!empty($this->value) && $this->value !== 'none') {
@ -67,7 +67,7 @@ class Setting extends Model
$value = __($options[$this->value]); $value = __($options[$this->value]);
} else { } else {
$value = __('app.options.none'); $value = __('app.options.none');
} }
break; break;
default: default:
$value = __($this->value); $value = __($this->value);
@ -90,7 +90,7 @@ class Setting extends Model
if(isset($this->value) && !empty($this->value)) { if(isset($this->value) && !empty($this->value)) {
$value .= '<a class="settinglink" href="'.route('settings.clear', $this->id).'" title="'.__('app.settings.remove').'">'.__('app.settings.reset').'</a>'; $value .= '<a class="settinglink" href="'.route('settings.clear', $this->id).'" title="'.__('app.settings.remove').'">'.__('app.settings.reset').'</a>';
} }
break; break;
case 'boolean': case 'boolean':
$checked = false; $checked = false;
@ -175,7 +175,7 @@ class Setting extends Model
$output = ''; $output = '';
$homepage_search = self::fetch('homepage_search'); $homepage_search = self::fetch('homepage_search');
$search_provider = self::where('key', '=', 'search_provider')->first(); $search_provider = self::where('key', '=', 'search_provider')->first();
//die(var_dump($search_provider->value)); //die(var_dump($search_provider->value));
// return early if search isn't applicable // return early if search isn't applicable
if((bool)$homepage_search !== true) return $output; if((bool)$homepage_search !== true) return $output;

2
app/SupportedApps/Contracts/Applications.php

@ -5,5 +5,5 @@ interface Applications {
public function defaultColour(); public function defaultColour();
public function icon(); public function icon();
} }

2
app/SupportedApps/Contracts/Livestats.php

@ -7,5 +7,5 @@ interface Livestats {
public function testConfig(); public function testConfig();
public function executeConfig(); public function executeConfig();
} }

4
app/SupportedApps/Glances.php

@ -1,7 +1,7 @@
<?php namespace App\SupportedApps; <?php namespace App\SupportedApps;
class Glances implements Contracts\Applications { class Glances implements Contracts\Applications {
public function defaultColour() public function defaultColour()
{ {
return '#2c363f'; return '#2c363f';
@ -10,5 +10,5 @@ class Glances implements Contracts\Applications {
{ {
return 'supportedapps/glances.png'; return 'supportedapps/glances.png';
} }
} }

24
app/SupportedApps/Grafana.php

@ -1,12 +1,12 @@
<?php namespace App\SupportedApps; <?php namespace App\SupportedApps;
class Grafana implements Contracts\Applications { class Grafana implements Contracts\Applications {
public function defaultColour() public function defaultColour()
{ {
return '#a56e4d'; return '#a56e4d';
} }
public function icon() public function icon()
{ {
return 'supportedapps/grafana.png'; return 'supportedapps/grafana.png';
} }
} }

2
app/SupportedApps/Nzbget.php

@ -80,5 +80,5 @@ class Nzbget implements Contracts\Applications, Contracts\Livestats {
return $res; return $res;
} }
} }

2
app/SupportedApps/Plexpy.php

@ -73,5 +73,5 @@ class Plexpy implements Contracts\Applications, Contracts\Livestats {
return $res; return $res;
} }
} }

1
app/SupportedApps/Sabnzbd.php

@ -85,5 +85,4 @@ class Sabnzbd implements Contracts\Applications, Contracts\Livestats {
return $res; return $res;
} }
} }

2
app/SupportedApps/Tautulli.php

@ -73,5 +73,5 @@ class Tautulli implements Contracts\Applications, Contracts\Livestats {
return $res; return $res;
} }
} }

2
config/app.php

@ -13,7 +13,7 @@ return [
| |
*/ */
'name' => env('APP_NAME', 'Heimdall'), 'name' => env('APP_NAME', 'Heimdall'),
'version' => '1.4.14', 'version' => '1.4.14',
/* /*

8
database/seeds/SettingsSeeder.php

@ -95,7 +95,7 @@ class SettingsSeeder extends Seeder
]); ]);
if(!$setting = Setting::find(4)) { if(!$setting = Setting::find(4)) {
$setting = new Setting; $setting = new Setting;
$setting->id = 4; $setting->id = 4;
$setting->group_id = 3; $setting->group_id = 3;
@ -117,8 +117,8 @@ class SettingsSeeder extends Seeder
'fi' => 'Suomi (Finnish)', 'fi' => 'Suomi (Finnish)',
'fr' => 'Français (French)', 'fr' => 'Français (French)',
'it' => 'Italiano (Italian)', 'it' => 'Italiano (Italian)',
'no' => 'Norsk (Norwegian)', 'no' => 'Norsk (Norwegian)',
'pl' => 'Polski (Polish)', 'pl' => 'Polski (Polish)',
'sv' => 'Svenska (Swedish)', 'sv' => 'Svenska (Swedish)',
'es' => 'Español (Spanish)', 'es' => 'Español (Spanish)',
'tr' => 'Türkçe (Turkish)', 'tr' => 'Türkçe (Turkish)',
@ -145,7 +145,7 @@ class SettingsSeeder extends Seeder
]); ]);
if(!$setting = Setting::find(7)) { if(!$setting = Setting::find(7)) {
$setting = new Setting; $setting = new Setting;
$setting->id = 7; $setting->id = 7;
$setting->group_id = 3; $setting->group_id = 3;

54
resources/assets/sass/_app.scss

@ -106,7 +106,7 @@ body {
.item-container { .item-container {
//width: 340px; //width: 340px;
//transition: width .35s ease-in-out; //transition: width .35s ease-in-out;
position: relative; position: relative;
.item-edit { .item-edit {
color: white; color: white;
@ -214,7 +214,7 @@ body {
box-shadow: 0 0 20px 2px rgba(0,0,0,0.3); box-shadow: 0 0 20px 2px rgba(0,0,0,0.3);
color: white; color: white;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
display: none; display: none;
outline: 1px solid transparent; outline: 1px solid transparent;
&.active { &.active {
@ -317,7 +317,7 @@ body {
width: 100%; width: 100%;
margin:0; margin:0;
background:#fff; background:#fff;
thead { thead {
th { th {
background: #f2f3f6; background: #f2f3f6;
@ -344,7 +344,7 @@ body {
width: 5px; width: 5px;
background: $app-green; background: $app-green;
} }
} }
} }
} }
@ -355,7 +355,7 @@ body {
&.form-error { &.form-error {
background: #e69191; background: #e69191;
color: white; color: white;
text-align: center; text-align: center;
} }
} }
a { a {
@ -375,9 +375,9 @@ body {
.button { .button {
font-size: 18px; font-size: 18px;
color: lighten($app-text, 15%); color: lighten($app-text, 15%);
padding: 0 10px; padding: 0 10px;
border: none; border: none;
border-left: 1px solid $table-line; border-left: 1px solid $table-line;
display: flex; display: flex;
line-height: 1; line-height: 1;
position:relative; position:relative;
@ -482,10 +482,10 @@ div.create {
width: 36px; width: 36px;
height: 20px; height: 20px;
} }
/* Hide default HTML checkbox */ /* Hide default HTML checkbox */
.switch input {display:none;} .switch input {display:none;}
/* The slider */ /* The slider */
.slider { .slider {
position: absolute; position: absolute;
@ -498,7 +498,7 @@ div.create {
-webkit-transition: .4s; -webkit-transition: .4s;
transition: .4s; transition: .4s;
} }
.slider:before { .slider:before {
position: absolute; position: absolute;
content: ""; content: "";
@ -510,30 +510,30 @@ div.create {
-webkit-transition: .4s; -webkit-transition: .4s;
transition: .4s; transition: .4s;
} }
input:checked + .slider { input:checked + .slider {
background-color: #2196F3; background-color: #2196F3;
} }
input:focus + .slider { input:focus + .slider {
box-shadow: 0 0 1px #2196F3; box-shadow: 0 0 1px #2196F3;
} }
input:checked + .slider:before { input:checked + .slider:before {
-webkit-transform: translateX(16px); -webkit-transform: translateX(16px);
-ms-transform: translateX(16px); -ms-transform: translateX(16px);
transform: translateX(16px); transform: translateX(16px);
} }
/* Rounded sliders */ /* Rounded sliders */
.slider.round { .slider.round {
border-radius: 20px; border-radius: 20px;
} }
.slider.round:before { .slider.round:before {
border-radius: 50%; border-radius: 50%;
} }
@-webkit-keyframes autofill { @-webkit-keyframes autofill {
to { to {
background:#f5f5f5; background:#f5f5f5;
@ -593,15 +593,15 @@ div.create {
position: relative; position: relative;
width: 100%; width: 100%;
max-width: 500px; max-width: 500px;
form { form {
width: 100%; width: 100%;
} }
.input-container { .input-container {
background: white; background: white;
border-radius: 5px; border-radius: 5px;
box-shadow: 0px 0px 5px 0 rgba(0,0,0,0.4); box-shadow: 0px 0px 5px 0 rgba(0,0,0,0.4);
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
input { input {
padding: 17px 15px; padding: 17px 15px;
@ -634,7 +634,7 @@ div.create {
z-index: 1000; z-index: 1000;
float: left; float: left;
display: none; display: none;
min-width: 160px; min-width: 160px;
padding: 4px 0; padding: 4px 0;
margin: 0 0 10px 25px; margin: 0 0 10px 25px;
list-style: none; list-style: none;
@ -670,7 +670,7 @@ div.create {
.ui-state-hover, .ui-state-active { .ui-state-hover, .ui-state-active {
font-weight: 700; font-weight: 700;
} }
#appimage { #appimage {
@ -705,7 +705,7 @@ hr {
border-width: 0; border-width: 0;
border-top: 1px solid #eaeaea; border-top: 1px solid #eaeaea;
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
} }
.upload-btn-wrapper { .upload-btn-wrapper {
@ -713,7 +713,7 @@ hr {
overflow: hidden; overflow: hidden;
display: inline-block; display: inline-block;
} }
.btn { .btn {
border: none; border: none;
color: white; color: white;
@ -721,7 +721,7 @@ hr {
padding: 8px 12px; padding: 8px 12px;
border-radius: 8px; border-radius: 8px;
font-size: 16px; font-size: 16px;
&.test { &.test {
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
@ -733,7 +733,7 @@ hr {
background: #207774; background: #207774;
} }
} }
.upload-btn-wrapper input[type=file] { .upload-btn-wrapper input[type=file] {
font-size: 100px; font-size: 100px;
position: absolute; position: absolute;
@ -785,9 +785,9 @@ hr {
} }
input:-webkit-autofill, input:-webkit-autofill,
input:-webkit-autofill:hover, input:-webkit-autofill:hover,
input:-webkit-autofill:focus input:-webkit-autofill:focus
input:-webkit-autofill, input:-webkit-autofill,
textarea:-webkit-autofill, textarea:-webkit-autofill,
textarea:-webkit-autofill:hover textarea:-webkit-autofill:hover
textarea:-webkit-autofill:focus, textarea:-webkit-autofill:focus,

22
resources/assets/sass/_huebee.scss

@ -8,17 +8,17 @@ http://huebee.buzz
transform: translateY(0px); transform: translateY(0px);
transition: opacity 0.15s, transform 0.15s; transition: opacity 0.15s, transform 0.15s;
} }
.huebee.is-hidden { .huebee.is-hidden {
opacity: 0; opacity: 0;
transform: translateY(10px); transform: translateY(10px);
} }
.huebee.is-static-open { .huebee.is-static-open {
position: relative; position: relative;
z-index: auto; z-index: auto;
} }
.huebee__container { .huebee__container {
position: absolute; position: absolute;
left: 0; left: 0;
@ -28,7 +28,7 @@ http://huebee.buzz
border-radius: 5px; border-radius: 5px;
box-shadow: 0 5px 10px hsla(0, 0%, 0%, 0.3); box-shadow: 0 5px 10px hsla(0, 0%, 0%, 0.3);
} }
.huebee.is-static-open .huebee__container { .huebee.is-static-open .huebee__container {
position: relative; position: relative;
display: inline-block; display: inline-block;
@ -36,12 +36,12 @@ http://huebee.buzz
top: auto; top: auto;
box-shadow: none; box-shadow: none;
} }
.huebee__canvas { .huebee__canvas {
display: block; display: block;
cursor: pointer; cursor: pointer;
} }
.huebee__cursor { .huebee__cursor {
width: 15px; width: 15px;
height: 15px; height: 15px;
@ -53,9 +53,9 @@ http://huebee.buzz
border-radius: 5px; border-radius: 5px;
pointer-events: none; pointer-events: none;
} }
.huebee__cursor.is-hidden { opacity: 0; } .huebee__cursor.is-hidden { opacity: 0; }
.huebee__close-button { .huebee__close-button {
display: block; display: block;
position: absolute; position: absolute;
@ -66,18 +66,18 @@ http://huebee.buzz
border-radius: 12px; border-radius: 12px;
background: #222; background: #222;
} }
.huebee__close-button__x { .huebee__close-button__x {
stroke: white; stroke: white;
stroke-width: 3; stroke-width: 3;
stroke-linecap: round; stroke-linecap: round;
} }
.huebee__close-button:hover { .huebee__close-button:hover {
background: white; background: white;
cursor: pointer; cursor: pointer;
} }
.huebee__close-button:hover .huebee__close-button__x { .huebee__close-button:hover .huebee__close-button__x {
stroke: #222; stroke: #222;
} }

16
resources/lang/it/app.php

@ -22,12 +22,12 @@ return [
'settings.remove' => 'Rimuovi', 'settings.remove' => 'Rimuovi',
'settings.search' => 'Cerca', 'settings.search' => 'Cerca',
'settings.no_items' => 'Nessun elemento trovato', 'settings.no_items' => 'Nessun elemento trovato',
'settings.label' => 'Etichetta',
'settings.value' => 'Valore', 'settings.label' => 'Etichetta',
'settings.edit' => 'Modifica', 'settings.value' => 'Valore',
'settings.view' => 'Vista', 'settings.edit' => 'Modifica',
'settings.view' => 'Vista',
'options.none' => '- non impostato -', 'options.none' => '- non impostato -',
'options.google' => 'Google', 'options.google' => 'Google',
@ -64,9 +64,9 @@ return [
'url' => 'Url', 'url' => 'Url',
'title' => 'Titolo', 'title' => 'Titolo',
'delete' => 'Elimina', 'delete' => 'Elimina',
'optional' => 'Opzionale', 'optional' => 'Opzionale',
'restore' => 'Ripristina', 'restore' => 'Ripristina',
'alert.success.item_created' => 'Elemento creato con successo', 'alert.success.item_created' => 'Elemento creato con successo',
'alert.success.item_updated' => 'Elemento aggiornato con successo', 'alert.success.item_updated' => 'Elemento aggiornato con successo',

16
resources/lang/nl/app.php

@ -22,12 +22,12 @@ return [
'settings.remove' => 'Verwijderen', 'settings.remove' => 'Verwijderen',
'settings.search' => 'zoeken', 'settings.search' => 'zoeken',
'settings.no_items' => 'Geen items gevonden', 'settings.no_items' => 'Geen items gevonden',
'settings.label' => 'Label',
'settings.value' => 'Waarde', 'settings.label' => 'Label',
'settings.edit' => 'Bewerken', 'settings.value' => 'Waarde',
'settings.view' => 'Weergeven', 'settings.edit' => 'Bewerken',
'settings.view' => 'Weergeven',
'options.none' => '- niet ingesteld -', 'options.none' => '- niet ingesteld -',
'options.google' => 'Google', 'options.google' => 'Google',
@ -68,9 +68,9 @@ return [
'url' => 'URL', 'url' => 'URL',
'title' => 'Titel', 'title' => 'Titel',
'delete' => 'Verwijderen', 'delete' => 'Verwijderen',
'optional' => 'Optioneel', 'optional' => 'Optioneel',
'restore' => 'Herstellen', 'restore' => 'Herstellen',
'alert.success.item_created' => 'Item met succes aangemaakt', 'alert.success.item_created' => 'Item met succes aangemaakt',
'alert.success.item_updated' => 'Item met succes bewerkt', 'alert.success.item_updated' => 'Item met succes bewerkt',

16
resources/lang/no/app.php

@ -22,12 +22,12 @@ return [
'settings.remove' => 'Fjern', 'settings.remove' => 'Fjern',
'settings.search' => 'søk', 'settings.search' => 'søk',
'settings.no_items' => 'Ingen funn', 'settings.no_items' => 'Ingen funn',
'settings.label' => 'Merkelapp',
'settings.value' => 'Verdi', 'settings.label' => 'Merkelapp',
'settings.edit' => 'Endre', 'settings.value' => 'Verdi',
'settings.view' => 'Se', 'settings.edit' => 'Endre',
'settings.view' => 'Se',
'options.none' => '- ikke valgt -', 'options.none' => '- ikke valgt -',
'options.google' => 'Google', 'options.google' => 'Google',
@ -64,9 +64,9 @@ return [
'url' => 'Url', 'url' => 'Url',
'title' => 'Tittel', 'title' => 'Tittel',
'delete' => 'Slett', 'delete' => 'Slett',
'optional' => 'Valgfritt', 'optional' => 'Valgfritt',
'restore' => 'Tilbakestill', 'restore' => 'Tilbakestill',
'alert.success.item_created' => 'Objektet ble opprettet', 'alert.success.item_created' => 'Objektet ble opprettet',
'alert.success.item_updated' => 'Objektet ble oppdatert', 'alert.success.item_updated' => 'Objektet ble oppdatert',

16
resources/lang/pl/app.php

@ -22,12 +22,12 @@ return [
'settings.remove' => 'Usuń', 'settings.remove' => 'Usuń',
'settings.search' => 'szukaj', 'settings.search' => 'szukaj',
'settings.no_items' => 'Nic nie znaleziono', 'settings.no_items' => 'Nic nie znaleziono',
'settings.label' => 'Etykieta',
'settings.value' => 'Wartość', 'settings.label' => 'Etykieta',
'settings.edit' => 'Edytuj', 'settings.value' => 'Wartość',
'settings.view' => 'Widok', 'settings.edit' => 'Edytuj',
'settings.view' => 'Widok',
'options.none' => '- not set -', 'options.none' => '- not set -',
'options.google' => 'Google', 'options.google' => 'Google',
@ -64,9 +64,9 @@ return [
'url' => 'URL', 'url' => 'URL',
'title' => 'Tytuł', 'title' => 'Tytuł',
'delete' => 'Usuń', 'delete' => 'Usuń',
'optional' => 'Opcjonalny', 'optional' => 'Opcjonalny',
'restore' => 'Przywróć', 'restore' => 'Przywróć',
'alert.success.item_created' => 'Element utworzony', 'alert.success.item_created' => 'Element utworzony',
'alert.success.item_updated' => 'Element zaktualizowany', 'alert.success.item_updated' => 'Element zaktualizowany',

42
resources/lang/tr/app.php

@ -1,18 +1,18 @@
<?php <?php
return [ return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| App Language Lines | App Language Lines
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
*/ */
'settings.system' => 'Sistem', 'settings.system' => 'Sistem',
'settings.appearance' => 'Görünüm', 'settings.appearance' => 'Görünüm',
'settings.miscellaneous' => 'Çeşitli', 'settings.miscellaneous' => 'Çeşitli',
'settings.version' => 'Versiyon', 'settings.version' => 'Versiyon',
'settings.background_image' => 'Arkaplan Resmi', 'settings.background_image' => 'Arkaplan Resmi',
'settings.homepage_search' => 'Anasayfa Arama', 'settings.homepage_search' => 'Anasayfa Arama',
@ -22,31 +22,31 @@ return [
'settings.remove' => 'Sil', 'settings.remove' => 'Sil',
'settings.search' => 'ara', 'settings.search' => 'ara',
'settings.no_items' => 'Öğe bulunamadı', 'settings.no_items' => 'Öğe bulunamadı',
'settings.label' => 'Etiket', 'settings.label' => 'Etiket',
'settings.value' => 'Değer', 'settings.value' => 'Değer',
'settings.edit' => 'Düzenle', 'settings.edit' => 'Düzenle',
'settings.view' => 'Görüntüle', 'settings.view' => 'Görüntüle',
'options.none' => '- ayarlanmadı -', 'options.none' => '- ayarlanmadı -',
'options.google' => 'Google', 'options.google' => 'Google',
'options.ddg' => 'DuckDuckGo', 'options.ddg' => 'DuckDuckGo',
'options.bing' => 'Bing', 'options.bing' => 'Bing',
'options.yes' => 'Evet', 'options.yes' => 'Evet',
'options.no' => 'Hayır', 'options.no' => 'Hayır',
'buttons.save' => 'Kaydet', 'buttons.save' => 'Kaydet',
'buttons.cancel' => 'İptal', 'buttons.cancel' => 'İptal',
'buttons.add' => 'Ekle', 'buttons.add' => 'Ekle',
'buttons.upload' => 'Dosya yükle', 'buttons.upload' => 'Dosya yükle',
'dash.pin_item' => 'Ana panele iğnele', 'dash.pin_item' => 'Ana panele iğnele',
'dash.no_apps' => 'Ana panele iğneli öğeler, :link1 or :link2', 'dash.no_apps' => 'Ana panele iğneli öğeler, :link1 or :link2',
'dash.link1' => 'Yeni uygulama ekle', 'dash.link1' => 'Yeni uygulama ekle',
'dash.link2' => 'Ana panele iğnele', 'dash.link2' => 'Ana panele iğnele',
'dash.pinned_items' => 'İğnelenen öğeler', 'dash.pinned_items' => 'İğnelenen öğeler',
'apps.app_list' => 'Uygulama listesi', 'apps.app_list' => 'Uygulama listesi',
'apps.view_trash' => 'Çöpü görüntüle', 'apps.view_trash' => 'Çöpü görüntüle',
'apps.add_application' => 'Uygulama ekle', 'apps.add_application' => 'Uygulama ekle',
@ -59,20 +59,20 @@ return [
'apps.username' => 'Kullanıcı adı', 'apps.username' => 'Kullanıcı adı',
'apps.password' => 'Şifre', 'apps.password' => 'Şifre',
'apps.config' => 'Yapılandırma', 'apps.config' => 'Yapılandırma',
'url' => 'Adres', 'url' => 'Adres',
'title' => 'Başlık', 'title' => 'Başlık',
'delete' => 'Sil', 'delete' => 'Sil',
'optional' => 'İsteğe bağlı', 'optional' => 'İsteğe bağlı',
'restore' => 'Eski haline getir', 'restore' => 'Eski haline getir',
'alert.success.item_created' => 'Öğe yaratıldı', 'alert.success.item_created' => 'Öğe yaratıldı',
'alert.success.item_updated' => 'Öğe güncellendi', 'alert.success.item_updated' => 'Öğe güncellendi',
'alert.success.item_deleted' => 'Öğe silindi', 'alert.success.item_deleted' => 'Öğe silindi',
'alert.success.item_restored' => 'Öğe eski haline getirildi', 'alert.success.item_restored' => 'Öğe eski haline getirildi',
'alert.success.setting_updated' => 'Ayarlama kaydedildi', 'alert.success.setting_updated' => 'Ayarlama kaydedildi',
'alert.error.not_exist' => 'Böyle bir seçenek yok.', 'alert.error.not_exist' => 'Böyle bir seçenek yok.',
]; ];

4
resources/lang/tr/auth.php

@ -12,8 +12,8 @@ return [
| these language lines according to your application's requirements. | these language lines according to your application's requirements.
| |
*/ */
'failed' => 'Kimlik bilgileri doğru değil.', 'failed' => 'Kimlik bilgileri doğru değil.',
'throttle' => 'Çok fazla girişim. :seconds saniye sonra tekrar deneyin.', 'throttle' => 'Çok fazla girişim. :seconds saniye sonra tekrar deneyin.',
]; ];

6
resources/lang/tr/pagination.php

@ -1,7 +1,7 @@
<?php <?php
return [ return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Pagination Language Lines | Pagination Language Lines
@ -12,8 +12,8 @@ return [
| you want to customize your views to better match your application. | you want to customize your views to better match your application.
| |
*/ */
'previous' => '&laquo; Önceki', 'previous' => '&laquo; Önceki',
'next' => 'Sonraki &raquo;', 'next' => 'Sonraki &raquo;',
]; ];

6
resources/lang/tr/passwords.php

@ -1,7 +1,7 @@
<?php <?php
return [ return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Password Reset Language Lines | Password Reset Language Lines
@ -12,11 +12,11 @@ return [
| has failed, such as for an invalid token or invalid new password. | has failed, such as for an invalid token or invalid new password.
| |
*/ */
'password' => 'Şifre en az altı karakter olmalı ve onaylamasına uymalıdır.', 'password' => 'Şifre en az altı karakter olmalı ve onaylamasına uymalıdır.',
'reset' => 'Şifreniz sıfırlandı!', 'reset' => 'Şifreniz sıfırlandı!',
'sent' => 'Şifre sıfırlama bağlantısı eposta adresinize yollandı!', 'sent' => 'Şifre sıfırlama bağlantısı eposta adresinize yollandı!',
'token' => 'Şifre sıfırlama simgesi geçerli değil.', 'token' => 'Şifre sıfırlama simgesi geçerli değil.',
'user' => "Adresle ilişkili kullanıcı adı bulunamadı.", 'user' => "Adresle ilişkili kullanıcı adı bulunamadı.",
]; ];

12
resources/lang/tr/validation.php

@ -12,7 +12,7 @@ return [
| as the size rules. Feel free to tweak each of these messages here. | as the size rules. Feel free to tweak each of these messages here.
| |
*/ */
'accepted' => ':attribute kabul edilmelidir.', 'accepted' => ':attribute kabul edilmelidir.',
'active_url' => ':attribute geçerli bir adres değil.', 'active_url' => ':attribute geçerli bir adres değil.',
'after' => ':attribute :date tarihinden sonra olmalıdır.', 'after' => ':attribute :date tarihinden sonra olmalıdır.',
@ -87,7 +87,7 @@ return [
'unique' => ':attribute zaten kullanımda.', 'unique' => ':attribute zaten kullanımda.',
'uploaded' => ':attribute yüklenemedi.', 'uploaded' => ':attribute yüklenemedi.',
'url' => ':attribute düzeni geçersiz.', 'url' => ':attribute düzeni geçersiz.',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Custom Validation Language Lines | Custom Validation Language Lines
@ -98,13 +98,13 @@ return [
| specify a specific custom language line for a given attribute rule. | specify a specific custom language line for a given attribute rule.
| |
*/ */
'custom' => [ 'custom' => [
'attribute-name' => [ 'attribute-name' => [
'rule-name' => 'custom-message', 'rule-name' => 'custom-message',
], ],
], ],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Custom Validation Attributes | Custom Validation Attributes
@ -115,7 +115,7 @@ return [
| of "email". This simply helps us make messages a little cleaner. | of "email". This simply helps us make messages a little cleaner.
| |
*/ */
'attributes' => [], 'attributes' => [],
]; ];

8
resources/views/app.blade.php

@ -40,7 +40,7 @@
$active = ((bool)$app->pinned === true) ? 'active' : ''; $active = ((bool)$app->pinned === true) ? 'active' : '';
?> ?>
<li>{{ $app->title }}<a class="{{ $active }}" data-id="{{ $app->id }}" href="{{ route('items.pintoggle', [$app->id], false) }}"><i class="fas fa-thumbtack"></i></a></li> <li>{{ $app->title }}<a class="{{ $active }}" data-id="{{ $app->id }}" href="{{ route('items.pintoggle', [$app->id], false) }}"><i class="fas fa-thumbtack"></i></a></li>
@endforeach @endforeach
</ul> </ul>
@endif @endif
@ -71,13 +71,13 @@
</div> </div>
</div> </div>
@endif @endif
@yield('content') @yield('content')
<div id="config-buttons"> <div id="config-buttons">
@if(Route::is('dash') || Route::is('tags.show')) @if(Route::is('dash') || Route::is('tags.show'))
<a id="config-button" class="config" href=""><i class="fas fa-exchange"></i></a> <a id="config-button" class="config" href=""><i class="fas fa-exchange"></i></a>
@endif @endif
<a id="dash" class="config" href="{{ route('dash', [], false) }}"><i class="fas fa-th"></i></a> <a id="dash" class="config" href="{{ route('dash', [], false) }}"><i class="fas fa-th"></i></a>
<a id="items" class="config" href="{{ route('items.index', [], false) }}"><i class="fas fa-list"></i></a> <a id="items" class="config" href="{{ route('items.index', [], false) }}"><i class="fas fa-list"></i></a>
<a id="folder" class="config" href="{{ route('tags.index', [], false) }}"><i class="fas fa-tag"></i></a> <a id="folder" class="config" href="{{ route('tags.index', [], false) }}"><i class="fas fa-tag"></i></a>
@ -92,6 +92,6 @@
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
<script src="/js/app.js?v=2"></script> <script src="/js/app.js?v=2"></script>
@yield('scripts') @yield('scripts')
</body> </body>
</html> </html>

2
resources/views/item.blade.php

@ -14,5 +14,5 @@
<a class="link{{ title_color($app->colour) }}"{!! $app->link_target !!} href="{{ $app->link }}"><i class="fas {{ $app->link_icon }}"></i></a> <a class="link{{ title_color($app->colour) }}"{!! $app->link_target !!} href="{{ $app->link }}"><i class="fas {{ $app->link_icon }}"></i></a>
</div> </div>
<a class="item-edit" href="{{ route($app->link_type.'.edit', [ $app->id ], false) }}"><i class="fas fa-pencil"></i></a> <a class="item-edit" href="{{ route($app->link_type.'.edit', [ $app->id ], false) }}"><i class="fas fa-pencil"></i></a>
</section> </section>

6
resources/views/items/form.blade.php

@ -23,7 +23,7 @@
$checked = false; $checked = false;
if(isset($item->pinned) && (bool)$item->pinned === true) $checked = true; if(isset($item->pinned) && (bool)$item->pinned === true) $checked = true;
$set_checked = ($checked) ? ' checked="checked"' : ''; $set_checked = ($checked) ? ' checked="checked"' : '';
?> ?>
<input type="checkbox" name="pinned" value="1"<?php echo $set_checked;?> /> <input type="checkbox" name="pinned" value="1"<?php echo $set_checked;?> />
<span class="slider round"></span> <span class="slider round"></span>
</label> </label>
@ -57,7 +57,7 @@
</div> </div>
</div> </div>
</div> </div>
@if(isset($item) && isset($item->config->view)) @if(isset($item) && isset($item->config->view))
<div id="sapconfig" style="display: block;"> <div id="sapconfig" style="display: block;">
@if(isset($item)) @if(isset($item))
@ -67,7 +67,7 @@
@else @else
<div id="sapconfig"></div> <div id="sapconfig"></div>
@endif @endif
</div> </div>
<footer> <footer>
<div class="section-title">&nbsp;</div> <div class="section-title">&nbsp;</div>

2
resources/views/settings/form.blade.php

@ -17,7 +17,7 @@
{!! $setting->edit_value !!} {!! $setting->edit_value !!}
</div> </div>
</div> </div>
<footer> <footer>
<div class="section-title">&nbsp;</div> <div class="section-title">&nbsp;</div>

2
resources/views/supportedapps/nzbget.blade.php

@ -5,7 +5,7 @@
<label>{{ strtoupper(__('app.url')) }}</label> <label>{{ strtoupper(__('app.url')) }}</label>
{!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!} {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
</div> </div>
<div class="input"> <div class="input">
<label>{{ __('app.apps.username') }}</label> <label>{{ __('app.apps.username') }}</label>
{!! Form::text('config[username]', null, array('placeholder' => __('app.apps.username'), 'data-config' => 'username', 'class' => 'form-control config-item')) !!} {!! Form::text('config[username]', null, array('placeholder' => __('app.apps.username'), 'data-config' => 'username', 'class' => 'form-control config-item')) !!}

2
resources/views/supportedapps/pihole.blade.php

@ -6,7 +6,7 @@
<label>{{ strtoupper(__('app.url')) }}</label> <label>{{ strtoupper(__('app.url')) }}</label>
{!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!} {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
</div> </div>
<div class="input"> <div class="input">
<label>{{ __('app.apps.enable') }}</label> <label>{{ __('app.apps.enable') }}</label>
{!! Form::hidden('config[enabled]', '0') !!} {!! Form::hidden('config[enabled]', '0') !!}

2
resources/views/supportedapps/proxmox.blade.php

@ -5,7 +5,7 @@
<label>{{ strtoupper(__('app.url')) }}</label> <label>{{ strtoupper(__('app.url')) }}</label>
{!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!} {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
</div> </div>
<div class="input"> <div class="input">
<label>{{ __('app.apps.username') }}</label> <label>{{ __('app.apps.username') }}</label>
{!! Form::text('config[username]', null, array('placeholder' => __('app.apps.username'), 'data-config' => 'username', 'class' => 'form-control config-item')) !!} {!! Form::text('config[username]', null, array('placeholder' => __('app.apps.username'), 'data-config' => 'username', 'class' => 'form-control config-item')) !!}

2
resources/views/supportedapps/runeaudio.blade.php

@ -6,7 +6,7 @@
<label>{{ strtoupper(__('app.url')) }}</label> <label>{{ strtoupper(__('app.url')) }}</label>
{!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!} {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
</div> </div>
<div class="input"> <div class="input">
<label>{{ __('app.apps.enable') }}</label> <label>{{ __('app.apps.enable') }}</label>
{!! Form::hidden('config[enabled]', '0') !!} {!! Form::hidden('config[enabled]', '0') !!}

2
resources/views/supportedapps/sabnzbd.blade.php

@ -1,7 +1,7 @@
<h2>{{ __('app.apps.config') }} ({{ __('app.optional') }})</h2> <h2>{{ __('app.apps.config') }} ({{ __('app.optional') }})</h2>
<div class="items"> <div class="items">
<input type="hidden" data-config="type" class="config-item" name="config[type]" value="\App\SupportedApps\Sabnzbd" /> <input type="hidden" data-config="type" class="config-item" name="config[type]" value="\App\SupportedApps\Sabnzbd" />
<div class="input"> <div class="input">
<label>{{ strtoupper(__('app.url')) }}</label> <label>{{ strtoupper(__('app.url')) }}</label>
{!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!} {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}

6
resources/views/tags/form.blade.php

@ -20,7 +20,7 @@
$checked = false; $checked = false;
if(isset($item->pinned) && (bool)$item->pinned === true) $checked = true; if(isset($item->pinned) && (bool)$item->pinned === true) $checked = true;
$set_checked = ($checked) ? ' checked="checked"' : ''; $set_checked = ($checked) ? ' checked="checked"' : '';
?> ?>
<input type="checkbox" name="pinned" value="1"<?php echo $set_checked;?> /> <input type="checkbox" name="pinned" value="1"<?php echo $set_checked;?> />
<span class="slider round"></span> <span class="slider round"></span>
</label> </label>
@ -51,7 +51,7 @@
</div> </div>
</div> </div>
</div> </div>
@if(isset($item) && isset($item->config->view)) @if(isset($item) && isset($item->config->view))
<div id="sapconfig" style="display: block;"> <div id="sapconfig" style="display: block;">
@if(isset($item)) @if(isset($item))
@ -61,7 +61,7 @@
@else @else
<div id="sapconfig"></div> <div id="sapconfig"></div>
@endif @endif
</div> </div>
<footer> <footer>
<div class="section-title">&nbsp;</div> <div class="section-title">&nbsp;</div>

2
resources/views/tags/list.blade.php

@ -47,7 +47,7 @@
</tr> </tr>
@endif @endif
</tbody> </tbody>
</table> </table>
</section> </section>

2
resources/views/tags/scripts.blade.php

@ -4,7 +4,7 @@
var elem = $('.color-picker')[0]; var elem = $('.color-picker')[0];
var hueb = new Huebee( elem, { var hueb = new Huebee( elem, {
// options // options
}); });
}); });
</script> </script>

2
resources/views/tags/trash.blade.php

@ -43,7 +43,7 @@
</tr> </tr>
@endif @endif
</tbody> </tbody>
</table> </table>
</section> </section>

8
resources/views/welcome.blade.php

@ -4,17 +4,17 @@
@include('partials.search') @include('partials.search')
@if($apps->first()) @if($apps->first())
@include('sortable') @include('sortable')
@else @else
<div class="message-container2"> <div class="message-container2">
<div class="alert alert-danger"> <div class="alert alert-danger">
<p>{!! __('app.dash.no_apps', <p>{!! __('app.dash.no_apps',
[ [
'link1' => '<a href="'.route('items.create', [], false).'">'.__('app.dash.link1').'</a>', 'link1' => '<a href="'.route('items.create', [], false).'">'.__('app.dash.link1').'</a>',
'link2' => '<a id="pin-item" href="">'.__('app.dash.link2').'</a>' 'link2' => '<a id="pin-item" href="">'.__('app.dash.link2').'</a>'
]) !!}</p> ]) !!}</p>
</div> </div>
</div> </div>
<div id="sortable"> <div id="sortable">
@include('add') @include('add')

Loading…
Cancel
Save