summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--includes/pages/admin_free.php51
-rw-r--r--includes/pages/admin_groups.php87
-rw-r--r--includes/pages/admin_questions.php52
-rw-r--r--includes/pages/admin_shifts.php43
-rw-r--r--includes/pages/user_messages.php3
-rw-r--r--includes/sys_template.php4
-rw-r--r--public/vendor/bootstrap-3.2.0/css/theme1.css36
-rw-r--r--templates/admin_free.html20
-rw-r--r--templates/admin_groups.html14
-rw-r--r--templates/admin_groups_edit_form.html14
-rw-r--r--templates/admin_question_answered.html9
-rw-r--r--templates/admin_question_unanswered.html16
-rw-r--r--templates/admin_questions.html31
-rw-r--r--templates/admin_rooms_edit_form.html59
-rw-r--r--templates/admin_rooms_new_form.html46
-rw-r--r--templates/admin_shift_preview.html20
-rw-r--r--themes/theme1.scss12
17 files changed, 160 insertions, 357 deletions
diff --git a/includes/pages/admin_free.php b/includes/pages/admin_free.php
index 19a4c99f..836197db 100644
--- a/includes/pages/admin_free.php
+++ b/includes/pages/admin_free.php
@@ -29,7 +29,7 @@ function admin_free() {
$users = sql_select("SELECT `User`.* FROM `User` ${angeltypesearch} LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID` AND `Shifts`.`start` < " . sql_escape(time()) . " AND `Shifts`.`end` > " . sql_escape(time()) . ") WHERE `User`.`Gekommen` = 1 AND `Shifts`.`SID` IS NULL GROUP BY `User`.`UID` ORDER BY `Nick`");
- $table = "";
+ $free_users_table = array();
if ($search == "")
$tokens = array();
else
@@ -46,24 +46,41 @@ function admin_free() {
if (! $match)
continue;
}
- $table .= '<tr>';
- $table .= '<td>' . User_Nick_render($usr) . '</td>';
- $table .= '<td>' . $usr['DECT'] . '</td>';
- $table .= '<td>' . $usr['jabber'] . '</td>';
- if (in_array('admin_user', $privileges))
- $table .= '<td><a href="' . page_link_to('admin_user') . '&amp;id=' . $usr['UID'] . '">edit</a></td>';
- else
- $table .= '<td>' . User_Nick_render($usr) . '</td>';
- $table .= '</tr>';
+ $free_users_table[] = array(
+ 'name' => User_Nick_render($usr),
+ 'shift_state' => User_shift_mode_render(User_shift_state($usr)),
+ 'dect' => $usr['DECT'],
+ 'jabber' => $usr['jabber'],
+ 'email' => $usr['email'],
+ 'actions' => in_array('admin_user', $privileges) ? button(page_link_to('admin_user') . '&amp;id=' . $usr['UID'], _("edit"), 'btn-xs') : ''
+ );
}
- return template_render('../templates/admin_free.html', array(
- 'title' => admin_free_title(),
- 'search' => $search,
- 'angeltypes' => html_select_key('angeltype', 'angeltype', $angel_types, $_REQUEST['angeltype']),
- 'confirmed_only' => isset($_REQUEST['confirmed_only']) ? 'checked' : '',
- 'table' => $table,
- 'link' => page_link_to('admin_free')
+ return page_with_title(admin_free_title(), array(
+ form(array(
+ div('row', array(
+ div('col-md-4', array(
+ form_text('search', _("Search"), $search)
+ )),
+ div('col-md-4', array(
+ form_select('angeltype', _("Angeltype"), $angel_types, $_REQUEST['angeltype'])
+ )),
+ div('col-md-2', array(
+ form_checkbox('confirmed_only', _("Only confirmed"), isset($_REQUEST['confirmed_only']))
+ )),
+ div('col-md-2', array(
+ form_submit('submit', _("Search"))
+ ))
+ ))
+ )),
+ table(array(
+ 'name' => _("Nick"),
+ 'shift_state' => '',
+ 'dect' => _("DECT"),
+ 'jabber' => _("Jabber"),
+ 'email' => _("E-Mail"),
+ 'actions' => ''
+ ), $free_users_table)
));
}
?>
diff --git a/includes/pages/admin_groups.php b/includes/pages/admin_groups.php
index 4d88e74e..3133cf8b 100644
--- a/includes/pages/admin_groups.php
+++ b/includes/pages/admin_groups.php
@@ -5,87 +5,76 @@ function admin_groups_title() {
function admin_groups() {
global $user;
-
+
$html = "";
$groups = sql_select("SELECT * FROM `Groups` ORDER BY `Name`");
- if (!isset ($_REQUEST["action"])) {
- $groups_html = "";
+ if (! isset($_REQUEST["action"])) {
+ $groups_table = array();
foreach ($groups as $group) {
- $groups_html .= sprintf(
- '<tr><td>%s</td>',
- $group['Name']
- );
$privileges = sql_select("SELECT * FROM `GroupPrivileges` JOIN `Privileges` ON (`GroupPrivileges`.`privilege_id` = `Privileges`.`id`) WHERE `group_id`=" . sql_escape($group['UID']));
- $privileges_html = array ();
-
+ $privileges_html = array();
+
foreach ($privileges as $priv)
$privileges_html[] = $priv['name'];
-
- $groups_html .= sprintf(
- '<td>%s</td>'
- . '<td><a href="%s&action=edit&id=%s">Ändern</a></td>',
- join(', ', $privileges_html),
- page_link_to("admin_groups"),
- $group['UID']
+
+ $groups_table[] = array(
+ 'name' => $group['Name'],
+ 'privileges' => join(', ', $privileges_html),
+ 'actions' => button(page_link_to('admin_groups') . '&action=edit&id=' . $group['UID'], _("edit"), 'btn-xs')
);
}
-
- return template_render('../templates/admin_groups.html', array (
- 'nick' => User_Nick_render($user),
- 'groups' => $groups_html
+
+ return page_with_title(admin_groups_title(), array(
+ table(array(
+ 'name' => _("Name"),
+ 'privileges' => _("Privileges"),
+ 'actions' => ''
+ ), $groups_table)
));
} else {
switch ($_REQUEST["action"]) {
- case 'edit' :
- if (isset ($_REQUEST['id']) && preg_match("/^-[0-9]{1,11}$/", $_REQUEST['id']))
+ case 'edit':
+ if (isset($_REQUEST['id']) && preg_match("/^-[0-9]{1,11}$/", $_REQUEST['id']))
$id = $_REQUEST['id'];
else
return error("Incomplete call, missing Groups ID.", true);
-
+
$room = sql_select("SELECT * FROM `Groups` WHERE `UID`=" . sql_escape($id) . " LIMIT 1");
if (count($room) > 0) {
- list ($room) = $room;
+ list($room) = $room;
$privileges = sql_select("SELECT `Privileges`.*, `GroupPrivileges`.`group_id` FROM `Privileges` LEFT OUTER JOIN `GroupPrivileges` ON (`Privileges`.`id` = `GroupPrivileges`.`privilege_id` AND `GroupPrivileges`.`group_id`=" . sql_escape($id) . ") ORDER BY `Privileges`.`name`");
$privileges_html = "";
- foreach ($privileges as $priv)
- $privileges_html .= sprintf(
- '<tr><td><input type="checkbox" '
- . 'name="privileges[]" value="%s" %s />'
- . '</td> <td>%s</td> <td>%s</td></tr>',
- $priv['id'],
- ($priv['group_id'] != ""
- ? 'checked="checked"'
- : ''),
- $priv['name'],
- $priv['desc']
- );
-
- $html .= template_render('../templates/admin_groups_edit_form.html', array (
- 'link' => page_link_to("admin_groups"),
- 'id' => $id,
- 'privileges' => $privileges_html
+ $privileges_form = array();
+ foreach ($privileges as $priv) {
+ $privileges_form[] = form_checkbox('privileges[]', $priv['desc'] . ' (' . $priv['name'] . ')', $priv['group_id'] != "", $priv['id']);
+ $privileges_html .= sprintf('<tr><td><input type="checkbox" ' . 'name="privileges[]" value="%s" %s />' . '</td> <td>%s</td> <td>%s</td></tr>', $priv['id'], ($priv['group_id'] != "" ? 'checked="checked"' : ''), $priv['name'], $priv['desc']);
+ }
+
+ $privileges_form[] = form_submit('submit', _("Save"));
+ $html .= page_with_title(_("Edit group"), array(
+ form($privileges_form, page_link_to('admin_groups') . '&action=save&id=' . $id)
));
} else
return error("No Group found.", true);
break;
-
- case 'save' :
- if (isset ($_REQUEST['id']) && preg_match("/^-[0-9]{1,11}$/", $_REQUEST['id']))
+
+ case 'save':
+ if (isset($_REQUEST['id']) && preg_match("/^-[0-9]{1,11}$/", $_REQUEST['id']))
$id = $_REQUEST['id'];
else
return error("Incomplete call, missing Groups ID.", true);
-
+
$room = sql_select("SELECT * FROM `Groups` WHERE `UID`=" . sql_escape($id) . " LIMIT 1");
- if (!is_array($_REQUEST['privileges']))
- $_REQUEST['privileges'] = array ();
+ if (! is_array($_REQUEST['privileges']))
+ $_REQUEST['privileges'] = array();
if (count($room) > 0) {
- list ($room) = $room;
+ list($room) = $room;
sql_query("DELETE FROM `GroupPrivileges` WHERE `group_id`=" . sql_escape($id));
$privilege_names = array();
foreach ($_REQUEST['privileges'] as $priv) {
if (preg_match("/^[0-9]{1,}$/", $priv)) {
$group_privileges_source = sql_select("SELECT * FROM `Privileges` WHERE `id`=" . sql_escape($priv) . " LIMIT 1");
- if(count($group_privileges_source) > 0) {
+ if (count($group_privileges_source) > 0) {
sql_query("INSERT INTO `GroupPrivileges` SET `group_id`=" . sql_escape($id) . ", `privilege_id`=" . sql_escape($priv));
$privilege_names[] = $group_privileges_source[0]['name'];
}
diff --git a/includes/pages/admin_questions.php b/includes/pages/admin_questions.php
index 8bdde714..1b4b9970 100644
--- a/includes/pages/admin_questions.php
+++ b/includes/pages/admin_questions.php
@@ -20,24 +20,26 @@ function admin_questions() {
global $user;
if (! isset($_REQUEST['action'])) {
- $open_questions = "";
+ $unanswered_questions_table = array();
$questions = sql_select("SELECT * FROM `Questions` WHERE `AID` IS NULL");
foreach ($questions as $question) {
$user_source = User($question['UID']);
if ($user_source === false)
engelsystem_error("Unable to load user.");
- $open_questions .= template_render('../templates/admin_question_unanswered.html', array(
- 'question_nick' => User_Nick_render($user_source),
- 'question_id' => $question['QID'],
- 'link' => page_link_to("admin_questions"),
- 'question' => str_replace("\n", '<br />', $question['Question'])
- ));
+ $unanswered_questions_table[] = array(
+ 'from' => User_Nick_render($user_source),
+ 'question' => str_replace("\n", "<br />", $question['Question']),
+ 'answer' => form(array(
+ form_textarea('answer', _("Answer"), ''),
+ form_submit('submit', _("Save"))
+ ), page_link_to('admin_questions') . '&action=answer&id=' . $question['QID']),
+ 'actions' => button(page_link_to("admin_questions") . '&action=delete&id=' . $question['QID'], _("delete"), 'btn-xs')
+ );
}
- $answered_questions = "";
+ $answered_questions_table = array();
$questions = sql_select("SELECT * FROM `Questions` WHERE NOT `AID` IS NULL");
-
foreach ($questions as $question) {
$user_source = User($question['UID']);
if ($user_source === false)
@@ -46,21 +48,31 @@ function admin_questions() {
$answer_user_source = User($question['AID']);
if ($answer_user_source === false)
engelsystem_error("Unable to load user.");
-
- $answered_questions .= template_render('../templates/admin_question_answered.html', array(
- 'question_id' => $question['QID'],
- 'question_nick' => User_Nick_render($user_source),
+ $answered_questions_table[] = array(
+ 'from' => User_Nick_render($user_source),
'question' => str_replace("\n", "<br />", $question['Question']),
- 'answer_nick' => User_Nick_render($answer_user_source),
+ 'answered_by' => User_Nick_render($answer_user_source),
'answer' => str_replace("\n", "<br />", $question['Answer']),
- 'link' => page_link_to("admin_questions")
- ));
+ 'actions' => button(page_link_to("admin_questions") . '&action=delete&id=' . $question['QID'], _("delete"), 'btn-xs')
+ );
}
- return template_render('../templates/admin_questions.html', array(
- 'link' => page_link_to("admin_questions"),
- 'open_questions' => $open_questions,
- 'answered_questions' => $answered_questions
+ return page_with_title(admin_questions_title(), array(
+ '<h2>' . _("Unanswered questions") . '</h2>',
+ table(array(
+ 'from' => _("From"),
+ 'question' => _("Question"),
+ 'answer' => _("Answer"),
+ 'actions' => ''
+ ), $unanswered_questions_table),
+ '<h2>' . _("Answered questions") . '</h2>',
+ table(array(
+ 'from' => _("From"),
+ 'question' => _("Question"),
+ 'answered_by' => _("Answered by"),
+ 'answer' => _("Answer"),
+ 'actions' => ''
+ ), $answered_questions_table)
));
} else {
switch ($_REQUEST['action']) {
diff --git a/includes/pages/admin_shifts.php b/includes/pages/admin_shifts.php
index 7e3cc3b3..473022eb 100644
--- a/includes/pages/admin_shifts.php
+++ b/includes/pages/admin_shifts.php
@@ -189,15 +189,17 @@ function admin_shifts() {
} while ($shift_end < $end);
}
- $shifts_table = "";
+ $shifts_table = array();
foreach ($shifts as $shift) {
- $shifts_table .= '<tr><td><span class="glyphicon glyphicon-time"></span> ' . date("Y-m-d H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . '<br /><span class="glyphicon glyphicon-map-marker"></span> ' . $room_array[$shift['RID']] . '</td>';
- $shifts_table .= '<td>' . $shift['name'];
+ $shifts_table_entry = array(
+ 'timeslot' => '<span class="glyphicon glyphicon-time"></span> ' . date("Y-m-d H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . '<br /><span class="glyphicon glyphicon-map-marker"></span> ' . $room_array[$shift['RID']],
+ 'entries' => $shift['name']
+ );
foreach ($types as $type) {
if (isset($needed_angel_types[$type['id']]) && $needed_angel_types[$type['id']] > 0)
- $shifts_table .= '<br /><span class="icon-icon_angel"></span> <b>' . $type['name'] . ':</b> ' . $needed_angel_types[$type['id']] . ' missing';
+ $shifts_table_entry['entries'] .= '<br /><span class="icon-icon_angel"></span> <b>' . $type['name'] . ':</b> ' . $needed_angel_types[$type['id']] . ' missing';
}
- $shifts_table .= '</td></tr>';
+ $shifts_table[] = $shifts_table_entry;
}
// Fürs Anlegen zwischenspeichern:
@@ -206,18 +208,25 @@ function admin_shifts() {
$hidden_types = "";
foreach ($needed_angel_types as $type_id => $count)
- $hidden_types .= '<input type="hidden" name="type_' . $type_id . '" value="' . $count . '" />';
- return template_render('../templates/admin_shift_preview.html', array(
- 'shifts_table' => $shifts_table,
- 'name' => $name,
- 'rid' => $rid,
- 'start' => date("Y-m-d H:i", $start),
- 'end' => date("Y-m-d H:i", $end),
- 'mode' => $mode,
- 'length' => $length,
- 'change_hours' => implode(', ', $change_hours),
- 'angelmode' => $angelmode,
- 'needed_angel_types' => $hidden_types
+ $hidden_types .= form_hidden('type_' . $type_id, $count);
+ return page_with_title(_("Preview"), array(
+ form(array(
+ $hidden_types,
+ form_hidden('name', $name),
+ form_hidden('rid', $rid),
+ form_hidden('start', date("Y-m-d H:i", $start)),
+ form_hidden('end', date("Y-m-d H:i", $end)),
+ form_hidden('mode', $mode),
+ form_hidden('length', $length),
+ form_hidden('change_hours', implode(', ', $change_hours)),
+ form_hidden('angelmode', $angelmode),
+ form_submit('back', _("back")),
+ table(array(
+ 'timeslot' => _("Timeslot"),
+ 'entries' => _("Entries")
+ ), $shifts_table),
+ form_submit('submit', _("Save"))
+ ))
));
}
diff --git a/includes/pages/user_messages.php b/includes/pages/user_messages.php
index 5e0b9b85..d1c51d56 100644
--- a/includes/pages/user_messages.php
+++ b/includes/pages/user_messages.php
@@ -8,7 +8,8 @@ function user_unread_messages() {
if (isset($user)) {
$new_messages = sql_num_query("SELECT * FROM `Messages` WHERE isRead='N' AND `RUID`=" . sql_escape($user['UID']));
- return '<span class="badge">' . $new_messages . '</span>';
+ if ($new_messages > 0)
+ return '<span class="badge">' . $new_messages . '</span>';
}
return '';
}
diff --git a/includes/sys_template.php b/includes/sys_template.php
index 3366346b..be463139 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -42,6 +42,10 @@ function toolbar_dropdown($glyphicon, $label, $submenu) {
<ul class="dropdown-menu" role="menu">' . join("\n", $submenu) . '</ul></li>';
}
+function form_hidden($name, $value) {
+ return '<input type="hidden" name="' . $name . '" value="' . $value . '" />';
+}
+
/**
* Rendert ein Zahlenfeld mit Buttons zum verstellen
*/
diff --git a/public/vendor/bootstrap-3.2.0/css/theme1.css b/public/vendor/bootstrap-3.2.0/css/theme1.css
index 179ac12d..260b60e8 100644
--- a/public/vendor/bootstrap-3.2.0/css/theme1.css
+++ b/public/vendor/bootstrap-3.2.0/css/theme1.css
@@ -2689,16 +2689,16 @@ select[multiple].input-lg,
.btn-default {
color: white;
background-color: #424242;
- border-color: #424242; }
+ border-color: #282828; }
.btn-default:hover, .btn-default:focus, .btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle {
color: white;
background-color: #282828;
- border-color: #232323; }
+ border-color: #090909; }
.btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle {
background-image: none; }
.btn-default.disabled, .btn-default.disabled:hover, .btn-default.disabled:focus, .btn-default.disabled:active, .btn-default.disabled.active, .btn-default[disabled], .btn-default[disabled]:hover, .btn-default[disabled]:focus, .btn-default[disabled]:active, .btn-default[disabled].active, fieldset[disabled] .btn-default, fieldset[disabled] .btn-default:hover, fieldset[disabled] .btn-default:focus, fieldset[disabled] .btn-default:active, fieldset[disabled] .btn-default.active {
background-color: #424242;
- border-color: #424242; }
+ border-color: #282828; }
.btn-default .badge {
color: #424242;
background-color: white; }
@@ -2706,16 +2706,16 @@ select[multiple].input-lg,
.btn-primary {
color: white;
background-color: #428bca;
- border-color: #428bca; }
+ border-color: #282828; }
.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open > .btn-primary.dropdown-toggle {
color: white;
background-color: #3071a9;
- border-color: #2d6ca2; }
+ border-color: #090909; }
.btn-primary:active, .btn-primary.active, .open > .btn-primary.dropdown-toggle {
background-image: none; }
.btn-primary.disabled, .btn-primary.disabled:hover, .btn-primary.disabled:focus, .btn-primary.disabled:active, .btn-primary.disabled.active, .btn-primary[disabled], .btn-primary[disabled]:hover, .btn-primary[disabled]:focus, .btn-primary[disabled]:active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary, fieldset[disabled] .btn-primary:hover, fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary:active, fieldset[disabled] .btn-primary.active {
background-color: #428bca;
- border-color: #428bca; }
+ border-color: #282828; }
.btn-primary .badge {
color: #428bca;
background-color: white; }
@@ -2723,16 +2723,16 @@ select[multiple].input-lg,
.btn-success {
color: white;
background-color: #5cb85c;
- border-color: #5cb85c; }
+ border-color: #282828; }
.btn-success:hover, .btn-success:focus, .btn-success:active, .btn-success.active, .open > .btn-success.dropdown-toggle {
color: white;
background-color: #449d44;
- border-color: #419641; }
+ border-color: #090909; }
.btn-success:active, .btn-success.active, .open > .btn-success.dropdown-toggle {
background-image: none; }
.btn-success.disabled, .btn-success.disabled:hover, .btn-success.disabled:focus, .btn-success.disabled:active, .btn-success.disabled.active, .btn-success[disabled], .btn-success[disabled]:hover, .btn-success[disabled]:focus, .btn-success[disabled]:active, .btn-success[disabled].active, fieldset[disabled] .btn-success, fieldset[disabled] .btn-success:hover, fieldset[disabled] .btn-success:focus, fieldset[disabled] .btn-success:active, fieldset[disabled] .btn-success.active {
background-color: #5cb85c;
- border-color: #5cb85c; }
+ border-color: #282828; }
.btn-success .badge {
color: #5cb85c;
background-color: white; }
@@ -2740,16 +2740,16 @@ select[multiple].input-lg,
.btn-info {
color: white;
background-color: #5bc0de;
- border-color: #5bc0de; }
+ border-color: #282828; }
.btn-info:hover, .btn-info:focus, .btn-info:active, .btn-info.active, .open > .btn-info.dropdown-toggle {
color: white;
background-color: #31b0d5;
- border-color: #2aabd2; }
+ border-color: #090909; }
.btn-info:active, .btn-info.active, .open > .btn-info.dropdown-toggle {
background-image: none; }
.btn-info.disabled, .btn-info.disabled:hover, .btn-info.disabled:focus, .btn-info.disabled:active, .btn-info.disabled.active, .btn-info[disabled], .btn-info[disabled]:hover, .btn-info[disabled]:focus, .btn-info[disabled]:active, .btn-info[disabled].active, fieldset[disabled] .btn-info, fieldset[disabled] .btn-info:hover, fieldset[disabled] .btn-info:focus, fieldset[disabled] .btn-info:active, fieldset[disabled] .btn-info.active {
background-color: #5bc0de;
- border-color: #5bc0de; }
+ border-color: #282828; }
.btn-info .badge {
color: #5bc0de;
background-color: white; }
@@ -2757,16 +2757,16 @@ select[multiple].input-lg,
.btn-warning {
color: white;
background-color: #f0ad4e;
- border-color: #f0ad4e; }
+ border-color: #282828; }
.btn-warning:hover, .btn-warning:focus, .btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle {
color: white;
background-color: #ec971f;
- border-color: #eb9316; }
+ border-color: #090909; }
.btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle {
background-image: none; }
.btn-warning.disabled, .btn-warning.disabled:hover, .btn-warning.disabled:focus, .btn-warning.disabled:active, .btn-warning.disabled.active, .btn-warning[disabled], .btn-warning[disabled]:hover, .btn-warning[disabled]:focus, .btn-warning[disabled]:active, .btn-warning[disabled].active, fieldset[disabled] .btn-warning, fieldset[disabled] .btn-warning:hover, fieldset[disabled] .btn-warning:focus, fieldset[disabled] .btn-warning:active, fieldset[disabled] .btn-warning.active {
background-color: #f0ad4e;
- border-color: #f0ad4e; }
+ border-color: #282828; }
.btn-warning .badge {
color: #f0ad4e;
background-color: white; }
@@ -2774,16 +2774,16 @@ select[multiple].input-lg,
.btn-danger {
color: white;
background-color: #d9534f;
- border-color: #d9534f; }
+ border-color: #282828; }
.btn-danger:hover, .btn-danger:focus, .btn-danger:active, .btn-danger.active, .open > .btn-danger.dropdown-toggle {
color: white;
background-color: #c9302c;
- border-color: #c12e2a; }
+ border-color: #090909; }
.btn-danger:active, .btn-danger.active, .open > .btn-danger.dropdown-toggle {
background-image: none; }
.btn-danger.disabled, .btn-danger.disabled:hover, .btn-danger.disabled:focus, .btn-danger.disabled:active, .btn-danger.disabled.active, .btn-danger[disabled], .btn-danger[disabled]:hover, .btn-danger[disabled]:focus, .btn-danger[disabled]:active, .btn-danger[disabled].active, fieldset[disabled] .btn-danger, fieldset[disabled] .btn-danger:hover, fieldset[disabled] .btn-danger:focus, fieldset[disabled] .btn-danger:active, fieldset[disabled] .btn-danger.active {
background-color: #d9534f;
- border-color: #d9534f; }
+ border-color: #282828; }
.btn-danger .badge {
color: #d9534f;
background-color: white; }
diff --git a/templates/admin_free.html b/templates/admin_free.html
deleted file mode 100644
index c5ea6eba..00000000
--- a/templates/admin_free.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="col-md-10">
- <h1>%title%</h1>
- <form action="%link%" method="post">
- <p>
- Search Angel: <input type="text" name="search" value="%search%" placeholder="Name"> %angeltypes% <label><input type="checkbox" name="confirmed_only" %confirmed_only% value="1"> Nur zugelassene</label> <input type="submit" name="submit" value="Search">
- </p>
- </form>
- <table class="table">
- <thead>
- <tr>
- <th>Nickname</th>
- <th>DECT</th>
- <th>Jabber</th>
- <th>Edit</th>
- </tr>
- </thead>
- <tbody>%table%
- </tbody>
- </table>
-</div> \ No newline at end of file
diff --git a/templates/admin_groups.html b/templates/admin_groups.html
deleted file mode 100644
index 4bbb9d52..00000000
--- a/templates/admin_groups.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<p>
- Hallo %nick%, <br /> hier hast du die Möglichkeit Gruppenrechte zu ändern:
-</p>
-<table class="table">
- <thead>
- <tr>
- <th>Name</th>
- <th>Rechte</th>
- <th>&nbsp;</th>
- </tr>
- </thead>
- <tbody>%groups%
- </tbody>
-</table>
diff --git a/templates/admin_groups_edit_form.html b/templates/admin_groups_edit_form.html
deleted file mode 100644
index c1f2bd84..00000000
--- a/templates/admin_groups_edit_form.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<form action="%link%&action=save" method="post">
- <table class="table">
- <thead>
- <tr>
- <th>&nbsp;</th>
- <th>Name</th>
- <th>Description</th>
- </tr>
- </thead>
- <tbody>%privileges%
- </tbody>
- </table>
- <input type="hidden" name="id" value="%id%" /><input class="btn btn-primary" type="submit" name="submit" value="Save" />
-</form> \ No newline at end of file
diff --git a/templates/admin_question_answered.html b/templates/admin_question_answered.html
deleted file mode 100644
index 8801d58f..00000000
--- a/templates/admin_question_answered.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<tr>
- <td> %question_nick% </td>
- <td> %question% </td>
- <td> %answer_nick% </td>
- <td> %answer% </td>
- <td>
- <a href="%link%&action=delete&id=%question_id%">Löschen</a>
- </td>
-</tr>
diff --git a/templates/admin_question_unanswered.html b/templates/admin_question_unanswered.html
deleted file mode 100644
index 066b7dcc..00000000
--- a/templates/admin_question_unanswered.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<tr>
- <td>%question_nick%</td>
- <td>%question%</td>
- <td>
- <form action="%link%&action=answer" method="post">
- <div class="form-group">
- <textarea class="form-control" name="answer"></textarea>
- </div>
- <input type="hidden" name="id" value="%question_id%" />
- <div class="form-group">
- <input class="btn btn-default" type="submit" name="submit" value="Speichern" />
- </div>
- </form>
- </td>
- <td><a href="%link%&action=delete&id=%question_id%">Löschen</a></td>
-</tr>
diff --git a/templates/admin_questions.html b/templates/admin_questions.html
deleted file mode 100644
index 3608e232..00000000
--- a/templates/admin_questions.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="col-md-10">
- <h1>Fragen beantworten</h1>
- <h2>Unbeantwortete Fragen:</h2>
- <table class="table">
- <thead>
- <tr>
- <th>Von</th>
- <th>Frage</th>
- <th>Antwort</th>
- <th>&nbsp;</th>
- </tr>
- </thead>
- <tbody>%open_questions%
- </tbody>
- </table>
- <hr />
- <h2>Beantwortete Fragen:</h2>
- <table class="table">
- <thead>
- <tr>
- <th>Von</th>
- <th>Frage</th>
- <th>Von</th>
- <th>Antwort</th>
- <th>&nbsp;</th>
- </tr>
- </thead>
- <tbody>%answered_questions%
- </tbody>
- </table>
-</div> \ No newline at end of file
diff --git a/templates/admin_rooms_edit_form.html b/templates/admin_rooms_edit_form.html
deleted file mode 100644
index cd1506fa..00000000
--- a/templates/admin_rooms_edit_form.html
+++ /dev/null
@@ -1,59 +0,0 @@
-Raum und dafür benötigte Engel bearbeiten:
-<br/>
-<form action="%link%&action=changesave" method="post">
- <table>
- <tr>
- <td>
- Name
- </td>
- <td>
- <input type="text" name="Name" value="%name%" />
- </td>
- </tr>
- <tr>
- <td>
- Man
- </td>
- <td>
- <input type="text" name="Man" value="%man%" />
- </td>
- </tr>
- <tr>
- <td>
- From Pentabarf
- </td>
- <td>
- %from_pentabarf_options%
- </td>
- </tr>
- <tr>
- <td>
- Show
- </td>
- <td>
- %show_options%
- </td>
- </tr>
- <tr>
- <td>
- Number
- </td>
- <td>
- <input type="text" name="Number" value="%number%" />
- </td>
- </tr>
- <tr>
- <th>
- Angle Type
- </th>
- <th>
- Needed for this room
- </th>
- </tr>
- %angel_types%
- </table>
- <input type="hidden" name="RID" value="%room_id%" /><input type="submit" value="Save" />
-</form>
-<form action="%link%&action=delete" method="post">
- <input type="hidden" name="RID" value="%room_id%" /><input type="submit" value="Delete" />
-</form> \ No newline at end of file
diff --git a/templates/admin_rooms_new_form.html b/templates/admin_rooms_new_form.html
deleted file mode 100644
index f386259c..00000000
--- a/templates/admin_rooms_new_form.html
+++ /dev/null
@@ -1,46 +0,0 @@
-Neuen Raum einrichten:
-<br/>
-<form action="%link%&action=newsave" method="post">
- <table>
- <tr>
- <td>
- Name
- </td>
- <td>
- <input type="text" name="Name" />
- </td>
- </tr>
- <tr>
- <td>
- Man
- </td>
- <td>
- <input type="text" name="Man" />
- </td>
- </tr>
- <tr>
- <td>
- From Pentabarf
- </td>
- <td>
- <input type="radio" name="FromPentabarf" value="Y" /> Yes <input type="radio" name="FromPentabarf" value="N" />No
- </td>
- </tr>
- <tr>
- <td>
- Show
- </td>
- <td>
- <input type="radio" name="Show" value="Y" /> Yes<input type="radio" name="Show" value="N" /> No
- </td>
- </tr>
- <tr>
- <td>
- Number
- </td>
- <td>
- <input type="text" name="Number" value="" />
- </td>
- </tr>
- </table><input type="submit" value="Create" />
-</form> \ No newline at end of file
diff --git a/templates/admin_shift_preview.html b/templates/admin_shift_preview.html
deleted file mode 100644
index 99e6e27f..00000000
--- a/templates/admin_shift_preview.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="col-md-10">
- <h1>Vorschau:</h1>
- <form action="" method="post">
- <table class="table">
- <thead>
- <tr>
- <th>Timeslot</th>
- <th>Entries</th>
- </tr>
- </thead>
- <tbody>%shifts_table%
- </tbody>
- </table>
- <p>
- <input type="submit" name="back" value="Zurück" /><input type="submit" name="submit" value="Erstellen" />
- </p>
- <input type="hidden" name="name" value="%name%" /> <input type="hidden" name="rid" value="%rid%" /> <input type="hidden" name="start" value="%start%" /> <input type="hidden" name="end" value="%end%" /> <input type="hidden" name="mode" value="%mode%" /> <input type="hidden" name="length"
- value="%length%" /> <input type="hidden" name="change_hours" value="%change_hours%" /> <input type="hidden" name="angelmode" value="%angelmode%" /> %needed_angel_types%
- </form>
-</div> \ No newline at end of file
diff --git a/themes/theme1.scss b/themes/theme1.scss
index bd1919e1..7db3bb3b 100644
--- a/themes/theme1.scss
+++ b/themes/theme1.scss
@@ -167,27 +167,27 @@ $btn-font-weight: normal;
$btn-default-color: #fff;
$btn-default-bg: lighten($gray-dark, 10%);
-$btn-default-border: $btn-default-bg;
+$btn-default-border: darken($btn-default-bg, 10%);
$btn-primary-color: $btn-default-color;
$btn-primary-bg: $brand-primary;
-$btn-primary-border: $btn-primary-bg;
+$btn-primary-border: darken($btn-default-bg, 10%);
$btn-success-color: $btn-default-color;
$btn-success-bg: $brand-success;
-$btn-success-border: $btn-success-bg;
+$btn-success-border: darken($btn-default-bg, 10%);
$btn-info-color: $btn-default-color;
$btn-info-bg: $brand-info;
-$btn-info-border: $btn-info-bg;
+$btn-info-border: darken($btn-default-bg, 10%);
$btn-warning-color: $btn-default-color;
$btn-warning-bg: $brand-warning;
-$btn-warning-border: $btn-warning-bg;
+$btn-warning-border: darken($btn-default-bg, 10%);
$btn-danger-color: $btn-default-color;
$btn-danger-bg: $brand-danger;
-$btn-danger-border: $btn-danger-bg;
+$btn-danger-border: darken($btn-default-bg, 10%);
$btn-link-disabled-color: $gray-light;
generated by cgit v1.2.3-70-g09d2 (git 2.47.1) at 2024-12-24 03:40:21 +0000