-
Notifications
You must be signed in to change notification settings - Fork 163
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
configsetup: use defaultConfig as placeholder where possible
Change-Id: I129bc194f8df93d52251d0e623f2fd1da69b7cb4
- Loading branch information
Showing
1 changed file
with
38 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
'language' => [ | ||
'type' => 'select', | ||
'name' => 'language', | ||
'placeholder' => 'language', | ||
'placeholder' => $defaultConfig['language'], | ||
'options' => [ | ||
'de' => 'DE', | ||
'en' => 'EN', | ||
|
@@ -18,13 +18,13 @@ | |
], | ||
'start_screen_title' => [ | ||
'type' => 'input', | ||
'placeholder' => 'Photobooth', | ||
'placeholder' => $defaultConfig['start_screen_title'], | ||
'name' => 'start_screen_title', | ||
'value' => $config['start_screen_title'] | ||
], | ||
'start_screen_subtitle' => [ | ||
'type' => 'input', | ||
'placeholder' => 'Webinterface by André Rinas', | ||
'placeholder' => $defaultConfig['start_screen_subtitle'], | ||
'name' => 'start_screen_subtitle', | ||
'value' => $config['start_screen_subtitle'] | ||
], | ||
|
@@ -89,12 +89,12 @@ | |
'cntdwn_time' => [ | ||
'type' => 'input', | ||
'name' => 'cntdwn_time', | ||
'placeholder' => '5', | ||
'placeholder' => $defaultConfig['cntdwn_time'], | ||
'value' => $config['cntdwn_time'] | ||
], | ||
'cheese_time' => [ | ||
'type' => 'input', | ||
'placeholder' => '1000', | ||
'placeholder' => $defaultConfig['cheese_time'], | ||
'name' => 'cheese_time', | ||
'value' => $config['cheese_time'] | ||
], | ||
|
@@ -123,7 +123,7 @@ | |
], | ||
'polaroid_rotation' => [ | ||
'type' => 'input', | ||
'placeholder' => '0', | ||
'placeholder' => $defaultConfig['polaroid_rotation'], | ||
'name' => 'polaroid_rotation', | ||
'value' => $config['polaroid_rotation'] | ||
], | ||
|
@@ -140,7 +140,7 @@ | |
'collage_cntdwn_time' => [ | ||
'type' => 'input', | ||
'name' => 'collage_cntdwn_time', | ||
'placeholder' => '3', | ||
'placeholder' => $defaultConfig['collage_cntdwn_time'], | ||
'value' => $config['collage_cntdwn_time'] | ||
], | ||
'continuous_collage' => [ | ||
|
@@ -158,27 +158,27 @@ | |
'jpeg_quality_image' => [ | ||
'type' => 'input', | ||
'name' => 'jpeg_quality_image', | ||
'placeholder' => '80', | ||
'placeholder' => $defaultConfig['jpeg_quality_image'], | ||
'value' => $config['jpeg_quality_image'] | ||
], | ||
'jpeg_quality_chroma' => [ | ||
'type' => 'input', | ||
'name' => 'jpeg_quality_chroma', | ||
'placeholder' => '70', | ||
'placeholder' => $defaultConfig['jpeg_quality_chroma'], | ||
'value' => $config['jpeg_quality_chroma'] | ||
], | ||
'jpeg_quality_thumb' => [ | ||
'type' => 'input', | ||
'name' => 'jpeg_quality_thumb', | ||
'placeholder' => '60', | ||
'placeholder' => $defaultConfig['jpeg_quality_thumb'], | ||
'value' => $config['jpeg_quality_thumb'] | ||
] | ||
], | ||
'user_interface' => [ | ||
'color_theme' => [ | ||
'type' => 'select', | ||
'name' => 'color_theme', | ||
'placeholder' => 'default', | ||
'placeholder' => $defaultConfig['color_theme'], | ||
'options' => [ | ||
'default' => 'default', | ||
'blue-gray' => 'blue-gray' | ||
|
@@ -228,37 +228,37 @@ | |
], | ||
'keying' => [ | ||
'type' => 'input', | ||
'placeholder' => 'keying', | ||
'placeholder' => $defaultConfig['folders']['keying'], | ||
'name' => 'folders[keying]', | ||
'value' => $config['folders']['keying'] | ||
], | ||
'print' => [ | ||
'type' => 'input', | ||
'placeholder' => 'print', | ||
'name' => 'folders[print]', | ||
'placeholder' => $defaultConfig['folders']['print'], | ||
'value' => $config['folders']['print'] | ||
], | ||
'qrcodes' => [ | ||
'type' => 'input', | ||
'placeholder' => 'qrcodes', | ||
'placeholder' => $defaultConfig['folders']['qrcodes'], | ||
'name' => 'folders[qrcodes]', | ||
'value' => $config['folders']['qrcodes'] | ||
], | ||
'thumbs' => [ | ||
'type' => 'input', | ||
'placeholder' => 'thumbs', | ||
'placeholder' => $defaultConfig['folders']['thumbs'], | ||
'name' => 'folders[thumbs]', | ||
'value' => $config['folders']['thumbs'] | ||
], | ||
'tmp' => [ | ||
'type' => 'input', | ||
'placeholder' => 'tmp', | ||
'placeholder' => $defaultConfig['folders']['tmp'], | ||
'name' => 'folders[tmp]', | ||
'value' => $config['folders']['tmp'] | ||
], | ||
'data' => [ | ||
'type' => 'input', | ||
'placeholder' => 'data', | ||
'placeholder' => $defaultConfig['folders']['data'], | ||
'name' => 'folders[data]', | ||
'value' => $config['folders']['data'] | ||
] | ||
|
@@ -284,7 +284,7 @@ | |
'symbol' => [ | ||
'type' => 'select', | ||
'name' => 'event[symbol]', | ||
'placeholder' => 'event[symbol]', | ||
'placeholder' => $defaultConfig['event']['symbol'], | ||
'options' => [ | ||
'fa-camera' => 'Camera', | ||
'fa-camera-retro' => 'Camera Retro', | ||
|
@@ -323,13 +323,13 @@ | |
'crop_width' => [ | ||
'type' => 'input', | ||
'name' => 'crop_width', | ||
'placeholder' => '1000', | ||
'placeholder' => $defaultConfig['crop_width'], | ||
'value' => $config['crop_width'] | ||
], | ||
'crop_height' => [ | ||
'type' => 'input', | ||
'name' => 'crop_height', | ||
'placeholder' => '500', | ||
'placeholder' => $defaultConfig['crop_height'], | ||
'value' => $config['crop_height'] | ||
], | ||
'is_textonprint' => [ | ||
|
@@ -339,49 +339,49 @@ | |
], | ||
'line1' => [ | ||
'type' => 'input', | ||
'placeholder' => 'line 1', | ||
'placeholder' => $defaultConfig['textonprint']['line1'], | ||
'name' => 'textonprint[line1]', | ||
'value' => $config['textonprint']['line1'] | ||
], | ||
'line2' => [ | ||
'type' => 'input', | ||
'placeholder' => 'line 2', | ||
'placeholder' => $defaultConfig['textonprint']['line2'], | ||
'name' => 'textonprint[line2]', | ||
'value' => $config['textonprint']['line2'] | ||
], | ||
'line3' => [ | ||
'type' => 'input', | ||
'placeholder' => 'line 3', | ||
'placeholder' => $defaultConfig['textonprint']['line3'], | ||
'name' => 'textonprint[line3]', | ||
'value' => $config['textonprint']['line3'] | ||
], | ||
'locationx' => [ | ||
'type' => 'input', | ||
'placeholder' => '2250', | ||
'placeholder' => $defaultConfig['locationx'], | ||
'name' => 'locationx', | ||
'value' => $config['locationx'] | ||
], | ||
'locationy' => [ | ||
'type' => 'input', | ||
'placeholder' => '1050', | ||
'placeholder' => $defaultConfig['locationy'], | ||
'name' => 'locationy', | ||
'value' => $config['locationy'] | ||
], | ||
'rotation' => [ | ||
'type' => 'input', | ||
'placeholder' => '40', | ||
'placeholder' => $defaultConfig['rotation'], | ||
'name' => 'rotation', | ||
'value' => $config['rotation'] | ||
], | ||
'fontsize' => [ | ||
'type' => 'input', | ||
'placeholder' => '100', | ||
'placeholder' => $defaultConfig['fontsize'], | ||
'name' => 'fontsize', | ||
'value' => $config['fontsize'] | ||
], | ||
'linespace' => [ | ||
'type' => 'input', | ||
'placeholder' => '100', | ||
'placeholder' => $defaultConfig['linespace'], | ||
'name' => 'linespace', | ||
'value' => $config['linespace'] | ||
], | ||
|
@@ -409,7 +409,7 @@ | |
], | ||
'date_format' => [ | ||
'type' => 'input', | ||
'placeholder' => 'd.m.Y - G:i', | ||
'placeholder' => $defaultConfig['gallery']['date_format'], | ||
'name' => 'gallery[date_format]', | ||
'value' => $config['gallery']['date_format'] | ||
] | ||
|
@@ -422,55 +422,55 @@ | |
], | ||
'host' => [ | ||
'type' => 'input', | ||
'placeholder' => 'smtp.example.com', | ||
'placeholder' => $defaultConfig['mail_host'], | ||
'name' => 'mail_host', | ||
'value' => $config['mail_host'] | ||
], | ||
'username' => [ | ||
'type' => 'input', | ||
'placeholder' => '[email protected]', | ||
'placeholder' => $defaultConfig['mail_username'], | ||
'name' => 'mail_username', | ||
'value' => $config['mail_username'] | ||
], | ||
'password' => [ | ||
'type' => 'input', | ||
'placeholder' => 'yourpassword', | ||
'placeholder' => $defaultConfig['mail_password'], | ||
'name' => 'mail_password', | ||
'value' => $config['mail_password'] | ||
], | ||
'secure' => [ | ||
'type' => 'input', | ||
'placeholder' => 'tls', | ||
'placeholder' => $defaultConfig['mail_secure'], | ||
'name' => 'mail_secure', | ||
'value' => $config['mail_secure'] | ||
], | ||
'port' => [ | ||
'type' => 'input', | ||
'placeholder' => '587', | ||
'placeholder' => $defaultConfig['mail_port'], | ||
'name' => 'mail_port', | ||
'value' => $config['mail_port'] | ||
], | ||
'fromAddress' => [ | ||
'type' => 'input', | ||
'placeholder' => '[email protected]', | ||
'placeholder' => $defaultConfig['mail_fromAddress'], | ||
'name' => 'mail_fromAddress', | ||
'value' => $config['mail_fromAddress'] | ||
], | ||
'fromName' => [ | ||
'type' => 'input', | ||
'placeholder' => 'Photobooth', | ||
'placeholder' => $defaultConfig['mail_fromName'], | ||
'name' => 'mail_fromName', | ||
'value' => $config['mail_fromName'] | ||
], | ||
'subject' => [ | ||
'type' => 'input', | ||
'placeholder' => 'Here is your picture', | ||
'placeholder' => $defaultConfig['mail_subject'], | ||
'name' => 'mail_subject', | ||
'value' => $config['mail_subject'] | ||
], | ||
'text' => [ | ||
'type' => 'input', | ||
'placeholder' => 'Hey, your picture is attached.', | ||
'placeholder' => $defaultConfig['mail_text'], | ||
'name' => 'mail_text', | ||
'value' => $config['mail_text'] | ||
], | ||
|