diff options
| author | Igor Scheller <igor.scheller@igorshp.de> | 2017-03-02 08:11:52 +0100 |
|---|---|---|
| committer | Igor Scheller <igor.scheller@igorshp.de> | 2017-03-02 08:11:52 +0100 |
| commit | 68da2a4eb8122bf4d4d795bb6094939e3b170dfd (patch) | |
| tree | 0980f1fe459f5ef39fcefdf968c0f94996ed08ae | |
| parent | 781f830678dcc5601c47a01acab7763c9bb8363d (diff) | |
Renamed "default_theme" config to "theme"
| -rw-r--r-- | config/config.default.php | 11 | ||||
| -rw-r--r-- | includes/pages/guest_login.php | 2 | ||||
| -rw-r--r-- | public/index.php | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/config/config.default.php b/config/config.default.php index c7a79fc4..8ae01144 100644 --- a/config/config.default.php +++ b/config/config.default.php @@ -27,7 +27,7 @@ return [ 'contact_email' => 'mailto:ticket@c3heaven.de', // Default theme of the start page, 1=style1.css - 'default_theme' => 1, + 'theme' => 1, // Number of News shown on one site 'display_news' => 6, @@ -56,7 +56,10 @@ return [ // local timezone 'timezone' => 'Europe/Berlin', - // multiply 'night shifts' and freeloaded shifts (start or end between 2 and 6 exclusive) by 2 + // weigh every shift the same + //'shift_sum_formula' => 'SUM(`end` - `start`)', + + // Multiply 'night shifts' and freeloaded shifts (start or end between 2 and 6 exclusive) by 2 'shift_sum_formula' => ' SUM( (1 + @@ -70,10 +73,8 @@ return [ * (1 - 3 * `ShiftEntry`.`freeloaded`) ) ', - // weigh every shift the same - //'shift_sum_formula' => 'SUM(`end` - `start`)', - // voucher calculation + // Voucher calculation 'voucher_settings' => [ 'initial_vouchers' => 2, 'shifts_per_voucher' => 1, diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index 2ffa4b98..99970a01 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -209,7 +209,7 @@ function guest_register() VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), ?, NULL, ?) ', [ - config('default_theme'), + config('theme'), $nick, $preName, $lastName, diff --git a/public/index.php b/public/index.php index 4e5dab03..895b4fe0 100644 --- a/public/index.php +++ b/public/index.php @@ -169,7 +169,7 @@ if ( $event_config = EventConfig(); echo template_render(__DIR__ . '/../templates/layout.html', [ - 'theme' => isset($user) ? $user['color'] : config('default_theme'), + 'theme' => isset($user) ? $user['color'] : config('theme'), 'title' => $title, 'atom_link' => ($page == 'news' || $page == 'user_meetings') ? ' <link href="' . page_link_to('atom') . (($page == 'user_meetings') ? '&meetings=1' : '') |