From 5e8453992810181facf168d6aaede9d2dcd61dba Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Sun, 5 Jan 2014 19:30:06 +0100 Subject: rewritten angeltypes and user angeltypes --- public/css/base.css | 35 +++++++++++++++++++++++++---------- public/index.php | 35 +++++++++++++++++++---------------- public/pic/icons/arrow_left.png | Bin 0 -> 345 bytes 3 files changed, 44 insertions(+), 26 deletions(-) create mode 100755 public/pic/icons/arrow_left.png (limited to 'public') diff --git a/public/css/base.css b/public/css/base.css index 2f5aa18c..89fa62a5 100644 --- a/public/css/base.css +++ b/public/css/base.css @@ -357,8 +357,13 @@ tr:hover .hidden { margin: 0 0 10px 0; } +.actions a { + background: 2px 1px no-repeat; + padding-right: 5px; +} + a.button { - background: #f0f0f0; + background: #f0f0f0 2px 2px no-repeat; border: 1px solid #888; border-radius: 4px; line-height: 25px; @@ -374,26 +379,36 @@ a.button { .button:hover, .toolbar .button:hover { color: #000; - background: #fff; + background-color: #fff; } -.button.add { - background: url('../pic/icons/add.png') 2px 2px no-repeat; +.button.add, .actions .add { + background-image: url('../pic/icons/add.png'); padding-left: 20px; } -.button.edit { - background: url('../pic/icons/pencil.png') 2px 2px no-repeat; +.button.edit, .actions .edit { + background-image: url('../pic/icons/pencil.png'); padding-left: 20px; } -.button.ok { - background: url('../pic/icons/tick.png') 2px 2px no-repeat; +.button.ok, .actions .ok { + background-image: url('../pic/icons/tick.png'); + padding-left: 20px; +} + +.button.cancel, .actions .cancel { + background-image: url('../pic/icons/cross.png'); + padding-left: 20px; +} + +.button.delete, .actions .delete { + background-image: url('../pic/icons/bin.png'); padding-left: 20px; } -.button.cancel { - background: url('../pic/icons/cross.png') 2px 2px no-repeat; +.button.back, .actions .back { + background-image: url('../pic/icons/arrow_left.png'); padding-left: 20px; } diff --git a/public/index.php b/public/index.php index 24d92b9d..9cd01e40 100644 --- a/public/index.php +++ b/public/index.php @@ -10,20 +10,26 @@ require_once ('includes/sys_menu.php'); require_once ('includes/sys_page.php'); require_once ('includes/sys_template.php'); +require_once ('includes/model/AngelType_model.php'); require_once ('includes/model/LogEntries_model.php'); +require_once ('includes/model/Message_model.php'); require_once ('includes/model/NeededAngelTypes_model.php'); +require_once ('includes/model/Room_model.php'); require_once ('includes/model/ShiftEntry_model.php'); require_once ('includes/model/Shifts_model.php'); +require_once ('includes/model/UserAngelTypes_model.php'); require_once ('includes/model/User_model.php'); -require_once ('includes/model/Room_model.php'); -require_once ('includes/model/Message_model.php'); -require_once ('includes/model/AngelType_model.php'); +require_once ('includes/view/AngelTypes_view.php'); require_once ('includes/view/Questions_view.php'); require_once ('includes/view/Shifts_view.php'); require_once ('includes/view/ShiftEntry_view.php'); +require_once ('includes/view/UserAngelTypes_view.php'); require_once ('includes/view/User_view.php'); +require_once ('includes/controller/angeltypes_controller.php'); +require_once ('includes/controller/user_angeltypes_controller.php'); + require_once ('includes/helper/internationalization_helper.php'); require_once ('includes/helper/message_helper.php'); require_once ('includes/helper/error_helper.php'); @@ -34,7 +40,6 @@ if (file_exists('../config/config.php')) require_once ('config/config.php'); require_once ('includes/pages/admin_active.php'); -require_once ('includes/pages/admin_angel_types.php'); require_once ('includes/pages/admin_arrive.php'); require_once ('includes/pages/admin_free.php'); require_once ('includes/pages/admin_groups.php'); @@ -70,7 +75,8 @@ $free_pages = array( 'stats', 'shifts_json_export_all', 'user_password_recovery', - 'api' + 'api', + 'credits' ); // Gewünschte Seite/Funktion @@ -86,7 +92,7 @@ if (isset($_REQUEST['p']) && preg_match("/^[a-z0-9_]*$/i", $_REQUEST['p']) && (i require_once ('includes/controller/api.php'); error("Api disabled temporily."); redirect(page_link_to('login')); - //api_controller(); + // api_controller(); } elseif ($p == "ical") { require_once ('includes/pages/user_ical.php'); user_ical(); @@ -106,6 +112,10 @@ if (isset($_REQUEST['p']) && preg_match("/^[a-z0-9_]*$/i", $_REQUEST['p']) && (i require_once ('includes/controller/users_controller.php'); $title = user_password_recovery_title(); $content = user_password_recovery_controller(); + } elseif ($p == "angeltypes") { + list($title, $content) = angeltypes_controller(); + } elseif ($p == "user_angeltypes") { + list($title, $content) = user_angeltypes_controller(); } elseif ($p == "news") { $title = news_title(); $content = user_news(); @@ -164,9 +174,6 @@ if (isset($_REQUEST['p']) && preg_match("/^[a-z0-9_]*$/i", $_REQUEST['p']) && (i } elseif ($p == "admin_news") { require_once ('includes/pages/admin_news.php'); $content = admin_news(); - } elseif ($p == "admin_angel_types") { - $title = admin_angel_types_title(); - $content = admin_angel_types(); } elseif ($p == "admin_rooms") { $title = admin_rooms_title(); $content = admin_rooms(); @@ -206,10 +213,10 @@ if (isset($_REQUEST['p']) && preg_match("/^[a-z0-9_]*$/i", $_REQUEST['p']) && (i if (isset($user)) { $freeloaded_shifts_count = count(ShiftEntries_freeloaded_by_user($user)); - if($freeloaded_shifts_count >= $max_freeloadable_shifts) + if ($freeloaded_shifts_count >= $max_freeloadable_shifts) $content = error(sprintf(_("You freeloaded %s shifts. Shift signup is locked. Please go to heavens desk to be unlocked again."), $freeloaded_shifts_count), true) . $content; - - // Hinweis für ungelesene Nachrichten + + // Hinweis für ungelesene Nachrichten if ($p != "user_messages") $content = user_unread_messages() . $content; @@ -226,10 +233,6 @@ if (isset($user)) { // Erzengel Hinweis für unbeantwortete Fragen if ($p != "admin_questions") $content = admin_new_questions() . $content; - - // Erzengel Hinweis für freizuschaltende Engeltypen - if ($p != "admin_user_angeltypes") - $content = admin_new_user_angeltypes() . $content; } echo template_render('../templates/layout.html', array( diff --git a/public/pic/icons/arrow_left.png b/public/pic/icons/arrow_left.png new file mode 100755 index 00000000..5dc69678 Binary files /dev/null and b/public/pic/icons/arrow_left.png differ -- cgit v1.2.3-54-g00ecf