diff options
584 files changed, 4440 insertions, 2565 deletions
@@ -5,3 +5,4 @@ _vimrc_local.vim .sass-cache config/config.php +test/coverage @@ -1,21 +1,21 @@ # Installation eines frischen Engelsystems ## Mindestvorrausetzungen (bzw. getestet unter): - * PHP 5.4.x mit Suhosin-Patch (cgi-fcgi), mysqli und gettext - * mysqld Ver 5.1.49-3 for debian-linux-gnu on x86_64 ((Debian)) + * PHP 5.4.x (cgi-fcgi) + * MySQL-Server 5.5.x * Webserver mit PHP-Anbindung, z.B. lighttpd, nginx oder Apache ## Vorgehen: * Klonen des `master` inkl. submodules in lokales Verzeichnis: `git clone --recursive https://github.com/engelsystem/engelsystem.git` * Der Webserver muss Schreibrechte auf das Verzeichnis `import` bekommen, für alle anderen Dateien reichen Leserechte. * Der Webserver muss auf `public` als http-root zeigen. + * Empfehlung: Dirlisting sollte deaktiviert sein. * Es muss eine MySQL-Datenbank angelegt werden und ein User existieren, der alle Rechte auf dieser Datenbank besitzt. - * Es muss die `db/install.sql` importiert/ausgeführt werden. - * Erstelle bei Bedarf eine `config/config.php`, die die Werte (z.B. DB-Zugang) aus der `config/config.default.php` überschreibt. - * Engelsystem im Browser aufrufen, Anmeldung mit `admin:asdfasdf` vornehmen und Admin-Passwort ändern. + * Es muss die db/install.sql importiert/ausgeführt werden. + * Erstelle bei Bedarf eine config/config.php, die die Werte (z.B. DB-Zugang) aus der config/config.default.php überschreibt. + * Engelsystem im Browser aufrufen, Anmeldung mit admin:asdfasdf vornehmen und Admin-Passwort ändern. Das Engelsystem ist jetzt einsatzbereit. -Fehler bitte im auf Github melden: -https://github.com/engelsystem/engelsystem +Fehler bitte auf Github melden: https://github.com/engelsystem/engelsystem/issues diff --git a/config/config.default.php b/config/config.default.php index 1c0da7fc..4aa8d154 100644 --- a/config/config.default.php +++ b/config/config.default.php @@ -1,5 +1,8 @@ <?php +// Enable maintenance mode (showin a static page) +$maintenance_mode = false; + // URL to the angel faq and job description $faq_url = "https://events.ccc.de/congress/2013/wiki/Static:Volunteers"; diff --git a/db/install.sql b/db/install.sql index 5c612d54..3b45fa27 100644 --- a/db/install.sql +++ b/db/install.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 25. Dez 2014 um 22:28 +-- Erstellungszeit: 12. Jul 2015 um 14:45 -- Server Version: 5.6.12 -- PHP-Version: 5.5.3 @@ -11,12 +11,6 @@ SET FOREIGN_KEY_CHECKS=0; SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; SET time_zone = "+00:00"; --- --- Datenbank: `engelsystem` --- -CREATE DATABASE IF NOT EXISTS `engelsystem` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; -USE `engelsystem`; - -- -------------------------------------------------------- -- @@ -31,7 +25,7 @@ CREATE TABLE IF NOT EXISTS `AngelTypes` ( `description` text NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `Name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=4 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ; -- -- Daten für Tabelle `AngelTypes` @@ -43,27 +37,6 @@ INSERT INTO `AngelTypes` (`id`, `name`, `restricted`, `description`) VALUES -- -------------------------------------------------------- -- --- Tabellenstruktur für Tabelle `Counter` --- - -DROP TABLE IF EXISTS `Counter`; -CREATE TABLE IF NOT EXISTS `Counter` ( - `URL` varchar(255) NOT NULL DEFAULT '', - `Anz` bigint(20) NOT NULL DEFAULT '0', - PRIMARY KEY (`URL`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Counter der Seiten'; - --- --- Daten für Tabelle `Counter` --- - -INSERT INTO `Counter` (`URL`, `Anz`) VALUES -('login', 2), -('news', 1); - --- -------------------------------------------------------- - --- -- Tabellenstruktur für Tabelle `GroupPrivileges` -- @@ -161,7 +134,7 @@ DROP TABLE IF EXISTS `LogEntries`; CREATE TABLE IF NOT EXISTS `LogEntries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `timestamp` int(11) NOT NULL, - `nick` varchar(23) NOT NULL, + `nick` text NOT NULL, `message` text NOT NULL, PRIMARY KEY (`id`), KEY `timestamp` (`timestamp`) @@ -204,7 +177,7 @@ CREATE TABLE IF NOT EXISTS `NeededAngelTypes` ( KEY `room_id` (`room_id`,`angel_type_id`), KEY `shift_id` (`shift_id`), KEY `angel_type_id` (`angel_type_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=107 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -222,7 +195,7 @@ CREATE TABLE IF NOT EXISTS `News` ( `Treffen` tinyint(4) NOT NULL DEFAULT '0', PRIMARY KEY (`ID`), KEY `UID` (`UID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=14 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -316,7 +289,7 @@ CREATE TABLE IF NOT EXISTS `Questions` ( PRIMARY KEY (`QID`), KEY `UID` (`UID`), KEY `AID` (`AID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Fragen und Antworten' AUTO_INCREMENT=2 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Fragen und Antworten' AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -334,7 +307,7 @@ CREATE TABLE IF NOT EXISTS `Room` ( `Number` int(11) DEFAULT NULL, PRIMARY KEY (`RID`), UNIQUE KEY `Name` (`Name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=6 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -356,7 +329,7 @@ CREATE TABLE IF NOT EXISTS `ShiftEntry` ( KEY `UID` (`UID`), KEY `SID` (`SID`,`TID`), KEY `freeloaded` (`freeloaded`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=9 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -378,7 +351,7 @@ CREATE TABLE IF NOT EXISTS `Shifts` ( UNIQUE KEY `PSID` (`PSID`), KEY `RID` (`RID`), KEY `shifttype_id` (`shifttype_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=191 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -394,7 +367,14 @@ CREATE TABLE IF NOT EXISTS `ShiftTypes` ( `description` text NOT NULL, PRIMARY KEY (`id`), KEY `angeltype_id` (`angeltype_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ; + +-- +-- Daten für Tabelle `ShiftTypes` +-- + +INSERT INTO `ShiftTypes` (`id`, `name`, `angeltype_id`, `description`) VALUES +(4, 'asdf', NULL, ''); -- -------------------------------------------------------- @@ -424,7 +404,6 @@ CREATE TABLE IF NOT EXISTS `User` ( `Tshirt` tinyint(4) DEFAULT '0', `color` tinyint(4) DEFAULT '10', `Sprache` char(64) NOT NULL, - `Avatar` int(11) DEFAULT '0', `Menu` char(1) NOT NULL DEFAULT 'L', `lastLogIn` int(11) NOT NULL, `CreateDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', @@ -432,19 +411,23 @@ CREATE TABLE IF NOT EXISTS `User` ( `kommentar` text, `Hometown` varchar(255) NOT NULL DEFAULT '', `api_key` varchar(32) NOT NULL, + `got_voucher` tinyint(1) NOT NULL, + `arrival_date` int(11) DEFAULT NULL, + `planned_arrival_date` int(11) NOT NULL, PRIMARY KEY (`UID`), UNIQUE KEY `Nick` (`Nick`), KEY `api_key` (`api_key`), KEY `password_recovery_token` (`password_recovery_token`), - KEY `force_active` (`force_active`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=7 ; + KEY `force_active` (`force_active`), + KEY `arrival_date` (`arrival_date`,`planned_arrival_date`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ; -- -- Daten für Tabelle `User` -- -INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `email_shiftinfo`, `jabber`, `Size`, `Passwort`, `password_recovery_token`, `Gekommen`, `Aktiv`, `force_active`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`, `api_key`) VALUES -(1, 'admin', 'Gates', 'Bill', 42, '', '-', '', 'admin@example.com', 0, '', 'XL', '$6$rounds=5000$hjXbIhoRTH3vKiRa$Wl2P2iI5T9iRR.HHu/YFHswBW0WVn0yxCfCiX0Keco9OdIoDK6bIAADswP6KvMCJSwTGdV8PgA8g8Xfw5l8BD1', NULL, 1, 0, 1, 0, 2, 'de_DE.UTF-8', 115, 'L', 1419542882, '0000-00-00 00:00:00', '', '', '', '038850abdd1feb264406be3ffa746235'); +INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `email_shiftinfo`, `jabber`, `Size`, `Passwort`, `password_recovery_token`, `Gekommen`, `Aktiv`, `force_active`, `Tshirt`, `color`, `Sprache`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`, `api_key`, `got_voucher`, `arrival_date`, `planned_arrival_date`) VALUES +(1, 'admin', 'Gates', 'Bill', 42, '', '-', '', 'admin@example.com', 0, '', 'XL', '$6$rounds=5000$hjXbIhoRTH3vKiRa$Wl2P2iI5T9iRR.HHu/YFHswBW0WVn0yxCfCiX0Keco9OdIoDK6bIAADswP6KvMCJSwTGdV8PgA8g8Xfw5l8BD1', NULL, 1, 0, 0, 0, 2, 'de_DE.UTF-8', 'L', 1436705059, '0000-00-00 00:00:00', '', '', '', '038850abdd1feb264406be3ffa746235', 0, NULL, 0); -- -------------------------------------------------------- @@ -464,7 +447,7 @@ CREATE TABLE IF NOT EXISTS `UserAngelTypes` ( KEY `angeltype_id` (`angeltype_id`), KEY `confirm_user_id` (`confirm_user_id`), KEY `coordinator` (`coordinator`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=18 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=16 ; -- -- Daten für Tabelle `UserAngelTypes` @@ -487,7 +470,7 @@ CREATE TABLE IF NOT EXISTS `UserGroups` ( PRIMARY KEY (`id`), KEY `uid` (`uid`,`group_id`), KEY `group_id` (`group_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=18 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=13 ; -- -- Daten für Tabelle `UserGroups` diff --git a/db/update.d/16_admin_user_angeltypes.php b/db/update.d/16_admin_user_angeltypes.php index de1803ea..29fc9f54 100644 --- a/db/update.d/16_admin_user_angeltypes.php +++ b/db/update.d/16_admin_user_angeltypes.php @@ -5,7 +5,7 @@ if (sql_num_query("SELECT * FROM `Privileges` WHERE `name`='admin_user_angeltypes'") == 0) { sql_query("INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES ( NULL , 'admin_user_angeltypes', 'Confirm restricted angel types' );"); $id = sql_id(); - sql_query("INSERT INTO `GroupPrivileges` SET `group_id`=-5, `privilege_id`=" . sql_escape($id)); + sql_query("INSERT INTO `GroupPrivileges` SET `group_id`=-5, `privilege_id`='" . sql_escape($id) . "'"); sql_query("INSERT INTO `Sprache` ( `TextID` , `Sprache` , diff --git a/db/update.sql b/db/update.sql index 681d2a7c..3dbd613a 100644 --- a/db/update.sql +++ b/db/update.sql @@ -1,3 +1,36 @@ +/* more shift infos */ +ALTER TABLE `Shifts` ADD `created_by_user_id` INT NOT NULL , +ADD `created_at_timestamp` INT NOT NULL , +ADD `edited_by_user_id` INT NOT NULL , +ADD `edited_at_timestamp` INT NOT NULL; +ALTER TABLE `Shifts` ADD INDEX ( `created_by_user_id` ); +ALTER TABLE `Shifts` ADD INDEX ( `edited_by_user_id` ); +ALTER TABLE `Shifts` CHANGE `created_by_user_id` `created_by_user_id` INT( 11 ) NULL ; +ALTER TABLE `Shifts` CHANGE `edited_by_user_id` `edited_by_user_id` INT( 11 ) NULL ; +update Shifts set created_by_user_id=null, edited_by_user_id=null; +ALTER TABLE `Shifts` ADD FOREIGN KEY ( `created_by_user_id` ) REFERENCES `engelsystem`.`User` (`UID`) ON DELETE SET NULL ON UPDATE CASCADE ; +ALTER TABLE `Shifts` ADD FOREIGN KEY ( `edited_by_user_id` ) REFERENCES `engelsystem`.`User` (`UID`) ON DELETE SET NULL ON UPDATE CASCADE ; + +/* Introduce planned departure date */ +ALTER TABLE `User` ADD `planned_departure_date` INT NULL, ADD INDEX ( `planned_departure_date` ); + +/* Allow longer angeltype names */ +ALTER TABLE `AngelTypes` CHANGE `name` `name` VARCHAR( 50 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ''; + +/* Enable multiple vouchers */ +ALTER TABLE `User` CHANGE `got_voucher` `got_voucher` INT NOT NULL; + +/* introduce user arrival date */ +ALTER TABLE `User` ADD `arrival_date` INT NULL , +ADD `planned_arrival_date` INT NOT NULL , +ADD INDEX ( `arrival_date` , `planned_arrival_date` ) ; + +/* fix log */ +ALTER TABLE `LogEntries` CHANGE `nick` `nick` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ; + +/* introduce got-voucher flag */ +ALTER TABLE `User` ADD `got_voucher` BOOLEAN NOT NULL; + /* introduce shift types */ CREATE TABLE IF NOT EXISTS `ShiftTypes` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -7,8 +40,8 @@ CREATE TABLE IF NOT EXISTS `ShiftTypes` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1; ALTER TABLE `ShiftTypes` ADD INDEX ( `angeltype_id` ); -ALTER TABLE `ShiftTypes` ADD FOREIGN KEY ( `angeltype_id` ) REFERENCES `engelsystem`.`AngelTypes` (`id`) ON DELETE CASCADE ON UPDATE CASCADE; -INSERT INTO `engelsystem`.`Privileges` (`id`, `name`, `desc`) VALUES (NULL , 'shifttypes', 'Administrate shift types'); +ALTER TABLE `ShiftTypes` ADD FOREIGN KEY ( `angeltype_id` ) REFERENCES `AngelTypes` (`id`) ON DELETE CASCADE ON UPDATE CASCADE; +INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (NULL , 'shifttypes', 'Administrate shift types'); INSERT INTO `GroupPrivileges` SET `group_id`=-5, `privilege_id`=(SELECT `id` FROM `Privileges` WHERE `name`='shifttypes'); ALTER TABLE `Shifts` ADD `shifttype_id` INT NOT NULL AFTER `SID`, ADD INDEX ( `shifttype_id` ); @@ -16,7 +49,7 @@ UPDATE `Shifts` SET `name`='' WHERE `name` IS NULL; INSERT INTO `ShiftTypes` SELECT DISTINCT NULL , `name` , NULL , '' FROM `Shifts`; UPDATE `Shifts` SET `shifttype_id`=(SELECT `id` FROM `ShiftTypes` WHERE `ShiftTypes`.`name`=`Shifts`.`name`); ALTER TABLE `Shifts` ADD `title` TEXT NULL AFTER `SID`; -ALTER TABLE `Shifts` ADD FOREIGN KEY ( `shifttype_id` ) REFERENCES `engelsystem`.`ShiftTypes` (`id`) ON DELETE CASCADE ON UPDATE CASCADE; +ALTER TABLE `Shifts` ADD FOREIGN KEY ( `shifttype_id` ) REFERENCES `ShiftTypes` (`id`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `Shifts` DROP `name`; /* cleanup */ diff --git a/includes/controller/api.php b/includes/controller/api.php deleted file mode 100644 index 9ecd3a2f..00000000 --- a/includes/controller/api.php +++ /dev/null @@ -1,355 +0,0 @@ -<?php - -/************************************************************************************************ - * API Documentation - ************************************************************************************************ - -General: --------- -All API calls output JSON-encoded data. Client parameters should be passed encoded using JSON in HTTP POST data. -Every API Request must be contained the Api Key (using JSON parameter 'key') and the Command (using JSON parameter 'cmd'). - - -Testing API calls (using curl): -------------------------------- -$ curl -d '{"cmd":"getVersion"}' '<Address>/?p=api' -$ curl -d '{"cmd":"getApiKey","user":"admin","pw":"admin"}' '<Address>/?p=api' -$ curl -d '{"key":"<key>","cmd":"getRoom"}' '<Address>/?p=api' -$ curl -d '{"key":"<key>","cmd":"sendmessage","uid":"23","text":"test message"}' '<Address>/?p=api' - -Methods without key: --------------------- -getVersion - Description: - Returns API version. - Parameters: - nothing - Return Example: - {"status":"success","version": "1"} - -getApiKey - Description: - Returns API Key version. - Parameters: - user (string) - pw (string) - Return Example: - {"status":"success","Key":"1234567890123456789012"} - -Methods with Key: ------------------ -getRoom - Description: - Returns a list of all Rooms (no id set) or details of a single Room (requested id) - Parameters: - id (integer) - Room ID - Return Example: - [{"RID":"1"},{"RID":"23"},{"RID":"42"}] - {"RID":"1","Name":"Room Name","Man":null,"FromPentabarf":"","show":"Y","Number":"0"} - -getAngelType - Description: - Returns a list of all Angel Types (no id set) or details of a single Angel Type (requested id) - Parameters: - id (integer) - Type ID - Return Example: - [{"id":"8"},{"id":"9"}] - {"id":"9","name":"Angeltypes 2","restricted":"0"} - -getUser - Description: - Returns a list of all Users (no id set) or details of a single User (requested id) - Parameters: - id (integer) - User ID - Return Example: - [{"UID":"1"},{"UID":"23"},{"UID":"42"}] - {"UID":"1","Nick":"admin","Name":"Gates","Vorname":"Bill","Telefon":"","DECT":"","Handy":"","email":"","jabber":"","Avatar":"115"} - -getShift - Description: - Returns a list of all Shifte (no id set, filter is optional) or details of a single Shift (requested id) - Parameters: - id (integer) - Shift ID - filterRoom (Array of integer) - Array of Room IDs (optional, for list request) - filterTask (Array of integer) - Array if Task (optional, for list request) - filterOccupancy (integer) - Occupancy state: (optional, for list request) - 1 occupied - 2 free - 3 occupied and free - Return Example: - [{"SID":"1"},{"SID":"2"},{"SID":"3"}] - {"SID":"10","start":"1388264400","end":"1388271600","RID":"1","name":"Shift 1","URL":null,"PSID":null,\ - "ShiftEntry":[{"TID":"8","UID":"4","freeloaded":"0"}], - "NeedAngels":[{"TID":"8","count":"1","restricted":"0","taken":1},{"TID":"9","count":"2","restricted":"0","taken":0}]} - -getMessage - Description: - Returns a list of all Messages (no id set) or details of a single Message (requested id) - Parameters: - id (integer) - Message ID - Return Example: - [{"id":"1"},{"id":"2"},{"id":"3"}] - {"id":"3","Datum":"1388247583","SUID":"23","RUID":"42","isRead":"N","Text":"message text"} - -sendMessage - Description: - send a Message to an other angel - Parameters: - uid (integer) - User ID of the reciever - text (string) - Message Text - Return Example: - {"status":"success"} - -************************************************************************************************/ - -/** - * General API Controller - */ -function api_controller() { - global $user, $DataJson; - - header("Content-Type: application/json; charset=utf-8"); - - // decode JSON request - $input = file_get_contents("php://input"); - $input = json_decode($input, true); - $_REQUEST = $input; - - // get command - $cmd = ''; - if (isset($_REQUEST['cmd'])) - $cmd = strtolower($_REQUEST['cmd']); - - // decode commands, without key - switch ($cmd) { - case 'getversion': - getVersion(); - die(json_encode($DataJson)); - break; - case 'getapikey': - getApiKey(); - die(json_encode($DataJson)); - break; - } - - // get API KEY - if (isset($_REQUEST['key']) && preg_match("/^[0-9a-f]{32}$/", $_REQUEST['key'])) - $key = $_REQUEST['key']; - else - die(json_encode(array( - 'status' => 'failed', - 'error' => 'Missing parameter "key".' - ))); - - // check API key - $user = User_by_api_key($key); - if ($user === false) - die(json_encode(array( - 'status' => 'failed', - 'error' => 'Unable to find user' - ))); - if ($user == null) - die(json_encode(array( - 'status' => 'failed', - 'error' => 'Key invalid.' - ))); - - // decode command - switch ($cmd) { - case 'getroom': - getRoom(); - break; - case 'getangeltype': - getAngelType(); - break; - case 'getuser': - // TODO Dataleak! Only coordinators are allowed to see so much user informations. - //getUser(); - break; - case 'getshift': - getShift(); - break; - case 'getmessage': - // TODO Dataleak! - //getMessage(); - break; - case 'sendmessage': - sendMessage(); - break; - default: - $DataJson = array( - 'status' => 'failed', - 'error' => 'Unknown Command "' . $cmd . '"' - ); - } - - // check - if ($DataJson === false) { - $DataJson = array( - 'status' => 'failed', - 'error' => 'DataJson === false' - ); - } elseif ($DataJson == null) { - $DataJson = array( - 'status' => 'failed', - 'error' => 'DataJson == null' - ); - } - - echo json_encode($DataJson); - die(); -} - -/** - * Get Version of API - */ -function getVersion() { - global $DataJson; - - $DataJson = array( - 'status' => 'success', - 'Version' => 1 - ); -} - -/** - * Get API Key - */ -function getApiKey() { - global $DataJson; - - if (! isset($_REQUEST['user'])) { - $DataJson = array( - 'status' => 'failed', - 'error' => 'Missing parameter "user".' - ); - } elseif (! isset($_REQUEST['pw'])) { - $DataJson = array( - 'status' => 'failed', - 'error' => 'Missing parameter "pw".' - ); - } else { - $Erg = sql_select("SELECT `UID`, `Passwort`, `api_key` FROM `User` WHERE `Nick`='" . sql_escape($_REQUEST['user']) . "'"); - - if (count($Erg) == 1) { - $Erg = $Erg[0]; - if (verify_password($_REQUEST['pw'], $Erg["Passwort"], $Erg["UID"])) { - $key = $Erg["api_key"]; - $DataJson = array( - 'status' => 'success', - 'Key' => $key - ); - } else { - $DataJson = array( - 'status' => 'failed', - 'error' => 'PW wrong' - ); - } - } else { - $DataJson = array( - 'status' => 'failed', - 'error' => 'User not found.' - ); - } - } - - sleep(1); -} - -/** - * Get Room - */ -function getRoom() { - global $DataJson; - - if (isset($_REQUEST['id'])) { - $DataJson = Room($_REQUEST['id']); - } else { - $DataJson = Room_ids(); - } -} - -/** - * Get AngelType - */ -function getAngelType() { - global $DataJson; - - if (isset($_REQUEST['id'])) { - $DataJson = AngelType($_REQUEST['id']); - } else { - $DataJson = AngelType_ids(); - } -} - -/** - * Get User - */ -function getUser() { - global $DataJson; - - if (isset($_REQUEST['id'])) { - $DataJson = mUser_Limit($_REQUEST['id']); - } else { - $DataJson = User_ids(); - } -} - -/** - * Get Shift - */ -function getShift() { - global $DataJson; - - if (isset($_REQUEST['id'])) { - $DataJson = Shift($_REQUEST['id']); - } else { - $DataJson = Shifts_filtered(); - } -} - -/** - * @TODO: Why are ALL messages of ALL users returned? Data leak. It is not checked if this is my message! - * Get Message - */ -function getMessage() { - global $DataJson; - - if (isset($_REQUEST['id'])) { - $DataJson = Message($_REQUEST['id']); - } else { - $DataJson = Message_ids(); - } -} - -/** - * Send Message - */ -function sendMessage() { - global $DataJson; - - if (! isset($_REQUEST['uid'])) { - $DataJson = array( - 'status' => 'failed', - 'error' => 'Missing parameter "uid".' - ); - } elseif (! isset($_REQUEST['text'])) { - $DataJson = array( - 'status' => 'failed', - 'error' => 'Missing parameter "text".' - ); - } else { - if (Message_send($_REQUEST['uid'], $_REQUEST['text']) === true) { - $DataJson = array( - 'status' => 'success' - ); - } else { - $DataJson = array( - 'status' => 'failed', - 'error' => 'Transmitting was terminated with an Error.' - ); - } - } -} - -?> diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php index 90753217..9982388e 100644 --- a/includes/controller/shifts_controller.php +++ b/includes/controller/shifts_controller.php @@ -145,7 +145,7 @@ function shifts_json_export_controller() { INNER JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) INNER JOIN `ShiftTypes` ON (`Shifts`.`shifttype_id`=`ShiftTypes`.`id`) INNER JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) - WHERE `UID`=" . sql_escape($user['UID']) . " + WHERE `UID`='" . sql_escape($user['UID']) . "' ORDER BY `start`"); } diff --git a/includes/controller/user_angeltypes_controller.php b/includes/controller/user_angeltypes_controller.php index 66abc589..f76f10ae 100644 --- a/includes/controller/user_angeltypes_controller.php +++ b/includes/controller/user_angeltypes_controller.php @@ -14,7 +14,7 @@ function user_angeltypes_unconfirmed_hint() { $unconfirmed_links = []; foreach ($unconfirmed_user_angeltypes as $user_angeltype) - $unconfirmed_links[] = '<a href="' . page_link_to('angeltypes') . '&action=view&angeltype_id=' . $user_angeltype['angeltype_id'] . '">' . $user_angeltype['name'] . '</a>'; + $unconfirmed_links[] = '<a href="' . page_link_to('angeltypes') . '&action=view&angeltype_id=' . $user_angeltype['angeltype_id'] . '">' . $user_angeltype['name'] . ' (+' . $user_angeltype['count'] . ')' . '</a>'; return info(sprintf(ngettext("There is %d unconfirmed angeltype.", "There are %d unconfirmed angeltypes.", count($unconfirmed_user_angeltypes)), count($unconfirmed_user_angeltypes)) . " " . _('Angel types which need approvals:') . ' ' . join(', ', $unconfirmed_links), true); } diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php index 3a23835c..067fc4aa 100644 --- a/includes/controller/users_controller.php +++ b/includes/controller/users_controller.php @@ -22,10 +22,20 @@ function users_controller() { return user_edit_controller(); case 'delete': return user_delete_controller(); + case 'edit_vouchers': + return user_edit_vouchers_controller(); } } -function user_controller() { +function users_link() { + return page_link_to('users'); +} + +function user_link($user) { + return page_link_to('users') . '&action=view&user_id=' . $user['UID']; +} + +function user_edit_vouchers_controller() { global $privileges, $user; if (isset($_REQUEST['user_id'])) { @@ -33,19 +43,58 @@ function user_controller() { } else $user_source = $user; - $admin_user_privilege = in_array('admin_user', $privileges); + if (! in_array('admin_user', $privileges)) + redirect(page_link_to('')); + + if (isset($_REQUEST['submit'])) { + $ok = true; + + if (isset($_REQUEST['vouchers']) && test_request_int('vouchers') && trim($_REQUEST['vouchers']) >= 0) + $vouchers = trim($_REQUEST['vouchers']); + else { + $ok = false; + error(_("Please enter a valid number of vouchers.")); + } + + if ($ok) { + $user_source['got_voucher'] = $vouchers; + + $result = User_update($user_source); + if ($result === false) + engelsystem_error('Unable to update user.'); + + success(_("Saved the number of vouchers.")); + engelsystem_log(User_Nick_render($user_source) . ': ' . sprintf("Got %s vouchers", $user_source['got_voucher'])); + + redirect(user_link($user_source)); + } + } + + return array( + sprintf(_("%s's vouchers"), $user_source['Nick']), + User_edit_vouchers_view($user_source) + ); +} + +function user_controller() { + global $privileges, $user; + + if (isset($_REQUEST['user_id'])) { + $user_source = User($_REQUEST['user_id']); + } else + $user_source = $user; $shifts = Shifts_by_user($user_source); foreach ($shifts as &$shift) { // TODO: Move queries to model - $shift['needed_angeltypes'] = sql_select("SELECT DISTINCT `AngelTypes`.* FROM `ShiftEntry` JOIN `AngelTypes` ON `ShiftEntry`.`TID`=`AngelTypes`.`id` WHERE `ShiftEntry`.`SID`=" . sql_escape($shift['SID']) . " ORDER BY `AngelTypes`.`name`"); + $shift['needed_angeltypes'] = sql_select("SELECT DISTINCT `AngelTypes`.* FROM `ShiftEntry` JOIN `AngelTypes` ON `ShiftEntry`.`TID`=`AngelTypes`.`id` WHERE `ShiftEntry`.`SID`='" . sql_escape($shift['SID']) . "' ORDER BY `AngelTypes`.`name`"); foreach ($shift['needed_angeltypes'] as &$needed_angeltype) { $needed_angeltype['users'] = sql_select(" SELECT `ShiftEntry`.`freeloaded`, `User`.* FROM `ShiftEntry` JOIN `User` ON `ShiftEntry`.`UID`=`User`.`UID` - WHERE `ShiftEntry`.`SID`=" . sql_escape($shift['SID']) . " - AND `ShiftEntry`.`TID`=" . sql_escape($needed_angeltype['id'])); + WHERE `ShiftEntry`.`SID`='" . sql_escape($shift['SID']) . "' + AND `ShiftEntry`.`TID`='" . sql_escape($needed_angeltype['id']) . "'"); } } @@ -54,7 +103,7 @@ function user_controller() { return array( $user_source['Nick'], - User_view($user_source, $admin_user_privilege, User_is_freeloader($user_source), User_angeltypes($user_source), User_groups($user_source), $shifts, $user['UID'] == $user_source['UID']) + User_view($user_source, in_array('admin_user', $privileges), User_is_freeloader($user_source), User_angeltypes($user_source), User_groups($user_source), $shifts, $user['UID'] == $user_source['UID']) ); } @@ -80,7 +129,7 @@ function users_list_controller() { return array( _('All users'), - Users_view($users, $order_by, User_arrived_count(), User_active_count(), User_force_active_count(), ShiftEntries_freeleaded_count(), User_tshirts_count()) + Users_view($users, $order_by, User_arrived_count(), User_active_count(), User_force_active_count(), ShiftEntries_freeleaded_count(), User_tshirts_count(), User_got_voucher_count()) ); } diff --git a/includes/engelsystem_provider.php b/includes/engelsystem_provider.php new file mode 100644 index 00000000..057d5513 --- /dev/null +++ b/includes/engelsystem_provider.php @@ -0,0 +1,89 @@ +<?php +/** + * This file includes all needed functions, connects to the db etc. + */ +require_once realpath(__DIR__ . '/../includes/mysqli_provider.php'); + +require_once realpath(__DIR__ . '/../includes/sys_auth.php'); +require_once realpath(__DIR__ . '/../includes/sys_log.php'); +require_once realpath(__DIR__ . '/../includes/sys_menu.php'); +require_once realpath(__DIR__ . '/../includes/sys_page.php'); +require_once realpath(__DIR__ . '/../includes/sys_template.php'); + +require_once realpath(__DIR__ . '/../includes/model/AngelType_model.php'); +require_once realpath(__DIR__ . '/../includes/model/LogEntries_model.php'); +require_once realpath(__DIR__ . '/../includes/model/Message_model.php'); +require_once realpath(__DIR__ . '/../includes/model/NeededAngelTypes_model.php'); +require_once realpath(__DIR__ . '/../includes/model/Room_model.php'); +require_once realpath(__DIR__ . '/../includes/model/ShiftEntry_model.php'); +require_once realpath(__DIR__ . '/../includes/model/Shifts_model.php'); +require_once realpath(__DIR__ . '/../includes/model/ShiftTypes_model.php'); +require_once realpath(__DIR__ . '/../includes/model/UserAngelTypes_model.php'); +require_once realpath(__DIR__ . '/../includes/model/UserGroups_model.php'); +require_once realpath(__DIR__ . '/../includes/model/User_model.php'); + +require_once realpath(__DIR__ . '/../includes/view/AngelTypes_view.php'); +require_once realpath(__DIR__ . '/../includes/view/Questions_view.php'); +require_once realpath(__DIR__ . '/../includes/view/Rooms_view.php'); +require_once realpath(__DIR__ . '/../includes/view/Shifts_view.php'); +require_once realpath(__DIR__ . '/../includes/view/ShiftEntry_view.php'); +require_once realpath(__DIR__ . '/../includes/view/ShiftTypes_view.php'); +require_once realpath(__DIR__ . '/../includes/view/UserAngelTypes_view.php'); +require_once realpath(__DIR__ . '/../includes/view/User_view.php'); + +require_once realpath(__DIR__ . '/../includes/controller/angeltypes_controller.php'); +require_once realpath(__DIR__ . '/../includes/controller/rooms_controller.php'); +require_once realpath(__DIR__ . '/../includes/controller/shifts_controller.php'); +require_once realpath(__DIR__ . '/../includes/controller/shifttypes_controller.php'); +require_once realpath(__DIR__ . '/../includes/controller/users_controller.php'); +require_once realpath(__DIR__ . '/../includes/controller/user_angeltypes_controller.php'); + +require_once realpath(__DIR__ . '/../includes/helper/internationalization_helper.php'); +require_once realpath(__DIR__ . '/../includes/helper/message_helper.php'); +require_once realpath(__DIR__ . '/../includes/helper/error_helper.php'); +require_once realpath(__DIR__ . '/../includes/helper/email_helper.php'); +require_once realpath(__DIR__ . '/../includes/helper/session_helper.php'); + +require_once realpath(__DIR__ . '/../includes/mailer/shifts_mailer.php'); + +require_once realpath(__DIR__ . '/../config/config.default.php'); +if (file_exists(realpath(__DIR__ . '/../config/config.php'))) + require_once realpath(__DIR__ . '/../config/config.php'); + +if ($maintenance_mode) { + echo file_get_contents(__DIR__ . '/../public/maintenance.html'); + die(); +} + +require_once realpath(__DIR__ . '/../includes/pages/admin_active.php'); +require_once realpath(__DIR__ . '/../includes/pages/admin_arrive.php'); +require_once realpath(__DIR__ . '/../includes/pages/admin_free.php'); +require_once realpath(__DIR__ . '/../includes/pages/admin_groups.php'); +require_once realpath(__DIR__ . '/../includes/pages/admin_import.php'); +require_once realpath(__DIR__ . '/../includes/pages/admin_log.php'); +require_once realpath(__DIR__ . '/../includes/pages/admin_questions.php'); +require_once realpath(__DIR__ . '/../includes/pages/admin_rooms.php'); +require_once realpath(__DIR__ . '/../includes/pages/admin_shifts.php'); +require_once realpath(__DIR__ . '/../includes/pages/admin_user.php'); +require_once realpath(__DIR__ . '/../includes/pages/guest_login.php'); +require_once realpath(__DIR__ . '/../includes/pages/user_messages.php'); +require_once realpath(__DIR__ . '/../includes/pages/user_myshifts.php'); +require_once realpath(__DIR__ . '/../includes/pages/user_news.php'); +require_once realpath(__DIR__ . '/../includes/pages/user_questions.php'); +require_once realpath(__DIR__ . '/../includes/pages/user_settings.php'); +require_once realpath(__DIR__ . '/../includes/pages/user_shifts.php'); + +require_once realpath(__DIR__ . '/../vendor/parsedown/Parsedown.php'); + +if (! defined('PHPUNIT_TESTSUITE')) { + session_lifetime(24 * 60, preg_replace("/[^a-z0-9-]/", '', md5(__DIR__))); +} +session_start(); + +gettext_init(); + +sql_connect($config['host'], $config['user'], $config['pw'], $config['db']); + +load_auth(); + +?>
\ No newline at end of file diff --git a/includes/helper/internationalization_helper.php b/includes/helper/internationalization_helper.php index 836bbc6a..a8fdd0f0 100644 --- a/includes/helper/internationalization_helper.php +++ b/includes/helper/internationalization_helper.php @@ -7,6 +7,20 @@ $locales = array( $default_locale = 'en_US.UTF-8'; /** + * Return currently active locale + */ +function locale() { + return $_SESSION['locale']; +} + +/** + * Returns two letter language code from currently active locale + */ +function locale_short() { + return substr(locale(), 0, 2); +} + +/** * Initializes gettext for internationalization and updates the sessions locale to use for translation. */ function gettext_init() { diff --git a/includes/helper/session_helper.php b/includes/helper/session_helper.php index 4063ff69..443701ee 100644 --- a/includes/helper/session_helper.php +++ b/includes/helper/session_helper.php @@ -9,7 +9,7 @@ */ function session_lifetime($lifetime, $application_name) { // Set session save path and name - $session_save_path = rtrim(session_save_path(), '/') . '/' . $application_name; + $session_save_path = '/tmp/' . $application_name; if (! file_exists($session_save_path)) mkdir($session_save_path); if (file_exists($session_save_path)) @@ -22,7 +22,7 @@ function session_lifetime($lifetime, $application_name) { ini_set('session.gc_divisor', 100); // Cookie settings (lifetime) - ini_set('session.cookie_secure', ! (preg_match("/^localhost/", $_SERVER["HTTP_HOST"]) || isset($_GET['debug']))); + ini_set('session.cookie_secure', ! (isset($_SERVER['HTTP_HOST']) && preg_match("/^localhost/", $_SERVER["HTTP_HOST"]) || isset($_GET['debug']))); ini_set('session.use_only_cookies', true); ini_set('session.cookie_lifetime', $lifetime * 60); } diff --git a/includes/model/AngelType_model.php b/includes/model/AngelType_model.php index d0119e6f..5e7f4fb6 100644 --- a/includes/model/AngelType_model.php +++ b/includes/model/AngelType_model.php @@ -8,7 +8,7 @@ function AngelType_delete($angeltype) { return sql_query(" DELETE FROM `AngelTypes` - WHERE `id`=" . sql_escape($angeltype['id']) . " + WHERE `id`='" . sql_escape($angeltype['id']) . "' LIMIT 1"); } @@ -24,9 +24,9 @@ function AngelType_update($angeltype_id, $name, $restricted, $description) { return sql_query(" UPDATE `AngelTypes` SET `name`='" . sql_escape($name) . "', - `restricted`=" . sql_escape($restricted ? 1 : 0) . ", + `restricted`='" . sql_escape($restricted ? 1 : 0) . "', `description`='" . sql_escape($description) . "' - WHERE `id`=" . sql_escape($angeltype_id) . " + WHERE `id`='" . sql_escape($angeltype_id) . "' LIMIT 1"); } @@ -42,7 +42,7 @@ function AngelType_create($name, $restricted, $description) { $result = sql_query(" INSERT INTO `AngelTypes` SET `name`='" . sql_escape($name) . "', - `restricted`=" . sql_escape($restricted ? 1 : 0) . ", + `restricted`='" . sql_escape($restricted ? 1 : 0) . "', `description`='" . sql_escape($description) . "'"); if ($result === false) return false; @@ -69,7 +69,7 @@ function AngelType_validate_name($name, $angeltype) { SELECT * FROM `AngelTypes` WHERE `name`='" . sql_escape($name) . "' - AND NOT `id`=" . sql_escape($angeltype['id']) . " + AND NOT `id`='" . sql_escape($angeltype['id']) . "' LIMIT 1") == 0, $name ); @@ -130,7 +130,7 @@ function AngelType_ids() { * ID */ function AngelType($id) { - $angelType_source = sql_select("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($id) . " LIMIT 1"); + $angelType_source = sql_select("SELECT * FROM `AngelTypes` WHERE `id`='" . sql_escape($id) . "' LIMIT 1"); if ($angelType_source === false) return false; if (count($angelType_source) > 0) diff --git a/includes/model/LogEntries_model.php b/includes/model/LogEntries_model.php index 2e8a8cf7..8b7f65a0 100644 --- a/includes/model/LogEntries_model.php +++ b/includes/model/LogEntries_model.php @@ -8,11 +8,11 @@ * Message */ function LogEntry_create($nick, $message) { - return sql_query("INSERT INTO `LogEntries` SET `timestamp`=" . sql_escape(time()) . ", `nick`='" . sql_escape($nick) . "', `message`='" . sql_escape($message) . "'"); + return sql_query("INSERT INTO `LogEntries` SET `timestamp`='" . sql_escape(time()) . "', `nick`='" . sql_escape($nick) . "', `message`='" . sql_escape($message) . "'"); } /** - * Returns log entries of the last 24 hours with maximum count of 1000. + * Returns log entries with maximum count of 10000. */ function LogEntries() { return sql_select("SELECT * FROM `LogEntries` ORDER BY `timestamp` DESC LIMIT 10000"); @@ -25,4 +25,11 @@ function LogEntries_filter($keyword) { return sql_select("SELECT * FROM `LogEntries` WHERE `nick` LIKE '%" . sql_escape($keyword) . "%' OR `message` LIKE '%" . sql_escape($keyword) . "%' ORDER BY `timestamp` DESC"); } +/** + * Delete all log entries. + */ +function LogEntries_clear_all() { + return sql_query("TRUNCATE `LogEntries`"); +} + ?> diff --git a/includes/model/Message_model.php b/includes/model/Message_model.php index 1e1923e8..7bae0dd4 100644 --- a/includes/model/Message_model.php +++ b/includes/model/Message_model.php @@ -14,7 +14,7 @@ function Message_ids() { * ID */ function Message($id) { - $message_source = sql_select("SELECT * FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1"); + $message_source = sql_select("SELECT * FROM `Messages` WHERE `id`='" . sql_escape($id) . "' LIMIT 1"); if ($message_source === false) return false; if (count($message_source) > 0) @@ -38,8 +38,8 @@ function Message_send($id, $text) { $text = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($text)); $to = preg_replace("/([^0-9]{1,})/ui", '', strip_tags($id)); - if (($text != "" && is_numeric($to)) && (sql_num_query("SELECT * FROM `User` WHERE `UID`=" . sql_escape($to) . " AND NOT `UID`=" . sql_escape($user['UID']) . " LIMIT 1") > 0)) { - sql_query("INSERT INTO `Messages` SET `Datum`=" . sql_escape(time()) . ", `SUID`=" . sql_escape($user['UID']) . ", `RUID`=" . sql_escape($to) . ", `Text`='" . sql_escape($text) . "'"); + if (($text != "" && is_numeric($to)) && (sql_num_query("SELECT * FROM `User` WHERE `UID`='" . sql_escape($to) . "' AND NOT `UID`='" . sql_escape($user['UID']) . "' LIMIT 1") > 0)) { + sql_query("INSERT INTO `Messages` SET `Datum`='" . sql_escape(time()) . "', `SUID`='" . sql_escape($user['UID']) . "', `RUID`='" . sql_escape($to) . "', `Text`='" . sql_escape($text) . "'"); return true; } else { return false; diff --git a/includes/model/NeededAngelTypes_model.php b/includes/model/NeededAngelTypes_model.php index e9176d34..8d6b8cce 100644 --- a/includes/model/NeededAngelTypes_model.php +++ b/includes/model/NeededAngelTypes_model.php @@ -10,7 +10,7 @@ function NeededAngelTypes_by_shift($shiftId) { SELECT `NeededAngelTypes`.*, `AngelTypes`.`name`, `AngelTypes`.`restricted` FROM `NeededAngelTypes` JOIN `AngelTypes` ON `AngelTypes`.`id` = `NeededAngelTypes`.`angel_type_id` - WHERE `shift_id`=" . sql_escape($shiftId) . " + WHERE `shift_id`='" . sql_escape($shiftId) . "' AND `count` > 0 ORDER BY `room_id` DESC "); @@ -24,7 +24,7 @@ function NeededAngelTypes_by_shift($shiftId) { FROM `NeededAngelTypes` JOIN `AngelTypes` ON `AngelTypes`.`id` = `NeededAngelTypes`.`angel_type_id` JOIN `Shifts` ON `Shifts`.`RID` = `NeededAngelTypes`.`room_id` - WHERE `Shifts`.`SID`=" . sql_escape($shiftId) . " + WHERE `Shifts`.`SID`='" . sql_escape($shiftId) . "' AND `count` > 0 ORDER BY `room_id` DESC "); diff --git a/includes/model/Room_model.php b/includes/model/Room_model.php index c48abc78..2868916e 100644 --- a/includes/model/Room_model.php +++ b/includes/model/Room_model.php @@ -1,15 +1,33 @@ <?php /** - * Returns room id array + * Delete a room + * @param int $room_id */ -function Room_ids() { - $room_source = sql_select("SELECT `RID` FROM `Room` WHERE `show` = 'Y'"); - if ($room_source === false) +function Room_delete($room_id) { + return sql_query("DELETE FROM `Room` WHERE `RID`=" . sql_escape($room_id)); +} + +/** + * Create a new room + * + * @param string $name + * Name of the room + * @param boolean $from_frab + * Is this a frab imported room? + * @param boolean $public + * Is the room visible for angels? + */ +function Room_create($name, $from_frab, $public) { + $result = sql_query(" + INSERT INTO `Room` SET + `Name`='" . sql_escape($name) . "', + `FromPentabarf`='" . sql_escape($from_frab ? 'Y' : 'N') . "', + `show`='" . sql_escape($public ? 'Y' : 'N') . "', + `Number`=0"); + if ($result === false) return false; - if (count($room_source) > 0) - return $room_source; - return null; + return sql_id(); } /** @@ -18,7 +36,8 @@ function Room_ids() { * @param $id RID */ function Room($id) { - $room_source = sql_select("SELECT * FROM `Room` WHERE `RID`=" . sql_escape($id) . " AND `show` = 'Y' LIMIT 1"); + $room_source = sql_select("SELECT * FROM `Room` WHERE `RID`='" . sql_escape($id) . "' AND `show` = 'Y'"); + if ($room_source === false) return false; if (count($room_source) > 0) diff --git a/includes/model/ShiftEntry_model.php b/includes/model/ShiftEntry_model.php index 5129f15a..008531ff 100644 --- a/includes/model/ShiftEntry_model.php +++ b/includes/model/ShiftEntry_model.php @@ -16,7 +16,7 @@ function ShiftEntries_by_shift($shift_id) { FROM `ShiftEntry` JOIN `User` ON `ShiftEntry`.`UID`=`User`.`UID` JOIN `AngelTypes` ON `ShiftEntry`.`TID`=`AngelTypes`.`id` - WHERE `ShiftEntry`.`SID`=" . sql_escape($shift_id)); + WHERE `ShiftEntry`.`SID`='" . sql_escape($shift_id) . "'"); } /** @@ -27,12 +27,12 @@ function ShiftEntries_by_shift($shift_id) { function ShiftEntry_create($shift_entry) { mail_shift_assign(User($shift_entry['UID']), Shift($shift_entry['SID'])); return sql_query("INSERT INTO `ShiftEntry` SET - `SID`=" . sql_escape($shift_entry['SID']) . ", - `TID`=" . sql_escape($shift_entry['TID']) . ", - `UID`=" . sql_escape($shift_entry['UID']) . ", + `SID`='" . sql_escape($shift_entry['SID']) . "', + `TID`='" . sql_escape($shift_entry['TID']) . "', + `UID`='" . sql_escape($shift_entry['UID']) . "', `Comment`='" . sql_escape($shift_entry['Comment']) . "', `freeload_comment`='" . sql_escape($shift_entry['freeload_comment']) . "', - `freeloaded`=" . sql_escape($shift_entry['freeloaded'] ? 'TRUE' : 'FALSE')); + `freeloaded`=" . sql_bool($shift_entry['freeloaded'])); } /** @@ -42,15 +42,15 @@ function ShiftEntry_update($shift_entry) { return sql_query("UPDATE `ShiftEntry` SET `Comment`='" . sql_escape($shift_entry['Comment']) . "', `freeload_comment`='" . sql_escape($shift_entry['freeload_comment']) . "', - `freeloaded`=" . sql_escape($shift_entry['freeloaded'] ? 'TRUE' : 'FALSE') . " - WHERE `id`=" . sql_escape($shift_entry['id'])); + `freeloaded`=" . sql_bool($shift_entry['freeloaded']) . " + WHERE `id`='" . sql_escape($shift_entry['id']) . "'"); } /** * Get a shift entry. */ function ShiftEntry($shift_entry_id) { - $shift_entry = sql_select("SELECT * FROM `ShiftEntry` WHERE `id`=" . sql_escape($shift_entry_id)); + $shift_entry = sql_select("SELECT * FROM `ShiftEntry` WHERE `id`='" . sql_escape($shift_entry_id) . "'"); if ($shift_entry === false) return false; if (count($shift_entry) == 0) @@ -64,7 +64,7 @@ function ShiftEntry($shift_entry_id) { function ShiftEntry_delete($shift_entry_id) { $shift_entry = ShiftEntry($shift_entry_id); mail_shift_removed(User($shift_entry['UID']), Shift($shift_entry['SID'])); - return sql_query("DELETE FROM `ShiftEntry` WHERE `id`=" . sql_escape($shift_entry_id)); + return sql_query("DELETE FROM `ShiftEntry` WHERE `id`='" . sql_escape($shift_entry_id) . "'"); } /** diff --git a/includes/model/ShiftTypes_model.php b/includes/model/ShiftTypes_model.php index 7b502585..7f057da8 100644 --- a/includes/model/ShiftTypes_model.php +++ b/includes/model/ShiftTypes_model.php @@ -5,7 +5,7 @@ * @param int $shifttype_id */ function ShiftType_delete($shifttype_id) { - return sql_query("DELETE FROM `ShiftTypes` WHERE `id`=" . sql_escape($shifttype_id)); + return sql_query("DELETE FROM `ShiftTypes` WHERE `id`='" . sql_escape($shifttype_id) . "'"); } /** @@ -21,7 +21,7 @@ function ShiftType_update($shifttype_id, $name, $angeltype_id, $description) { `name`='" . sql_escape($name) . "', `angeltype_id`=" . sql_null($angeltype_id) . ", `description`='" . sql_escape($description) . "' - WHERE `id`=" . sql_escape($shifttype_id)); + WHERE `id`='" . sql_escape($shifttype_id) . "'"); } /** @@ -48,7 +48,7 @@ function ShiftType_create($name, $angeltype_id, $description) { * @param int $shifttype_id */ function ShiftType($shifttype_id) { - $shifttype = sql_select("SELECT * FROM `ShiftTypes` WHERE `id`=" . sql_escape($shifttype_id)); + $shifttype = sql_select("SELECT * FROM `ShiftTypes` WHERE `id`='" . sql_escape($shifttype_id) . "'"); if ($shifttype === false) return false; if ($shifttype == null) diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php index 37c772bf..d32de0cb 100644 --- a/includes/model/Shifts_model.php +++ b/includes/model/Shifts_model.php @@ -43,11 +43,23 @@ function Shift_signup_allowed($shift, $angeltype, $user_angeltype = null, $user_ $signed_up = true; break; } + + $needed_angeltypes = NeededAngelTypes_by_shift($shift['SID']); + if ($needed_angeltypes === false) + engelsystem_error('Unable to load needed angel types.'); // is the shift still running or alternatively is the user shift admin? $user_may_join_shift = true; - // you cannot join if user alread joined a parallel or this shift + // you canot join if shift is full + foreach ($needed_angeltypes as $needed_angeltype) + if ($needed_angeltype['angel_type_id'] == $angeltype['id']) { + if ($needed_angeltype['taken'] >= $needed_angeltype['count']) + $user_may_join_shift = false; + break; + } + + // you cannot join if user alread joined a parallel or this shift $user_may_join_shift &= ! $collides; // you cannot join if you already singed up for this shift @@ -73,7 +85,7 @@ function Shift_signup_allowed($shift, $angeltype, $user_angeltype = null, $user_ * Delete a shift by its external id. */ function Shift_delete_by_psid($shift_psid) { - return sql_query("DELETE FROM `Shifts` WHERE `PSID`=" . sql_escape($shift_psid)); + return sql_query("DELETE FROM `Shifts` WHERE `PSID`='" . sql_escape($shift_psid) . "'"); } /** @@ -82,25 +94,28 @@ function Shift_delete_by_psid($shift_psid) { function Shift_delete($shift_id) { mail_shift_delete(Shift($shift_id)); - return sql_query("DELETE FROM `Shifts` WHERE `SID`=" . sql_escape($shift_id)); + return sql_query("DELETE FROM `Shifts` WHERE `SID`='" . sql_escape($shift_id) . "'"); } /** * Update a shift. */ function Shift_update($shift) { + global $user; $shift['name'] = ShiftType($shift['shifttype_id'])['name']; mail_shift_change(Shift($shift['SID']), $shift); return sql_query("UPDATE `Shifts` SET - `shifttype_id`=" . sql_escape($shift['shifttype_id']) . ", - `start`=" . sql_escape($shift['start']) . ", - `end`=" . sql_escape($shift['end']) . ", - `RID`=" . sql_escape($shift['RID']) . ", + `shifttype_id`='" . sql_escape($shift['shifttype_id']) . "', + `start`='" . sql_escape($shift['start']) . "', + `end`='" . sql_escape($shift['end']) . "', + `RID`='" . sql_escape($shift['RID']) . "', `title`=" . sql_null($shift['title']) . ", `URL`=" . sql_null($shift['URL']) . ", - `PSID`=" . sql_null($shift['PSID']) . " - WHERE `SID`=" . sql_escape($shift['SID'])); + `PSID`=" . sql_null($shift['PSID']) . ", + `edited_by_user_id`='" . sql_escape($user['UID']) . "', + `edited_at_timestamp`=" . time() . " + WHERE `SID`='" . sql_escape($shift['SID']) . "'"); } /** @@ -122,14 +137,17 @@ function Shift_update_by_psid($shift) { * @return new shift id or false */ function Shift_create($shift) { + global $user; $result = sql_query("INSERT INTO `Shifts` SET - `shifttype_id`=" . sql_escape($shift['shifttype_id']) . ", - `start`=" . sql_escape($shift['start']) . ", - `end`=" . sql_escape($shift['end']) . ", - `RID`=" . sql_escape($shift['RID']) . ", + `shifttype_id`='" . sql_escape($shift['shifttype_id']) . "', + `start`='" . sql_escape($shift['start']) . "', + `end`='" . sql_escape($shift['end']) . "', + `RID`='" . sql_escape($shift['RID']) . "', `title`=" . sql_null($shift['title']) . ", `URL`=" . sql_null($shift['URL']) . ", - `PSID`=" . sql_null($shift['PSID'])); + `PSID`=" . sql_null($shift['PSID']) . ", + `created_by_user_id`='" . sql_escape($user['UID']) . "', + `created_at_timestamp`=" . time()); if ($result === false) return false; return sql_id(); @@ -145,7 +163,7 @@ function Shifts_by_user($user) { JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) - WHERE `UID`=" . sql_escape($user['UID']) . " + WHERE `UID`='" . sql_escape($user['UID']) . "' ORDER BY `start` "); } @@ -161,7 +179,7 @@ function Shifts_filtered() { // filterRoom (Array of integer) - Array of Room IDs (optional, for list request) if (isset($_REQUEST['filterRoom']) && is_array($_REQUEST['filterRoom'])) { foreach ($_REQUEST['filterRoom'] as $key => $value) { - $filter .= ", `RID`=" . sql_escape($value) . " "; + $filter .= ", `RID`='" . sql_escape($value) . "' "; } } @@ -206,8 +224,8 @@ function Shift($id) { SELECT `Shifts`.*, `ShiftTypes`.`name` FROM `Shifts` JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) - WHERE `SID`=" . sql_escape($id)); - $shiftsEntry_source = sql_select("SELECT `id`, `TID` , `UID` , `freeloaded` FROM `ShiftEntry` WHERE `SID`=" . sql_escape($id)); + WHERE `SID`='" . sql_escape($id) . "'"); + $shiftsEntry_source = sql_select("SELECT `id`, `TID` , `UID` , `freeloaded` FROM `ShiftEntry` WHERE `SID`='" . sql_escape($id) . "'"); if ($shifts_source === false) return false; diff --git a/includes/model/UserAngelTypes_model.php b/includes/model/UserAngelTypes_model.php index 7dcaef7a..b2ebd9fe 100644 --- a/includes/model/UserAngelTypes_model.php +++ b/includes/model/UserAngelTypes_model.php @@ -8,7 +8,7 @@ function User_angeltypes($user) { SELECT `AngelTypes`.*, `UserAngelTypes`.`confirm_user_id`, `UserAngelTypes`.`coordinator` FROM `UserAngelTypes` JOIN `AngelTypes` ON `UserAngelTypes`.`angeltype_id` = `AngelTypes`.`id` - WHERE `UserAngelTypes`.`user_id`=" . sql_escape($user['UID']) . " + WHERE `UserAngelTypes`.`user_id`='" . sql_escape($user['UID']) . "' "); } @@ -19,13 +19,19 @@ function User_angeltypes($user) { */ function User_unconfirmed_AngelTypes($user) { return sql_select(" - SELECT `UnconfirmedMembers`.*, `AngelTypes`.`name` FROM `UserAngelTypes` + SELECT + `UserAngelTypes`.*, + `AngelTypes`.`name`, + count(`UnconfirmedMembers`.`user_id`) as `count` + FROM `UserAngelTypes` JOIN `AngelTypes` ON `UserAngelTypes`.`angeltype_id`=`AngelTypes`.`id` JOIN `UserAngelTypes` as `UnconfirmedMembers` ON `UserAngelTypes`.`angeltype_id`=`UnconfirmedMembers`.`angeltype_id` - WHERE `UserAngelTypes`.`user_id`=" . sql_escape($user['UID']) . " - AND `UserAngelTypes`.`coordinator`=TRUE - AND `AngelTypes`.`restricted`=TRUE - AND `UnconfirmedMembers`.`confirm_user_id` IS NULL"); + WHERE `UserAngelTypes`.`user_id`='" . sql_escape($user['UID']) . "' + AND `UserAngelTypes`.`coordinator`=TRUE + AND `AngelTypes`.`restricted`=TRUE + AND `UnconfirmedMembers`.`confirm_user_id` IS NULL + GROUP BY `UserAngelTypes`.`angeltype_id` + ORDER BY `AngelTypes`.`name`"); } /** @@ -38,8 +44,8 @@ function User_is_AngelType_coordinator($user, $angeltype) { return (sql_num_query(" SELECT `id` FROM `UserAngelTypes` - WHERE `user_id`=" . sql_escape($user['UID']) . " - AND `angeltype_id`=" . sql_escape($angeltype['id']) . " + WHERE `user_id`='" . sql_escape($user['UID']) . "' + AND `angeltype_id`='" . sql_escape($angeltype['id']) . "' AND `coordinator`=TRUE LIMIT 1") > 0) || in_array('admin_user_angeltypes', privileges_for_user($user['UID'])); } @@ -53,8 +59,8 @@ function User_is_AngelType_coordinator($user, $angeltype) { function UserAngelType_update($user_angeltype_id, $coordinator) { return sql_query(" UPDATE `UserAngelTypes` - SET `coordinator`=" . ($coordinator ? 'TRUE' : 'FALSE') . " - WHERE `id`=" . sql_escape($user_angeltype_id) . " + SET `coordinator`=" . sql_bool($coordinator) . " + WHERE `id`='" . sql_escape($user_angeltype_id) . "' LIMIT 1"); } @@ -66,7 +72,7 @@ function UserAngelType_update($user_angeltype_id, $coordinator) { function UserAngelTypes_delete_all($angeltype_id) { return sql_query(" DELETE FROM `UserAngelTypes` - WHERE `angeltype_id`=" . sql_escape($angeltype_id) . " + WHERE `angeltype_id`='" . sql_escape($angeltype_id) . "' AND `confirm_user_id` IS NULL"); } @@ -79,8 +85,8 @@ function UserAngelTypes_delete_all($angeltype_id) { function UserAngelTypes_confirm_all($angeltype_id, $confirm_user) { return sql_query(" UPDATE `UserAngelTypes` - SET `confirm_user_id`=" . sql_escape($confirm_user['UID']) . " - WHERE `angeltype_id`=" . sql_escape($angeltype_id) . " + SET `confirm_user_id`='" . sql_escape($confirm_user['UID']) . "' + WHERE `angeltype_id`='" . sql_escape($angeltype_id) . "' AND `confirm_user_id` IS NULL"); } @@ -93,8 +99,8 @@ function UserAngelTypes_confirm_all($angeltype_id, $confirm_user) { function UserAngelType_confirm($user_angeltype_id, $confirm_user) { return sql_query(" UPDATE `UserAngelTypes` - SET `confirm_user_id`=" . sql_escape($confirm_user['UID']) . " - WHERE `id`=" . sql_escape($user_angeltype_id) . " + SET `confirm_user_id`='" . sql_escape($confirm_user['UID']) . "' + WHERE `id`='" . sql_escape($user_angeltype_id) . "' LIMIT 1"); } @@ -106,7 +112,7 @@ function UserAngelType_confirm($user_angeltype_id, $confirm_user) { function UserAngelType_delete($user_angeltype) { return sql_query(" DELETE FROM `UserAngelTypes` - WHERE `id`=" . sql_escape($user_angeltype['id']) . " + WHERE `id`='" . sql_escape($user_angeltype['id']) . "' LIMIT 1"); } @@ -119,8 +125,8 @@ function UserAngelType_delete($user_angeltype) { function UserAngelType_create($user, $angeltype) { $result = sql_query(" INSERT INTO `UserAngelTypes` SET - `user_id`=" . sql_escape($user['UID']) . ", - `angeltype_id`=" . sql_escape($angeltype['id'])); + `user_id`='" . sql_escape($user['UID']) . "', + `angeltype_id`='" . sql_escape($angeltype['id']) . "'"); if ($result === false) return false; return sql_id(); @@ -135,7 +141,7 @@ function UserAngelType($user_angeltype_id) { $angeltype = sql_select(" SELECT * FROM `UserAngelTypes` - WHERE `id`=" . sql_escape($user_angeltype_id) . " + WHERE `id`='" . sql_escape($user_angeltype_id) . "' LIMIT 1"); if ($angeltype === false) return false; @@ -154,8 +160,8 @@ function UserAngelType_by_User_and_AngelType($user, $angeltype) { $angeltype = sql_select(" SELECT * FROM `UserAngelTypes` - WHERE `user_id`=" . sql_escape($user['UID']) . " - AND `angeltype_id`=" . sql_escape($angeltype['id']) . " + WHERE `user_id`='" . sql_escape($user['UID']) . "' + AND `angeltype_id`='" . sql_escape($angeltype['id']) . "' LIMIT 1"); if ($angeltype === false) return false; diff --git a/includes/model/UserGroups_model.php b/includes/model/UserGroups_model.php index 1d018386..766f402f 100644 --- a/includes/model/UserGroups_model.php +++ b/includes/model/UserGroups_model.php @@ -9,7 +9,7 @@ function User_groups($user) { SELECT `Groups`.* FROM `UserGroups` JOIN `Groups` ON `Groups`.`UID`=`UserGroups`.`group_id` - WHERE `UserGroups`.`uid`=" . sql_escape($user['UID']) . " + WHERE `UserGroups`.`uid`='" . sql_escape($user['UID']) . "' ORDER BY `UserGroups`.`group_id` "); } diff --git a/includes/model/User_model.php b/includes/model/User_model.php index a6c12f9d..bd3ec31f 100644 --- a/includes/model/User_model.php +++ b/includes/model/User_model.php @@ -5,6 +5,37 @@ */ /** + * Update user. + * + * @param User $user + */ +function User_update($user) { + return sql_query("UPDATE `User` SET + `Nick`='" . sql_escape($user['Nick']) . "', + `Name`='" . sql_escape($user['Name']) . "', + `Vorname`='" . sql_escape($user['Vorname']) . "', + `Alter`='" . sql_escape($user['Alter']) . "', + `Telefon`='" . sql_escape($user['Telefon']) . "', + `DECT`='" . sql_escape($user['DECT']) . "', + `Handy`='" . sql_escape($user['Handy']) . "', + `email`='" . sql_escape($user['email']) . "', + `email_shiftinfo`=" . sql_bool($user['email_shiftinfo']) . ", + `jabber`='" . sql_escape($user['jabber']) . "', + `Size`='" . sql_escape($user['Size']) . "', + `Gekommen`='" . sql_escape($user['Gekommen']) . "', + `Aktiv`='" . sql_escape($user['Aktiv']) . "', + `force_active`=" . sql_bool($user['force_active']) . ", + `Tshirt`='" . sql_escape($user['Tshirt']) . "', + `color`='" . sql_escape($user['color']) . "', + `Sprache`='" . sql_escape($user['Sprache']) . "', + `Hometown`='" . sql_escape($user['Hometown']) . "', + `got_voucher`='" . sql_escape($user['got_voucher']) . "', + `arrival_date`='" . sql_escape($user['arrival_date']) . "', + `planned_arrival_date`='" . sql_escape($user['planned_arrival_date']) . "' + WHERE `UID`='" . sql_escape($user['UID']) . "'"); +} + +/** * Counts all forced active users. */ function User_force_active_count() { @@ -15,6 +46,10 @@ function User_active_count() { return sql_select_single_cell("SELECT COUNT(*) FROM `User` WHERE `Aktiv` = 1"); } +function User_got_voucher_count() { + return sql_select_single_cell("SELECT SUM(`got_voucher`) FROM `User`"); +} + function User_arrived_count() { return sql_select_single_cell("SELECT COUNT(*) FROM `User` WHERE `Gekommen` = 1"); } @@ -39,14 +74,14 @@ function User_sortable_columns() { 'Aktiv', 'force_active', 'Tshirt', - 'lastLogIn' + 'lastLogIn' ); } /** * Get all users, ordered by Nick by default or by given param. * - * @param string $order_by + * @param string $order_by */ function Users($order_by = 'Nick') { return sql_select("SELECT * FROM `User` ORDER BY `" . sql_escape($order_by) . "` ASC"); @@ -55,24 +90,24 @@ function Users($order_by = 'Nick') { /** * Returns true if user is freeloader * - * @param User $user + * @param User $user */ function User_is_freeloader($user) { global $max_freeloadable_shifts, $user; - + return count(ShiftEntries_freeloaded_by_user($user)) >= $max_freeloadable_shifts; } /** * Returns all users that are not member of given angeltype. * - * @param Angeltype $angeltype + * @param Angeltype $angeltype */ function Users_by_angeltype_inverted($angeltype) { return sql_select(" SELECT `User`.* FROM `User` - LEFT JOIN `UserAngelTypes` ON (`User`.`UID`=`UserAngelTypes`.`user_id` AND `angeltype_id`=" . sql_escape($angeltype['id']) . ") + LEFT JOIN `UserAngelTypes` ON (`User`.`UID`=`UserAngelTypes`.`user_id` AND `angeltype_id`='" . sql_escape($angeltype['id']) . "') WHERE `UserAngelTypes`.`id` IS NULL ORDER BY `Nick`"); } @@ -80,7 +115,7 @@ function Users_by_angeltype_inverted($angeltype) { /** * Returns all members of given angeltype. * - * @param Angeltype $angeltype + * @param Angeltype $angeltype */ function Users_by_angeltype($angeltype) { return sql_select(" @@ -91,7 +126,7 @@ function Users_by_angeltype($angeltype) { `UserAngelTypes`.`coordinator` FROM `User` JOIN `UserAngelTypes` ON `User`.`UID`=`UserAngelTypes`.`user_id` - WHERE `UserAngelTypes`.`angeltype_id`=" . sql_escape($angeltype['id']) . " + WHERE `UserAngelTypes`.`angeltype_id`='" . sql_escape($angeltype['id']) . "' ORDER BY `Nick`"); } @@ -105,7 +140,7 @@ function User_ids() { /** * Strip unwanted characters from a users nick. * - * @param string $nick + * @param string $nick */ function User_validate_Nick($nick) { return preg_replace("/([^a-z0-9üöäß. _+*-]{1,})/ui", '', $nick); @@ -114,10 +149,10 @@ function User_validate_Nick($nick) { /** * Returns user by id. * - * @param $id UID + * @param $id UID */ function User($id) { - $user_source = sql_select("SELECT * FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + $user_source = sql_select("SELECT * FROM `User` WHERE `UID`='" . sql_escape($id) . "' LIMIT 1"); if ($user_source === false) return false; if (count($user_source) > 0) @@ -129,10 +164,10 @@ function User($id) { * TODO: Merge into normal user function * Returns user by id (limit informations. * - * @param $id UID + * @param $id UID */ function mUser_Limit($id) { - $user_source = sql_select("SELECT `UID`, `Nick`, `Name`, `Vorname`, `Telefon`, `DECT`, `Handy`, `email`, `jabber`, `Avatar` FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + $user_source = sql_select("SELECT `UID`, `Nick`, `Name`, `Vorname`, `Telefon`, `DECT`, `Handy`, `email`, `jabber` FROM `User` WHERE `UID`='" . sql_escape($id) . "' LIMIT 1"); if ($user_source === false) return false; if (count($user_source) > 0) @@ -159,7 +194,7 @@ function User_by_api_key($api_key) { /** * Returns User by email. * - * @param string $email + * @param string $email * @return Matching user, null or false on error */ function User_by_email($email) { @@ -174,7 +209,7 @@ function User_by_email($email) { /** * Returns User by password token. * - * @param string $token + * @param string $token * @return Matching user, null or false on error */ function User_by_password_recovery_token($token) { @@ -189,7 +224,7 @@ function User_by_password_recovery_token($token) { /** * Generates a new api key for given user. * - * @param User $user + * @param User $user */ function User_reset_api_key(&$user, $log = true) { $user['api_key'] = md5($user['Nick'] . time() . rand()); @@ -197,20 +232,20 @@ function User_reset_api_key(&$user, $log = true) { if ($result === false) return false; if ($log) - engelsystem_log(sprintf("API key resetted (%s).",User_Nick_render($user))); + engelsystem_log(sprintf("API key resetted (%s).", User_Nick_render($user))); } /** * Generates a new password recovery token for given user. * - * @param User $user + * @param User $user */ function User_generate_password_recovery_token(&$user) { $user['password_recovery_token'] = md5($user['Nick'] . time() . rand()); $result = sql_query("UPDATE `User` SET `password_recovery_token`='" . sql_escape($user['password_recovery_token']) . "' WHERE `UID`='" . sql_escape($user['UID']) . "' LIMIT 1"); if ($result === false) return false; - engelsystem_log("Password recovery for " . $user['Nick'] . " started."); + engelsystem_log("Password recovery for " . User_Nick_render($user) . " started."); return $user['password_recovery_token']; } diff --git a/includes/mysqli_provider.php b/includes/mysqli_provider.php index 9f4f1396..f141e0de 100644 --- a/includes/mysqli_provider.php +++ b/includes/mysqli_provider.php @@ -171,6 +171,16 @@ function sql_escape($query) { } /** + * Convert a boolean for mysql-queries. + * + * @param boolean $boolean + * @return string + */ +function sql_bool($boolean) { + return $boolean === true ? 'TRUE' : 'FALSE'; +} + +/** * Count query result lines. * * @param string $query diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php index 08c436fc..e3fa0996 100644 --- a/includes/pages/admin_active.php +++ b/includes/pages/admin_active.php @@ -1,22 +1,27 @@ <?php + function admin_active_title() { return _("Active angels"); } function admin_active() { global $tshirt_sizes, $shift_sum_formula; - + $msg = ""; $search = ""; $forced_count = sql_num_query("SELECT * FROM `User` WHERE `force_active`=1"); $count = $forced_count; $limit = ""; $set_active = ""; + if (isset($_REQUEST['search'])) $search = strip_request_item('search'); + + $show_all_shifts = isset($_REQUEST['show_all_shifts']); + if (isset($_REQUEST['set_active'])) { $ok = true; - + if (isset($_REQUEST['count']) && preg_match("/^[0-9]+$/", $_REQUEST['count'])) { $count = strip_request_item('count'); if ($count < $forced_count) { @@ -27,7 +32,7 @@ function admin_active() { $ok = false; $msg .= error(_("Please enter a number of angels to be marked as active."), true); } - + if ($ok) $limit = " LIMIT " . $count; if (isset($_REQUEST['ack'])) { @@ -42,23 +47,24 @@ function admin_active() { ORDER BY `force_active` DESC, `shift_length` DESC" . $limit); $user_nicks = array(); foreach ($users as $usr) { - sql_query("UPDATE `User` SET `Aktiv` = 1 WHERE `UID`=" . sql_escape($usr['UID'])); + sql_query("UPDATE `User` SET `Aktiv` = 1 WHERE `UID`='" . sql_escape($usr['UID']) . "'"); $user_nicks[] = User_Nick_render($usr); } + sql_query("UPDATE `User` SET `Aktiv`=1 WHERE `force_active`=TRUE"); engelsystem_log("These angels are active now: " . join(", ", $user_nicks)); - + $limit = ""; $msg = success(_("Marked angels."), true); } else { $set_active = '<a href="' . page_link_to('admin_active') . '&serach=' . $search . '">« ' . _("back") . '</a> | <a href="' . page_link_to('admin_active') . '&search=' . $search . '&count=' . $count . '&set_active&ack">' . _("apply") . '</a>'; } } - + if (isset($_REQUEST['active']) && preg_match("/^[0-9]+$/", $_REQUEST['active'])) { $id = $_REQUEST['active']; $user_source = User($id); if ($user_source != null) { - sql_query("UPDATE `User` SET `Aktiv`=1 WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + sql_query("UPDATE `User` SET `Aktiv`=1 WHERE `UID`='" . sql_escape($id) . "' LIMIT 1"); engelsystem_log("User " . User_Nick_render($user_source) . " is active now."); $msg = success(_("Angel has been marked as active."), true); } else @@ -67,7 +73,7 @@ function admin_active() { $id = $_REQUEST['not_active']; $user_source = User($id); if ($user_source != null) { - sql_query("UPDATE `User` SET `Aktiv`=0 WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + sql_query("UPDATE `User` SET `Aktiv`=0 WHERE `UID`='" . sql_escape($id) . "' LIMIT 1"); engelsystem_log("User " . User_Nick_render($user_source) . " is NOT active now."); $msg = success(_("Angel has been marked as not active."), true); } else @@ -76,7 +82,7 @@ function admin_active() { $id = $_REQUEST['tshirt']; $user_source = User($id); if ($user_source != null) { - sql_query("UPDATE `User` SET `Tshirt`=1 WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + sql_query("UPDATE `User` SET `Tshirt`=1 WHERE `UID`='" . sql_escape($id) . "' LIMIT 1"); engelsystem_log("User " . User_Nick_render($user_source) . " has tshirt now."); $msg = success(_("Angel has got a t-shirt."), true); } else @@ -85,21 +91,22 @@ function admin_active() { $id = $_REQUEST['not_tshirt']; $user_source = User($id); if ($user_source != null) { - sql_query("UPDATE `User` SET `Tshirt`=0 WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + sql_query("UPDATE `User` SET `Tshirt`=0 WHERE `UID`='" . sql_escape($id) . "' LIMIT 1"); engelsystem_log("User " . User_Nick_render($user_source) . " has NO tshirt."); $msg = success(_("Angel has got no t-shirt."), true); } else $msg = error(_("Angel not found."), true); } - + $users = sql_select(" SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, ${shift_sum_formula} as `shift_length` FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` - WHERE `User`.`Gekommen` = 1 + WHERE `User`.`Gekommen` = 1 + " . ($show_all_shifts ? "" : "AND (`Shifts`.`end` < " . time() . " OR `Shifts`.`end` IS NULL)") . " GROUP BY `User`.`UID` ORDER BY `force_active` DESC, `shift_length` DESC" . $limit); - + $matched_users = array(); if ($search == "") $tokens = array(); @@ -123,41 +130,47 @@ function admin_active() { $usr['active'] = glyph_bool($usr['Aktiv'] == 1); $usr['force_active'] = glyph_bool($usr['force_active'] == 1); $usr['tshirt'] = glyph_bool($usr['Tshirt'] == 1); - + $actions = array(); if ($usr['Aktiv'] == 0) - $actions[] = '<a href="' . page_link_to('admin_active') . '&active=' . $usr['UID'] . '&search=' . $search . '">' . _("set active") . '</a>'; + $actions[] = '<a href="' . page_link_to('admin_active') . '&active=' . $usr['UID'] . ($show_all_shifts ? '&show_all_shifts=' : '') . '&search=' . $search . '">' . _("set active") . '</a>'; if ($usr['Aktiv'] == 1 && $usr['Tshirt'] == 0) { - $actions[] = '<a href="' . page_link_to('admin_active') . '&not_active=' . $usr['UID'] . '&search=' . $search . '">' . _("remove active") . '</a>'; - $actions[] = '<a href="' . page_link_to('admin_active') . '&tshirt=' . $usr['UID'] . '&search=' . $search . '">' . _("got t-shirt") . '</a>'; + $actions[] = '<a href="' . page_link_to('admin_active') . '&not_active=' . $usr['UID'] . ($show_all_shifts ? '&show_all_shifts=' : '') . '&search=' . $search . '">' . _("remove active") . '</a>'; + $actions[] = '<a href="' . page_link_to('admin_active') . '&tshirt=' . $usr['UID'] . ($show_all_shifts ? '&show_all_shifts=' : '') . '&search=' . $search . '">' . _("got t-shirt") . '</a>'; } if ($usr['Tshirt'] == 1) - $actions[] = '<a href="' . page_link_to('admin_active') . '&not_tshirt=' . $usr['UID'] . '&search=' . $search . '">' . _("remove t-shirt") . '</a>'; - + $actions[] = '<a href="' . page_link_to('admin_active') . '&not_tshirt=' . $usr['UID'] . ($show_all_shifts ? '&show_all_shifts=' : '') . '&search=' . $search . '">' . _("remove t-shirt") . '</a>'; + $usr['actions'] = join(' ', $actions); - + $matched_users[] = $usr; } - - $shirt_statistics = sql_select(" - SELECT `Size`, count(`Size`) AS `count` - FROM `User` - WHERE `Tshirt`=1 - GROUP BY `Size` - ORDER BY `count` DESC"); - $shirt_statistics[] = array( - 'Size' => '<b>' . _("Sum") . '</b>', - 'count' => '<b>' . sql_select_single_cell("SELECT count(*) FROM `User` WHERE `Tshirt`=1") . '</b>' - ); - + + $shirt_statistics = []; + foreach ($tshirt_sizes as $size => $_) { + if ($size != '') { + $shirt_statistics[] = [ + 'size' => $size, + 'needed' => sql_select_single_cell("SELECT count(*) FROM `User` WHERE `Size`='" . sql_escape($size) . "' AND `Gekommen`=1"), + 'given' => sql_select_single_cell("SELECT count(*) FROM `User` WHERE `Size`='" . sql_escape($size) . "' AND `Tshirt`=1") + ]; + } + } + $shirt_statistics[] = [ + 'size' => '<b>' . _("Sum") . '</b>', + 'needed' => '<b>' . User_arrived_count() . '</b>', + 'given' => '<b>' . sql_select_single_cell("SELECT count(*) FROM `User` WHERE `Tshirt`=1") . '</b>' + ]; + return page_with_title(admin_active_title(), array( form(array( form_text('search', _("Search angel:"), $search), - form_submit('submit', _("Search")) - )), + form_checkbox('show_all_shifts', _("Show all shifts"), $show_all_shifts), + form_submit('submit', _("Search")) + ), page_link_to('admin_active')), $set_active == "" ? form(array( form_text('count', _("How much angels should be active?"), $count), - form_submit('set_active', _("Preview")) + form_submit('set_active', _("Preview")) )) : $set_active, msg(), table(array( @@ -168,13 +181,14 @@ function admin_active() { 'active' => _("Active?"), 'force_active' => _("Forced"), 'tshirt' => _("T-shirt?"), - 'actions' => "" + 'actions' => "" ), $matched_users), - '<h2>' . _("Given shirts") . '</h2>', + '<h2>' . _("Shirt statistics") . '</h2>', table(array( - 'Size' => _("Size"), - 'count' => _("Count") - ), $shirt_statistics) + 'size' => _("Size"), + 'needed' => _("Needed shirts"), + 'given' => _("Given shirts") + ), $shirt_statistics) )); } ?> diff --git a/includes/pages/admin_arrive.php b/includes/pages/admin_arrive.php index bec1ae56..64cf785d 100644 --- a/includes/pages/admin_arrive.php +++ b/includes/pages/admin_arrive.php @@ -1,4 +1,5 @@ <?php + function admin_arrive_title() { return _("Arrived angels"); } @@ -13,7 +14,7 @@ function admin_arrive() { $id = $_REQUEST['reset']; $user_source = User($id); if ($user_source != null) { - sql_query("UPDATE `User` SET `Gekommen`=0 WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + sql_query("UPDATE `User` SET `Gekommen`=0, `arrival_date` = NULL WHERE `UID`='" . sql_escape($id) . "' LIMIT 1"); engelsystem_log("User set to not arrived: " . User_Nick_render($user_source)); $msg = success(_("Reset done. Angel has not arrived."), true); } else @@ -22,7 +23,7 @@ function admin_arrive() { $id = $_REQUEST['arrived']; $user_source = User($id); if ($user_source != null) { - sql_query("UPDATE `User` SET `Gekommen`=1 WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + sql_query("UPDATE `User` SET `Gekommen`=1, `arrival_date`='" . time() . "' WHERE `UID`='" . sql_escape($id) . "' LIMIT 1"); engelsystem_log("User set has arrived: " . User_Nick_render($user_source)); $msg = success(_("Angel has been marked as arrived."), true); } else @@ -30,10 +31,12 @@ function admin_arrive() { } $users = sql_select("SELECT * FROM `User` ORDER BY `Nick`"); + $arrival_count_at_day = []; + $departure_count_at_day = []; $table = ""; - $users_matched = array(); + $users_matched = []; if ($search == "") - $tokens = array(); + $tokens = []; else $tokens = explode(" ", $search); foreach ($users as $usr) { @@ -48,18 +51,53 @@ function admin_arrive() { if (! $match) continue; } - $table .= '<tr>'; - $table .= '<td>' . User_Nick_render($usr) . '</td>'; + $usr['nick'] = User_Nick_render($usr); + if ($usr['planned_departure_date'] != null) + $usr['rendered_planned_departure_date'] = date('Y-m-d', $usr['planned_departure_date']); + else + $usr['rendered_planned_departure_date'] = '-'; + $usr['rendered_planned_arrival_date'] = date('Y-m-d', $usr['planned_arrival_date']); + $usr['rendered_arrival_date'] = $usr['arrival_date'] > 0 ? date('Y-m-d', $usr['arrival_date']) : "-"; $usr['arrived'] = $usr['Gekommen'] == 1 ? _("yes") : ""; $usr['actions'] = $usr['Gekommen'] == 1 ? '<a href="' . page_link_to('admin_arrive') . '&reset=' . $usr['UID'] . '&search=' . $search . '">' . _("reset") . '</a>' : '<a href="' . page_link_to('admin_arrive') . '&arrived=' . $usr['UID'] . '&search=' . $search . '">' . _("arrived") . '</a>'; - if ($usr['Gekommen'] == 1) - $table .= '<td>yes</td><td><a href="' . page_link_to('admin_arrive') . '&reset=' . $usr['UID'] . '&search=' . $search . '">reset</a></td>'; - else - $table .= '<td></td><td><a href="' . page_link_to('admin_arrive') . '&arrived=' . $usr['UID'] . '&search=' . $search . '">arrived</a></td>'; - $table .= '</tr>'; + + $day = $usr['arrival_date'] > 0 ? date('Y-m-d', $usr['arrival_date']) : date('Y-m-d', $usr['planned_arrival_date']); + if (! isset($arrival_count_at_day[$day])) + $arrival_count_at_day[$day] = 0; + if (! isset($departure_count_at_day[$day])) + $departure_count_at_day[$day] = 0; + $arrival_count_at_day[$day] ++; + + if ($usr['planned_departure_date'] != null) { + $day = date('Y-m-d', $usr['planned_departure_date']); + if (! isset($arrival_count_at_day[$day])) + $arrival_count_at_day[$day] = 0; + if (! isset($departure_count_at_day[$day])) + $departure_count_at_day[$day] = 0; + $departure_count_at_day[$day] ++; + } + $users_matched[] = $usr; } + + ksort($arrival_count_at_day); + ksort($departure_count_at_day); + + $arrival_count = []; + $arrival_sums = []; + $arrival_sum = 0; + foreach ($arrival_count_at_day as $day => $count) { + $arrival_sum += $count - $departure_count_at_day[$day]; + $arrival_sums[$day] = $arrival_sum; + $arrival_count[] = [ + 'day' => $day, + 'count' => $count, + 'sum' => $arrival_sum, + 'departure' => isset($departure_count_at_day[$day]) ? $departure_count_at_day[$day] : 0 + ]; + } + return page_with_title(admin_arrive_title(), array( msg(), form(array( @@ -68,9 +106,45 @@ function admin_arrive() { )), table(array( 'nick' => _("Nickname"), + 'rendered_planned_arrival_date' => _("Planned arrival"), 'arrived' => _("Arrived?"), + 'rendered_arrival_date' => _("Arrival date"), + 'rendered_planned_departure_date' => _("Planned departure"), 'actions' => "" - ), $users_matched) + ), $users_matched), + heading(_("Arrival statistics"), 2), + '<canvas id="daily_arrives" style="width: 100%; height: 300px;"></canvas> + <script type="text/javascript"> + $(function(){ + var ctx = $("#daily_arrives").get(0).getContext("2d"); + var chart = new Chart(ctx).Bar(' . json_encode(array( + 'labels' => array_keys($arrival_count_at_day), + 'datasets' => array( + array( + 'label' => _("arrived"), + 'fillColor' => "#090", + 'data' => array_values($arrival_count_at_day) + ), + array( + 'label' => _("arrived sum"), + 'fillColor' => "#888", + 'data' => array_values($arrival_sums) + ), + array( + 'label' => _("planned departure"), + 'fillColor' => "#900", + 'data' => array_values($departure_count_at_day) + ) + ) + )) . '); + }); + </script>', + table(array( + 'day' => _("Date"), + 'count' => _("arrived"), + 'sum' => _("arrived sum"), + 'departure' => _("planned departure") + ), $arrival_count) )); } ?> diff --git a/includes/pages/admin_free.php b/includes/pages/admin_free.php index b56da4d1..227769dc 100644 --- a/includes/pages/admin_free.php +++ b/includes/pages/admin_free.php @@ -32,7 +32,7 @@ function admin_free() { 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()) . ") + 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`"); diff --git a/includes/pages/admin_groups.php b/includes/pages/admin_groups.php index 3133cf8b..f43c63e9 100644 --- a/includes/pages/admin_groups.php +++ b/includes/pages/admin_groups.php @@ -11,7 +11,7 @@ function admin_groups() { if (! isset($_REQUEST["action"])) { $groups_table = array(); foreach ($groups as $group) { - $privileges = sql_select("SELECT * FROM `GroupPrivileges` JOIN `Privileges` ON (`GroupPrivileges`.`privilege_id` = `Privileges`.`id`) WHERE `group_id`=" . sql_escape($group['UID'])); + $privileges = sql_select("SELECT * FROM `GroupPrivileges` JOIN `Privileges` ON (`GroupPrivileges`.`privilege_id` = `Privileges`.`id`) WHERE `group_id`='" . sql_escape($group['UID']) . "'"); $privileges_html = array(); foreach ($privileges as $priv) @@ -39,10 +39,10 @@ function admin_groups() { else return error("Incomplete call, missing Groups ID.", true); - $room = sql_select("SELECT * FROM `Groups` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + $room = sql_select("SELECT * FROM `Groups` WHERE `UID`='" . sql_escape($id) . "' LIMIT 1"); if (count($room) > 0) { 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 = 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 = ""; $privileges_form = array(); foreach ($privileges as $priv) { @@ -64,18 +64,18 @@ function admin_groups() { else return error("Incomplete call, missing Groups ID.", true); - $room = sql_select("SELECT * FROM `Groups` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + $room = sql_select("SELECT * FROM `Groups` WHERE `UID`='" . sql_escape($id) . "' LIMIT 1"); if (! is_array($_REQUEST['privileges'])) $_REQUEST['privileges'] = array(); if (count($room) > 0) { list($room) = $room; - sql_query("DELETE FROM `GroupPrivileges` WHERE `group_id`=" . sql_escape($id)); + 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"); + $group_privileges_source = sql_select("SELECT * FROM `Privileges` WHERE `id`='" . sql_escape($priv) . "' LIMIT 1"); if (count($group_privileges_source) > 0) { - sql_query("INSERT INTO `GroupPrivileges` SET `group_id`=" . sql_escape($id) . ", `privilege_id`=" . sql_escape($priv)); + 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_import.php b/includes/pages/admin_import.php index 786ea08b..63104026 100644 --- a/includes/pages/admin_import.php +++ b/includes/pages/admin_import.php @@ -162,7 +162,9 @@ function admin_import() { list($rooms_new, $rooms_deleted) = prepare_rooms($import_file); foreach ($rooms_new as $room) { - sql_query("INSERT INTO `Room` SET `Name`='" . sql_escape($room) . "', `FromPentabarf`='Y', `Show`='Y'"); + $result = Room_create($room, true, true); + if ($result === false) + engelsystem_error('Unable to create room.'); $rooms_import[trim($room)] = sql_id(); } foreach ($rooms_deleted as $room) diff --git a/includes/pages/admin_news.php b/includes/pages/admin_news.php index 0653a045..1c435a14 100644 --- a/includes/pages/admin_news.php +++ b/includes/pages/admin_news.php @@ -11,7 +11,7 @@ function admin_news() { else return error("Incomplete call, missing News ID.", true); - $news = sql_select("SELECT * FROM `News` WHERE `ID`=" . sql_escape($id) . " LIMIT 1"); + $news = sql_select("SELECT * FROM `News` WHERE `ID`='" . sql_escape($id) . "' LIMIT 1"); if (count($news) > 0) { switch ($_REQUEST["action"]) { default: @@ -38,7 +38,13 @@ function admin_news() { case 'save': list($news) = $news; - sql_query("UPDATE `News` SET `Datum`='" . sql_escape(time()) . "', `Betreff`='" . sql_escape($_POST["eBetreff"]) . "', `Text`='" . sql_escape($_POST["eText"]) . "', `UID`='" . sql_escape($user['UID']) . "', `Treffen`='" . sql_escape($_POST["eTreffen"]) . "' WHERE `ID`=" . sql_escape($id) . " LIMIT 1"); + sql_query("UPDATE `News` SET + `Datum`='" . sql_escape(time()) . "', + `Betreff`='" . sql_escape($_POST["eBetreff"]) . "', + `Text`='" . sql_escape($_POST["eText"]) . "', + `UID`='" . sql_escape($user['UID']) . "', + `Treffen`='" . sql_escape($_POST["eTreffen"]) . "' + WHERE `ID`='" . sql_escape($id) . "'"); engelsystem_log("News updated: " . $_POST["eBetreff"]); success(_("News entry updated.")); redirect(page_link_to("news")); @@ -47,7 +53,7 @@ function admin_news() { case 'delete': list($news) = $news; - sql_query("DELETE FROM `News` WHERE `ID`=" . sql_escape($id) . " LIMIT 1"); + sql_query("DELETE FROM `News` WHERE `ID`='" . sql_escape($id) . "' LIMIT 1"); engelsystem_log("News deleted: " . $news['Betreff']); success(_("News entry deleted.")); redirect(page_link_to("news")); diff --git a/includes/pages/admin_questions.php b/includes/pages/admin_questions.php index 6d141251..e2fef880 100644 --- a/includes/pages/admin_questions.php +++ b/includes/pages/admin_questions.php @@ -82,12 +82,12 @@ function admin_questions() { else return error("Incomplete call, missing Question ID.", true); - $question = sql_select("SELECT * FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1"); + $question = sql_select("SELECT * FROM `Questions` WHERE `QID`='" . sql_escape($id) . "' LIMIT 1"); if (count($question) > 0 && $question[0]['AID'] == null) { $answer = trim(preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['answer']))); if ($answer != "") { - sql_query("UPDATE `Questions` SET `AID`=" . sql_escape($user['UID']) . ", `Answer`='" . sql_escape($answer) . "' WHERE `QID`=" . sql_escape($id) . " LIMIT 1"); + sql_query("UPDATE `Questions` SET `AID`='" . sql_escape($user['UID']) . "', `Answer`='" . sql_escape($answer) . "' WHERE `QID`='" . sql_escape($id) . "' LIMIT 1"); engelsystem_log("Question " . $question[0]['Question'] . " answered: " . $answer); redirect(page_link_to("admin_questions")); } else @@ -101,9 +101,9 @@ function admin_questions() { else return error("Incomplete call, missing Question ID.", true); - $question = sql_select("SELECT * FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1"); + $question = sql_select("SELECT * FROM `Questions` WHERE `QID`='" . sql_escape($id) . "' LIMIT 1"); if (count($question) > 0) { - sql_query("DELETE FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1"); + sql_query("DELETE FROM `Questions` WHERE `QID`='" . sql_escape($id) . "' LIMIT 1"); engelsystem_log("Question deleted: " . $question[0]['Question']); redirect(page_link_to("admin_questions")); } else diff --git a/includes/pages/admin_rooms.php b/includes/pages/admin_rooms.php index 1c10321e..2d5e5ae4 100644 --- a/includes/pages/admin_rooms.php +++ b/includes/pages/admin_rooms.php @@ -1,11 +1,12 @@ <?php + function admin_rooms_title() { return _("Rooms"); } function admin_rooms() { global $user; - + $rooms_source = sql_select("SELECT * FROM `Room` ORDER BY `Name`"); $rooms = array(); foreach ($rooms_source as $room) @@ -15,17 +16,17 @@ function admin_rooms() { 'public' => $room['show'] == 'Y' ? '✓' : '', 'actions' => buttons(array( button(page_link_to('admin_rooms') . '&show=edit&id=' . $room['RID'], _("edit"), 'btn-xs'), - button(page_link_to('admin_rooms') . '&show=delete&id=' . $room['RID'], _("delete"), 'btn-xs') - )) + button(page_link_to('admin_rooms') . '&show=delete&id=' . $room['RID'], _("delete"), 'btn-xs') + )) ); - + if (isset($_REQUEST['show'])) { $msg = ""; $name = ""; $from_pentabarf = ""; $public = 'Y'; $number = ""; - + $angeltypes_source = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`"); $angeltypes = array(); $angeltypes_count = array(); @@ -33,47 +34,47 @@ function admin_rooms() { $angeltypes[$angeltype['id']] = $angeltype['name']; $angeltypes_count[$angeltype['id']] = 0; } - + if (test_request_int('id')) { - $room = sql_select("SELECT * FROM `Room` WHERE `RID`=" . sql_escape($_REQUEST['id'])); + $room = sql_select("SELECT * FROM `Room` WHERE `RID`='" . sql_escape($_REQUEST['id']) . "'"); if (count($room) > 0) { $id = $_REQUEST['id']; $name = $room[0]['Name']; $from_pentabarf = $room[0]['FromPentabarf']; $public = $room[0]['show']; - $needed_angeltypes = sql_select("SELECT * FROM `NeededAngelTypes` WHERE `room_id`=" . sql_escape($id)); + $needed_angeltypes = sql_select("SELECT * FROM `NeededAngelTypes` WHERE `room_id`='" . sql_escape($id) . "'"); foreach ($needed_angeltypes as $needed_angeltype) $angeltypes_count[$needed_angeltype['angel_type_id']] = $needed_angeltype['count']; } else redirect(page_link_to('admin_rooms')); } - + if ($_REQUEST['show'] == 'edit') { if (isset($_REQUEST['submit'])) { $ok = true; - + if (isset($_REQUEST['name']) && strlen(strip_request_item('name')) > 0) $name = strip_request_item('name'); else { $ok = false; $msg .= error(_("Please enter a name."), true); } - + if (isset($_REQUEST['from_pentabarf'])) $from_pentabarf = 'Y'; else $from_pentabarf = ''; - + if (isset($_REQUEST['public'])) $public = 'Y'; else $public = ''; - + if (isset($_REQUEST['number'])) $number = strip_request_item('number'); else $ok = false; - + foreach ($angeltypes as $angeltype_id => $angeltype) { if (isset($_REQUEST['angeltype_count_' . $angeltype_id]) && preg_match("/^[0-9]{1,4}$/", $_REQUEST['angeltype_count_' . $angeltype_id])) $angeltypes_count[$angeltype_id] = $_REQUEST['angeltype_count_' . $angeltype_id]; @@ -82,27 +83,30 @@ function admin_rooms() { $msg .= error(sprintf(_("Please enter needed angels for type %s.", $angeltype)), true); } } - + if ($ok) { if (isset($id)) { - sql_query("UPDATE `Room` SET `Name`='" . sql_escape($name) . "', `FromPentabarf`='" . sql_escape($from_pentabarf) . "', `show`='" . sql_escape($public) . "', `Number`='" . sql_escape($number) . "' WHERE `RID`=" . sql_escape($id) . " LIMIT 1"); + sql_query("UPDATE `Room` SET `Name`='" . sql_escape($name) . "', `FromPentabarf`='" . sql_escape($from_pentabarf) . "', `show`='" . sql_escape($public) . "', `Number`='" . sql_escape($number) . "' WHERE `RID`='" . sql_escape($id) . "' LIMIT 1"); engelsystem_log("Room updated: " . $name . ", pentabarf import: " . $from_pentabarf . ", public: " . $public . ", number: " . $number); } else { - sql_query("INSERT INTO `Room` SET `Name`='" . sql_escape($name) . "', `FromPentabarf`='" . sql_escape($from_pentabarf) . "', `show`='" . sql_escape($public) . "', `Number`='" . sql_escape($number) . "'"); - $id = sql_id(); + $id = Room_create($name, $from_pentabarf, $public, $number); + if ($id === false) + engelsystem_error("Unable to create room."); engelsystem_log("Room created: " . $name . ", pentabarf import: " . $from_pentabarf . ", public: " . $public . ", number: " . $number); } - - sql_query("DELETE FROM `NeededAngelTypes` WHERE `room_id`=" . sql_escape($id)); + + sql_query("DELETE FROM `NeededAngelTypes` WHERE `room_id`='" . sql_escape($id) . "'"); $needed_angeltype_info = array(); foreach ($angeltypes_count as $angeltype_id => $angeltype_count) { - $angeltype_source = sql_select("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($angeltype_id) . " LIMIT 1"); - if (count($angeltype_source) > 0) { - sql_query("INSERT INTO `NeededAngelTypes` SET `room_id`=" . sql_escape($id) . ", `angel_type_id`=" . sql_escape($angeltype_id) . ", `count`=" . sql_escape($angeltype_count)); - $needed_angeltype_info[] = $angeltypes_source[0]['name'] . ": " . $angeltype_count; + $angeltype = AngelType($angeltype_id); + if ($angeltype === false) + engelsystem_error("Unable to load angeltype."); + if ($angeltype != null) { + sql_query("INSERT INTO `NeededAngelTypes` SET `room_id`='" . sql_escape($id) . "', `angel_type_id`='" . sql_escape($angeltype_id) . "', `count`='" . sql_escape($angeltype_count) . "'"); + $needed_angeltype_info[] = $angeltype['name'] . ": " . $angeltype_count; } } - + engelsystem_log("Set needed angeltypes of room " . $name . " to: " . join(", ", $needed_angeltype_info)); success(_("Room saved.")); redirect(page_link_to("admin_rooms")); @@ -110,66 +114,68 @@ function admin_rooms() { } $angeltypes_count_form = array(); foreach ($angeltypes as $angeltype_id => $angeltype) - $angeltypes_count_form[] = div('col-lg-4 col-md-6 col-xs-6', array(form_spinner('angeltype_count_' . $angeltype_id, $angeltype, $angeltypes_count[$angeltype_id]))); - + $angeltypes_count_form[] = div('col-lg-4 col-md-6 col-xs-6', array( + form_spinner('angeltype_count_' . $angeltype_id, $angeltype, $angeltypes_count[$angeltype_id]) + )); + return page_with_title(admin_rooms_title(), array( buttons(array( - button(page_link_to('admin_rooms'), _("back"), 'back') + button(page_link_to('admin_rooms'), _("back"), 'back') )), $msg, form(array( - div('row', array( - div('col-md-6', array( - form_text('name', _("Name"), $name), - form_checkbox('from_pentabarf', _("Frab import"), $from_pentabarf), - form_checkbox('public', _("Public"), $public), - form_text('number', _("Room number"), $number) - )), - div('col-md-6', array( - div('row', array( - div('col-md-12', array( - form_info(_("Needed angels:")), + div('row', array( + div('col-md-6', array( + form_text('name', _("Name"), $name), + form_checkbox('from_pentabarf', _("Frab import"), $from_pentabarf), + form_checkbox('public', _("Public"), $public), + form_text('number', _("Room number"), $number) )), - join($angeltypes_count_form) - )) - )) - )), - form_submit('submit', _("Save")) - )) + div('col-md-6', array( + div('row', array( + div('col-md-12', array( + form_info(_("Needed angels:")) + )), + join($angeltypes_count_form) + )) + )) + )), + form_submit('submit', _("Save")) + )) )); } elseif ($_REQUEST['show'] == 'delete') { if (isset($_REQUEST['ack'])) { - sql_query("DELETE FROM `Room` WHERE `RID`=" . sql_escape($id) . " LIMIT 1"); - sql_query("DELETE FROM `NeededAngelTypes` WHERE `room_id`=" . sql_escape($id) . " LIMIT 1"); - + sql_query("DELETE FROM `Room` WHERE `RID`='" . sql_escape($id) . "' LIMIT 1"); + sql_query("DELETE FROM `NeededAngelTypes` WHERE `room_id`='" . sql_escape($id) . "' LIMIT 1"); + engelsystem_log("Room deleted: " . $name); success(sprintf(_("Room %s deleted."), $name)); redirect(page_link_to('admin_rooms')); } - + return page_with_title(admin_rooms_title(), array( buttons(array( - button(page_link_to('admin_rooms'), _("back"), 'back') + button(page_link_to('admin_rooms'), _("back"), 'back') )), sprintf(_("Do you want to delete room %s?"), $name), buttons(array( - button(page_link_to('admin_rooms') . '&show=delete&id=' . $id . '&ack', _("Delete"), 'delete') - )) + button(page_link_to('admin_rooms') . '&show=delete&id=' . $id . '&ack', _("Delete"), 'delete') + )) )); } } - + return page_with_title(admin_rooms_title(), array( buttons(array( - button(page_link_to('admin_rooms') . '&show=edit', _("add")) + button(page_link_to('admin_rooms') . '&show=edit', _("add")) )), msg(), table(array( 'name' => _("Name"), 'from_pentabarf' => _("Frab import"), 'public' => _("Public"), - 'actions' => "" - ), $rooms) + 'actions' => "" + ), $rooms) )); } ?> diff --git a/includes/pages/admin_shifts.php b/includes/pages/admin_shifts.php index 733144b3..346e9046 100644 --- a/includes/pages/admin_shifts.php +++ b/includes/pages/admin_shifts.php @@ -10,7 +10,7 @@ function admin_shifts() { $rid = 0; $start = DateTime::createFromFormat("Y-m-d H:i", date("Y-m-d") . " 00:00")->getTimestamp(); - $end = $start + 24 * 60 * 60; + $end = $start; $mode = 'single'; $angelmode = 'manually'; $length = ''; @@ -143,7 +143,7 @@ function admin_shifts() { if ($ok) { if ($angelmode == 'location') { $needed_angel_types = array(); - $needed_angel_types_location = sql_select("SELECT * FROM `NeededAngelTypes` WHERE `room_id`=" . sql_escape($rid)); + $needed_angel_types_location = sql_select("SELECT * FROM `NeededAngelTypes` WHERE `room_id`='" . sql_escape($rid) . "'"); foreach ($needed_angel_types_location as $type) $needed_angel_types[$type['angel_type_id']] = $type['count']; } @@ -206,7 +206,7 @@ function admin_shifts() { 'start' => $shift_start, 'end' => $shift_end, 'RID' => $rid, - 'name' => $title, + 'title' => $title, 'shifttype_id' => $shifttype_id ); @@ -269,12 +269,12 @@ function admin_shifts() { if ($shift_id === false) engelsystem_error('Unable to create shift.'); - engelsystem_log("Shift created: " . $shift['name'] . " from " . date("Y-m-d H:i", $shift['start']) . " to " . date("Y-m-d H:i", $shift['end'])); + engelsystem_log("Shift created: " . $shifttypes[$shift['shifttype_id']] . " with title " . $shift['title'] . " from " . date("Y-m-d H:i", $shift['start']) . " to " . date("Y-m-d H:i", $shift['end'])); $needed_angel_types_info = array(); foreach ($_SESSION['admin_shifts_types'] as $type_id => $count) { - $angel_type_source = sql_select("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($type_id) . " LIMIT 1"); + $angel_type_source = sql_select("SELECT * FROM `AngelTypes` WHERE `id`='" . sql_escape($type_id) . "' LIMIT 1"); if (count($angel_type_source) > 0) { - sql_query("INSERT INTO `NeededAngelTypes` SET `shift_id`=" . sql_escape($shift_id) . ", `angel_type_id`=" . sql_escape($type_id) . ", `count`=" . sql_escape($count)); + sql_query("INSERT INTO `NeededAngelTypes` SET `shift_id`='" . sql_escape($shift_id) . "', `angel_type_id`='" . sql_escape($type_id) . "', `count`='" . sql_escape($count) . "'"); $needed_angel_types_info[] = $angel_type_source[0]['name'] . ": " . $count; } } @@ -293,7 +293,7 @@ function admin_shifts() { $room_select = html_select_key('rid', 'rid', $room_array, $_REQUEST['rid']); $angel_types = ""; foreach ($types as $type) - $angel_types .= form_spinner('type_' . $type['id'], $type['name'], $needed_angel_types[$type['id']]); + $angel_types .= '<div class="col-md-4">' . form_spinner('type_' . $type['id'], $type['name'], $needed_angel_types[$type['id']]) . '</div>'; return page_with_title(admin_shifts_title(), array( msg(), @@ -316,7 +316,7 @@ function admin_shifts() { form_info(_("Needed angels"), ''), form_radio('angelmode', _("Take needed angels from room settings"), $angelmode == 'location', 'location'), form_radio('angelmode', _("The following angels are needed"), $angelmode == 'manually', 'manually'), - $angel_types, + '<div class="row">'.$angel_types.'</div>', '</div>', '</div>', form_submit('preview', _("Preview")) diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php index 4e10ca1e..ee244925 100644 --- a/includes/pages/admin_user.php +++ b/includes/pages/admin_user.php @@ -9,224 +9,174 @@ function admin_user() { $html = ''; - if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['id']) && sql_num_query("SELECT * FROM `User` WHERE `UID`=" . sql_escape($_REQUEST['id'])) > 0) { - $id = $_REQUEST['id']; - if (! isset($_REQUEST['action'])) { - $html .= "Hallo,<br />" . "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' " . "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, " . "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. " . "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel " . "bereits sein T-Shirt erhalten hat.<br /><br />\n"; - - $html .= "<form action=\"" . page_link_to("admin_user") . "&action=save&id=$id\" method=\"post\">\n"; - $html .= "<table border=\"0\">\n"; - $html .= "<input type=\"hidden\" name=\"Type\" value=\"Normal\">\n"; - - $SQL = "SELECT * FROM `User` WHERE `UID`='" . sql_escape($id) . "'"; - $Erg = sql_query($SQL); - list($user_source) = sql_select($SQL); - - $html .= "<tr><td>\n"; - $html .= "<table>\n"; - $html .= " <tr><td>Nick</td><td>" . "<input type=\"text\" size=\"40\" name=\"eNick\" value=\"" . $user_source['Nick'] . "\"></td></tr>\n"; - $html .= " <tr><td>lastLogIn</td><td>" . date("Y-m-d H:i", $user_source['lastLogIn']) . "</td></tr>\n"; - $html .= " <tr><td>Name</td><td>" . "<input type=\"text\" size=\"40\" name=\"eName\" value=\"" . $user_source['Name'] . "\"></td></tr>\n"; - $html .= " <tr><td>Vorname</td><td>" . "<input type=\"text\" size=\"40\" name=\"eVorname\" value=\"" . $user_source['Vorname'] . "\"></td></tr>\n"; - $html .= " <tr><td>Alter</td><td>" . "<input type=\"text\" size=\"5\" name=\"eAlter\" value=\"" . $user_source['Alter'] . "\"></td></tr>\n"; - $html .= " <tr><td>Telefon</td><td>" . "<input type=\"text\" size=\"40\" name=\"eTelefon\" value=\"" . $user_source['Telefon'] . "\"></td></tr>\n"; - $html .= " <tr><td>Handy</td><td>" . "<input type=\"text\" size=\"40\" name=\"eHandy\" value=\"" . $user_source['Handy'] . "\"></td></tr>\n"; - $html .= " <tr><td>DECT</td><td>" . "<input type=\"text\" size=\"4\" name=\"eDECT\" value=\"" . $user_source['DECT'] . "\"></td></tr>\n"; - $html .= " <tr><td>email</td><td>" . "<input type=\"text\" size=\"40\" name=\"eemail\" value=\"" . $user_source['email'] . "\"></td></tr>\n"; - $html .= "<tr><td>".form_checkbox('email_shiftinfo', _("Please send me an email if my shifts change"), $user_source['email_shiftinfo']) . "</td></tr>\n"; - $html .= " <tr><td>jabber</td><td>" . "<input type=\"text\" size=\"40\" name=\"ejabber\" value=\"" . $user_source['jabber'] . "\"></td></tr>\n"; - $html .= " <tr><td>Size</td><td>" . html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size']) . "</td></tr>\n"; - - $options = array( - '1' => "Yes", - '0' => "No" - ); - - // Gekommen? - $html .= " <tr><td>Gekommen</td><td>\n"; - $html .= html_options('eGekommen', $options, $user_source['Gekommen']) . "</td></tr>\n"; - - // Aktiv? - $html .= " <tr><td>Aktiv</td><td>\n"; - $html .= html_options('eAktiv', $options, $user_source['Aktiv']) . "</td></tr>\n"; - - // Aktiv erzwingen - if (in_array('admin_active', $privileges)) { - $html .= " <tr><td>" . _("Force active") . "</td><td>\n"; - $html .= html_options('force_active', $options, $user_source['force_active']) . "</td></tr>\n"; - } - - // T-Shirt bekommen? - $html .= " <tr><td>T-Shirt</td><td>\n"; - $html .= html_options('eTshirt', $options, $user_source['Tshirt']) . "</td></tr>\n"; - - $html .= " <tr><td>Hometown</td><td>" . "<input type=\"text\" size=\"40\" name=\"Hometown\" value=\"" . $user_source['Hometown'] . "\"></td></tr>\n"; - - $html .= "</table>\n</td><td valign=\"top\">" . User_Avatar_render($user_source) . "</td></tr>"; - - $html .= "</td></tr>\n"; - $html .= "</table>\n<br />\n"; - $html .= "<input type=\"submit\" value=\"Speichern\">\n"; - $html .= "</form>"; - - $html .= "<hr />"; - - // UserAngelType subform - list($user_source) = sql_select($SQL); - - $selected_angel_types = sql_select_single_col("SELECT `angeltype_id` FROM `UserAngelTypes` WHERE `user_id`=" . sql_escape($user_source['UID'])); - $accepted_angel_types = sql_select_single_col("SELECT `angeltype_id` FROM `UserAngelTypes` WHERE `user_id`=" . sql_escape($user_source['UID']) . " AND `confirm_user_id` IS NOT NULL"); - $nonrestricted_angel_types = sql_select_single_col("SELECT `id` FROM `AngelTypes` WHERE `restricted` = 0"); - - $angel_types_source = sql_select("SELECT `id`, `name` FROM `AngelTypes` ORDER BY `name`"); - $angel_types = array(); - foreach ($angel_types_source as $angel_type) - $angel_types[$angel_type['id']] = $angel_type['name']; - - if (isset($_REQUEST['submit_user_angeltypes'])) { - $selected_angel_types = isset($_REQUEST['selected_angel_types']) && is_array($_REQUEST['selected_angel_types']) ? array_intersect($_REQUEST['selected_angel_types'], array_keys($angel_types)) : array(); - $accepted_angel_types = isset($_REQUEST['accepted_angel_types']) && is_array($_REQUEST['accepted_angel_types']) ? array_unique(array_diff(array_intersect($_REQUEST['accepted_angel_types'], array_keys($angel_types)), $nonrestricted_angel_types)) : array(); - if (in_array("admin_user_angeltypes", $privileges)) - $selected_angel_types = array_merge((array) $selected_angel_types, $accepted_angel_types); - $selected_angel_types = array_unique($selected_angel_types); - - // Assign angel-types - sql_transaction_start(); - sql_query("DELETE FROM `UserAngelTypes` WHERE `user_id`=" . sql_escape($user_source['UID'])); - $user_angel_type_info = array(); - if (! empty($selected_angel_types)) { - $SQL = "INSERT INTO `UserAngelTypes` (`user_id`, `angeltype_id`) VALUES "; - foreach ($selected_angel_types as $selected_angel_type_id) { - $SQL .= "(" . $user_source['UID'] . ", " . $selected_angel_type_id . "),"; - $user_angel_type_info[] = $angel_types[$selected_angel_type_id] . (in_array($selected_angel_type_id, $accepted_angel_types) ? ' (confirmed)' : ''); - } - // remove superfluous comma - $SQL = substr($SQL, 0, - 1); - sql_query($SQL); - } - if (in_array("admin_user_angeltypes", $privileges)) { - sql_query("UPDATE `UserAngelTypes` SET `confirm_user_id` = NULL WHERE `user_id` = " . sql_escape($user_source['UID'])); - if (! empty($accepted_angel_types)) - sql_query("UPDATE `UserAngelTypes` SET `confirm_user_id` = '" . sql_escape($user['UID']) . "' WHERE `user_id` = '" . sql_escape($user_source['UID']) . "' AND `angeltype_id` IN (" . implode(',', $accepted_angel_types) . ")"); - } - sql_transaction_commit(); - - engelsystem_log("Set angeltypes of " . User_Nick_render($user_source) . " to: " . join(", ", $user_angel_type_info)); - success("Angeltypes saved."); - redirect(page_link_to('admin_user') . '&id=' . $user_source['UID']); - } - - $html .= form(array( - msg(), - form_multi_checkboxes(array( - 'selected_angel_types' => 'gewünscht', - 'accepted_angel_types' => 'akzeptiert' - ), "Angeltypes", $angel_types, array( - 'selected_angel_types' => $selected_angel_types, - 'accepted_angel_types' => array_merge($accepted_angel_types, $nonrestricted_angel_types) - ), array( - 'accepted_angel_types' => $nonrestricted_angel_types - )), - form_submit('submit_user_angeltypes', _("Save")) - )); - - $html .= "<hr />"; - - $html .= "Hier kannst Du das Passwort dieses Engels neu setzen:<form action=\"" . page_link_to("admin_user") . "&action=change_pw&id=$id\" method=\"post\">\n"; - $html .= "<table>\n"; - $html .= " <tr><td>Passwort</td><td>" . "<input type=\"password\" size=\"40\" name=\"new_pw\" value=\"\"></td></tr>\n"; - $html .= " <tr><td>Wiederholung</td><td>" . "<input type=\"password\" size=\"40\" name=\"new_pw2\" value=\"\"></td></tr>\n"; - - $html .= "</table>"; - $html .= "<input type=\"submit\" value=\"Speichern\">\n"; - $html .= "</form>"; - - $html .= "<hr />"; - + if (! isset($_REQUEST['id'])) + redirect(users_link()); + + $id = $_REQUEST['id']; + if (! isset($_REQUEST['action'])) { + $user_source = User($id); + if ($user_source === false) + engelsystem_error('Unable to load user.'); + if ($user_source == null) { + error(_('This user does not exist.')); + redirect(users_link()); + } + + $html .= "Hallo,<br />" . "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' " . "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, " . "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. " . "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel " . "bereits sein T-Shirt erhalten hat.<br /><br />\n"; + + $html .= "<form action=\"" . page_link_to("admin_user") . "&action=save&id=$id\" method=\"post\">\n"; + $html .= "<table border=\"0\">\n"; + $html .= "<input type=\"hidden\" name=\"Type\" value=\"Normal\">\n"; + + $SQL = "SELECT * FROM `User` WHERE `UID`='" . sql_escape($id) . "'"; + list($user_source) = sql_select($SQL); + + $html .= "<tr><td>\n"; + $html .= "<table>\n"; + $html .= " <tr><td>Nick</td><td>" . "<input type=\"text\" size=\"40\" name=\"eNick\" value=\"" . $user_source['Nick'] . "\"></td></tr>\n"; + $html .= " <tr><td>lastLogIn</td><td>" . date("Y-m-d H:i", $user_source['lastLogIn']) . "</td></tr>\n"; + $html .= " <tr><td>Name</td><td>" . "<input type=\"text\" size=\"40\" name=\"eName\" value=\"" . $user_source['Name'] . "\"></td></tr>\n"; + $html .= " <tr><td>Vorname</td><td>" . "<input type=\"text\" size=\"40\" name=\"eVorname\" value=\"" . $user_source['Vorname'] . "\"></td></tr>\n"; + $html .= " <tr><td>Alter</td><td>" . "<input type=\"text\" size=\"5\" name=\"eAlter\" value=\"" . $user_source['Alter'] . "\"></td></tr>\n"; + $html .= " <tr><td>Telefon</td><td>" . "<input type=\"text\" size=\"40\" name=\"eTelefon\" value=\"" . $user_source['Telefon'] . "\"></td></tr>\n"; + $html .= " <tr><td>Handy</td><td>" . "<input type=\"text\" size=\"40\" name=\"eHandy\" value=\"" . $user_source['Handy'] . "\"></td></tr>\n"; + $html .= " <tr><td>DECT</td><td>" . "<input type=\"text\" size=\"4\" name=\"eDECT\" value=\"" . $user_source['DECT'] . "\"></td></tr>\n"; + $html .= " <tr><td>email</td><td>" . "<input type=\"text\" size=\"40\" name=\"eemail\" value=\"" . $user_source['email'] . "\"></td></tr>\n"; + $html .= "<tr><td>" . form_checkbox('email_shiftinfo', _("Please send me an email if my shifts change"), $user_source['email_shiftinfo']) . "</td></tr>\n"; + $html .= " <tr><td>jabber</td><td>" . "<input type=\"text\" size=\"40\" name=\"ejabber\" value=\"" . $user_source['jabber'] . "\"></td></tr>\n"; + $html .= " <tr><td>Size</td><td>" . html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size']) . "</td></tr>\n"; + + $options = array( + '1' => "Yes", + '0' => "No" + ); + + // Gekommen? + $html .= " <tr><td>Gekommen</td><td>\n"; + $html .= html_options('eGekommen', $options, $user_source['Gekommen']) . "</td></tr>\n"; + + // Aktiv? + $html .= " <tr><td>Aktiv</td><td>\n"; + $html .= html_options('eAktiv', $options, $user_source['Aktiv']) . "</td></tr>\n"; + + // Aktiv erzwingen + if (in_array('admin_active', $privileges)) { + $html .= " <tr><td>" . _("Force active") . "</td><td>\n"; + $html .= html_options('force_active', $options, $user_source['force_active']) . "</td></tr>\n"; + } + + // T-Shirt bekommen? + $html .= " <tr><td>T-Shirt</td><td>\n"; + $html .= html_options('eTshirt', $options, $user_source['Tshirt']) . "</td></tr>\n"; + + $html .= " <tr><td>Hometown</td><td>" . "<input type=\"text\" size=\"40\" name=\"Hometown\" value=\"" . $user_source['Hometown'] . "\"></td></tr>\n"; + + $html .= "</table>\n</td><td valign=\"top\"></td></tr>"; + + $html .= "</td></tr>\n"; + $html .= "</table>\n<br />\n"; + $html .= "<input type=\"submit\" value=\"Speichern\">\n"; + $html .= "</form>"; + + $html .= "<hr />"; + + $html .= form_info('', _('Please visit the angeltypes page or the users profile to manage users angeltypes.')); + + $html .= "Hier kannst Du das Passwort dieses Engels neu setzen:<form action=\"" . page_link_to("admin_user") . "&action=change_pw&id=$id\" method=\"post\">\n"; + $html .= "<table>\n"; + $html .= " <tr><td>Passwort</td><td>" . "<input type=\"password\" size=\"40\" name=\"new_pw\" value=\"\"></td></tr>\n"; + $html .= " <tr><td>Wiederholung</td><td>" . "<input type=\"password\" size=\"40\" name=\"new_pw2\" value=\"\"></td></tr>\n"; + + $html .= "</table>"; + $html .= "<input type=\"submit\" value=\"Speichern\">\n"; + $html .= "</form>"; + + $html .= "<hr />"; + + $my_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`='" . sql_escape($user['UID']) . "' ORDER BY `group_id` LIMIT 1"); + if (count($my_highest_group) > 0) + $my_highest_group = $my_highest_group[0]['group_id']; + + $his_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`='" . sql_escape($id) . "' ORDER BY `group_id` LIMIT 1"); + if (count($his_highest_group) > 0) + $his_highest_group = $his_highest_group[0]['group_id']; + + if ($id != $user['UID'] && $my_highest_group <= $his_highest_group) { $html .= "Hier kannst Du die Benutzergruppen des Engels festlegen:<form action=\"" . page_link_to("admin_user") . "&action=save_groups&id=" . $id . "\" method=\"post\">\n"; $html .= '<table>'; - $my_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($user['UID']) . " ORDER BY `uid` LIMIT 1"); - if (count($my_highest_group) > 0) - $my_highest_group = $my_highest_group[0]['group_id']; - - $his_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($id) . " ORDER BY `uid` LIMIT 1"); - if (count($his_highest_group) > 0) - $his_highest_group = $his_highest_group[0]['group_id']; + $groups = sql_select("SELECT * FROM `Groups` LEFT OUTER JOIN `UserGroups` ON (`UserGroups`.`group_id` = `Groups`.`UID` AND `UserGroups`.`uid` = '" . sql_escape($id) . "') WHERE `Groups`.`UID` >= '" . sql_escape($my_highest_group) . "' ORDER BY `Groups`.`Name`"); + foreach ($groups as $group) + $html .= '<tr><td><input type="checkbox" name="groups[]" value="' . $group['UID'] . '"' . ($group['group_id'] != "" ? ' checked="checked"' : '') . ' /></td><td>' . $group['Name'] . '</td></tr>'; - if ($id != $user['UID'] && $my_highest_group <= $his_highest_group) { - $groups = sql_select("SELECT * FROM `Groups` LEFT OUTER JOIN `UserGroups` ON (`UserGroups`.`group_id` = `Groups`.`UID` AND `UserGroups`.`uid` = " . sql_escape($id) . ") WHERE `Groups`.`UID` >= " . sql_escape($my_highest_group) . " ORDER BY `Groups`.`Name`"); - foreach ($groups as $group) - $html .= '<tr><td><input type="checkbox" name="groups[]" value="' . $group['UID'] . '"' . ($group['group_id'] != "" ? ' checked="checked"' : '') . ' /></td><td>' . $group['Name'] . '</td></tr>'; - - $html .= '</table>'; - - $html .= "<input type=\"submit\" value=\"Speichern\">\n"; - $html .= "</form>"; - - $html .= "<hr />"; - } + $html .= '</table>'; - $html .= "<form action=\"" . page_link_to("admin_user") . "&action=delete&id=" . $id . "\" method=\"post\">\n"; - $html .= "<input type=\"submit\" value=\"Löschen\">\n"; + $html .= "<input type=\"submit\" value=\"Speichern\">\n"; $html .= "</form>"; $html .= "<hr />"; - } else { - switch ($_REQUEST['action']) { - case 'save_groups': - if ($id != $user['UID']) { - $my_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($user['UID']) . " ORDER BY `group_id`"); - $his_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($id) . " ORDER BY `group_id`"); + } + + $html .= "<form action=\"" . page_link_to("admin_user") . "&action=delete&id=" . $id . "\" method=\"post\">\n"; + $html .= "<input type=\"submit\" value=\"Löschen\">\n"; + $html .= "</form>"; + + $html .= "<hr />"; + } else { + switch ($_REQUEST['action']) { + case 'save_groups': + if ($id != $user['UID']) { + $my_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`='" . sql_escape($user['UID']) . "' ORDER BY `group_id`"); + $his_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`='" . sql_escape($id) . "' ORDER BY `group_id`"); + + if (count($my_highest_group) > 0 && (count($his_highest_group) == 0 || ($my_highest_group[0]['group_id'] <= $his_highest_group[0]['group_id']))) { + $groups_source = sql_select("SELECT * FROM `Groups` LEFT OUTER JOIN `UserGroups` ON (`UserGroups`.`group_id` = `Groups`.`UID` AND `UserGroups`.`uid` = '" . sql_escape($id) . "') WHERE `Groups`.`UID` >= '" . sql_escape($my_highest_group[0]['group_id']) . "' ORDER BY `Groups`.`Name`"); + $groups = array(); + $grouplist = array(); + foreach ($groups_source as $group) { + $groups[$group['UID']] = $group; + $grouplist[] = $group['UID']; + } - if (count($my_highest_group) > 0 && (count($his_highest_group) == 0 || ($my_highest_group[0]['group_id'] <= $his_highest_group[0]['group_id']))) { - $groups_source = sql_select("SELECT * FROM `Groups` LEFT OUTER JOIN `UserGroups` ON (`UserGroups`.`group_id` = `Groups`.`UID` AND `UserGroups`.`uid` = " . sql_escape($id) . ") WHERE `Groups`.`UID` >= " . sql_escape($my_highest_group[0]['group_id']) . " ORDER BY `Groups`.`Name`"); - $groups = array(); - $grouplist = array(); - foreach ($groups_source as $group) { - $groups[$group['UID']] = $group; - $grouplist[] = $group['UID']; - } - - if (! is_array($_REQUEST['groups'])) - $_REQUEST['groups'] = array(); - - sql_query("DELETE FROM `UserGroups` WHERE `uid`=" . sql_escape($id)); - $user_groups_info = array(); - foreach ($_REQUEST['groups'] as $group) { - if (in_array($group, $grouplist)) { - sql_query("INSERT INTO `UserGroups` SET `uid`=" . sql_escape($id) . ", `group_id`=" . sql_escape($group)); - $user_groups_info[] = $groups[$group]['Name']; - } + if (! is_array($_REQUEST['groups'])) + $_REQUEST['groups'] = array(); + + sql_query("DELETE FROM `UserGroups` WHERE `uid`='" . sql_escape($id) . "'"); + $user_groups_info = array(); + foreach ($_REQUEST['groups'] as $group) { + if (in_array($group, $grouplist)) { + sql_query("INSERT INTO `UserGroups` SET `uid`='" . sql_escape($id) . "', `group_id`='" . sql_escape($group) . "'"); + $user_groups_info[] = $groups[$group]['Name']; } - $user_source = User($id); - engelsystem_log("Set groups of " . User_Nick_render($user_source) . " to: " . join(", ", $user_groups_info)); - $html .= success("Benutzergruppen gespeichert.", true); - } else { - $html .= error("Du kannst keine Engel mit mehr Rechten bearbeiten.", true); } + $user_source = User($id); + engelsystem_log("Set groups of " . User_Nick_render($user_source) . " to: " . join(", ", $user_groups_info)); + $html .= success("Benutzergruppen gespeichert.", true); } else { - $html .= error("Du kannst Deine eigenen Rechte nicht bearbeiten.", true); - } - break; - - case 'delete': - if ($user['UID'] != $id) { - $user_source = sql_select("SELECT `Nick`, `UID` FROM `User` WHERE `UID` = '" . sql_escape($id) . "' LIMIT 1"); - sql_query("DELETE FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); - sql_query("DELETE FROM `UserGroups` WHERE `uid`=" . sql_escape($id)); - engelsystem_log("Deleted user " . User_Nick_render($user_source)); - $html .= success("Benutzer gelöscht!", true); - } else { - $html .= error("Du kannst Dich nicht selber löschen!", true); + $html .= error("Du kannst keine Engel mit mehr Rechten bearbeiten.", true); } - break; - - case 'save': - $force_active = $user['force_active']; - if (in_array('admin_active', $privileges)) - $force_active = $_REQUEST['force_active']; - $SQL = "UPDATE `User` SET + } else { + $html .= error("Du kannst Deine eigenen Rechte nicht bearbeiten.", true); + } + break; + + case 'delete': + if ($user['UID'] != $id) { + $user_source = sql_select("SELECT `Nick`, `UID` FROM `User` WHERE `UID` = '" . sql_escape($id) . "' LIMIT 1"); + sql_query("DELETE FROM `User` WHERE `UID`='" . sql_escape($id) . "' LIMIT 1"); + sql_query("DELETE FROM `UserGroups` WHERE `uid`='" . sql_escape($id) . "'"); + engelsystem_log("Deleted user " . User_Nick_render($user_source)); + $html .= success("Benutzer gelöscht!", true); + } else { + $html .= error("Du kannst Dich nicht selber löschen!", true); + } + break; + + case 'save': + $force_active = $user['force_active']; + if (in_array('admin_active', $privileges)) + $force_active = $_REQUEST['force_active']; + $SQL = "UPDATE `User` SET `Nick` = '" . sql_escape($_POST["eNick"]) . "', `Name` = '" . sql_escape($_POST["eName"]) . "', `Vorname` = '" . sql_escape($_POST["eVorname"]) . "', @@ -235,7 +185,7 @@ function admin_user() { `Alter` = '" . sql_escape($_POST["eAlter"]) . "', `DECT` = '" . sql_escape($_POST["eDECT"]) . "', `email` = '" . sql_escape($_POST["eemail"]) . "', - `email_shiftinfo` = " . sql_escape(isset($_REQUEST['email_shiftinfo']) ? 'TRUE' : 'FALSE') . ", + `email_shiftinfo` = " . sql_bool(isset($_REQUEST['email_shiftinfo'])) . ", `jabber` = '" . sql_escape($_POST["ejabber"]) . "', `Size` = '" . sql_escape($_POST["eSize"]) . "', `Gekommen`= '" . sql_escape($_POST["eGekommen"]) . "', @@ -244,27 +194,23 @@ function admin_user() { `Tshirt` = '" . sql_escape($_POST["eTshirt"]) . "', `Hometown` = '" . sql_escape($_POST["Hometown"]) . "' WHERE `UID` = '" . sql_escape($id) . "' - LIMIT 1;"; - sql_query($SQL); - engelsystem_log("Updated user: " . $_POST["eNick"] . ", " . $_POST["eSize"] . ", arrived: " . $_POST["eGekommen"] . ", active: " . $_POST["eAktiv"] . ", tshirt: " . $_POST["eTshirt"]); - $html .= success("Änderung wurde gespeichert...\n", true); - break; - - case 'change_pw': - if ($_REQUEST['new_pw'] != "" && $_REQUEST['new_pw'] == $_REQUEST['new_pw2']) { - set_password($id, $_REQUEST['new_pw']); - $user_source = User($id); - engelsystem_log("Set new password for " . User_Nick_render($user_source)); - $html .= success("Passwort neu gesetzt.", true); - } else { - $html .= error("Die Eingaben müssen übereinstimmen und dürfen nicht leer sein!", true); - } - break; - } + LIMIT 1"; + sql_query($SQL); + engelsystem_log("Updated user: " . $_POST["eNick"] . ", " . $_POST["eSize"] . ", arrived: " . $_POST["eGekommen"] . ", active: " . $_POST["eAktiv"] . ", tshirt: " . $_POST["eTshirt"]); + $html .= success("Änderung wurde gespeichert...\n", true); + break; + + case 'change_pw': + if ($_REQUEST['new_pw'] != "" && $_REQUEST['new_pw'] == $_REQUEST['new_pw2']) { + set_password($id, $_REQUEST['new_pw']); + $user_source = User($id); + engelsystem_log("Set new password for " . User_Nick_render($user_source)); + $html .= success("Passwort neu gesetzt.", true); + } else { + $html .= error("Die Eingaben müssen übereinstimmen und dürfen nicht leer sein!", true); + } + break; } - } else { - msg(); - redirect(page_link_to('users')); } return page_with_title(_('Edit user'), array( diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index fc375092..677b057b 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -32,6 +32,7 @@ function guest_register() { $tshirt_size = ''; $password_hash = ""; $selected_angel_types = array(); + $planned_arrival_date = null; $angel_types_source = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`"); $angel_types = array(); @@ -96,6 +97,13 @@ function guest_register() { $msg .= error(sprintf(_("Your password is too short (please use at least %s characters)."), MIN_PASSWORD_LENGTH), true); } + if (isset($_REQUEST['planned_arrival_date']) && DateTime::createFromFormat("Y-m-d", trim($_REQUEST['planned_arrival_date']))) { + $planned_arrival_date = DateTime::createFromFormat("Y-m-d", trim($_REQUEST['planned_arrival_date']))->getTimestamp(); + } else { + $ok = false; + $msg .= error(_("Please enter your planned date of arrival."), true); + } + $selected_angel_types = array(); foreach ($angel_types as $angel_type_id => $angel_type_name) if (isset($_REQUEST['angel_types_' . $angel_type_id])) @@ -122,7 +130,7 @@ function guest_register() { if ($ok) { sql_query(" INSERT INTO `User` SET - `color`=" . sql_escape($default_theme) . ", + `color`='" . sql_escape($default_theme) . "', `Nick`='" . sql_escape($nick) . "', `Vorname`='" . sql_escape($prename) . "', `Name`='" . sql_escape($lastname) . "', @@ -131,24 +139,26 @@ function guest_register() { `DECT`='" . sql_escape($dect) . "', `Handy`='" . sql_escape($mobile) . "', `email`='" . sql_escape($mail) . "', - `email_shiftinfo`=" . sql_escape($email_shiftinfo ? 'TRUE' : 'FALSE') . ", + `email_shiftinfo`=" . sql_bool($email_shiftinfo) . ", `jabber`='" . sql_escape($jabber) . "', `Size`='" . sql_escape($tshirt_size) . "', `Passwort`='" . sql_escape($password_hash) . "', `kommentar`='" . sql_escape($comment) . "', `Hometown`='" . sql_escape($hometown) . "', `CreateDate`=NOW(), - `Sprache`='" . sql_escape($_SESSION["locale"]) . "'"); + `Sprache`='" . sql_escape($_SESSION["locale"]) . "', + `arrival_date`=NULL, + `planned_arrival_date`='" . sql_escape($planned_arrival_date) . "'"); // Assign user-group and set password $user_id = sql_id(); - sql_query("INSERT INTO `UserGroups` SET `uid`=" . sql_escape($user_id) . ", `group_id`=-2"); + sql_query("INSERT INTO `UserGroups` SET `uid`='" . sql_escape($user_id) . "', `group_id`=-2"); set_password($user_id, $_REQUEST['password']); // Assign angel-types $user_angel_types_info = array(); foreach ($selected_angel_types as $selected_angel_type_id) { - sql_query("INSERT INTO `UserAngelTypes` SET `user_id`=" . sql_escape($user_id) . ", `angeltype_id`=" . sql_escape($selected_angel_type_id)); + sql_query("INSERT INTO `UserAngelTypes` SET `user_id`='" . sql_escape($user_id) . "', `angeltype_id`='" . sql_escape($selected_angel_type_id) . "'"); $user_angel_types_info[] = $angel_types[$selected_angel_type_id]; } engelsystem_log("User " . $nick . " signed up as: " . join(", ", $user_angel_types_info)); @@ -170,11 +180,18 @@ function guest_register() { form_text('nick', _("Nick") . ' ' . entry_required(), $nick) )), div('col-sm-8', array( - form_text('mail', _("E-Mail") . ' ' . entry_required(), $mail), + form_email('mail', _("E-Mail") . ' ' . entry_required(), $mail), form_checkbox('email_shiftinfo', _("Please send me an email if my shifts change"), $email_shiftinfo) )) )), - $enable_tshirt_size ? form_select('tshirt_size', _("Shirt size") . ' ' . entry_required(), $tshirt_sizes, $tshirt_size) : '', + div('row', array( + div('col-sm-6', array( + form_date('planned_arrival_date', _("Planned date of arrival") . ' ' . entry_required(), $planned_arrival_date, time()) + )), + div('col-sm-6', array( + $enable_tshirt_size ? form_select('tshirt_size', _("Shirt size") . ' ' . entry_required(), $tshirt_sizes, $tshirt_size) : '' + )) + )), div('row', array( div('col-sm-6', array( form_password('password', _("Password") . ' ' . entry_required()) @@ -269,6 +286,7 @@ function guest_login() { if ($ok) { $_SESSION['uid'] = $login_user['UID']; $_SESSION['locale'] = $login_user['Sprache']; + redirect(page_link_to('news')); } } diff --git a/includes/pages/user_ical.php b/includes/pages/user_ical.php index ba832842..bd954a87 100644 --- a/includes/pages/user_ical.php +++ b/includes/pages/user_ical.php @@ -28,7 +28,7 @@ function user_ical() { INNER JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) INNER JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) - WHERE `UID`=" . sql_escape($user['UID']) . " + WHERE `UID`='" . sql_escape($user['UID']) . "' ORDER BY `start`"); } diff --git a/includes/pages/user_messages.php b/includes/pages/user_messages.php index fe1b85ff..1785d5b6 100644 --- a/includes/pages/user_messages.php +++ b/includes/pages/user_messages.php @@ -7,7 +7,7 @@ function user_unread_messages() { global $user; if (isset($user)) { - $new_messages = sql_num_query("SELECT * FROM `Messages` WHERE isRead='N' AND `RUID`=" . sql_escape($user['UID'])); + $new_messages = sql_num_query("SELECT * FROM `Messages` WHERE isRead='N' AND `RUID`='" . sql_escape($user['UID']) . "'"); if ($new_messages > 0) return ' <span class="badge danger">' . $new_messages . '</span>'; } @@ -18,7 +18,7 @@ function user_messages() { global $user; if (! isset($_REQUEST['action'])) { - $users = sql_select("SELECT * FROM `User` WHERE NOT `UID`=" . sql_escape($user['UID']) . " ORDER BY `Nick`"); + $users = sql_select("SELECT * FROM `User` WHERE NOT `UID`='" . sql_escape($user['UID']) . "' ORDER BY `Nick`"); $to_select_data = array( "" => _("Select recipient...") @@ -29,7 +29,7 @@ function user_messages() { $to_select = html_select_key('to', 'to', $to_select_data, ''); - $messages = sql_select("SELECT * FROM `Messages` WHERE `SUID`=" . sql_escape($user['UID']) . " OR `RUID`=" . sql_escape($user['UID']) . " ORDER BY `isRead`,`Datum` DESC"); + $messages = sql_select("SELECT * FROM `Messages` WHERE `SUID`='" . sql_escape($user['UID']) . "' OR `RUID`='" . sql_escape($user['UID']) . "' ORDER BY `isRead`,`Datum` DESC"); foreach ($messages as $message) { $sender_user_source = User($message['SUID']); if ($sender_user_source === false) @@ -84,9 +84,9 @@ function user_messages() { else return error(_("Incomplete call, missing Message ID."), true); - $message = sql_select("SELECT * FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1"); + $message = sql_select("SELECT * FROM `Messages` WHERE `id`='" . sql_escape($id) . "' LIMIT 1"); if (count($message) > 0 && $message[0]['RUID'] == $user['UID']) { - sql_query("UPDATE `Messages` SET `isRead`='Y' WHERE `id`=" . sql_escape($id) . " LIMIT 1"); + sql_query("UPDATE `Messages` SET `isRead`='Y' WHERE `id`='" . sql_escape($id) . "' LIMIT 1"); redirect(page_link_to("user_messages")); } else return error(_("No Message found."), true); @@ -98,9 +98,9 @@ function user_messages() { else return error(_("Incomplete call, missing Message ID."), true); - $message = sql_select("SELECT * FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1"); + $message = sql_select("SELECT * FROM `Messages` WHERE `id`='" . sql_escape($id) . "' LIMIT 1"); if (count($message) > 0 && $message[0]['SUID'] == $user['UID']) { - sql_query("DELETE FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1"); + sql_query("DELETE FROM `Messages` WHERE `id`='" . sql_escape($id) . "' LIMIT 1"); redirect(page_link_to("user_messages")); } else return error(_("No Message found."), true); diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php index e557054d..ee3cf1be 100644 --- a/includes/pages/user_myshifts.php +++ b/includes/pages/user_myshifts.php @@ -9,15 +9,15 @@ function user_myshifts() { global $LETZTES_AUSTRAGEN; global $user, $privileges; $msg = ""; - - if (isset($_REQUEST['id']) && in_array("user_shifts_admin", $privileges) && preg_match("/^[0-9]{1,}$/", $_REQUEST['id']) && sql_num_query("SELECT * FROM `User` WHERE `UID`=" . sql_escape($_REQUEST['id'])) > 0) { + + if (isset($_REQUEST['id']) && in_array("user_shifts_admin", $privileges) && preg_match("/^[0-9]{1,}$/", $_REQUEST['id']) && sql_num_query("SELECT * FROM `User` WHERE `UID`='" . sql_escape($_REQUEST['id']) . "'") > 0) { $id = $_REQUEST['id']; } else { $id = $user['UID']; } - - list($shifts_user) = sql_select("SELECT * FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); - + + list($shifts_user) = sql_select("SELECT * FROM `User` WHERE `UID`='" . sql_escape($id) . "' LIMIT 1"); + if (isset($_REQUEST['reset'])) { if ($_REQUEST['reset'] == "ack") { User_reset_api_key($user); @@ -26,7 +26,7 @@ function user_myshifts() { } return page_with_title(_("Reset API key"), array( error(_("If you reset the key, the url to your iCal- and JSON-export and your atom feed changes! You have to update it in every application using one of these exports."), true), - button(page_link_to('user_myshifts') . '&reset=ack', _("Continue"), 'btn-danger') + button(page_link_to('user_myshifts') . '&reset=ack', _("Continue"), 'btn-danger') )); } elseif (isset($_REQUEST['edit']) && preg_match("/^[0-9]*$/", $_REQUEST['edit'])) { $id = $_REQUEST['edit']; @@ -44,11 +44,11 @@ function user_myshifts() { JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) - WHERE `ShiftEntry`.`id`=" . sql_escape($id) . " - AND `UID`=" . sql_escape($shifts_user['UID']) . " LIMIT 1"); + WHERE `ShiftEntry`.`id`='" . sql_escape($id) . "' + AND `UID`='" . sql_escape($shifts_user['UID']) . "' LIMIT 1"); if (count($shift) > 0) { $shift = $shift[0]; - + if (isset($_REQUEST['submit'])) { $freeloaded = $shift['freeloaded']; $freeload_comment = $shift['freeload_comment']; @@ -56,46 +56,51 @@ function user_myshifts() { $freeloaded = isset($_REQUEST['freeloaded']); $freeload_comment = strip_request_item_nl('freeload_comment'); } - + $comment = strip_request_item_nl('comment'); $user_source = User($shift['UID']); $result = ShiftEntry_update(array( 'id' => $id, 'Comment' => $comment, 'freeloaded' => $freeloaded, - 'freeload_comment' => $freeload_comment + 'freeload_comment' => $freeload_comment )); if ($result === false) engelsystem_error('Unable to update shift entr.'); - + engelsystem_log("Updated " . User_Nick_render($user_source) . "'s shift " . $shift['name'] . " from " . date("y-m-d H:i", $shift['start']) . " to " . date("y-m-d H:i", $shift['end']) . " with comment " . $comment . ". Freeloaded: " . ($freeloaded ? "YES Comment: " . $freeload_comment : "NO")); success(_("Shift saved.")); redirect(page_link_to('users') . '&action=view&user_id=' . $shifts_user['UID']); } - + return ShiftEntry_edit_view(User_Nick_render($shifts_user), date("Y-m-d H:i", $shift['start']) . ', ' . shift_length($shift), $shift['Name'], $shift['name'], $shift['angel_type'], $shift['Comment'], $shift['freeloaded'], $shift['freeload_comment'], in_array("user_shifts_admin", $privileges)); } else redirect(page_link_to('user_myshifts')); } elseif (isset($_REQUEST['cancel']) && preg_match("/^[0-9]*$/", $_REQUEST['cancel'])) { $id = $_REQUEST['cancel']; $shift = sql_select(" - SELECT `Shifts`.`start` + SELECT * FROM `Shifts` INNER JOIN `ShiftEntry` USING (`SID`) - WHERE `ShiftEntry`.`id`=" . sql_escape($id) . " AND `UID`=" . sql_escape($shifts_user['UID'])); + WHERE `ShiftEntry`.`id`='" . sql_escape($id) . "' AND `UID`='" . sql_escape($shifts_user['UID']) . "'"); if (count($shift) > 0) { $shift = $shift[0]; if (($shift['start'] > time() + $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges)) { $result = ShiftEntry_delete($id); if ($result === false) engelsystem_error('Unable to delete shift entry.'); + $room = Room($shift['RID']); + $angeltype = AngelType($shift['TID']); + $shifttype = ShiftType($shift['shifttype_id']); + + engelsystem_log("Deleted own shift: " . $shifttype['name'] . " at " . $room['Name'] . " from " . date("y-m-d H:i", $shift['start']) . " to " . date("y-m-d H:i", $shift['end']) . " as " . $angeltype['name']); success(_("You have been signed off from the shift.")); } else error(_("It's too late to sign yourself off the shift. If neccessary, ask the dispatcher to do so.")); } else - redirect(page_link_to('user_myshifts')); + redirect(user_link($shifts_user)); } - + redirect(page_link_to('users') . '&action=view'); } ?> diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php index 8a4c0aa8..7c104095 100644 --- a/includes/pages/user_news.php +++ b/includes/pages/user_news.php @@ -21,7 +21,7 @@ function user_meetings() { else $page = 0; - $news = sql_select("SELECT * FROM `News` WHERE `Treffen`=1 ORDER BY `ID` DESC LIMIT " . sql_escape($page * $DISPLAY_NEWS) . ", " . sql_escape($DISPLAY_NEWS)); + $news = sql_select("SELECT * FROM `News` WHERE `Treffen`=1 ORDER BY `Datum` DESC LIMIT " . sql_escape($page * $DISPLAY_NEWS) . ", " . sql_escape($DISPLAY_NEWS)); foreach ($news as $entry) $html .= display_news($entry); @@ -73,9 +73,9 @@ function user_news_comments() { global $user; $html = '<div class="col-md-12"><h1>' . user_news_comments_title() . '</h1>'; - if (isset($_REQUEST["nid"]) && preg_match("/^[0-9]{1,}$/", $_REQUEST['nid']) && sql_num_query("SELECT * FROM `News` WHERE `ID`=" . sql_escape($_REQUEST['nid']) . " LIMIT 1") > 0) { + if (isset($_REQUEST["nid"]) && preg_match("/^[0-9]{1,}$/", $_REQUEST['nid']) && sql_num_query("SELECT * FROM `News` WHERE `ID`='" . sql_escape($_REQUEST['nid']) . "' LIMIT 1") > 0) { $nid = $_REQUEST["nid"]; - list($news) = sql_select("SELECT * FROM `News` WHERE `ID`=" . sql_escape($nid) . " LIMIT 1"); + list($news) = sql_select("SELECT * FROM `News` WHERE `ID`='" . sql_escape($nid) . "' LIMIT 1"); if (isset($_REQUEST["text"])) { $text = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['text'])); sql_query("INSERT INTO `NewsComments` (`Refid`, `Datum`, `Text`, `UID`) VALUES ('" . sql_escape($nid) . "', '" . date("Y-m-d H:i:s") . "', '" . sql_escape($text) . "', '" . sql_escape($user["UID"]) . "')"); @@ -132,7 +132,7 @@ function user_news() { else $page = 0; - $news = sql_select("SELECT * FROM `News` ORDER BY `ID` DESC LIMIT " . sql_escape($page * $DISPLAY_NEWS) . ", " . sql_escape($DISPLAY_NEWS)); + $news = sql_select("SELECT * FROM `News` ORDER BY `Datum` DESC LIMIT " . sql_escape($page * $DISPLAY_NEWS) . ", " . sql_escape($DISPLAY_NEWS)); foreach ($news as $entry) $html .= display_news($entry); diff --git a/includes/pages/user_questions.php b/includes/pages/user_questions.php index be7f9930..0a2786d1 100644 --- a/includes/pages/user_questions.php +++ b/includes/pages/user_questions.php @@ -7,9 +7,9 @@ function user_questions() { global $user; if (! isset($_REQUEST['action'])) { - $open_questions = sql_select("SELECT * FROM `Questions` WHERE `AID` IS NULL AND `UID`=" . sql_escape($user['UID'])); + $open_questions = sql_select("SELECT * FROM `Questions` WHERE `AID` IS NULL AND `UID`='" . sql_escape($user['UID']) . "'"); - $answered_questions = sql_select("SELECT * FROM `Questions` WHERE NOT `AID` IS NULL AND `UID`=" . sql_escape($user['UID'])); + $answered_questions = sql_select("SELECT * FROM `Questions` WHERE NOT `AID` IS NULL AND `UID`='" . sql_escape($user['UID']) . "'"); foreach ($answered_questions as &$question) { $answer_user_source = User($question['AID']); if ($answer_user_source === false) @@ -23,7 +23,7 @@ function user_questions() { case 'ask': $question = strip_request_item_nl('question'); if ($question != "") { - $result = sql_query("INSERT INTO `Questions` SET `UID`=" . sql_escape($user['UID']) . ", `Question`='" . sql_escape($question) . "'"); + $result = sql_query("INSERT INTO `Questions` SET `UID`='" . sql_escape($user['UID']) . "', `Question`='" . sql_escape($question) . "'"); if ($result === false) engelsystem_error(_("Unable to save question.")); success(_("You question was saved.")); @@ -39,9 +39,9 @@ function user_questions() { else return error(_("Incomplete call, missing Question ID."), true); - $question = sql_select("SELECT * FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1"); + $question = sql_select("SELECT * FROM `Questions` WHERE `QID`='" . sql_escape($id) . "' LIMIT 1"); if (count($question) > 0 && $question[0]['UID'] == $user['UID']) { - sql_query("DELETE FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1"); + sql_query("DELETE FROM `Questions` WHERE `QID`='" . sql_escape($id) . "' LIMIT 1"); redirect(page_link_to("user_questions")); } else return page_with_title(questions_title(), array( diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php index 47744474..466d3c3e 100644 --- a/includes/pages/user_settings.php +++ b/includes/pages/user_settings.php @@ -7,7 +7,7 @@ function settings_title() { function user_settings() { global $enable_tshirt_size, $tshirt_sizes, $themes, $locales; global $user; - + $msg = ""; $nick = $user['Nick']; $lastname = $user['Name']; @@ -24,34 +24,12 @@ function user_settings() { $password_hash = ""; $selected_theme = $user['color']; $selected_language = $user['Sprache']; - - $selected_angel_types_source = sql_select("SELECT * FROM `UserAngelTypes` WHERE `user_id`=" . sql_escape($user['UID'])); - $selected_angel_types_source_ids = array(); - $selected_angel_types = array(); - foreach ($selected_angel_types_source as $selected_angel_type) { - $selected_angel_types[] = $selected_angel_type['angeltype_id']; - $selected_angel_types_source_ids[] = $selected_angel_type['angeltype_id']; - } - - $angel_types_source = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`"); - $angel_types = array(); - foreach ($angel_types_source as $angel_type) - $angel_types[$angel_type['id']] = $angel_type['name'] . ($angel_type['restricted'] ? " (restricted)" : ""); - + $planned_arrival_date = $user['planned_arrival_date']; + $planned_departure_date = $user['planned_departure_date']; + if (isset($_REQUEST['submit'])) { $ok = true; - - if (isset($_REQUEST['nick']) && strlen(strip_request_item('nick')) > 1) { - $nick = strip_request_item('nick'); - if (sql_num_query("SELECT * FROM `User` WHERE `Nick`='" . sql_escape($nick) . "' AND NOT `UID`=" . sql_escape($user['UID']) . " LIMIT 1") > 0) { - $ok = false; - $msg .= error(sprintf(_("Your nick "%s" already exists."), $nick), true); - } - } else { - $ok = false; - $msg .= error(sprintf(_("Your nick "%s" is too short (min. 2 characters)."), strip_request_item('nick')), true); - } - + if (isset($_REQUEST['mail']) && strlen(strip_request_item('mail')) > 0) { $mail = strip_request_item('mail'); if (! check_email($mail)) { @@ -62,9 +40,9 @@ function user_settings() { $ok = false; $msg .= error(_("Please enter your e-mail."), true); } - + $email_shiftinfo = isset($_REQUEST['email_shiftinfo']); - + if (isset($_REQUEST['jabber']) && strlen(strip_request_item('jabber')) > 0) { $jabber = strip_request_item('jabber'); if (! check_email($jabber)) { @@ -72,18 +50,30 @@ function user_settings() { $msg .= error(_("Please check your jabber account information."), true); } } - + if (isset($_REQUEST['tshirt_size']) && isset($tshirt_sizes[$_REQUEST['tshirt_size']])) $tshirt_size = $_REQUEST['tshirt_size']; elseif ($enable_tshirt_size) { $ok = false; } - - $selected_angel_types = array(); - foreach ($angel_types as $angel_type_id => $angel_type_name) - if (isset($_REQUEST['angel_types_' . $angel_type_id])) - $selected_angel_types[] = $angel_type_id; - + + if (isset($_REQUEST['planned_arrival_date']) && DateTime::createFromFormat("Y-m-d", trim($_REQUEST['planned_arrival_date']))) { + $planned_arrival_date = DateTime::createFromFormat("Y-m-d", trim($_REQUEST['planned_arrival_date']))->getTimestamp(); + } else { + $ok = false; + $msg .= error(_("Please enter your planned date of arrival."), true); + } + + if (isset($_REQUEST['planned_departure_date']) && $_REQUEST['planned_departure_date'] != '') { + if (DateTime::createFromFormat("Y-m-d", trim($_REQUEST['planned_departure_date']))) { + $planned_departure_date = DateTime::createFromFormat("Y-m-d", trim($_REQUEST['planned_departure_date']))->getTimestamp(); + } else { + $ok = false; + $msg .= error(_("Please enter your planned date of departure."), true); + } + } else + $planned_departure_date = null; + // Trivia if (isset($_REQUEST['lastname'])) $lastname = strip_request_item('lastname'); @@ -99,7 +89,7 @@ function user_settings() { $mobile = strip_request_item('mobile'); if (isset($_REQUEST['hometown'])) $hometown = strip_request_item('hometown'); - + if ($ok) { sql_query(" UPDATE `User` SET @@ -111,48 +101,20 @@ function user_settings() { `DECT`='" . sql_escape($dect) . "', `Handy`='" . sql_escape($mobile) . "', `email`='" . sql_escape($mail) . "', - `email_shiftinfo`=" . sql_escape($email_shiftinfo ? 'TRUE' : 'FALSE') . ", + `email_shiftinfo`=" . sql_bool($email_shiftinfo) . ", `jabber`='" . sql_escape($jabber) . "', `Size`='" . sql_escape($tshirt_size) . "', - `Hometown`='" . sql_escape($hometown) . "' - WHERE `UID`=" . sql_escape($user['UID'])); - - // Assign angel-types - - $deleted_angel_type_names = array(); - $added_angel_type_names = array(); - - foreach($selected_angel_types_source as $source_angel_type) { - if (!in_array($source_angel_type["angeltype_id"], $selected_angel_types)) { - $deleted_angel_type_names[] = $angel_types[$source_angel_type["angeltype_id"]]; - sql_query("DELETE FROM `UserAngelTypes` WHERE `user_id`='" . sql_escape($user['UID']) . "' AND `angeltype_id` = ". sql_escape($source_angel_type["angeltype_id"])); - } - } - - foreach($selected_angel_types as $selected_angel_type) { - if (!in_array($selected_angel_type, $selected_angel_types_source_ids)) { - $added_angel_type_names[] = $angel_types[$selected_angel_type]; - sql_query("INSERT INTO `UserAngelTypes` SET `user_id`=" . sql_escape($user['UID']) . ", `angeltype_id`=" . sql_escape($selected_angel_type)); - } - } - - if(count($deleted_angel_type_names) > 0 || count($added_angel_type_names) > 0) { - $log_message = "User changed his own Angel Types. "; - if(count($deleted_angel_type_names) > 0) { - $log_message .= "Removed: " . implode(", ", $deleted_angel_type_names) . " "; - } - if(count($added_angel_type_names) > 0) { - $log_message .= "Added: " . implode(", ", $added_angel_type_names); - } - engelsystem_log($log_message); - } - + `Hometown`='" . sql_escape($hometown) . "', + `planned_arrival_date`='" . sql_escape($planned_arrival_date) . "', + `planned_departure_date`=" . sql_null($planned_departure_date) . " + WHERE `UID`='" . sql_escape($user['UID']) . "'"); + success(_("Settings saved.")); redirect(page_link_to('user_settings')); } } elseif (isset($_REQUEST['submit_password'])) { $ok = true; - + if (! isset($_REQUEST['password']) || ! verify_password($_REQUEST['password'], $user['Passwort'], $user['UID'])) $msg .= error(_("-> not OK. Please try again."), true); elseif (strlen($_REQUEST['new_password']) < MIN_PASSWORD_LENGTH) @@ -166,58 +128,60 @@ function user_settings() { redirect(page_link_to('user_settings')); } elseif (isset($_REQUEST['submit_theme'])) { $ok = true; - + if (isset($_REQUEST['theme']) && isset($themes[$_REQUEST['theme']])) $selected_theme = $_REQUEST['theme']; else $ok = false; - + if ($ok) { - sql_query("UPDATE `User` SET `color`='" . sql_escape($selected_theme) . "' WHERE `UID`=" . sql_escape($user['UID'])); - + sql_query("UPDATE `User` SET `color`='" . sql_escape($selected_theme) . "' WHERE `UID`='" . sql_escape($user['UID']) . "'"); + success(_("Theme changed.")); redirect(page_link_to('user_settings')); } } elseif (isset($_REQUEST['submit_language'])) { $ok = true; - + if (isset($_REQUEST['language']) && isset($locales[$_REQUEST['language']])) $selected_language = $_REQUEST['language']; else $ok = false; - + if ($ok) { - sql_query("UPDATE `User` SET `Sprache`='" . sql_escape($selected_language) . "' WHERE `UID`=" . sql_escape($user['UID'])); + sql_query("UPDATE `User` SET `Sprache`='" . sql_escape($selected_language) . "' WHERE `UID`='" . sql_escape($user['UID']) . "'"); $_SESSION['locale'] = $selected_language; - + success("Language changed."); redirect(page_link_to('user_settings')); } } - + return page_with_title(settings_title(), array( - sprintf(_("Hello %s, here you can change your personal settings i.e. password, color settings etc."), User_Nick_render($user)), $msg, msg(), div('row', array( div('col-md-6', array( form(array( - form_info(_("Here you can change your user details.")), - form_text('nick', _("Nick") . "*", $nick), + form_info('', _("Here you can change your user details.")), + form_info(entry_required() . ' = ' . _("Entry required!")), + form_text('nick', _("Nick"), $nick, true), form_text('lastname', _("Last name"), $lastname), form_text('prename', _("First name"), $prename), + form_date('planned_arrival_date', _("Planned date of arrival") . ' ' . entry_required(), $planned_arrival_date, time()), + form_date('planned_departure_date', _("Planned date of departure"), $planned_departure_date, time()), form_text('age', _("Age"), $age), form_text('tel', _("Phone"), $tel), form_text('dect', _("DECT"), $dect), form_text('mobile', _("Mobile"), $mobile), - form_text('mail', _("E-Mail") . "*", $mail), + form_text('mail', _("E-Mail") . ' ' . entry_required(), $mail), form_checkbox('email_shiftinfo', _("Please send me an email if my shifts change"), $email_shiftinfo), form_text('jabber', _("Jabber"), $jabber), form_text('hometown', _("Hometown"), $hometown), $enable_tshirt_size ? form_select('tshirt_size', _("Shirt size"), $tshirt_sizes, $tshirt_size) : '', - form_checkboxes('angel_types', _("What do you want to do?") . sprintf(" (<a href=\"%s\">%s</a>)", page_link_to('angeltypes') . '&action=about', _("Description of job types")), $angel_types, $selected_angel_types), - form_submit('submit', _("Save")) - )) + form_info('', _('Please visit the angeltypes page to manage your angeltypes.')), + form_submit('submit', _("Save")) + )) )), div('col-md-6', array( form(array( @@ -225,20 +189,20 @@ function user_settings() { form_password('password', _("Old password:")), form_password('new_password', _("New password:")), form_password('new_password2', _("Password confirmation:")), - form_submit('submit_password', _("Save")) + form_submit('submit_password', _("Save")) )), form(array( form_info(_("Here you can choose your color settings:")), form_select('theme', _("Color settings:"), $themes, $selected_theme), - form_submit('submit_theme', _("Save")) + form_submit('submit_theme', _("Save")) )), form(array( form_info(_("Here you can choose your language:")), form_select('language', _("Language:"), $locales, $selected_language), - form_submit('submit_language', _("Save")) - )) - )) - )) + form_submit('submit_language', _("Save")) + )) + )) + )) )); } ?> diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 603ca993..8c01eef8 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -31,7 +31,7 @@ function user_shifts() { JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) - WHERE `ShiftEntry`.`id`=" . sql_escape($entry_id)); + WHERE `ShiftEntry`.`id`='" . sql_escape($entry_id) . "'"); if (count($shift_entry_source) > 0) { $shift_entry_source = $shift_entry_source[0]; @@ -58,7 +58,7 @@ function user_shifts() { SELECT `ShiftTypes`.`name`, `Shifts`.*, `Room`.* FROM `Shifts` JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) - WHERE `SID`=" . sql_escape($shift_id)); + WHERE `SID`='" . sql_escape($shift_id) . "'"); if (count($shift) == 0) redirect(page_link_to('user_shifts')); $shift = $shift[0]; @@ -72,28 +72,34 @@ function user_shifts() { $needed_angel_types[$type['id']] = 0; } - // Benötigte Engeltypen vom Raum - $needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`room_id`=" . sql_escape($shift['RID']) . ") ORDER BY `AngelTypes`.`name`"); + $shifttypes_source = ShiftTypes(); + $shifttypes = []; + foreach ($shifttypes_source as $shifttype) + $shifttypes[$shifttype['id']] = $shifttype['name']; + + // Benötigte Engeltypen vom Raum + $needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`room_id`='" . sql_escape($shift['RID']) . "') ORDER BY `AngelTypes`.`name`"); foreach ($needed_angel_types_source as $type) { if ($type['count'] != "") $needed_angel_types[$type['id']] = $type['count']; } // Benötigte Engeltypen von der Schicht - $needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`shift_id`=" . sql_escape($shift_id) . ") ORDER BY `AngelTypes`.`name`"); + $needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`shift_id`='" . sql_escape($shift_id) . "') ORDER BY `AngelTypes`.`name`"); foreach ($needed_angel_types_source as $type) { if ($type['count'] != "") $needed_angel_types[$type['id']] = $type['count']; } - $name = $shift['name']; + $shifttype_id = $shift['shifttype_id']; + $title = $shift['title']; $rid = $shift['RID']; $start = $shift['start']; $end = $shift['end']; if (isset($_REQUEST['submit'])) { // Name/Bezeichnung der Schicht, darf leer sein - $name = strip_request_item('name'); + $title = strip_request_item('title'); // Auswahl der sichtbaren Locations für die Schichten if (isset($_REQUEST['rid']) && preg_match("/^[0-9]+$/", $_REQUEST['rid']) && isset($room_array[$_REQUEST['rid']])) @@ -104,6 +110,13 @@ function user_shifts() { $msg .= error(_("Please select a room."), true); } + if (isset($_REQUEST['shifttype_id']) && isset($shifttypes[$_REQUEST['shifttype_id']])) + $shifttype_id = $_REQUEST['shifttype_id']; + else { + $ok = false; + $msg .= error(_('Please select a shifttype.'), true); + } + if (isset($_REQUEST['start']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['start']))) $start = $tmp->getTimestamp(); else { @@ -133,23 +146,28 @@ function user_shifts() { } if ($ok) { - $shift['name'] = $name; + $shift['shifttype_id'] = $shifttype_id; + $shift['title'] = $title; $shift['RID'] = $rid; $shift['start'] = $start; $shift['end'] = $end; + $result = Shift_update($shift); if ($result === false) engelsystem_error('Unable to update shift.'); - sql_query("DELETE FROM `NeededAngelTypes` WHERE `shift_id`=" . sql_escape($shift_id)); + sql_query("DELETE FROM `NeededAngelTypes` WHERE `shift_id`='" . sql_escape($shift_id) . "'"); $needed_angel_types_info = array(); foreach ($needed_angel_types as $type_id => $count) { - sql_query("INSERT INTO `NeededAngelTypes` SET `shift_id`=" . sql_escape($shift_id) . ", `angel_type_id`=" . sql_escape($type_id) . ", `count`=" . sql_escape($count)); + sql_query("INSERT INTO `NeededAngelTypes` SET `shift_id`='" . sql_escape($shift_id) . "', `angel_type_id`='" . sql_escape($type_id) . "', `count`='" . sql_escape($count) . "'"); $needed_angel_types_info[] = $angel_types[$type_id]['name'] . ": " . $count; } engelsystem_log("Updated shift '" . $name . "' from " . date("y-m-d H:i", $start) . " to " . date("y-m-d H:i", $end) . " with angel types " . join(", ", $needed_angel_types_info)); success(_("Shift updated.")); - redirect(shift_link($shift_id)); + + redirect(shift_link([ + 'SID' => $shift_id + ])); } } @@ -163,7 +181,8 @@ function user_shifts() { msg(), '<noscript>' . info(_("This page is much more comfortable with javascript."), true) . '</noscript>', form(array( - form_text('name', _("Name/Description:"), $name), + form_select('shifttype_id', _('Shifttype'), $shifttypes, $shifttype_id), + form_text('title', _("Title"), $title), form_select('rid', _("Room:"), $room_array, $rid), form_text('start', _("Start:"), date("Y-m-d H:i", $start)), form_text('end', _("End:"), date("Y-m-d H:i", $end)), @@ -218,32 +237,21 @@ function user_shifts() { $type_id = $_REQUEST['type_id']; else redirect(page_link_to('user_shifts')); - - // Schicht läuft schon, Eintragen für Engel nicht mehr möglich - if (! in_array('user_shifts_admin', $privileges) && time() > $shift['start']) { - error(_("This shift is running now or ended already. Please contact a dispatcher to join the shift.")); - redirect(shift_link($shift)); - } - - // Another shift the user is signed up for collides with this one - if (! in_array('user_shifts_admin', $privileges) && sql_num_query(" - SELECT `Shifts`.`SID` - FROM `Shifts` - INNER JOIN `ShiftEntry` ON (`Shifts`.`SID` = `ShiftEntry`.`SID` AND `ShiftEntry`.`UID` = " . sql_escape($user['UID']) . ") - WHERE `start` < '" . sql_escape($shift['end']) . "' AND `end` > '" . sql_escape($shift['start']) . "'") > 0) { - error(_("You already subscribed to shift in the same timeslot. Please contact a dispatcher to join the shift.")); - redirect(shift_link($shift)); - } if (in_array('user_shifts_admin', $privileges)) - $type = sql_select("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($type_id) . " LIMIT 1"); + $type = sql_select("SELECT * FROM `AngelTypes` WHERE `id`='" . sql_escape($type_id) . "' LIMIT 1"); else - $type = sql_select("SELECT * FROM `UserAngelTypes` JOIN `AngelTypes` ON (`UserAngelTypes`.`angeltype_id` = `AngelTypes`.`id`) WHERE `AngelTypes`.`id` = " . sql_escape($type_id) . " AND (`AngelTypes`.`restricted` = 0 OR (`UserAngelTypes`.`user_id` = " . sql_escape($user['UID']) . " AND NOT `UserAngelTypes`.`confirm_user_id` IS NULL)) LIMIT 1"); + $type = sql_select("SELECT * FROM `UserAngelTypes` JOIN `AngelTypes` ON (`UserAngelTypes`.`angeltype_id` = `AngelTypes`.`id`) WHERE `AngelTypes`.`id` = '" . sql_escape($type_id) . "' AND (`AngelTypes`.`restricted` = 0 OR (`UserAngelTypes`.`user_id` = '" . sql_escape($user['UID']) . "' AND NOT `UserAngelTypes`.`confirm_user_id` IS NULL)) LIMIT 1"); if (count($type) == 0) redirect(page_link_to('user_shifts')); $type = $type[0]; + if (! Shift_signup_allowed($shift, $type)) { + error(_('You are not allowed to sign up for this shift. Maybe shift is full or already running.')); + redirect(shift_link($shift)); + } + if (isset($_REQUEST['submit'])) { $selected_type_id = $type_id; if (in_array('user_shifts_admin', $privileges)) { @@ -252,10 +260,10 @@ function user_shifts() { else $user_id = $user['UID']; - if (sql_num_query("SELECT * FROM `User` WHERE `UID`=" . sql_escape($user_id) . " LIMIT 1") == 0) + if (sql_num_query("SELECT * FROM `User` WHERE `UID`='" . sql_escape($user_id) . "' LIMIT 1") == 0) redirect(page_link_to('user_shifts')); - if (isset($_REQUEST['angeltype_id']) && test_request_int('angeltype_id') && sql_num_query("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($_REQUEST['angeltype_id']) . " LIMIT 1") > 0) + if (isset($_REQUEST['angeltype_id']) && test_request_int('angeltype_id') && sql_num_query("SELECT * FROM `AngelTypes` WHERE `id`='" . sql_escape($_REQUEST['angeltype_id']) . "' LIMIT 1") > 0) $selected_type_id = $_REQUEST['angeltype_id']; } else $user_id = $user['UID']; @@ -340,7 +348,7 @@ function view_user_shifts() { if (in_array('user_shifts_admin', $privileges)) $types = sql_select("SELECT `id`, `name` FROM `AngelTypes` ORDER BY `AngelTypes`.`name`"); else - $types = sql_select("SELECT `AngelTypes`.`id`, `AngelTypes`.`name`, (`AngelTypes`.`restricted`=0 OR (NOT `UserAngelTypes`.`confirm_user_id` IS NULL OR `UserAngelTypes`.`id` IS NULL)) as `enabled` FROM `AngelTypes` LEFT JOIN `UserAngelTypes` ON (`UserAngelTypes`.`angeltype_id`=`AngelTypes`.`id` AND `UserAngelTypes`.`user_id`=" . sql_escape($user['UID']) . ") ORDER BY `AngelTypes`.`name`"); + $types = sql_select("SELECT `AngelTypes`.`id`, `AngelTypes`.`name`, (`AngelTypes`.`restricted`=0 OR (NOT `UserAngelTypes`.`confirm_user_id` IS NULL OR `UserAngelTypes`.`id` IS NULL)) as `enabled` FROM `AngelTypes` LEFT JOIN `UserAngelTypes` ON (`UserAngelTypes`.`angeltype_id`=`AngelTypes`.`id` AND `UserAngelTypes`.`user_id`='" . sql_escape($user['UID']) . "') ORDER BY `AngelTypes`.`name`"); if (empty($types)) $types = sql_select("SELECT `id`, `name` FROM `AngelTypes` WHERE `restricted` = 0"); $filled = array( @@ -363,9 +371,13 @@ function view_user_shifts() { $_SESSION['user_shifts'] = array(); if (! isset($_SESSION['user_shifts']['filled'])) { - $_SESSION['user_shifts']['filled'] = array( + // User shift admins see free and occupied shifts by default + $_SESSION['user_shifts']['filled'] = in_array('user_shifts_admin', $privileges) ? [ + 0, + 1 + ] : [ 0 - ); + ]; } foreach (array( @@ -441,10 +453,10 @@ function view_user_shifts() { if (count($_SESSION['user_shifts']['filled']) == 1) { if ($_SESSION['user_shifts']['filled'][0] == 0) $SQL .= " - AND (nat.`count` > entries.`count` OR entries.`count` IS NULL OR EXISTS (SELECT `SID` FROM `ShiftEntry` WHERE `UID` = " . sql_escape($user['UID']) . " AND `ShiftEntry`.`SID` = `Shifts`.`SID`))"; + AND (nat.`count` > entries.`count` OR entries.`count` IS NULL OR EXISTS (SELECT `SID` FROM `ShiftEntry` WHERE `UID` = '" . sql_escape($user['UID']) . "' AND `ShiftEntry`.`SID` = `Shifts`.`SID`))"; elseif ($_SESSION['user_shifts']['filled'][0] == 1) $SQL .= " - AND (nat.`count` <= entries.`count` OR EXISTS (SELECT `SID` FROM `ShiftEntry` WHERE `UID` = " . sql_escape($user['UID']) . " AND `ShiftEntry`.`SID` = `Shifts`.`SID`))"; + AND (nat.`count` <= entries.`count` OR EXISTS (SELECT `SID` FROM `ShiftEntry` WHERE `UID` = '" . sql_escape($user['UID']) . "' AND `ShiftEntry`.`SID` = `Shifts`.`SID`))"; } $SQL .= " ORDER BY `start`"; @@ -506,7 +518,10 @@ function view_user_shifts() { if ($colspan == 0) $colspan = 1; $todo[$rid] = array_fill(0, $maxshow, $colspan); - $shifts_table .= "<th" . (($colspan > 1) ? ' colspan="' . $colspan . '"' : '') . ">${room['name']}</th>\n"; + $shifts_table .= "<th" . (($colspan > 1) ? ' colspan="' . $colspan . '"' : '') . ">" . Room_name_render([ + 'RID' => $room['id'], + 'Name' => $room['name'] + ]) . "</th>\n"; } unset($block, $blocks, $firstblock, $colspan, $key, $room); @@ -543,7 +558,17 @@ function view_user_shifts() { // qqqqqq $is_free = false; - $shifts_row = '<a href="' . shift_link($shift) . '">' . date('d.m. H:i', $shift['start']); + $shifts_row = ''; + if (in_array('admin_shifts', $privileges)) + $shifts_row .= '<div class="pull-right">' . table_buttons(array( + button(page_link_to('user_shifts') . '&edit_shift=' . $shift['SID'], glyph('edit'), 'btn-xs'), + button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs') + )) . '</div>'; + $shifts_row .= Room_name_render([ + 'RID' => $room['id'], + 'Name' => $room['name'] + ]) . '<br />'; + $shifts_row .= '<a href="' . shift_link($shift) . '">' . date('d.m. H:i', $shift['start']); $shifts_row .= " – "; $shifts_row .= date('H:i', $shift['end']); $shifts_row .= "<br /><b>"; @@ -553,23 +578,19 @@ function view_user_shifts() { $shifts_row .= $shift['title']; $shifts_row .= "<br />"; } - if (in_array('admin_shifts', $privileges)) - $shifts_row .= ' ' . table_buttons(array( - button(page_link_to('user_shifts') . '&edit_shift=' . $shift['SID'], glyph('edit'), 'btn-xs'), - button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs') - )); + $shifts_row .= '</a>'; $shifts_row .= '<br />'; $query = "SELECT `NeededAngelTypes`.`count`, `AngelTypes`.`id`, `AngelTypes`.`restricted`, `UserAngelTypes`.`confirm_user_id`, `AngelTypes`.`name`, `UserAngelTypes`.`user_id` FROM `NeededAngelTypes` JOIN `AngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id`) - LEFT JOIN `UserAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `UserAngelTypes`.`angeltype_id`AND `UserAngelTypes`.`user_id`=" . sql_escape($user['UID']) . ") + LEFT JOIN `UserAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `UserAngelTypes`.`angeltype_id`AND `UserAngelTypes`.`user_id`='" . sql_escape($user['UID']) . "') WHERE `count` > 0 AND "; if ($shift['has_special_needs']) - $query .= "`shift_id` = " . sql_escape($shift['SID']); + $query .= "`shift_id` = '" . sql_escape($shift['SID']) . "'"; else - $query .= "`room_id` = " . sql_escape($shift['RID']); + $query .= "`room_id` = '" . sql_escape($shift['RID']) . "'"; if (! empty($_SESSION['user_shifts']['types'])) $query .= " AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") "; $query .= " ORDER BY `AngelTypes`.`name`"; @@ -577,17 +598,14 @@ function view_user_shifts() { if (count($angeltypes) > 0) { foreach ($angeltypes as $angeltype) { - $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`=" . sql_escape($shift['SID']) . " AND `TID`=" . sql_escape($angeltype['id']) . " ORDER BY `Nick`"); + $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`='" . sql_escape($shift['SID']) . "' AND `TID`='" . sql_escape($angeltype['id']) . "' ORDER BY `Nick`"); $entry_list = array(); $freeloader = 0; foreach ($entries as $entry) { - if ($entry['Gekommen'] == 1) - $style = "font-weight:bold;"; - else - $style = "font-weight:normal;"; + $style = ''; if ($entry['freeloaded']) { $freeloader ++; - $style .= " text-decoration: line-through;"; + $style = " text-decoration: line-through;"; } if (in_array('user_shifts_admin', $privileges)) $entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) . ' ' . table_buttons(array( @@ -617,29 +635,30 @@ function view_user_shifts() { // User shift admins may join anybody in every shift $user_may_join_shift |= in_array('user_shifts_admin', $privileges); if ($user_may_join_shift) - $entry_list[] = '<a href="' . page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['id'] . '">' . $inner_text . ' »</a>'; + $entry_list[] = '<a href="' . page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['id'] . '">' . $inner_text . '</a> ' . button(page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['id'], _('Sign up'), 'btn-xs'); else { if (time() > $shift['start']) - $entry_list[] = $inner_text . ' (vorbei)'; + $entry_list[] = $inner_text . ' (' . _('ended') . ')'; elseif ($angeltype['restricted'] == 1 && isset($angeltype['user_id']) && ! isset($angeltype['confirm_user_id'])) $entry_list[] = $inner_text . glyph('lock'); + elseif ($angeltype['restricted'] == 1) + $entry_list[] = $inner_text; elseif ($collides) $entry_list[] = $inner_text; else - $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] . ')</a>'; + $entry_list[] = $inner_text . '<br />' . button(page_link_to('user_angeltypes') . '&action=add&angeltype_id=' . $angeltype['id'], sprintf(_('Become %s'), $angeltype['name']), 'btn-xs'); } unset($inner_text); $is_free = true; } - $shifts_row .= '<b>' . $angeltype['name'] . ':</b> '; + $shifts_row .= '<strong>' . AngelType_name_render($angeltype) . ':</strong> '; $shifts_row .= join(", ", $entry_list); $shifts_row .= '<br />'; } - if (in_array('user_shifts_admin', $privileges)) { - $shifts_row .= '<a href="' . page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['id'] . '">' . _("Add more angels") . ' »</a>'; - } + if (in_array('user_shifts_admin', $privileges)) + $shifts_row .= ' ' . button(page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['id'], _("Add more angels"), 'btn-xs'); } if ($shift['own'] && ! in_array('user_shifts_admin', $privileges)) $class = 'own'; @@ -695,23 +714,24 @@ function view_user_shifts() { $query = "SELECT `NeededAngelTypes`.`count`, `AngelTypes`.`id`, `AngelTypes`.`restricted`, `UserAngelTypes`.`confirm_user_id`, `AngelTypes`.`name`, `UserAngelTypes`.`user_id` FROM `NeededAngelTypes` JOIN `AngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id`) - LEFT JOIN `UserAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `UserAngelTypes`.`angeltype_id`AND `UserAngelTypes`.`user_id`=" . sql_escape($user['UID']) . ") + LEFT JOIN `UserAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `UserAngelTypes`.`angeltype_id`AND `UserAngelTypes`.`user_id`='" . sql_escape($user['UID']) . "') WHERE "; if ($shift_has_special_needs) - $query .= "`shift_id` = " . sql_escape($shift['SID']); + $query .= "`shift_id` = '" . sql_escape($shift['SID']) . "'"; else - $query .= "`room_id` = " . sql_escape($shift['RID']); + $query .= "`room_id` = '" . sql_escape($shift['RID']) . "'"; $query .= " AND `count` > 0 "; if (! empty($_SESSION['user_shifts']['types'])) $query .= "AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") "; $query .= "ORDER BY `AngelTypes`.`name`"; $angeltypes = sql_select($query); if (count($angeltypes) > 0) { - $my_shift = sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift['SID']) . " AND `UID`=" . sql_escape($user['UID']) . " LIMIT 1") > 0; + $my_shift = sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`='" . sql_escape($shift['SID']) . "' AND `UID`='" . sql_escape($user['UID']) . "' LIMIT 1") > 0; foreach ($angeltypes as &$angeltype) { - $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`=" . sql_escape($shift['SID']) . " AND `TID`=" . sql_escape($angeltype['id']) . " ORDER BY `Nick`"); + $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`='" . sql_escape($shift['SID']) . "' AND `TID`='" . sql_escape($angeltype['id']) . "' ORDER BY `Nick`"); $entry_list = array(); + $entry_nicks = []; $freeloader = 0; foreach ($entries as $entry) { if (in_array('user_shifts_admin', $privileges)) @@ -725,8 +745,11 @@ function view_user_shifts() { $freeloader ++; } $entry_list[] = $member; + $entry_nicks[] = $entry['Nick']; } $angeltype['taken'] = count($entries) - $freeloader; + $angeltype['angels'] = $entry_nicks; + // do we need more angles of this type? if ($angeltype['count'] - count($entries) + $freeloader > 0) { $inner_text = sprintf(ngettext("%d helper needed", "%d helpers needed", $angeltype['count'] - count($entries) + $freeloader), $angeltype['count'] - count($entries) + $freeloader); @@ -756,7 +779,7 @@ function view_user_shifts() { } elseif ($angeltype['restricted'] == 1 && isset($angeltype['user_id']) && ! isset($angeltype['confirm_user_id'])) { $entry_list[] = $inner_text . glyph("lock"); } else { - $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] . ')</a>'; + $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_angeltypes') . '&action=add&angeltype_id=' . $angeltype['id'] . '">' . sprintf(_('Become %s'), $angeltype['name']) . '</a>'; } } @@ -769,7 +792,7 @@ function view_user_shifts() { $shift_row['entries'] .= '<br />'; } if (in_array('user_shifts_admin', $privileges)) { - $shift_row['entries'] .= '<a href="' . page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['id'] . '">Weitere Helfer eintragen »</a>'; + $shift_row['entries'] .= '<a href="' . page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['id'] . '">' . _('Add more angels') . ' »</a>'; } $shifts_table[] = $shift_row; $shift['angeltypes'] = $angeltypes; @@ -795,7 +818,7 @@ function view_user_shifts() { 'start_time' => $_SESSION['user_shifts']['start_time'], 'end_select' => html_select_key("end_day", "end_day", array_combine($days, $days), $_SESSION['user_shifts']['end_day']), 'end_time' => $_SESSION['user_shifts']['end_time'], - 'type_select' => make_select($types, $_SESSION['user_shifts']['types'], "types", _("Tasks") . '<sup>1</sup>'), + 'type_select' => make_select($types, $_SESSION['user_shifts']['types'], "types", _("Angeltypes") . '<sup>1</sup>'), 'filled_select' => make_select($filled, $_SESSION['user_shifts']['filled'], "filled", _("Occupancy")), 'task_notice' => '<sup>1</sup>' . _("The tasks shown here are influenced by the preferences you defined in your settings!") . " <a href=\"" . page_link_to('angeltypes') . '&action=about' . "\">" . _("Description of the jobs.") . "</a>", 'new_style_checkbox' => '<label><input type="checkbox" name="new_style" value="1" ' . ($_SESSION['user_shifts']['new_style'] ? ' checked' : '') . '> ' . _("Use new style if possible") . '</label>', diff --git a/includes/sys_auth.php b/includes/sys_auth.php index e9fa197d..d4f35fa6 100644 --- a/includes/sys_auth.php +++ b/includes/sys_auth.php @@ -6,7 +6,7 @@ function load_auth() { $user = null; if (isset($_SESSION['uid'])) { - $user = sql_select("SELECT * FROM `User` WHERE `UID`=" . sql_escape($_SESSION['uid']) . " LIMIT 1"); + $user = sql_select("SELECT * FROM `User` WHERE `UID`='" . sql_escape($_SESSION['uid']) . "' LIMIT 1"); if (count($user) > 0) { // User ist eingeloggt, Datensatz zur Verfügung stellen und Timestamp updaten list ($user) = $user; @@ -53,47 +53,9 @@ function verify_password($password, $salt, $uid = false) { return $correct; } -// JSON Authorisierungs-Schnittstelle -function json_auth_service() { - global $api_key; - - header("Content-Type: application/json"); - - $User = $_REQUEST['user']; - $Pass = $_REQUEST['pw']; - $SourceOuth = $_REQUEST['so']; - - if (isset($api_key) && $SourceOuth == $api_key) { - $sql = "SELECT `UID`, `Passwort` FROM `User` WHERE `Nick`='" . sql_escape($User) . "'"; - $Erg = sql_select($sql); - - if (count($Erg) == 1) { - $Erg = $Erg[0]; - if (verify_password($Pass, $Erg["Passwort"], $Erg["UID"])) { - $user_privs = sql_select("SELECT `Privileges`.`name` FROM `User` JOIN `UserGroups` ON (`User`.`UID` = `UserGroups`.`uid`) JOIN `GroupPrivileges` ON (`UserGroups`.`group_id` = `GroupPrivileges`.`group_id`) JOIN `Privileges` ON (`GroupPrivileges`.`privilege_id` = `Privileges`.`id`) WHERE `User`.`UID`=" . sql_escape($UID) . ";"); - foreach ($user_privs as $user_priv) - $privileges[] = $user_priv['name']; - - $msg = array ( - 'status' => 'success', - 'rights' => $privileges - ); - echo json_encode($msg); - die(); - } - } - } - - echo json_encode(array ( - 'status' => 'failed', - 'error' => "JSON Service GET syntax: https://engelsystem.de/?auth&user=<user>&pw=<password>&so=<key>, POST is possible too" - )); - die(); -} - function privileges_for_user($user_id) { $privileges = array (); - $user_privs = sql_select("SELECT `Privileges`.`name` FROM `User` JOIN `UserGroups` ON (`User`.`UID` = `UserGroups`.`uid`) JOIN `GroupPrivileges` ON (`UserGroups`.`group_id` = `GroupPrivileges`.`group_id`) JOIN `Privileges` ON (`GroupPrivileges`.`privilege_id` = `Privileges`.`id`) WHERE `User`.`UID`=" . sql_escape($user_id) . ";"); + $user_privs = sql_select("SELECT `Privileges`.`name` FROM `User` JOIN `UserGroups` ON (`User`.`UID` = `UserGroups`.`uid`) JOIN `GroupPrivileges` ON (`UserGroups`.`group_id` = `GroupPrivileges`.`group_id`) JOIN `Privileges` ON (`GroupPrivileges`.`privilege_id` = `Privileges`.`id`) WHERE `User`.`UID`='" . sql_escape($user_id) . "'"); foreach ($user_privs as $user_priv) $privileges[] = $user_priv['name']; return $privileges; @@ -101,7 +63,7 @@ function privileges_for_user($user_id) { function privileges_for_group($group_id) { $privileges = array (); - $groups_privs = sql_select("SELECT * FROM `GroupPrivileges` JOIN `Privileges` ON (`GroupPrivileges`.`privilege_id` = `Privileges`.`id`) WHERE `group_id`=" . sql_escape($group_id)); + $groups_privs = sql_select("SELECT * FROM `GroupPrivileges` JOIN `Privileges` ON (`GroupPrivileges`.`privilege_id` = `Privileges`.`id`) WHERE `group_id`='" . sql_escape($group_id) . "'"); foreach ($groups_privs as $guest_priv) $privileges[] = $guest_priv['name']; return $privileges; diff --git a/includes/sys_counter.php b/includes/sys_counter.php deleted file mode 100644 index 40110165..00000000 --- a/includes/sys_counter.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php - -function counter() { - global $p; - - if (sql_num_query("SELECT `Anz` FROM `Counter` WHERE `URL`='" . sql_escape($p) . "'") == 0) - sql_query("INSERT INTO `Counter` ( `URL` , `Anz` ) VALUES ('" . sql_escape($p) . "', '1');"); - else - sql_query("UPDATE `Counter` SET `Anz` = `Anz` + 1 WHERE `URL` = '" . sql_escape($p) . "' LIMIT 1 ;"); -} -?> diff --git a/includes/sys_log.php b/includes/sys_log.php index 60c765c0..66ff5820 100644 --- a/includes/sys_log.php +++ b/includes/sys_log.php @@ -9,13 +9,12 @@ */ function engelsystem_log($message) { global $user; - + if (isset($user)) { - $nick = $user['Nick']; + $nick = User_Nick_render($user); } else { $nick = "Guest"; } - LogEntry_create($nick, $message); } @@ -27,14 +26,14 @@ function debug_string_backtrace() { debug_print_backtrace(); $trace = ob_get_contents(); ob_end_clean(); - + // Remove first item from backtrace as it's this function which // is redundant. $trace = preg_replace('/^#0\s+' . __FUNCTION__ . "[^\n]*\n/", '', $trace, 1); - + // Renumber backtrace items. $trace = preg_replace('/^#(\d+)/me', '\'#\' . ($1 - 1)', $trace); - + return $trace; } diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 16577cbc..c7ecfb88 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -45,6 +45,9 @@ function header_toolbar() { if ($unconfirmed_hint != '') $hints[] = $unconfirmed_hint; + if (! isset($user['planned_departure_date']) || $user['planned_departure_date'] == null) + $hints[] = info(_("Please enter your planned date of departure on your settings page to give us a feeling for teardown capacities."), true); + if (User_is_freeloader($user)) { $hints[] = error(sprintf(_("You freeloaded at least %s shifts. Shift signup is locked. Please go to heavens desk to be unlocked again."), $max_freeloadable_shifts), true); $hint_class = 'danger'; diff --git a/includes/sys_template.php b/includes/sys_template.php index 3b6d7d3b..dd5edde7 100644 --- a/includes/sys_template.php +++ b/includes/sys_template.php @@ -6,7 +6,7 @@ $themes = array( "0" => "Engelsystem light", "1" => "Engelsystem dark", - "2" => "Engelsystem 31c3" + "2" => "Engelsystem cccamp15" ); /** @@ -85,9 +85,18 @@ function toolbar_dropdown($glyphicon, $label, $submenu, $class = '') { function toolbar_popover($glyphicon, $label, $content, $class = '') { $id = md5(microtime() . $glyphicon . $label); return '<li class="dropdown messages ' . $class . '"> - <a id="' . $id . '" href="#" tabindex="0">' . ($glyphicon != '' ? '<span class="glyphicon glyphicon-' . $glyphicon . '"></span> ' : '') . $label . ' <span class="caret"></span></a> + <a id="' . $id . '" href="#">' . ($glyphicon != '' ? '<span class="glyphicon glyphicon-' . $glyphicon . '"></span> ' : '') + . $label . ' <span class="caret"></span></a> <script type="text/javascript"> - $(document).ready(function(){$("#' . $id . '").popover({trigger: "click focus", html: true, content: "' . addslashes(join('', $content)) . '", placement: "bottom", container: "#navbar-collapse-1"})}); + $(function(){ + $("#' . $id . '").popover({ + trigger: "focus", + html: true, + content: "' . addslashes(join('', $content)) . '", + placement: "bottom", + container: "#navbar-collapse-1" + }) + }); </script></li>'; } @@ -123,6 +132,40 @@ function form_spinner($name, $label, $value) { } /** + * Render a bootstrap datepicker + * + * @param string $name + * Name of the parameter + * @param string $label + * Label + * @param int $value + * Unix Timestamp + * @param int $min_date + * Earliest possible date + * @return HTML + */ +function form_date($name, $label, $value, $start_date = '') { + $id = $name . '-date'; + $value = is_numeric($value) ? date('Y-m-d', $value) : ''; + $start_date = is_numeric($start_date) ? date('Y-m-d', $start_date) : ''; + return form_element($label, ' + <div class="input-group date" id="' . $id . '"> + <input type="text" name="' . $name . '" class="form-control" value="' . $value . '"><span class="input-group-addon">' . glyph('th') . '</span> + </div> + <script type="text/javascript"> + $(function(){ + $("#' . $id . '").datepicker({ + language: "' . locale_short() . '", + todayBtn: "linked", + format: "yyyy-mm-dd", + startDate: "' . $start_date . '" + }); + }); + </script> + ', $id); +} + +/** * Rendert eine Liste von Checkboxen für ein Formular * * @param diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index 78563c0b..ce38a096 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -103,23 +103,25 @@ function AngelType_view($angeltype, $members, $user_angeltype, $admin_user_angel foreach ($members as $member) { $member['Nick'] = User_Nick_render($member); if ($angeltype['restricted'] && $member['confirm_user_id'] == null) { - $member['actions'] = join(" ", array( - '<a href="' . page_link_to('user_angeltypes') . '&action=confirm&user_angeltype_id=' . $member['user_angeltype_id'] . '" class="ok">' . _("confirm") . '</a>', - '<a href="' . page_link_to('user_angeltypes') . '&action=delete&user_angeltype_id=' . $member['user_angeltype_id'] . '" class="cancel">' . _("deny") . '</a>' - )); + $member['actions'] = table_buttons([ + button(page_link_to('user_angeltypes') . '&action=confirm&user_angeltype_id=' . $member['user_angeltype_id'], _("confirm"), 'btn-xs'), + button(page_link_to('user_angeltypes') . '&action=delete&user_angeltype_id=' . $member['user_angeltype_id'], _("deny"), 'btn-xs') + ]); $members_unconfirmed[] = $member; } elseif ($member['coordinator']) { if ($admin_angeltypes) - $member['actions'] = '<a href="' . page_link_to('user_angeltypes') . '&action=update&user_angeltype_id=' . $member['user_angeltype_id'] . '&coordinator=0" class="cancel">' . _("Remove coordinator rights") . '</a>'; + $member['actions'] = table_buttons([ + button(page_link_to('user_angeltypes') . '&action=update&user_angeltype_id=' . $member['user_angeltype_id'] . '&coordinator=0', _("Remove coordinator rights"), 'btn-xs') + ]); else $member['actions'] = ''; $coordinators[] = $member; } else { if ($admin_user_angeltypes) - $member['actions'] = join(" ", array( - $admin_angeltypes ? '<a href="' . page_link_to('user_angeltypes') . '&action=update&user_angeltype_id=' . $member['user_angeltype_id'] . '&coordinator=1" class="add">' . _("Add coordinator rights") . '</a>' : '', - '<a href="' . page_link_to('user_angeltypes') . '&action=delete&user_angeltype_id=' . $member['user_angeltype_id'] . '" class="cancel">' . _("remove") . '</a>' - )); + $member['actions'] = table_buttons([ + $admin_angeltypes ? button(page_link_to('user_angeltypes') . '&action=update&user_angeltype_id=' . $member['user_angeltype_id'] . '&coordinator=1', _("Add coordinator rights"), 'btn-xs') : '', + button(page_link_to('user_angeltypes') . '&action=delete&user_angeltype_id=' . $member['user_angeltype_id'], _("remove"), 'btn-xs') + ]); $members_confirmed[] = $member; } } @@ -131,6 +133,21 @@ function AngelType_view($angeltype, $members, $user_angeltype, $admin_user_angel 'actions' => "" ), $coordinators); } + + if (count($members_confirmed) > 0) + $members_confirmed[] = [ + 'Nick' => _('Sum'), + 'DECT' => count($members_confirmed), + 'actions' => '' + ]; + + if (count($members_unconfirmed) > 0) + $members_unconfirmed[] = [ + 'Nick' => _('Sum'), + 'DECT' => count($members_unconfirmed), + 'actions' => '' + ]; + $page[] = '<h3>' . _("Members") . '</h3>'; if ($admin_user_angeltypes) $page[] = buttons(array( diff --git a/includes/view/Rooms_view.php b/includes/view/Rooms_view.php index bb41a4d3..e1d411cb 100644 --- a/includes/view/Rooms_view.php +++ b/includes/view/Rooms_view.php @@ -4,7 +4,7 @@ function Room_name_render($room) { global $privileges; if (in_array('admin_rooms', $privileges)) return '<a href="' . room_link($room) . '">' . glyph('map-marker') . $room['Name'] . '</a>'; - return $room['Name']; + return glyph('map-marker') . $room['Name']; } ?>
\ No newline at end of file diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php index 00c18572..b0628a3b 100644 --- a/includes/view/Shifts_view.php +++ b/includes/view/Shifts_view.php @@ -1,5 +1,14 @@ <?php +function Shift_editor_info_render($shift) { + $info = []; + if ($shift['created_by_user_id'] != null) + $info[] = sprintf(glyph('plus') . _("created at %s by %s"), date('Y-m-d H:i', $shift['created_at_timestamp']), User_Nick_render(User($shift['created_by_user_id']))); + if ($shift['edited_by_user_id'] != null) + $info[] = sprintf(glyph('pencil') . _("edited at %s by %s"), date('Y-m-d H:i', $shift['edited_at_timestamp']), User_Nick_render(User($shift['edited_by_user_id']))); + return join('<br />', $info); +} + function Shift_signup_button_render($shift, $angeltype, $user_angeltype = null, $user_shifts = null) { global $user; @@ -12,7 +21,7 @@ function Shift_signup_button_render($shift, $angeltype, $user_angeltype = null, if (Shift_signup_allowed($shift, $angeltype, $user_angeltype, $user_shifts)) return button(page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['id'], _('Sign up')); elseif ($user_angeltype == null) - return button(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id'], sprintf('Become %s', $angeltype['name'])); + return button(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id'], sprintf(_('Become %s'), $angeltype['name'])); else return ''; } @@ -36,7 +45,7 @@ function Shift_view($shift, $shifttype, $room, $shift_admin, $angeltypes_source, $needed_angels .= '<div class="pull-right">' . Shift_signup_button_render($shift, $angeltypes[$needed_angeltype['TID']]) . '</div>'; $needed_angels .= '<h3>' . AngelType_name_render($angeltypes[$needed_angeltype['TID']]) . '</h3>'; - $needed_angels .= progress_bar(0, $needed_angeltype['count'], $needed_angeltype['taken'], $class, $needed_angeltype['taken'] . ' / ' . $needed_angeltype['count']); + $needed_angels .= progress_bar(0, $needed_angeltype['count'], min($needed_angeltype['taken'], $needed_angeltype['count']), $class, $needed_angeltype['taken'] . ' / ' . $needed_angeltype['count']); $angels = []; foreach ($shift['ShiftEntry'] as $shift_entry) { @@ -46,7 +55,7 @@ function Shift_view($shift, $shifttype, $room, $shift_admin, $angeltypes_source, $entry = '<strike>' . $entry . '</strike>'; if ($user_shift_admin) { $entry .= ' <div class="btn-group">'; - $entry .= button_glyph(page_link_to('user_myshifts') . '&edit=' . $shift['SID'] . '&id=' . $shift_entry['UID'], 'pencil', 'btn-xs'); + $entry .= button_glyph(page_link_to('user_myshifts') . '&edit=' . $shift_entry['id'] . '&id=' . $shift_entry['UID'], 'pencil', 'btn-xs'); $entry .= button_glyph(page_link_to('user_shifts') . '&entry_id=' . $shift_entry['id'], 'trash', 'btn-xs'); $entry .= '</div>'; } @@ -60,6 +69,7 @@ function Shift_view($shift, $shifttype, $room, $shift_admin, $angeltypes_source, } return page_with_title($shift['name'] . ' <small class="moment-countdown" data-timestamp="' . $shift['start'] . '">%c</small>', [ + msg(), Shift_collides($shift, $user_shifts) ? info(_('This shift collides with one of your shifts.'), true) : '', $signed_up ? info(_('You are signed up for this shift.'), true) : '', @@ -104,7 +114,8 @@ function Shift_view($shift, $shifttype, $room, $shift_admin, $angeltypes_source, '<h2>' . _('Description') . '</h2>', $parsedown->parse($shifttype['description']) ]) - ]) + ]), + $shift_admin ? Shift_editor_info_render($shift) : '' ]); } diff --git a/includes/view/User_view.php b/includes/view/User_view.php index a7d77b19..3ab5f816 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -19,10 +19,27 @@ $tshirt_sizes = array( 'XL-G' => "XL Girl" ); -function Users_view($users, $order_by, $arrived_count, $active_count, $force_active_count, $freeloads_count, $tshirts_count) { +/** + * View for editing the number of given vouchers + */ +function User_edit_vouchers_view($user) { + return page_with_title(sprintf(_("%s's vouchers"), User_Nick_render($user)), [ + msg(), + buttons([ + button(user_link($user), glyph('chevron-left') . _("back")) + ]), + form([ + form_spinner('vouchers', _("Number of vouchers"), $user['got_voucher']), + form_submit('submit', _("Save")) + ], page_link_to('users') . '&action=edit_vouchers&user_id=' . $user['UID']) + ]); +} + +function Users_view($users, $order_by, $arrived_count, $active_count, $force_active_count, $freeloads_count, $tshirts_count, $voucher_count) { foreach ($users as &$user) { $user['Nick'] = User_Nick_render($user); $user['Gekommen'] = glyph_bool($user['Gekommen']); + $user['got_voucher'] = $user['got_voucher']; $user['Aktiv'] = glyph_bool($user['Aktiv']); $user['force_active'] = glyph_bool($user['force_active']); $user['Tshirt'] = glyph_bool($user['Tshirt']); @@ -34,6 +51,7 @@ function Users_view($users, $order_by, $arrived_count, $active_count, $force_act $users[] = array( 'Nick' => '<strong>' . _('Sum') . '</strong>', 'Gekommen' => $arrived_count, + 'got_voucher' => $voucher_count, 'Aktiv' => $active_count, 'force_active' => $force_active_count, 'freeloads' => $freeloads_count, @@ -52,6 +70,7 @@ function Users_view($users, $order_by, $arrived_count, $active_count, $force_act 'Name' => Users_table_header_link('Name', _('Name'), $order_by), 'DECT' => Users_table_header_link('DECT', _('DECT'), $order_by), 'Gekommen' => Users_table_header_link('Gekommen', _('Arrived'), $order_by), + 'got_voucher' => Users_table_header_link('got_voucher', _('Voucher'), $order_by), 'freeloads' => _('Freeloads'), 'Aktiv' => Users_table_header_link('Aktiv', _('Active'), $order_by), 'force_active' => Users_table_header_link('force_active', _('Forced'), $order_by), @@ -106,10 +125,7 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel $shift_entries = array(); foreach ($needed_angel_type['users'] as $user_shift) { - if ($its_me) - $member = '<strong>' . User_Nick_render($user_shift) . '</strong>'; - else - $member = User_Nick_render($user_shift); + $member = User_Nick_render($user_shift); if ($user_shift['freeloaded']) $member = '<strike>' . $member . '</strike>'; @@ -143,15 +159,15 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel $myshift['actions'] = table_buttons($myshift['actions']); if ($shift['freeloaded']) - $timesum += - 2 * ($shift['end'] - $shift['start']); + $timesum += (- 2 * ($shift['end'] - $shift['start'])); else - $timesum += $shift['end'] - $shift['start']; + $timesum += ($shift['end'] - $shift['start']); $myshifts_table[] = $myshift; } if (count($myshifts_table) > 0) $myshifts_table[] = array( 'date' => '<b>' . _("Sum:") . '</b>', - 'time' => "<b>" . round($timesum / (60 * 60), 1) . " h</b>", + 'time' => "<b>" . round($timesum / 3600, 1) . " h</b>", 'room' => "", 'shift_info' => "", 'comment' => "", @@ -171,7 +187,8 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel '<h4>' . _("User state") . '</h4>', ($admin_user_privilege && $freeloader) ? '<span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"></span> ' . _("Freeloader") . '</span><br />' : '', $user_source['Gekommen'] ? User_shift_state_render($user_source) . '<br />' : '', - ($user_source['Gekommen'] ? '<span class="text-success"><span class="glyphicon glyphicon-home"></span> ' . _("Arrived") . '</span>' : '<span class="text-danger">' . _("Not arrived") . '</span>'), + $admin_user_privilege || $its_me ? ($user_source['Gekommen'] ? '<span class="text-success"><span class="glyphicon glyphicon-home"></span> ' . sprintf(_("Arrived at %s"), date('Y-m-d', $user_source['arrival_date'])) . '</span>' : '<span class="text-danger">' . sprintf(_("Not arrived (Planned: %s)"), date('Y-m-d', $user_source['planned_arrival_date'])) . '</span>') : ($user_source['Gekommen'] ? '<span class="text-success"><span class="glyphicon glyphicon-home"></span> ' . _("Arrived") . '</span>' : '<span class="text-danger">' . _("Not arrived") . '</span>'), + $admin_user_privilege ? ($user_source['got_voucher'] > 0 ? '<br /><span class="text-success">' . glyph('cutlery') . sprintf(ngettext("Got %s voucher", "Got %s vouchers", $user_source['got_voucher']), $user_source['got_voucher']) . '</span><br />' : '<br /><span class="text-danger">' . _("Got no vouchers") . '</span><br />') : '', ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Aktiv']) ? ' <span class="text-success">' . _("Active") . '</span>' : '', ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Tshirt']) ? ' <span class="text-success">' . _("T-Shirt") . '</span>' : '' )), @@ -189,6 +206,7 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel buttons(array( $admin_user_privilege ? button(page_link_to('admin_user') . '&id=' . $user_source['UID'], glyph("edit") . _("edit")) : '', ($admin_user_privilege && ! $user_source['Gekommen']) ? button(page_link_to('admin_arrive') . '&arrived=' . $user_source['UID'], _("arrived")) : '', + $admin_user_privilege ? button(page_link_to('users') . '&action=edit_vouchers&user_id=' . $user_source['UID'], glyph('cutlery') . _('Edit vouchers')) : '', $its_me ? button(page_link_to('user_settings'), glyph('list-alt') . _("Settings")) : '', $its_me ? button(page_link_to('ical') . '&key=' . $user_source['api_key'], glyph('calendar') . _("iCal Export")) : '', $its_me ? button(page_link_to('shifts_json_export') . '&key=' . $user_source['api_key'], glyph('export') . _("JSON Export")) : '', @@ -205,6 +223,7 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel 'comment' => _("Comment"), 'actions' => _("Action") ), $myshifts_table) : '', + $its_me ? info(glyph('info-sign') . _("Your night shifts between 2 and 8 am count twice."), true) : '', $its_me && count($shifts) == 0 ? error(sprintf(_("Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some shifts."), page_link_to('user_shifts')), true) : '' )); } @@ -249,7 +268,7 @@ function User_angeltypes_render($user_angeltypes) { $class = 'text-warning'; else $class = 'text-success'; - $output[] = '<span class="' . $class . '">' . ($angeltype['coordinator'] ? '<span class="glyphicon glyphicon-certificate"></span> ' : '') . $angeltype['name'] . '</span>'; + $output[] = '<span class="' . $class . '">' . ($angeltype['coordinator'] ? glyph('education') : '') . $angeltype['name'] . '</span>'; } return join('<br />', $output); } @@ -263,23 +282,13 @@ function User_groups_render($user_groups) { } /** - * Render a users avatar. - * - * @param User $user - * @return string - */ -function User_Avatar_render($user) { - return '<div class="avatar"> <img src="pic/avatar/avatar' . $user['Avatar'] . '.gif"></div>'; -} - -/** * Render a user nickname. * * @param User $user_source * @return string */ function User_Nick_render($user_source) { - return '<a href="' . page_link_to('users') . '&action=view&user_id=' . $user_source['UID'] . '"><span class="icon-icon_angel"></span> ' . htmlspecialchars($user_source['Nick']) . '</a>'; + return '<a class="' . ($user_source['Gekommen'] ? '' : 'text-muted') . '" href="' . page_link_to('users') . '&action=view&user_id=' . $user_source['UID'] . '"><span class="icon-icon_angel"></span> ' . htmlspecialchars($user_source['Nick']) . '</a>'; } ?> diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo Binary files differindex ecba53db..3e58bc2a 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po index cfc03bd5..d2241761 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Engelsystem 2.0\n" -"POT-Creation-Date: 2014-12-22 20:21+0100\n" -"PO-Revision-Date: 2014-12-22 20:25+0100\n" +"POT-Creation-Date: 2015-08-15 23:36+0100\n" +"PO-Revision-Date: 2015-08-15 23:36+0100\n" "Last-Translator: msquare <msquare@notrademark.de>\n" "Language-Team: \n" "Language: de_DE\n" @@ -18,6 +18,14 @@ msgstr "" "X-Poedit-SearchPath-1: .\n" #: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:49 +msgid "" +"Please enter your planned date of departure on your settings page to give us " +"a feeling for teardown capacities." +msgstr "" +"Bitte gib Dein geplantes Abreisedatum an, damit wir ein Gefühl für die Abbau-" +"Planung bekommen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:52 #, php-format msgid "" "You freeloaded at least %s shifts. Shift signup is locked. Please go to " @@ -26,7 +34,7 @@ msgstr "" "Du hast mindestens %s Schichten geschwänzt. Schicht-Registrierung ist " "gesperrt. Bitte gehe zum Himmelsschreibtisch um wieder entsperrt zu werden." -#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:56 +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:59 msgid "" "You are not marked as arrived. Please go to heaven's desk, get your angel " "badge and/or tell them that you arrived already." @@ -34,11 +42,11 @@ msgstr "" "Du bist nicht als angekommen markiert. Bitte gehe zur Himmelsverwaltung, " "hole Dein Badge ab und/oder erkläre ihnen, dass Du bereits angekommen bist." -#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:62 +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:65 msgid "You need to specify a tshirt size in your settings!" msgstr "Bitte eine T-Shirt-Größe auswählen" -#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:68 +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:71 msgid "" "You need to specify a DECT phone number in your settings! If you don't have " "a DECT phone, just enter \"-\"." @@ -46,25 +54,26 @@ msgstr "" "Bitte eine DECT-Telefonnummer in den Einstellungen eingeben. Wenn du noch " "keine Nummer hast, bitte einfach \"-\" angeben." -#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:129 +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:132 msgid "Admin" msgstr "Admin" -#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:311 +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:354 msgid "No data found." msgstr "Nichts gefunden." #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:7 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:821 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:56 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:72 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:179 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:196 msgid "Angeltypes" msgstr "Engeltypen" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:46 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:308 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:171 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:215 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:326 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:188 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:232 msgid "Teams/Job description" msgstr "Team-/Aufgabenbeschreibung" @@ -90,39 +99,39 @@ msgid "Edit %s" msgstr "%s bearbeiten" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:184 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:158 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:175 #, php-format msgid "Team %s" msgstr "Team %s" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:204 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:137 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:153 msgid "view" msgstr "ansehen" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:209 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:64 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:23 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:17 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:18 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:84 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:46 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:77 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:52 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:63 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:140 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:156 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:207 msgid "edit" msgstr "bearbeiten" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:210 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:37 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:56 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:18 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:201 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:19 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:220 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:48 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:86 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:5 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:12 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:47 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:78 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:15 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:53 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:64 @@ -131,13 +140,13 @@ msgstr "löschen" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:219 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:80 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:202 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:219 msgid "leave" msgstr "verlassen" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:221 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:76 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:204 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:221 msgid "join" msgstr "mitmachen" @@ -161,7 +170,7 @@ msgid "Shifttype not found." msgstr "Schichttyp nicht gefunden." #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:69 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:59 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:60 msgid "Please enter a name." msgstr "Gib bitte einen Namen an." @@ -291,13 +300,13 @@ msgid "Removed coordinator rights for %s from %s." msgstr "%s hat jetzt nicht mehr %s als Koordinator." #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:284 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:120 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:122 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:3 msgid "Add coordinator rights" msgstr "Koordinatorrechte geben" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:284 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:113 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:114 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:3 msgid "Remove coordinator rights" msgstr "Koordinatorrechte entfernen" @@ -332,59 +341,73 @@ msgstr "Du bist %s beigetreten." msgid "Become a %s" msgstr "Werde ein %s" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:82 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:44 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:56 +msgid "Please enter a valid number of vouchers." +msgstr "Bitte gib eine korrekte Anzahl von Vouchern ein." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:66 +msgid "Saved the number of vouchers." +msgstr "Anzahl der Voucher gespeichert." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:74 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:26 +#, php-format +msgid "%s's vouchers" +msgstr "Voucher von %s" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:131 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:62 msgid "All users" msgstr "Alle Benutzer" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:97 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:146 msgid "Token is not correct." msgstr "Der Token ist nicht in Ordnung." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:107 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:92 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:161 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:156 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:93 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:123 msgid "Your passwords don't match." msgstr "Deine Passwörter stimmen nicht überein." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:111 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:159 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:160 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:121 msgid "Your password is to short (please use at least 6 characters)." msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:117 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:166 msgid "Password could not be updated." msgstr "Passwort kann nicht neu gesetzt werden." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:119 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:163 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:168 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:125 msgid "Password saved." msgstr "Passwort gespeichert." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:137 -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:141 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:62 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:59 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:186 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:190 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:63 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:37 msgid "E-mail address is not correct." msgstr "Die E-Mail Adresse ist nicht in Ordnung." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:145 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:66 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:63 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:194 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:67 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:41 msgid "Please enter your e-mail." msgstr "Bitte gib Deine E-Mail-Adresse ein." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:152 -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:169 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:201 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:218 msgid "Password recovery" msgstr "Passwort wiederherstellen" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:152 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:201 #, php-format msgid "Please visit %s to recover your password." msgstr "Bitte besuche %s, um Dein Passwort zurückzusetzen" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:156 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:205 msgid "We sent an email containing your password recovery link." msgstr "" "Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt." @@ -468,11 +491,11 @@ msgstr "Du wurdest aus einer Schicht ausgetragen:" msgid "Removed from Shift" msgstr "Von Schicht ausgetragen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:3 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:4 msgid "Active angels" msgstr "Aktive Engel" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:23 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:28 #, php-format msgid "" "At least %s angels are forced to be active. The number has to be greater." @@ -480,79 +503,86 @@ msgstr "" "Mindestens %s engel werden als aktiv gekennzeichnet. Die Nummer muss größer " "sein." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:28 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:33 msgid "Please enter a number of angels to be marked as active." msgstr "" "Bitte gib eine Anzahl an Engeln ein, die als Aktiv markiert werden sollen." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:51 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:57 msgid "Marked angels." msgstr "Engel wurden markiert." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:53 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:117 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:152 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:59 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:123 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:158 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:251 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:29 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:65 msgid "back" msgstr "zurück" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:53 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:59 msgid "apply" msgstr "anwenden" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:63 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:69 msgid "Angel has been marked as active." msgstr "Engel wurde als aktiv markiert." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:65 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:74 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:92 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:20 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:29 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:71 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:80 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:98 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:21 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:30 msgid "Angel not found." msgstr "Engel nicht gefunden." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:72 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:78 msgid "Angel has been marked as not active." msgstr "Engel wurde als nicht aktiv markiert." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:81 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:87 msgid "Angel has got a t-shirt." msgstr "Engel hat ein T-Shirt bekommen." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:90 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:96 msgid "Angel has got no t-shirt." msgstr "Engel hat kein T-Shirt bekommen." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:129 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:136 msgid "set active" msgstr "setze aktiv" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:131 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:138 msgid "remove active" msgstr "entferne aktiv" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:132 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:139 msgid "got t-shirt" msgstr "hat t-shirt" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:135 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:142 msgid "remove t-shirt" msgstr "entferne t-shirt" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:149 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:35 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:160 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:139 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:146 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52 msgid "Sum" msgstr "Summe" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:155 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:167 msgid "Search angel:" msgstr "Suche Engel:" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:156 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:66 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:67 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:168 +msgid "Show all shifts" +msgstr "Alle Schichten anzeigen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:169 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:104 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:105 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:71 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:80 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:25 @@ -560,72 +590,76 @@ msgstr "Suche Engel:" msgid "Search" msgstr "Suche" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:159 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:172 msgid "How much angels should be active?" msgstr "Wie viele Engel sollten aktiv sein?" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:160 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:173 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:239 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:322 msgid "Preview" msgstr "Vorschau" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:164 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:70 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:177 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:108 msgid "Nickname" msgstr "Nick" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:165 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:175 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:59 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:178 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:188 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:78 msgid "Size" msgstr "Größe" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:166 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:179 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:4 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:199 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:217 msgid "Shifts" msgstr "Schichten" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:167 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:180 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:311 msgid "Length" msgstr "Länge" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:168 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:181 msgid "Active?" msgstr "Aktiv?" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:169 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:57 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:182 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:76 msgid "Forced" msgstr "Gezwungen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:170 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:183 msgid "T-shirt?" msgstr "T-Shirt?" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:173 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:186 +msgid "Shirt statistics" +msgstr "T-Shirt Statistik" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:189 +msgid "Needed shirts" +msgstr "Benötigte T-Shirts" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:190 msgid "Given shirts" msgstr "Ausgegebene T-Shirts" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:176 -msgid "Count" -msgstr "Anzahl" - -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:3 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:4 msgid "Arrived angels" msgstr "Angekommene Engel" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:18 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:19 msgid "Reset done. Angel has not arrived." msgstr "Zurückgesetzt. Engel ist nicht angekommen." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:27 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:28 msgid "Angel has been marked as arrived." msgstr "Engel wurde als angekommen markiert." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:54 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:62 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:8 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:19 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:30 @@ -634,19 +668,53 @@ msgstr "Engel wurde als angekommen markiert." msgid "yes" msgstr "Ja" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:55 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:63 msgid "reset" msgstr "zurücksetzen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:55 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:191 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:63 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:124 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:144 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208 msgid "arrived" msgstr "angekommen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:71 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:109 +msgid "Planned arrival" +msgstr "Geplanter Ankunftstag" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:110 msgid "Arrived?" msgstr "Angekommen?" +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:111 +msgid "Arrival date" +msgstr "Ankunftsdatum" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:112 +msgid "Planned departure" +msgstr "Geplante Abreise" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:115 +msgid "Arrival statistics" +msgstr "Ankunfts-Statistik" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:129 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:145 +msgid "arrived sum" +msgstr "Summe angekommen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:134 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:146 +msgid "planned departure" +msgstr "Geplante Abreise" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:143 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:27 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:71 +msgid "Date" +msgstr "Datum" + #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:3 msgid "Free angels" msgstr "Freie Engel" @@ -662,36 +730,36 @@ msgid "Only confirmed" msgstr "Nur bestätigte" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:85 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:170 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:293 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:206 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:129 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:140 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:152 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:50 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:180 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:311 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:168 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:131 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:157 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:169 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:68 msgid "Nick" msgstr "Nick" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:87 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:192 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:211 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:130 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:141 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:153 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:53 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:209 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:175 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:132 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:158 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:170 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:71 msgid "DECT" msgstr "DECT" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:88 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:201 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:215 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:218 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:179 msgid "Jabber" msgstr "Jabber" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:89 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:173 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:213 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:220 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:183 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:177 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:239 msgid "E-Mail" msgstr "E-Mail" @@ -700,15 +768,15 @@ msgid "Grouprights" msgstr "Gruppenrechte" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:29 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:107 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:111 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:123 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:168 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:109 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:113 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:129 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:174 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:60 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:174 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:191 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:33 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:74 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:70 msgid "Name" msgstr "Name" @@ -719,22 +787,22 @@ msgstr "Privilegien" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:53 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:32 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:35 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:137 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:143 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:257 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:130 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:62 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:106 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:160 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:219 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:228 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:233 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:238 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:172 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:183 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:192 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:197 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:202 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:191 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:65 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:32 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:37 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:236 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:33 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:255 msgid "Save" msgstr "Speichern" @@ -743,8 +811,8 @@ msgid "Edit group" msgstr "Gruppe bearbeiten" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:4 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:124 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:169 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:130 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:175 msgid "Frab import" msgstr "Frab Import" @@ -754,7 +822,7 @@ msgstr "Der Webserver hat keine Schreibrechte für das Verzeichnis import." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:48 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:96 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:157 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:159 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:48 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:53 msgid "Please select a shift type." @@ -773,16 +841,22 @@ msgid "Please provide some data." msgstr "Bitte lade eine Datei hoch." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:73 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:104 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:197 msgid "File Upload" msgstr "Datei hochladen" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:73 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:104 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:197 msgid "Validation" msgstr "Überprüfen" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:73 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:80 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:141 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:104 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:143 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:197 msgid "Import" msgstr "Importieren" @@ -796,6 +870,7 @@ msgstr "" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:78 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:301 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:184 msgid "Shifttype" msgstr "Schichttyp" @@ -804,76 +879,77 @@ msgid "xcal-File (.xcal)" msgstr "xcal-Datei (.xcal)" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:89 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:147 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:149 msgid "Missing import file." msgstr "Import-Datei nicht vorhanden." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:106 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:108 msgid "Rooms to create" msgstr "Anzulegende Räume" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:110 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:112 msgid "Rooms to delete" msgstr "Zu löschende Räume" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:114 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:116 msgid "Shifts to create" msgstr "Anzulegende Schichten" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:116 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:125 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:134 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:201 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:118 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:127 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:136 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:219 msgid "Day" msgstr "Tag" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:117 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:126 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:135 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:119 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:128 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:137 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:306 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:57 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:88 msgid "Start" msgstr "Beginn" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:118 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:127 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:136 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:120 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:129 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:138 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:307 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:65 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:96 msgid "End" msgstr "Ende" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:119 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:128 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:137 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:121 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:130 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:139 msgid "Shift type" msgstr "Schichttyp" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:120 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:129 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:138 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:122 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:131 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:140 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:302 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:53 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:185 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:84 msgid "Title" msgstr "Titel" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:121 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:130 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:139 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:123 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:132 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:141 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:303 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:778 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:803 msgid "Room" msgstr "Raum" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:123 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:125 msgid "Shifts to update" msgstr "Zu aktualisierende Schichten" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:132 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:134 msgid "Shifts to delete" msgstr "Zu löschende Schichten" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:192 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:198 msgid "It's done!" msgstr "Erledigt!" @@ -885,11 +961,6 @@ msgstr "Log" msgid "Edit news entry" msgstr "News-Eintrag bearbeiten" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:27 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:71 -msgid "Date" -msgstr "Datum" - #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:28 msgid "Author" msgstr "Autor" @@ -912,16 +983,15 @@ msgid "Meeting" msgstr "Treffen" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:35 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:156 -#, fuzzy +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:162 msgid "Delete" msgstr "löschen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:43 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:49 msgid "News entry updated." msgstr "News-Eintrag gespeichert." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:52 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:58 msgid "News entry deleted." msgstr "News-Eintrag gelöscht." @@ -965,44 +1035,44 @@ msgstr "Beantwortete Fragen" msgid "Answered by" msgstr "Antwort von" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:3 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:791 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:816 msgid "Rooms" msgstr "Räume" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:82 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:83 #, php-format msgid "Please enter needed angels for type %s." msgstr "Bitte gib die Anzahl der benötigten Engel vom Typ %s an." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:107 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:111 msgid "Room saved." msgstr "Raum gespeichert." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:125 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:170 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:131 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:176 msgid "Public" msgstr "Öffentlich" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:126 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:132 msgid "Room number" msgstr "Raumnummer" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:131 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:137 msgid "Needed angels:" msgstr "Benötigte Engel:" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:146 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:152 #, php-format msgid "Room %s deleted." msgstr "Raum %s gelöscht." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:154 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:160 #, php-format msgid "Do you want to delete room %s?" msgstr "Möchest Du den Raum %s wirklich löschen?" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:164 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:170 msgid "add" msgstr "Neu" @@ -1023,7 +1093,6 @@ msgid "Please select an end time." msgstr "Bitte eine Endzeit auswählen." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:84 -#, fuzzy msgid "The shifts end has to be after its start." msgstr "Die Endzeit muss nach der Startzeit liegen." @@ -1066,8 +1135,8 @@ msgstr "Typ und Titel" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:255 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:316 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:170 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:79 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:189 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:110 msgid "Needed angels" msgstr "Benötigte Engel" @@ -1103,17 +1172,28 @@ msgstr "Die folgenden Engel werden benötigt" msgid "All Angels" msgstr "Engelliste" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:36 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:174 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:214 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:21 +msgid "This user does not exist." +msgstr "Benutzer existiert nicht." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:45 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:184 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178 msgid "Please send me an email if my shifts change" msgstr "Informiere mich per E-Mail über Änderungen an meinen Schichten" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:55 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:64 msgid "Force active" msgstr "Aktiv erzwingen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:270 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:83 +msgid "" +"Please visit the angeltypes page or the users profile to manage users " +"angeltypes." +msgstr "" +"Bitte benutze die Engeltypen-Seite um die Engeltypen des Users zu verwalten." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:216 msgid "Edit user" msgstr "User bearbeiten" @@ -1122,12 +1202,12 @@ msgid "Credits" msgstr "Credits" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:4 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:295 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:313 msgid "Login" msgstr "Login" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:8 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:222 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:239 msgid "Register" msgstr "Registrieren" @@ -1135,37 +1215,40 @@ msgstr "Registrieren" msgid "Logout" msgstr "Logout" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:51 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:48 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:52 #, php-format msgid "Your nick "%s" already exists." msgstr "Der Nick "%s" existiert schon." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:55 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:52 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:56 #, php-format msgid "Your nick "%s" is too short (min. 2 characters)." msgstr "Der Nick "%s" ist zu kurz (Mindestens 2 Zeichen)." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:76 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:72 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:77 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:50 msgid "Please check your jabber account information." msgstr "Bitte überprüfe deine Jabber Account Eingabe." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:85 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:86 msgid "Please select your shirt size." msgstr "Bitte wähle Deine T-Shirt Größe." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:96 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:97 #, php-format msgid "Your password is too short (please use at least %s characters)." msgstr "Dein Passwort ist zu kurz (Bitte mindestens %s Zeichen nutzen)." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:155 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:104 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:64 +msgid "Please enter your planned date of arrival." +msgstr "Bitte gib Dein geplantes Ankunftsdatum an." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:165 msgid "Angel registration successful!" msgstr "Engel-Registrierung erfolgreich!" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:162 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:172 msgid "" "By completing this form you're registering as a Chaos-Angel. This script " "will create you an account in the angel task sheduler." @@ -1173,33 +1256,36 @@ msgstr "" "Mit diesem Formular registrierst Du Dich als Engel. Du bekommst ein Konto in " "der Engel-Aufgabenverwaltung." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:177 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:217 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:189 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:171 +msgid "Planned date of arrival" +msgstr "Geplanter Ankunftstag" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:192 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:181 msgid "Shirt size" msgstr "T-Shirt Größe" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:180 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:294 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:234 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:197 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:312 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:253 msgid "Password" msgstr "Passwort" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:183 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:235 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:200 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:254 msgid "Confirm password" msgstr "Passwort wiederholen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:186 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:218 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:203 msgid "What do you want to do?" msgstr "Was möchtest Du machen?" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:186 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:218 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:203 msgid "Description of job types" msgstr "Beschreibung der Aufgaben" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:187 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:204 msgid "" "Restricted angel types need will be confirmed later by an archangel. You can " "change your selection in the options section." @@ -1207,49 +1293,50 @@ msgstr "" "Beschränkte Engeltypen müssen später von einem Erzengel freigeschaltet " "werden. Du kannst Deine Auswahl später in den Einstellungen ändern." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:195 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:212 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:212 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:176 msgid "Mobile" msgstr "Handy" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:198 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:210 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:215 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:174 msgid "Phone" msgstr "Telefon" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:204 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:208 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:221 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:170 msgid "First name" msgstr "Vorname" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:207 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:207 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:224 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:169 msgid "Last name" msgstr "Nachname" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:212 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:209 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:229 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:173 msgid "Age" msgstr "Alter" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:215 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:216 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:232 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:180 msgid "Hometown" msgstr "Wohnort" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:218 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:235 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:167 msgid "Entry required!" msgstr "Pflichtfeld!" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:254 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:271 msgid "Your password is incorrect. Please try it again." msgstr "Dein Passwort stimmt nicht. Bitte probiere es nochmal." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:258 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:275 msgid "Please enter a password." msgstr "Gib bitte ein Passwort ein." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:262 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:279 msgid "" "No user was found with that Nickname. Please try again. If you are still " "having problems, ask an Dispatcher." @@ -1257,31 +1344,31 @@ msgstr "" "Es wurde kein Engel mit diesem Namen gefunden. Probiere es bitte noch " "einmal. Wenn das Problem weiterhin besteht, frage einen Dispatcher." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:266 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:283 msgid "Please enter a nickname." msgstr "Gib bitte einen Nick an." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:278 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:296 msgid "Please sign up, if you want to help us!" msgstr "Bitte registriere Dich, wenn Du helfen möchtest!" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:285 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:303 msgid "Registration is disabled." msgstr "Registrierung ist abgeschaltet." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:297 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:315 msgid "I forgot my password" msgstr "Passwort vergessen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:299 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:317 msgid "Please note: You have to activate cookies!" msgstr "Hinweis: Cookies müssen aktiviert sein!" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:305 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:323 msgid "What can I do?" msgstr "Was kann ich machen?" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:306 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:324 msgid "Please read about the jobs you can do to help us." msgstr "" "Bitte informiere Dich über die Tätigkeiten bei denen Du uns helfen kannst." @@ -1346,7 +1433,7 @@ msgid "Wrong action." msgstr "Falsche Aktion." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:4 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:290 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:298 msgid "My shifts" msgstr "Meine Schichten" @@ -1355,7 +1442,7 @@ msgid "Key changed." msgstr "Key geändert." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:27 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:195 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:213 msgid "Reset API key" msgstr "API-Key zurücksetzen" @@ -1376,11 +1463,11 @@ msgstr "Fortfahren" msgid "Shift saved." msgstr "Schicht gespeichert." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:92 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:97 msgid "You have been signed off from the shift." msgstr "Du wurdest aus der Schicht ausgetragen." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:94 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:99 msgid "" "It's too late to sign yourself off the shift. If neccessary, ask the " "dispatcher to do so." @@ -1447,68 +1534,71 @@ msgid "No question found." msgstr "Keine Frage gefunden." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:4 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:192 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:210 msgid "Settings" msgstr "Einstellungen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:150 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:72 +msgid "Please enter your planned date of departure." +msgstr "Bitte gib Dein geplantes Abreisedatum an." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:112 msgid "Settings saved." msgstr "Einstellungen gespeichert." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:157 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:119 msgid "-> not OK. Please try again." msgstr "-> Nicht OK. Bitte erneut versuchen." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:165 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:127 msgid "Failed setting password." msgstr "Konnte Passwort nicht speichern." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:140 msgid "Theme changed." msgstr "Aussehen geändert." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:199 -#, php-format -msgid "" -"Hello %s, here you can change your personal settings i.e. password, color " -"settings etc." -msgstr "" -"Hallo %s, hier kannst Du Deine persönlichen Einstellungen (z.B. Passwort, " -"Aussehen, usw.) ändern." - -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:205 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:166 msgid "Here you can change your user details." msgstr "Hier kannst Du Deine Details ändern." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:224 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:172 +msgid "Planned date of departure" +msgstr "Geplanter Abreisetag" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:182 +msgid "Please visit the angeltypes page to manage your angeltypes." +msgstr "Bitte benutze die Engeltypen-Seite um deine Engeltypen zu verwalten." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:188 msgid "Here you can change your password." msgstr "Hier kannst Du Dein Passwort ändern." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:225 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:189 msgid "Old password:" msgstr "Altes Passwort:" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:226 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:190 msgid "New password:" msgstr "Neues Passwort:" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:227 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:191 msgid "Password confirmation:" msgstr "Passwort wiederholen:" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:231 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:195 msgid "Here you can choose your color settings:" msgstr "Hier kannst Du das Aussehen auswählen:" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:232 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:196 msgid "Color settings:" msgstr "Aussehen:" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:236 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:200 msgid "Here you can choose your language:" msgstr "Hier kannst Du Deine Sprache auswählen:" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:237 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:201 msgid "Language:" msgstr "Sprache:" @@ -1520,102 +1610,94 @@ msgstr "Schicht-Eintrag gelöscht." msgid "Entry not found." msgstr "Eintrag nicht gefunden." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:104 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:110 msgid "Please select a room." msgstr "Bitte einen Raum auswählen." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:111 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:117 +msgid "Please select a shifttype." +msgstr "Bitte einen Schichttyp wählen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:124 msgid "Please enter a valid starting time for the shifts." msgstr "Bitte gib eine korrekte Startzeit für die Schichten ein." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:118 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:131 msgid "Please enter a valid ending time for the shifts." msgstr "Bitte gib eine korrekte Endzeit für die Schichten ein." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:123 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:136 msgid "The ending time has to be after the starting time." msgstr "Die Endzeit muss nach der Startzeit liegen." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:131 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:144 #, php-format msgid "Please check your input for needed angels of type %s." msgstr "Bitte prüfe deine Eingabe für benötigte Engel des Typs %s." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:151 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:166 msgid "Shift updated." msgstr "Schicht aktualisiert." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:164 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:182 msgid "This page is much more comfortable with javascript." msgstr "Diese Seite ist mit JavaScript viel komfortabler." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:166 -msgid "Name/Description:" -msgstr "Name/Beschreibung:" - -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:167 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:186 msgid "Room:" msgstr "Raum:" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:168 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:187 msgid "Start:" msgstr "Start:" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:169 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:188 msgid "End:" msgstr "Ende:" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:195 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:214 msgid "Shift deleted." msgstr "Schicht gelöscht." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:200 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:219 #, php-format msgid "Do you want to delete the shift %s from %s to %s?" msgstr "Möchtest Du die Schicht %s von %s bis %s löschen?" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:224 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:251 msgid "" -"This shift is running now or ended already. Please contact a dispatcher to " -"join the shift." +"You are not allowed to sign up for this shift. Maybe shift is full or " +"already running." msgstr "" -"Diese Schicht läuft bereits oder ist bereits vorbei. Bitte einen Dispatcher " -"Dich nachzutragen." +"Du darfst Dich nicht für diese Schicht eintragen. Vielleicht ist die Schicht " +"voll oder sie läuft bereits." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:234 -msgid "" -"You already subscribed to shift in the same timeslot. Please contact a " -"dispatcher to join the shift." -msgstr "" -"Du hast bereits eine Schicht im gleichen Zeitrahmen. Bitte einen Dispatcher " -"Dich nachzutragen." - -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:290 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:298 msgid "You are subscribed. Thank you!" msgstr "Du bist eingetragen. Danke!" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:299 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:172 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:307 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:188 msgid "Freeloader" msgstr "Schwänzer" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:329 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:337 msgid "The administration has not configured any shifts yet." msgstr "Die Administratoren haben noch keine Schichten angelegt." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:336 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:344 msgid "The administration has not configured any rooms yet." msgstr "Die Administratoren habe noch keine Räume eingerichtet." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:349 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:357 msgid "occupied" msgstr "belegt" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:353 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:361 msgid "free" msgstr "frei" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:358 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:366 msgid "" "The administration has not configured any angeltypes yet - or you are not " "subscribed to any angeltype." @@ -1623,36 +1705,49 @@ msgstr "" "Die Administratoren haben noch keine Engeltypen konfiguriert - oder Du hast " "noch keine Engeltypen ausgewählt." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:598 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:730 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:618 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:755 #, php-format msgid "%d helper needed" msgid_plural "%d helpers needed" msgstr[0] "%d Helfer benötigt" msgstr[1] "%d Helfer benötigt" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:639 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:638 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:22 +msgid "Sign up" +msgstr "Eintragen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:641 +msgid "ended" +msgstr "vorbei" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:649 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:782 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:24 +#, php-format +msgid "Become %s" +msgstr "Werde ein %s" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:661 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:795 msgid "Add more angels" msgstr "Neue Engel hinzufügen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:778 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:202 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:803 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:220 msgid "Time" msgstr "Zeit" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:779 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:804 msgid "Entries" msgstr "Einträge" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:796 -msgid "Tasks" -msgstr "Aufgaben" - -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:797 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:822 msgid "Occupancy" msgstr "Belegung" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:798 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:823 msgid "" "The tasks shown here are influenced by the preferences you defined in your " "settings!" @@ -1660,19 +1755,19 @@ msgstr "" "Die Schichten, die hier angezeigt werden, sind von Deinen Einstellungen " "(Engeltypen/Aufgaben) abhängig!" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:798 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:823 msgid "Description of the jobs." msgstr "Beschreibung der Aufgaben." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:799 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:824 msgid "Use new style if possible" msgstr "Wenn möglich neuen Stil verwenden" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:801 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:826 msgid "iCal export" msgstr "iCal Export" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:801 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:826 #, php-format msgid "" "Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s" @@ -1683,21 +1778,21 @@ msgstr "" "\">JSON Format</a> verfügbar (Link bitte geheimhalten, sonst <a href=\"%s" "\">API-Key zurücksetzen</a>)." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:802 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:827 msgid "Filter" msgstr "Filter" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:836 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:861 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:22 msgid "All" msgstr "Alle" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:837 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:862 msgid "None" msgstr "Keine" #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:28 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:146 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:163 msgid "Unconfirmed" msgstr "Unbestätigt" @@ -1728,7 +1823,7 @@ msgid "cancel" msgstr "abbrechen" #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:61 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:175 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:192 msgid "Restricted" msgstr "Beschränkt" @@ -1750,7 +1845,7 @@ msgstr "" #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:63 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:93 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:83 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:114 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:35 msgid "Description" msgstr "Beschreibung" @@ -1777,44 +1872,44 @@ msgstr "bestätigen" msgid "deny" msgstr "ablehnen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:121 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:123 msgid "remove" msgstr "entfernen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:127 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:129 msgid "Coordinators" msgstr "Koordinatoren" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:134 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:151 msgid "Members" msgstr "Mitglieder" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:137 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:154 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:70 msgid "Add" msgstr "Hinzufügen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:148 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:165 msgid "confirm all" msgstr "Alle bestätigen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:149 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:166 msgid "deny all" msgstr "Alle ablehnen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:170 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:187 msgid "New angeltype" msgstr "Neuer Engeltyp" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:176 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:193 msgid "Membership" msgstr "Mitgliedschaft" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:190 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:207 msgid "FAQ" msgstr "FAQ" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:192 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:209 msgid "" "Here is the list of teams and their tasks. If you have questions, read the " "FAQ." @@ -1822,7 +1917,7 @@ msgstr "" "Hier ist die Liste der Teams und ihrer Aufgaben. Wenn Du Fragen hast, schaue " "im FAQ nach." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:209 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:226 msgid "" "This angeltype is restricted by double-opt-in by a team coordinator. Please " "show up at the according introduction meetings." @@ -1839,8 +1934,8 @@ msgid "Your Question:" msgstr "Deine Frage:" #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:17 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:131 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:133 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:147 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:149 msgid "Freeloaded" msgstr "Geschwänzt" @@ -1876,12 +1971,26 @@ msgstr "Typ:" msgid "Comment (for your eyes only):" msgstr "Kommentar (nur für Dich):" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:18 -msgid "Sign up" -msgstr "Eintragen" +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:6 +#, php-format +msgid "created at %s by %s" +msgstr "erstellt am %s von %s" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:8 +#, php-format +msgid "edited at %s by %s" +msgstr "bearbeitet am %s von %s" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:74 +msgid "This shift collides with one of your shifts." +msgstr "Diese Schicht kollidiert mit deinen Schichten." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:73 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:203 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:75 +msgid "You are signed up for this shift." +msgstr "Du bist für diese Schicht eingetragen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:104 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:221 msgid "Location" msgstr "Ort" @@ -1911,103 +2020,139 @@ msgstr "Neuer Schichttyp" msgid "Please select..." msgstr "Bitte auswählen..." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:29 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:32 +msgid "Number of vouchers" +msgstr "Anzahl Voucher" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:46 msgid "m/d/Y h:i a" msgstr "d.m.Y H:i" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:47 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:65 msgid "New user" msgstr "Neuer User" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:51 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:69 msgid "Prename" msgstr "Vorname" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:54 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:72 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190 msgid "Arrived" msgstr "Angekommen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:55 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:73 +msgid "Voucher" +msgstr "Voucher" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:74 msgid "Freeloads" msgstr "Schwänzereien" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:56 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:175 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:75 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:192 msgid "Active" msgstr "Aktiv" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:58 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:176 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:77 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:193 msgid "T-Shirt" msgstr "T-Shirt" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:60 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:79 msgid "Last login" msgstr "Letzter Login" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:76 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:95 msgid "Free" msgstr "Frei" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:80 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:82 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:99 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:101 #, php-format msgid "Next shift %c" msgstr "Nächste Schicht %c" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:87 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:106 #, php-format msgid "Shift starts %c" msgstr "Schicht startet %c" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:89 -#, fuzzy, php-format +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:108 +#, php-format msgid "Shift ends %c" msgstr "Schicht endet %c" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:142 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:158 msgid "sign off" msgstr "abmelden" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:153 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:169 msgid "Sum:" msgstr "Summe:" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:171 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:187 msgid "User state" msgstr "Engelzustand" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190 +#, php-format +msgid "Arrived at %s" +msgstr "Angekommen am %s" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190 +#, php-format +msgid "Not arrived (Planned: %s)" +msgstr "Nicht angekommen (Geplant: %s)" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190 msgid "Not arrived" msgstr "Nicht angekommen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:183 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:191 +#, php-format +msgid "Got %s voucher" +msgid_plural "Got %s vouchers" +msgstr[0] "Einen Voucher bekommen" +msgstr[1] "%s Voucher bekommen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:191 +msgid "Got no vouchers" +msgstr "Voucher nicht bekommen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:200 msgid "Rights" msgstr "Rechte" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:193 -#, fuzzy +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:209 +msgid "Edit vouchers" +msgstr "Voucher bearbeiten" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:211 msgid "iCal Export" msgstr "iCal Export" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:194 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:212 msgid "JSON Export" msgstr "JSON Export" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:204 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:222 msgid "Name & workmates" msgstr "Name & Kollegen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:205 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:223 msgid "Comment" msgstr "Kommentar" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:206 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:224 msgid "Action" msgstr "Aktion" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:226 +msgid "Your night shifts between 2 and 8 am count twice." +msgstr "Deine Nachtschichten zwischen 2 und 8 Uhr zählen doppelt." + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:227 #, php-format msgid "" "Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some " @@ -2016,7 +2161,7 @@ msgstr "" "Gehe zur <a href=\"%s\">Schicht-Tabelle</a>, um Dich für Schichten " "einzutragen." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:218 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:237 msgid "" "We will send you an e-mail with a password recovery link. Please use the " "email address you used for registration." @@ -2025,11 +2170,11 @@ msgstr "" "zurücksetzen kannst. Bitte benutze die Mailadresse, die du bei der Anmeldung " "verwendet hast." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:221 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:240 msgid "Recover" msgstr "Wiederherstellen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:232 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:251 msgid "Please enter a new password." msgstr "Gib bitte ein neues Passwort ein." @@ -2076,11 +2221,11 @@ msgstr "Möchtest Du wirklich %s zu %s hinzufügen?" msgid "save" msgstr "Speichern" -#: /Users/msquare/workspace/projects/engelsystem/public/index.php:223 +#: /Users/msquare/workspace/projects/engelsystem/public/index.php:143 msgid "No Access" msgstr "Kein Zugriff" -#: /Users/msquare/workspace/projects/engelsystem/public/index.php:224 +#: /Users/msquare/workspace/projects/engelsystem/public/index.php:144 msgid "" "You don't have permission to view this page. You probably have to sign in or " "register in order to gain access!" @@ -2088,6 +2233,45 @@ msgstr "" "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich " "bitte ein, um Zugriff zu erhalten!" +#~ msgid "Tasks" +#~ msgstr "Aufgaben" + +#~ msgid "Count" +#~ msgstr "Anzahl" + +#~ msgid "User didnt got vouchers." +#~ msgstr "Engel hat keine Voucher mehr." + +#~ msgid "Remove vouchers" +#~ msgstr "Voucher entfernen" + +#~ msgid "" +#~ "This shift is running now or ended already. Please contact a dispatcher " +#~ "to join the shift." +#~ msgstr "" +#~ "Diese Schicht läuft bereits oder ist bereits vorbei. Bitte einen " +#~ "Dispatcher Dich nachzutragen." + +#~ msgid "" +#~ "You already subscribed to shift in the same timeslot. Please contact a " +#~ "dispatcher to join the shift." +#~ msgstr "" +#~ "Du hast bereits eine Schicht im gleichen Zeitrahmen. Bitte einen " +#~ "Dispatcher Dich nachzutragen." + +#~ msgid "The shift is already full." +#~ msgstr "Diese Schicht ist bereits voll belegt." + +#~ msgid "" +#~ "Hello %s, here you can change your personal settings i.e. password, color " +#~ "settings etc." +#~ msgstr "" +#~ "Hallo %s, hier kannst Du Deine persönlichen Einstellungen (z.B. Passwort, " +#~ "Aussehen, usw.) ändern." + +#~ msgid "Name/Description:" +#~ msgstr "Name/Beschreibung:" + #~ msgid "Timeslot" #~ msgstr "Zeiten" @@ -2103,9 +2287,6 @@ msgstr "" #~ msgid "You are not confirmed for this angel type." #~ msgstr "Du bist für diesen Engeltyp noch nicht freigeschaltet." -#~ msgid "All Shifts" -#~ msgstr "Alle Schichten" - #~ msgid "Exports" #~ msgstr "Exporte" diff --git a/public/css/theme0.css b/public/css/theme0.css index 101f1e7a..52b70c9c 100644 --- a/public/css/theme0.css +++ b/public/css/theme0.css @@ -1,4 +1,9 @@ -/*! normalize.css v3.0.1 | MIT License | git.io/normalize */ +/*! + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ html { font-family: sans-serif; -ms-text-size-adjust: 100%; @@ -16,6 +21,7 @@ footer, header, hgroup, main, +menu, nav, section, summary { @@ -37,7 +43,7 @@ template { display: none; } a { - background: transparent; + background-color: transparent; } a:active, a:hover { @@ -87,7 +93,6 @@ figure { margin: 1em 40px; } hr { - -moz-box-sizing: content-box; box-sizing: content-box; height: 0; } @@ -147,8 +152,6 @@ input[type="number"]::-webkit-outer-spin-button { } input[type="search"] { -webkit-appearance: textfield; - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; box-sizing: content-box; } input[type="search"]::-webkit-search-cancel-button, @@ -178,8 +181,11 @@ td, th { padding: 0; } +/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */ @media print { - * { + *, + *:before, + *:after { background: transparent !important; color: #000 !important; box-shadow: none !important; @@ -224,9 +230,6 @@ th { h3 { page-break-after: avoid; } - select { - background: #fff !important; - } .navbar { display: none; } @@ -252,7 +255,7 @@ th { @font-face { font-family: 'Glyphicons Halflings'; src: url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.eot'); - src: url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); + src: url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } .glyphicon { position: relative; @@ -271,7 +274,8 @@ th { .glyphicon-plus:before { content: "\2b"; } -.glyphicon-euro:before { +.glyphicon-euro:before, +.glyphicon-eur:before { content: "\20ac"; } .glyphicon-minus:before { @@ -865,6 +869,192 @@ th { .glyphicon-tree-deciduous:before { content: "\e200"; } +.glyphicon-cd:before { + content: "\e201"; +} +.glyphicon-save-file:before { + content: "\e202"; +} +.glyphicon-open-file:before { + content: "\e203"; +} +.glyphicon-level-up:before { + content: "\e204"; +} +.glyphicon-copy:before { + content: "\e205"; +} +.glyphicon-paste:before { + content: "\e206"; +} +.glyphicon-alert:before { + content: "\e209"; +} +.glyphicon-equalizer:before { + content: "\e210"; +} +.glyphicon-king:before { + content: "\e211"; +} +.glyphicon-queen:before { + content: "\e212"; +} +.glyphicon-pawn:before { + content: "\e213"; +} +.glyphicon-bishop:before { + content: "\e214"; +} +.glyphicon-knight:before { + content: "\e215"; +} +.glyphicon-baby-formula:before { + content: "\e216"; +} +.glyphicon-tent:before { + content: "\26fa"; +} +.glyphicon-blackboard:before { + content: "\e218"; +} +.glyphicon-bed:before { + content: "\e219"; +} +.glyphicon-apple:before { + content: "\f8ff"; +} +.glyphicon-erase:before { + content: "\e221"; +} +.glyphicon-hourglass:before { + content: "\231b"; +} +.glyphicon-lamp:before { + content: "\e223"; +} +.glyphicon-duplicate:before { + content: "\e224"; +} +.glyphicon-piggy-bank:before { + content: "\e225"; +} +.glyphicon-scissors:before { + content: "\e226"; +} +.glyphicon-bitcoin:before { + content: "\e227"; +} +.glyphicon-btc:before { + content: "\e227"; +} +.glyphicon-xbt:before { + content: "\e227"; +} +.glyphicon-yen:before { + content: "\00a5"; +} +.glyphicon-jpy:before { + content: "\00a5"; +} +.glyphicon-ruble:before { + content: "\20bd"; +} +.glyphicon-rub:before { + content: "\20bd"; +} +.glyphicon-scale:before { + content: "\e230"; +} +.glyphicon-ice-lolly:before { + content: "\e231"; +} +.glyphicon-ice-lolly-tasted:before { + content: "\e232"; +} +.glyphicon-education:before { + content: "\e233"; +} +.glyphicon-option-horizontal:before { + content: "\e234"; +} +.glyphicon-option-vertical:before { + content: "\e235"; +} +.glyphicon-menu-hamburger:before { + content: "\e236"; +} +.glyphicon-modal-window:before { + content: "\e237"; +} +.glyphicon-oil:before { + content: "\e238"; +} +.glyphicon-grain:before { + content: "\e239"; +} +.glyphicon-sunglasses:before { + content: "\e240"; +} +.glyphicon-text-size:before { + content: "\e241"; +} +.glyphicon-text-color:before { + content: "\e242"; +} +.glyphicon-text-background:before { + content: "\e243"; +} +.glyphicon-object-align-top:before { + content: "\e244"; +} +.glyphicon-object-align-bottom:before { + content: "\e245"; +} +.glyphicon-object-align-horizontal:before { + content: "\e246"; +} +.glyphicon-object-align-left:before { + content: "\e247"; +} +.glyphicon-object-align-vertical:before { + content: "\e248"; +} +.glyphicon-object-align-right:before { + content: "\e249"; +} +.glyphicon-triangle-right:before { + content: "\e250"; +} +.glyphicon-triangle-left:before { + content: "\e251"; +} +.glyphicon-triangle-bottom:before { + content: "\e252"; +} +.glyphicon-triangle-top:before { + content: "\e253"; +} +.glyphicon-console:before { + content: "\e254"; +} +.glyphicon-superscript:before { + content: "\e255"; +} +.glyphicon-subscript:before { + content: "\e256"; +} +.glyphicon-menu-left:before { + content: "\e257"; +} +.glyphicon-menu-right:before { + content: "\e258"; +} +.glyphicon-menu-down:before { + content: "\e259"; +} +.glyphicon-menu-up:before { + content: "\e260"; +} * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -896,12 +1086,12 @@ textarea { line-height: inherit; } a { - color: #428bca; + color: #337ab7; text-decoration: none; } a:hover, a:focus { - color: #2a6496; + color: #23527c; text-decoration: underline; } a:focus { @@ -968,6 +1158,9 @@ hr { overflow: visible; clip: auto; } +[role="button"] { + cursor: pointer; +} h1, h2, h3, @@ -1134,64 +1327,74 @@ mark, color: #777777; } .text-primary { - color: #428bca; + color: #337ab7; } -a.text-primary:hover { - color: #3071a9; +a.text-primary:hover, +a.text-primary:focus { + color: #286090; } .text-success { color: #3c763d; } -a.text-success:hover { +a.text-success:hover, +a.text-success:focus { color: #2b542c; } .text-info { color: #31708f; } -a.text-info:hover { +a.text-info:hover, +a.text-info:focus { color: #245269; } .text-warning { color: #8a6d3b; } -a.text-warning:hover { +a.text-warning:hover, +a.text-warning:focus { color: #66512c; } .text-danger { color: #a94442; } -a.text-danger:hover { +a.text-danger:hover, +a.text-danger:focus { color: #843534; } .bg-primary { color: #fff; - background-color: #428bca; + background-color: #337ab7; } -a.bg-primary:hover { - background-color: #3071a9; +a.bg-primary:hover, +a.bg-primary:focus { + background-color: #286090; } .bg-success { background-color: #dff0d8; } -a.bg-success:hover { +a.bg-success:hover, +a.bg-success:focus { background-color: #c1e2b3; } .bg-info { background-color: #d9edf7; } -a.bg-info:hover { +a.bg-info:hover, +a.bg-info:focus { background-color: #afd9ee; } .bg-warning { background-color: #fcf8e3; } -a.bg-warning:hover { +a.bg-warning:hover, +a.bg-warning:focus { background-color: #f7ecb5; } .bg-danger { background-color: #f2dede; } -a.bg-danger:hover { +a.bg-danger:hover, +a.bg-danger:focus { background-color: #e4b9b9; } .page-header { @@ -1309,10 +1512,6 @@ blockquote.pull-right small:after, blockquote.pull-right .small:after { content: '\00A0 \2014'; } -blockquote:before, -blockquote:after { - content: ""; -} address { margin-bottom: 20px; font-style: normal; @@ -2106,7 +2305,7 @@ th { .table-bordered > thead > tr > td { border-bottom-width: 2px; } -.table-striped > tbody > tr:nth-child(odd) { +.table-striped > tbody > tr:nth-of-type(odd) { background-color: #f9f9f9; } .table-hover > tbody > tr:hover { @@ -2230,6 +2429,7 @@ table th[class*="col-"] { } .table-responsive { overflow-x: auto; + min-height: 0.01%; } @media screen and (max-width: 767px) { .table-responsive { @@ -2372,66 +2572,46 @@ output { .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { - cursor: not-allowed; background-color: #eeeeee; opacity: 1; } +.form-control[disabled], +fieldset[disabled] .form-control { + cursor: not-allowed; +} textarea.form-control { height: auto; } input[type="search"] { -webkit-appearance: none; } -input[type="date"], -input[type="time"], -input[type="datetime-local"], -input[type="month"] { - line-height: 34px; - line-height: 1.42857143 \0; -} -input[type="date"].input-sm, -input[type="time"].input-sm, -input[type="datetime-local"].input-sm, -input[type="month"].input-sm { - line-height: 30px; - line-height: 1.5 \0; -} -input[type="date"].input-lg, -input[type="time"].input-lg, -input[type="datetime-local"].input-lg, -input[type="month"].input-lg { - line-height: 46px; - line-height: 1.33 \0; -} -_:-ms-fullscreen, -:root input[type="date"], -_:-ms-fullscreen, -:root input[type="time"], -_:-ms-fullscreen, -:root input[type="datetime-local"], -_:-ms-fullscreen, -:root input[type="month"] { - line-height: 1.42857143; -} -_:-ms-fullscreen.input-sm, -:root input[type="date"].input-sm, -_:-ms-fullscreen.input-sm, -:root input[type="time"].input-sm, -_:-ms-fullscreen.input-sm, -:root input[type="datetime-local"].input-sm, -_:-ms-fullscreen.input-sm, -:root input[type="month"].input-sm { - line-height: 1.5; -} -_:-ms-fullscreen.input-lg, -:root input[type="date"].input-lg, -_:-ms-fullscreen.input-lg, -:root input[type="time"].input-lg, -_:-ms-fullscreen.input-lg, -:root input[type="datetime-local"].input-lg, -_:-ms-fullscreen.input-lg, -:root input[type="month"].input-lg { - line-height: 1.33; +@media screen and (-webkit-min-device-pixel-ratio: 0) { + input[type="date"].form-control, + input[type="time"].form-control, + input[type="datetime-local"].form-control, + input[type="month"].form-control { + line-height: 34px; + } + input[type="date"].input-sm, + input[type="time"].input-sm, + input[type="datetime-local"].input-sm, + input[type="month"].input-sm, + .input-group-sm input[type="date"], + .input-group-sm input[type="time"], + .input-group-sm input[type="datetime-local"], + .input-group-sm input[type="month"] { + line-height: 30px; + } + input[type="date"].input-lg, + input[type="time"].input-lg, + input[type="datetime-local"].input-lg, + input[type="month"].input-lg, + .input-group-lg input[type="date"], + .input-group-lg input[type="time"], + .input-group-lg input[type="datetime-local"], + .input-group-lg input[type="month"] { + line-height: 46px; + } } .form-group { margin-bottom: 15px; @@ -2465,6 +2645,7 @@ _:-ms-fullscreen.input-lg, } .radio-inline, .checkbox-inline { + position: relative; display: inline-block; padding-left: 20px; margin-bottom: 0; @@ -2501,50 +2682,87 @@ fieldset[disabled] .checkbox label { padding-top: 7px; padding-bottom: 7px; margin-bottom: 0; + min-height: 34px; } .form-control-static.input-lg, .form-control-static.input-sm { padding-left: 0; padding-right: 0; } -.input-sm, -.form-group-sm .form-control { +.input-sm { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px; } -select.input-sm, -select.form-group-sm .form-control { +select.input-sm { height: 30px; line-height: 30px; } textarea.input-sm, -textarea.form-group-sm .form-control, -select[multiple].input-sm, -select[multiple].form-group-sm .form-control { +select[multiple].input-sm { height: auto; } -.input-lg, -.form-group-lg .form-control { +.form-group-sm .form-control { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +.form-group-sm select.form-control { + height: 30px; + line-height: 30px; +} +.form-group-sm textarea.form-control, +.form-group-sm select[multiple].form-control { + height: auto; +} +.form-group-sm .form-control-static { + height: 30px; + min-height: 32px; + padding: 6px 10px; + font-size: 12px; + line-height: 1.5; +} +.input-lg { height: 46px; padding: 10px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 6px; } -select.input-lg, -select.form-group-lg .form-control { +select.input-lg { height: 46px; line-height: 46px; } textarea.input-lg, -textarea.form-group-lg .form-control, -select[multiple].input-lg, -select[multiple].form-group-lg .form-control { +select[multiple].input-lg { height: auto; } +.form-group-lg .form-control { + height: 46px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.3333333; + border-radius: 6px; +} +.form-group-lg select.form-control { + height: 46px; + line-height: 46px; +} +.form-group-lg textarea.form-control, +.form-group-lg select[multiple].form-control { + height: auto; +} +.form-group-lg .form-control-static { + height: 46px; + min-height: 38px; + padding: 11px 16px; + font-size: 18px; + line-height: 1.3333333; +} .has-feedback { position: relative; } @@ -2563,12 +2781,16 @@ select[multiple].form-group-lg .form-control { text-align: center; pointer-events: none; } -.input-lg + .form-control-feedback { +.input-lg + .form-control-feedback, +.input-group-lg + .form-control-feedback, +.form-group-lg .form-control + .form-control-feedback { width: 46px; height: 46px; line-height: 46px; } -.input-sm + .form-control-feedback { +.input-sm + .form-control-feedback, +.input-group-sm + .form-control-feedback, +.form-group-sm .form-control + .form-control-feedback { width: 30px; height: 30px; line-height: 30px; @@ -2753,12 +2975,14 @@ select[multiple].form-group-lg .form-control { } @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { - padding-top: 14.3px; + padding-top: 14.333333px; + font-size: 18px; } } @media (min-width: 768px) { .form-horizontal .form-group-sm .control-label { padding-top: 6px; + font-size: 12px; } } .btn { @@ -2808,20 +3032,31 @@ select[multiple].form-group-lg .form-control { .btn[disabled], fieldset[disabled] .btn { cursor: not-allowed; - pointer-events: none; opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; box-shadow: none; } +a.btn.disabled, +fieldset[disabled] a.btn { + pointer-events: none; +} .btn-default { color: #333333; background-color: #ffffff; border-color: #cccccc; } -.btn-default:hover, .btn-default:focus, -.btn-default.focus, +.btn-default.focus { + color: #333333; + background-color: #e6e6e6; + border-color: #8c8c8c; +} +.btn-default:hover { + color: #333333; + background-color: #e6e6e6; + border-color: #adadad; +} .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { @@ -2829,6 +3064,19 @@ fieldset[disabled] .btn { background-color: #e6e6e6; border-color: #adadad; } +.btn-default:active:hover, +.btn-default.active:hover, +.open > .dropdown-toggle.btn-default:hover, +.btn-default:active:focus, +.btn-default.active:focus, +.open > .dropdown-toggle.btn-default:focus, +.btn-default:active.focus, +.btn-default.active.focus, +.open > .dropdown-toggle.btn-default.focus { + color: #333333; + background-color: #d4d4d4; + border-color: #8c8c8c; +} .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { @@ -2861,18 +3109,39 @@ fieldset[disabled] .btn-default.active { } .btn-primary { color: #ffffff; - background-color: #428bca; - border-color: #357ebd; + background-color: #337ab7; + border-color: #2e6da4; } -.btn-primary:hover, .btn-primary:focus, -.btn-primary.focus, +.btn-primary.focus { + color: #ffffff; + background-color: #286090; + border-color: #122b40; +} +.btn-primary:hover { + color: #ffffff; + background-color: #286090; + border-color: #204d74; +} .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { color: #ffffff; - background-color: #3071a9; - border-color: #285e8e; + background-color: #286090; + border-color: #204d74; +} +.btn-primary:active:hover, +.btn-primary.active:hover, +.open > .dropdown-toggle.btn-primary:hover, +.btn-primary:active:focus, +.btn-primary.active:focus, +.open > .dropdown-toggle.btn-primary:focus, +.btn-primary:active.focus, +.btn-primary.active.focus, +.open > .dropdown-toggle.btn-primary.focus { + color: #ffffff; + background-color: #204d74; + border-color: #122b40; } .btn-primary:active, .btn-primary.active, @@ -2897,11 +3166,11 @@ fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { - background-color: #428bca; - border-color: #357ebd; + background-color: #337ab7; + border-color: #2e6da4; } .btn-primary .badge { - color: #428bca; + color: #337ab7; background-color: #ffffff; } .btn-success { @@ -2909,9 +3178,17 @@ fieldset[disabled] .btn-primary.active { background-color: #5cb85c; border-color: #4cae4c; } -.btn-success:hover, .btn-success:focus, -.btn-success.focus, +.btn-success.focus { + color: #ffffff; + background-color: #449d44; + border-color: #255625; +} +.btn-success:hover { + color: #ffffff; + background-color: #449d44; + border-color: #398439; +} .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { @@ -2919,6 +3196,19 @@ fieldset[disabled] .btn-primary.active { background-color: #449d44; border-color: #398439; } +.btn-success:active:hover, +.btn-success.active:hover, +.open > .dropdown-toggle.btn-success:hover, +.btn-success:active:focus, +.btn-success.active:focus, +.open > .dropdown-toggle.btn-success:focus, +.btn-success:active.focus, +.btn-success.active.focus, +.open > .dropdown-toggle.btn-success.focus { + color: #ffffff; + background-color: #398439; + border-color: #255625; +} .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { @@ -2954,9 +3244,17 @@ fieldset[disabled] .btn-success.active { background-color: #5bc0de; border-color: #46b8da; } -.btn-info:hover, .btn-info:focus, -.btn-info.focus, +.btn-info.focus { + color: #ffffff; + background-color: #31b0d5; + border-color: #1b6d85; +} +.btn-info:hover { + color: #ffffff; + background-color: #31b0d5; + border-color: #269abc; +} .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { @@ -2964,6 +3262,19 @@ fieldset[disabled] .btn-success.active { background-color: #31b0d5; border-color: #269abc; } +.btn-info:active:hover, +.btn-info.active:hover, +.open > .dropdown-toggle.btn-info:hover, +.btn-info:active:focus, +.btn-info.active:focus, +.open > .dropdown-toggle.btn-info:focus, +.btn-info:active.focus, +.btn-info.active.focus, +.open > .dropdown-toggle.btn-info.focus { + color: #ffffff; + background-color: #269abc; + border-color: #1b6d85; +} .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { @@ -2999,9 +3310,17 @@ fieldset[disabled] .btn-info.active { background-color: #f0ad4e; border-color: #eea236; } -.btn-warning:hover, .btn-warning:focus, -.btn-warning.focus, +.btn-warning.focus { + color: #ffffff; + background-color: #ec971f; + border-color: #985f0d; +} +.btn-warning:hover { + color: #ffffff; + background-color: #ec971f; + border-color: #d58512; +} .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { @@ -3009,6 +3328,19 @@ fieldset[disabled] .btn-info.active { background-color: #ec971f; border-color: #d58512; } +.btn-warning:active:hover, +.btn-warning.active:hover, +.open > .dropdown-toggle.btn-warning:hover, +.btn-warning:active:focus, +.btn-warning.active:focus, +.open > .dropdown-toggle.btn-warning:focus, +.btn-warning:active.focus, +.btn-warning.active.focus, +.open > .dropdown-toggle.btn-warning.focus { + color: #ffffff; + background-color: #d58512; + border-color: #985f0d; +} .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { @@ -3044,9 +3376,17 @@ fieldset[disabled] .btn-warning.active { background-color: #d9534f; border-color: #d43f3a; } -.btn-danger:hover, .btn-danger:focus, -.btn-danger.focus, +.btn-danger.focus { + color: #ffffff; + background-color: #c9302c; + border-color: #761c19; +} +.btn-danger:hover { + color: #ffffff; + background-color: #c9302c; + border-color: #ac2925; +} .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { @@ -3054,6 +3394,19 @@ fieldset[disabled] .btn-warning.active { background-color: #c9302c; border-color: #ac2925; } +.btn-danger:active:hover, +.btn-danger.active:hover, +.open > .dropdown-toggle.btn-danger:hover, +.btn-danger:active:focus, +.btn-danger.active:focus, +.open > .dropdown-toggle.btn-danger:focus, +.btn-danger:active.focus, +.btn-danger.active.focus, +.open > .dropdown-toggle.btn-danger.focus { + color: #ffffff; + background-color: #ac2925; + border-color: #761c19; +} .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { @@ -3085,7 +3438,7 @@ fieldset[disabled] .btn-danger.active { background-color: #ffffff; } .btn-link { - color: #428bca; + color: #337ab7; font-weight: normal; border-radius: 0; } @@ -3106,7 +3459,7 @@ fieldset[disabled] .btn-link { } .btn-link:hover, .btn-link:focus { - color: #2a6496; + color: #23527c; text-decoration: underline; background-color: transparent; } @@ -3121,7 +3474,7 @@ fieldset[disabled] .btn-link:focus { .btn-group-lg > .btn { padding: 10px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 6px; } .btn-sm, @@ -3175,9 +3528,12 @@ tbody.collapse.in { position: relative; height: 0; overflow: hidden; - -webkit-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; + -webkit-transition-property: height, visibility; + transition-property: height, visibility; + -webkit-transition-duration: 0.35s; + transition-duration: 0.35s; + -webkit-transition-timing-function: ease; + transition-timing-function: ease; } .caret { display: inline-block; @@ -3185,10 +3541,12 @@ tbody.collapse.in { height: 0; margin-left: 2px; vertical-align: middle; - border-top: 4px solid; + border-top: 4px dashed; + border-top: 4px solid \9; border-right: 4px solid transparent; border-left: 4px solid transparent; } +.dropup, .dropdown { position: relative; } @@ -3247,7 +3605,7 @@ tbody.collapse.in { color: #ffffff; text-decoration: none; outline: 0; - background-color: #428bca; + background-color: #337ab7; } .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, @@ -3299,14 +3657,15 @@ tbody.collapse.in { .dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; - border-bottom: 4px solid; + border-bottom: 4px dashed; + border-bottom: 4px solid \9; content: ""; } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; - margin-bottom: 1px; + margin-bottom: 2px; } @media (min-width: 768px) { .navbar-right .dropdown-menu { @@ -3339,10 +3698,6 @@ tbody.collapse.in { .btn-group-vertical > .btn.active { z-index: 2; } -.btn-group > .btn:focus, -.btn-group-vertical > .btn:focus { - outline: 0; -} .btn-group .btn + .btn, .btn-group .btn + .btn-group, .btn-group .btn-group + .btn, @@ -3352,6 +3707,7 @@ tbody.collapse.in { .btn-toolbar { margin-left: -5px; } +.btn-toolbar .btn, .btn-toolbar .btn-group, .btn-toolbar .input-group { float: left; @@ -3382,12 +3738,12 @@ tbody.collapse.in { .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0; } -.btn-group > .btn-group:first-child > .btn:last-child, -.btn-group > .btn-group:first-child > .dropdown-toggle { +.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child, +.btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle { border-bottom-right-radius: 0; border-top-right-radius: 0; } -.btn-group > .btn-group:last-child > .btn:first-child { +.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child { border-bottom-left-radius: 0; border-top-left-radius: 0; } @@ -3487,9 +3843,8 @@ tbody.collapse.in { [data-toggle="buttons"] > .btn input[type="checkbox"], [data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] { position: absolute; - z-index: -1; - opacity: 0; - filter: alpha(opacity=0); + clip: rect(0, 0, 0, 0); + pointer-events: none; } .input-group { position: relative; @@ -3514,7 +3869,7 @@ tbody.collapse.in { height: 46px; padding: 10px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 6px; } select.input-group-lg > .form-control, @@ -3643,6 +3998,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group { + z-index: 2; margin-left: -1px; } .nav { @@ -3678,7 +4034,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav .open > a:hover, .nav .open > a:focus { background-color: #eeeeee; - border-color: #428bca; + border-color: #337ab7; } .nav .nav-divider { height: 1px; @@ -3771,7 +4127,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { color: #ffffff; - background-color: #428bca; + background-color: #337ab7; } .nav-stacked > li { float: none; @@ -3927,8 +4283,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { right: 0; left: 0; z-index: 1030; - -webkit-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); } @media (min-width: 768px) { .navbar-fixed-top, @@ -4102,6 +4456,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-form .form-group { margin-bottom: 5px; } + .navbar-form .form-group:last-child { + margin-bottom: 0; + } } @media (min-width: 768px) { .navbar-form { @@ -4121,6 +4478,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { border-top-left-radius: 0; } .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { + margin-bottom: 0; + border-top-right-radius: 4px; + border-top-left-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } @@ -4391,7 +4751,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { padding: 6px 12px; line-height: 1.42857143; text-decoration: none; - color: #428bca; + color: #337ab7; background-color: #ffffff; border: 1px solid #dddddd; margin-left: -1px; @@ -4411,7 +4771,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus { - color: #2a6496; + z-index: 3; + color: #23527c; background-color: #eeeeee; border-color: #dddddd; } @@ -4423,8 +4784,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > .active > span:focus { z-index: 2; color: #ffffff; - background-color: #428bca; - border-color: #428bca; + background-color: #337ab7; + border-color: #337ab7; cursor: default; } .pagination > .disabled > span, @@ -4442,6 +4803,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination-lg > li > span { padding: 10px 16px; font-size: 18px; + line-height: 1.3333333; } .pagination-lg > li:first-child > a, .pagination-lg > li:first-child > span { @@ -4457,6 +4819,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination-sm > li > span { padding: 5px 10px; font-size: 12px; + line-height: 1.5; } .pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span { @@ -4539,11 +4902,11 @@ a.label:focus { background-color: #5e5e5e; } .label-primary { - background-color: #428bca; + background-color: #337ab7; } .label-primary[href]:hover, .label-primary[href]:focus { - background-color: #3071a9; + background-color: #286090; } .label-success { background-color: #5cb85c; @@ -4581,7 +4944,7 @@ a.label:focus { font-weight: bold; color: #ffffff; line-height: 1; - vertical-align: baseline; + vertical-align: middle; white-space: nowrap; text-align: center; background-color: #777777; @@ -4594,7 +4957,8 @@ a.label:focus { position: relative; top: -1px; } -.btn-xs .badge { +.btn-xs .badge, +.btn-group-xs > .btn .badge { top: 0; padding: 1px 5px; } @@ -4604,16 +4968,23 @@ a.badge:focus { text-decoration: none; cursor: pointer; } -a.list-group-item.active > .badge, +.list-group-item.active > .badge, .nav-pills > .active > a > .badge { - color: #428bca; + color: #337ab7; background-color: #ffffff; } +.list-group-item > .badge { + float: right; +} +.list-group-item > .badge + .badge { + margin-right: 5px; +} .nav-pills > li > a > .badge { margin-left: 3px; } .jumbotron { - padding: 30px; + padding-top: 30px; + padding-bottom: 30px; margin-bottom: 30px; color: inherit; background-color: #eeeeee; @@ -4642,7 +5013,8 @@ a.list-group-item.active > .badge, padding-top: 48px; padding-bottom: 48px; } - .container .jumbotron { + .container .jumbotron, + .container-fluid .jumbotron { padding-left: 60px; padding-right: 60px; } @@ -4671,7 +5043,7 @@ a.list-group-item.active > .badge, a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active { - border-color: #428bca; + border-color: #337ab7; } .thumbnail .caption { padding: 9px; @@ -4785,7 +5157,7 @@ a.thumbnail.active { line-height: 20px; color: #ffffff; text-align: center; - background-color: #428bca; + background-color: #337ab7; -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-transition: width 0.6s ease; @@ -4805,13 +5177,6 @@ a.thumbnail.active { -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress-bar[aria-valuenow="0"] { - color: #777777; - min-width: 30px; - background-color: transparent; - background-image: none; - box-shadow: none; -} .progress-bar-success { background-color: #5cb85c; } @@ -4844,29 +5209,49 @@ a.thumbnail.active { background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.media, -.media-body { - overflow: hidden; - zoom: 1; -} -.media, -.media .media { +.media { margin-top: 15px; } .media:first-child { margin-top: 0; } +.media, +.media-body { + zoom: 1; + overflow: hidden; +} +.media-body { + width: 10000px; +} .media-object { display: block; } -.media-heading { - margin: 0 0 5px; +.media-object.img-thumbnail { + max-width: none; } +.media-right, +.media > .pull-right { + padding-left: 10px; +} +.media-left, .media > .pull-left { - margin-right: 10px; + padding-right: 10px; } -.media > .pull-right { - margin-left: 10px; +.media-left, +.media-right, +.media-body { + display: table-cell; + vertical-align: top; +} +.media-middle { + vertical-align: middle; +} +.media-bottom { + vertical-align: bottom; +} +.media-heading { + margin-top: 0; + margin-bottom: 5px; } .media-list { padding-left: 0; @@ -4893,24 +5278,26 @@ a.thumbnail.active { border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; } -.list-group-item > .badge { - float: right; -} -.list-group-item > .badge + .badge { - margin-right: 5px; -} -a.list-group-item { +a.list-group-item, +button.list-group-item { color: #555555; } -a.list-group-item .list-group-item-heading { +a.list-group-item .list-group-item-heading, +button.list-group-item .list-group-item-heading { color: #333333; } a.list-group-item:hover, -a.list-group-item:focus { +button.list-group-item:hover, +a.list-group-item:focus, +button.list-group-item:focus { text-decoration: none; color: #555555; background-color: #f5f5f5; } +button.list-group-item { + width: 100%; + text-align: left; +} .list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus { @@ -4933,8 +5320,8 @@ a.list-group-item:focus { .list-group-item.active:focus { z-index: 2; color: #ffffff; - background-color: #428bca; - border-color: #428bca; + background-color: #337ab7; + border-color: #337ab7; } .list-group-item.active .list-group-item-heading, .list-group-item.active:hover .list-group-item-heading, @@ -4950,26 +5337,33 @@ a.list-group-item:focus { .list-group-item.active .list-group-item-text, .list-group-item.active:hover .list-group-item-text, .list-group-item.active:focus .list-group-item-text { - color: #e1edf7; + color: #c7ddef; } .list-group-item-success { color: #3c763d; background-color: #dff0d8; } -a.list-group-item-success { +a.list-group-item-success, +button.list-group-item-success { color: #3c763d; } -a.list-group-item-success .list-group-item-heading { +a.list-group-item-success .list-group-item-heading, +button.list-group-item-success .list-group-item-heading { color: inherit; } a.list-group-item-success:hover, -a.list-group-item-success:focus { +button.list-group-item-success:hover, +a.list-group-item-success:focus, +button.list-group-item-success:focus { color: #3c763d; background-color: #d0e9c6; } a.list-group-item-success.active, +button.list-group-item-success.active, a.list-group-item-success.active:hover, -a.list-group-item-success.active:focus { +button.list-group-item-success.active:hover, +a.list-group-item-success.active:focus, +button.list-group-item-success.active:focus { color: #fff; background-color: #3c763d; border-color: #3c763d; @@ -4978,20 +5372,27 @@ a.list-group-item-success.active:focus { color: #31708f; background-color: #d9edf7; } -a.list-group-item-info { +a.list-group-item-info, +button.list-group-item-info { color: #31708f; } -a.list-group-item-info .list-group-item-heading { +a.list-group-item-info .list-group-item-heading, +button.list-group-item-info .list-group-item-heading { color: inherit; } a.list-group-item-info:hover, -a.list-group-item-info:focus { +button.list-group-item-info:hover, +a.list-group-item-info:focus, +button.list-group-item-info:focus { color: #31708f; background-color: #c4e3f3; } a.list-group-item-info.active, +button.list-group-item-info.active, a.list-group-item-info.active:hover, -a.list-group-item-info.active:focus { +button.list-group-item-info.active:hover, +a.list-group-item-info.active:focus, +button.list-group-item-info.active:focus { color: #fff; background-color: #31708f; border-color: #31708f; @@ -5000,20 +5401,27 @@ a.list-group-item-info.active:focus { color: #8a6d3b; background-color: #fcf8e3; } -a.list-group-item-warning { +a.list-group-item-warning, +button.list-group-item-warning { color: #8a6d3b; } -a.list-group-item-warning .list-group-item-heading { +a.list-group-item-warning .list-group-item-heading, +button.list-group-item-warning .list-group-item-heading { color: inherit; } a.list-group-item-warning:hover, -a.list-group-item-warning:focus { +button.list-group-item-warning:hover, +a.list-group-item-warning:focus, +button.list-group-item-warning:focus { color: #8a6d3b; background-color: #faf2cc; } a.list-group-item-warning.active, +button.list-group-item-warning.active, a.list-group-item-warning.active:hover, -a.list-group-item-warning.active:focus { +button.list-group-item-warning.active:hover, +a.list-group-item-warning.active:focus, +button.list-group-item-warning.active:focus { color: #fff; background-color: #8a6d3b; border-color: #8a6d3b; @@ -5022,20 +5430,27 @@ a.list-group-item-warning.active:focus { color: #a94442; background-color: #f2dede; } -a.list-group-item-danger { +a.list-group-item-danger, +button.list-group-item-danger { color: #a94442; } -a.list-group-item-danger .list-group-item-heading { +a.list-group-item-danger .list-group-item-heading, +button.list-group-item-danger .list-group-item-heading { color: inherit; } a.list-group-item-danger:hover, -a.list-group-item-danger:focus { +button.list-group-item-danger:hover, +a.list-group-item-danger:focus, +button.list-group-item-danger:focus { color: #a94442; background-color: #ebcccc; } a.list-group-item-danger.active, +button.list-group-item-danger.active, a.list-group-item-danger.active:hover, -a.list-group-item-danger.active:focus { +button.list-group-item-danger.active:hover, +a.list-group-item-danger.active:focus, +button.list-group-item-danger.active:focus { color: #fff; background-color: #a94442; border-color: #a94442; @@ -5074,7 +5489,11 @@ a.list-group-item-danger.active:focus { font-size: 16px; color: inherit; } -.panel-title > a { +.panel-title > a, +.panel-title > small, +.panel-title > .small, +.panel-title > small > a, +.panel-title > .small > a { color: inherit; } .panel-footer { @@ -5105,6 +5524,10 @@ a.list-group-item-danger.active:focus { border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; } +.panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child { + border-top-right-radius: 0; + border-top-left-radius: 0; +} .panel-heading + .list-group .list-group-item:first-child { border-top-width: 0; } @@ -5265,7 +5688,8 @@ a.list-group-item-danger.active:focus { .panel-group .panel-heading { border-bottom: 0; } -.panel-group .panel-heading + .panel-collapse > .panel-body { +.panel-group .panel-heading + .panel-collapse > .panel-body, +.panel-group .panel-heading + .panel-collapse > .list-group { border-top: 1px solid #dddddd; } .panel-group .panel-footer { @@ -5293,22 +5717,22 @@ a.list-group-item-danger.active:focus { border-bottom-color: #dddddd; } .panel-primary { - border-color: #428bca; + border-color: #337ab7; } .panel-primary > .panel-heading { color: #ffffff; - background-color: #428bca; - border-color: #428bca; + background-color: #337ab7; + border-color: #337ab7; } .panel-primary > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #428bca; + border-top-color: #337ab7; } .panel-primary > .panel-heading .badge { - color: #428bca; + color: #337ab7; background-color: #ffffff; } .panel-primary > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #428bca; + border-bottom-color: #337ab7; } .panel-success { border-color: #d6e9c6; @@ -5392,7 +5816,8 @@ a.list-group-item-danger.active:focus { .embed-responsive .embed-responsive-item, .embed-responsive iframe, .embed-responsive embed, -.embed-responsive object { +.embed-responsive object, +.embed-responsive video { position: absolute; top: 0; left: 0; @@ -5401,10 +5826,10 @@ a.list-group-item-danger.active:focus { width: 100%; border: 0; } -.embed-responsive.embed-responsive-16by9 { +.embed-responsive-16by9 { padding-bottom: 56.25%; } -.embed-responsive.embed-responsive-4by3 { +.embed-responsive-4by3 { padding-bottom: 75%; } .well { @@ -5470,16 +5895,20 @@ button.close { outline: 0; } .modal.fade .modal-dialog { - -webkit-transform: translate3d(0, -25%, 0); - transform: translate3d(0, -25%, 0); + -webkit-transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + -o-transform: translate(0, -25%); + transform: translate(0, -25%); -webkit-transition: -webkit-transform 0.3s ease-out; -moz-transition: -moz-transform 0.3s ease-out; -o-transition: -o-transform 0.3s ease-out; transition: transform 0.3s ease-out; } .modal.in .modal-dialog { - -webkit-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); + -webkit-transform: translate(0, 0); + -ms-transform: translate(0, 0); + -o-transform: translate(0, 0); + transform: translate(0, 0); } .modal-open .modal { overflow-x: hidden; @@ -5578,9 +6007,22 @@ button.close { position: absolute; z-index: 1070; display: block; - visibility: visible; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-style: normal; + font-weight: normal; + letter-spacing: normal; + line-break: auto; + line-height: 1.42857143; + text-align: left; + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + white-space: normal; + word-break: normal; + word-spacing: normal; + word-wrap: normal; font-size: 12px; - line-height: 1.4; opacity: 0; filter: alpha(opacity=0); } @@ -5609,7 +6051,6 @@ button.close { padding: 3px 8px; color: #ffffff; text-align: center; - text-decoration: none; background-color: #000000; border-radius: 4px; } @@ -5629,13 +6070,15 @@ button.close { } .tooltip.top-left .tooltip-arrow { bottom: 0; - left: 5px; + right: 5px; + margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000000; } .tooltip.top-right .tooltip-arrow { bottom: 0; - right: 5px; + left: 5px; + margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000000; } @@ -5662,13 +6105,15 @@ button.close { } .tooltip.bottom-left .tooltip-arrow { top: 0; - left: 5px; + right: 5px; + margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000000; } .tooltip.bottom-right .tooltip-arrow { top: 0; - right: 5px; + left: 5px; + margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000000; } @@ -5680,10 +6125,22 @@ button.close { display: none; max-width: 276px; padding: 1px; - font-size: 14px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-style: normal; font-weight: normal; + letter-spacing: normal; + line-break: auto; line-height: 1.42857143; text-align: left; + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + white-space: normal; + word-break: normal; + word-spacing: normal; + word-wrap: normal; + font-size: 14px; background-color: #ffffff; background-clip: padding-box; border: 1px solid #cccccc; @@ -5691,7 +6148,6 @@ button.close { border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - white-space: normal; } .popover.top { margin-top: -10px; @@ -5813,23 +6269,33 @@ button.close { } @media all and (transform-3d), (-webkit-transform-3d) { .carousel-inner > .item { + -webkit-transition: -webkit-transform 0.6s ease-in-out; + -moz-transition: -moz-transform 0.6s ease-in-out; + -o-transition: -o-transform 0.6s ease-in-out; transition: transform 0.6s ease-in-out; + -webkit-backface-visibility: hidden; + -moz-backface-visibility: hidden; backface-visibility: hidden; - perspective: 1000; + -webkit-perspective: 1000px; + -moz-perspective: 1000px; + perspective: 1000px; } .carousel-inner > .item.next, .carousel-inner > .item.active.right { + -webkit-transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0); left: 0; } .carousel-inner > .item.prev, .carousel-inner > .item.active.left { + -webkit-transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0); left: 0; } .carousel-inner > .item.next.left, .carousel-inner > .item.prev.right, .carousel-inner > .item.active { + -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); left: 0; } @@ -5907,6 +6373,7 @@ button.close { .carousel-control .glyphicon-chevron-right { position: absolute; top: 50%; + margin-top: -10px; z-index: 5; display: inline-block; } @@ -5924,7 +6391,7 @@ button.close { .carousel-control .icon-next { width: 20px; height: 20px; - margin-top: -10px; + line-height: 1; font-family: serif; } .carousel-control .icon-prev:before { @@ -6083,7 +6550,6 @@ button.close { } .hidden { display: none !important; - visibility: hidden !important; } .affix { position: fixed; @@ -6116,7 +6582,7 @@ button.close { display: block !important; } table.visible-xs { - display: table; + display: table !important; } tr.visible-xs { display: table-row !important; @@ -6146,7 +6612,7 @@ button.close { display: block !important; } table.visible-sm { - display: table; + display: table !important; } tr.visible-sm { display: table-row !important; @@ -6176,7 +6642,7 @@ button.close { display: block !important; } table.visible-md { - display: table; + display: table !important; } tr.visible-md { display: table-row !important; @@ -6206,7 +6672,7 @@ button.close { display: block !important; } table.visible-lg { - display: table; + display: table !important; } tr.visible-lg { display: table-row !important; @@ -6259,7 +6725,7 @@ button.close { display: block !important; } table.visible-print { - display: table; + display: table !important; } tr.visible-print { display: table-row !important; @@ -6305,32 +6771,32 @@ body { color: #777777; } #shifts td.free { - border: 1px solid #777777; + border: 1px solid #d9534f; background-color: #f2dede; } -a#shifts td.free:hover { +a#shifts td.free:hover, +a#shifts td.free:focus { background-color: #e4b9b9; } #shifts td.occupied { - border: 1px solid #777777; + border: 1px solid #5cb85c; background-color: #dff0d8; } -a#shifts td.occupied:hover { +a#shifts td.occupied:hover, +a#shifts td.occupied:focus { background-color: #c1e2b3; } #shifts td.collides { - border: 1px solid #777777; + border: 1px solid #f0ad4e; background-color: #fcf8e3; } -a#shifts td.collides:hover { +a#shifts td.collides:hover, +a#shifts td.collides:focus { background-color: #f7ecb5; } #shifts td.own { border: 1px solid #777777; } -.shifts-table { - overflow-x: scroll; -} .row-day { border-top: 2px solid #777777; } diff --git a/public/css/theme1.css b/public/css/theme1.css index a0c9e1a6..5bccd01f 100644 --- a/public/css/theme1.css +++ b/public/css/theme1.css @@ -21,7 +21,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*! normalize.css v3.0.1 | MIT License | git.io/normalize */ +/*! + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ html { font-family: sans-serif; -ms-text-size-adjust: 100%; @@ -39,6 +44,7 @@ footer, header, hgroup, main, +menu, nav, section, summary { @@ -60,7 +66,7 @@ template { display: none; } a { - background: transparent; + background-color: transparent; } a:active, a:hover { @@ -110,7 +116,6 @@ figure { margin: 1em 40px; } hr { - -moz-box-sizing: content-box; box-sizing: content-box; height: 0; } @@ -170,8 +175,6 @@ input[type="number"]::-webkit-outer-spin-button { } input[type="search"] { -webkit-appearance: textfield; - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; box-sizing: content-box; } input[type="search"]::-webkit-search-cancel-button, @@ -201,8 +204,11 @@ td, th { padding: 0; } +/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */ @media print { - * { + *, + *:before, + *:after { background: transparent !important; color: #000 !important; box-shadow: none !important; @@ -247,9 +253,6 @@ th { h3 { page-break-after: avoid; } - select { - background: #fff !important; - } .navbar { display: none; } @@ -275,7 +278,7 @@ th { @font-face { font-family: 'Glyphicons Halflings'; src: url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.eot'); - src: url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); + src: url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } .glyphicon { position: relative; @@ -294,7 +297,8 @@ th { .glyphicon-plus:before { content: "\2b"; } -.glyphicon-euro:before { +.glyphicon-euro:before, +.glyphicon-eur:before { content: "\20ac"; } .glyphicon-minus:before { @@ -888,6 +892,192 @@ th { .glyphicon-tree-deciduous:before { content: "\e200"; } +.glyphicon-cd:before { + content: "\e201"; +} +.glyphicon-save-file:before { + content: "\e202"; +} +.glyphicon-open-file:before { + content: "\e203"; +} +.glyphicon-level-up:before { + content: "\e204"; +} +.glyphicon-copy:before { + content: "\e205"; +} +.glyphicon-paste:before { + content: "\e206"; +} +.glyphicon-alert:before { + content: "\e209"; +} +.glyphicon-equalizer:before { + content: "\e210"; +} +.glyphicon-king:before { + content: "\e211"; +} +.glyphicon-queen:before { + content: "\e212"; +} +.glyphicon-pawn:before { + content: "\e213"; +} +.glyphicon-bishop:before { + content: "\e214"; +} +.glyphicon-knight:before { + content: "\e215"; +} +.glyphicon-baby-formula:before { + content: "\e216"; +} +.glyphicon-tent:before { + content: "\26fa"; +} +.glyphicon-blackboard:before { + content: "\e218"; +} +.glyphicon-bed:before { + content: "\e219"; +} +.glyphicon-apple:before { + content: "\f8ff"; +} +.glyphicon-erase:before { + content: "\e221"; +} +.glyphicon-hourglass:before { + content: "\231b"; +} +.glyphicon-lamp:before { + content: "\e223"; +} +.glyphicon-duplicate:before { + content: "\e224"; +} +.glyphicon-piggy-bank:before { + content: "\e225"; +} +.glyphicon-scissors:before { + content: "\e226"; +} +.glyphicon-bitcoin:before { + content: "\e227"; +} +.glyphicon-btc:before { + content: "\e227"; +} +.glyphicon-xbt:before { + content: "\e227"; +} +.glyphicon-yen:before { + content: "\00a5"; +} +.glyphicon-jpy:before { + content: "\00a5"; +} +.glyphicon-ruble:before { + content: "\20bd"; +} +.glyphicon-rub:before { + content: "\20bd"; +} +.glyphicon-scale:before { + content: "\e230"; +} +.glyphicon-ice-lolly:before { + content: "\e231"; +} +.glyphicon-ice-lolly-tasted:before { + content: "\e232"; +} +.glyphicon-education:before { + content: "\e233"; +} +.glyphicon-option-horizontal:before { + content: "\e234"; +} +.glyphicon-option-vertical:before { + content: "\e235"; +} +.glyphicon-menu-hamburger:before { + content: "\e236"; +} +.glyphicon-modal-window:before { + content: "\e237"; +} +.glyphicon-oil:before { + content: "\e238"; +} +.glyphicon-grain:before { + content: "\e239"; +} +.glyphicon-sunglasses:before { + content: "\e240"; +} +.glyphicon-text-size:before { + content: "\e241"; +} +.glyphicon-text-color:before { + content: "\e242"; +} +.glyphicon-text-background:before { + content: "\e243"; +} +.glyphicon-object-align-top:before { + content: "\e244"; +} +.glyphicon-object-align-bottom:before { + content: "\e245"; +} +.glyphicon-object-align-horizontal:before { + content: "\e246"; +} +.glyphicon-object-align-left:before { + content: "\e247"; +} +.glyphicon-object-align-vertical:before { + content: "\e248"; +} +.glyphicon-object-align-right:before { + content: "\e249"; +} +.glyphicon-triangle-right:before { + content: "\e250"; +} +.glyphicon-triangle-left:before { + content: "\e251"; +} +.glyphicon-triangle-bottom:before { + content: "\e252"; +} +.glyphicon-triangle-top:before { + content: "\e253"; +} +.glyphicon-console:before { + content: "\e254"; +} +.glyphicon-superscript:before { + content: "\e255"; +} +.glyphicon-subscript:before { + content: "\e256"; +} +.glyphicon-menu-left:before { + content: "\e257"; +} +.glyphicon-menu-right:before { + content: "\e258"; +} +.glyphicon-menu-down:before { + content: "\e259"; +} +.glyphicon-menu-up:before { + content: "\e260"; +} * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -991,6 +1181,9 @@ hr { overflow: visible; clip: auto; } +[role="button"] { + cursor: pointer; +} h1, h2, h3, @@ -1159,62 +1352,72 @@ mark, .text-primary { color: #428bca; } -a.text-primary:hover { +a.text-primary:hover, +a.text-primary:focus { color: #3071a9; } .text-success { color: #ffffff; } -a.text-success:hover { +a.text-success:hover, +a.text-success:focus { color: #e6e6e6; } .text-info { color: #ffffff; } -a.text-info:hover { +a.text-info:hover, +a.text-info:focus { color: #e6e6e6; } .text-warning { color: #ffffff; } -a.text-warning:hover { +a.text-warning:hover, +a.text-warning:focus { color: #e6e6e6; } .text-danger { color: #ffffff; } -a.text-danger:hover { +a.text-danger:hover, +a.text-danger:focus { color: #e6e6e6; } .bg-primary { color: #fff; background-color: #428bca; } -a.bg-primary:hover { +a.bg-primary:hover, +a.bg-primary:focus { background-color: #3071a9; } .bg-success { background-color: #5cb85c; } -a.bg-success:hover { +a.bg-success:hover, +a.bg-success:focus { background-color: #449d44; } .bg-info { background-color: #5bc0de; } -a.bg-info:hover { +a.bg-info:hover, +a.bg-info:focus { background-color: #31b0d5; } .bg-warning { background-color: #f0ad4e; } -a.bg-warning:hover { +a.bg-warning:hover, +a.bg-warning:focus { background-color: #ec971f; } .bg-danger { background-color: #d9534f; } -a.bg-danger:hover { +a.bg-danger:hover, +a.bg-danger:focus { background-color: #c9302c; } .page-header { @@ -1332,10 +1535,6 @@ blockquote.pull-right small:after, blockquote.pull-right .small:after { content: '\00A0 \2014'; } -blockquote:before, -blockquote:after { - content: ""; -} address { margin-bottom: 20px; font-style: normal; @@ -2129,7 +2328,7 @@ th { .table-bordered > thead > tr > td { border-bottom-width: 2px; } -.table-striped > tbody > tr:nth-child(odd) { +.table-striped > tbody > tr:nth-of-type(odd) { background-color: #080808; } .table-hover > tbody > tr:hover { @@ -2253,6 +2452,7 @@ table th[class*="col-"] { } .table-responsive { overflow-x: auto; + min-height: 0.01%; } @media screen and (max-width: 767px) { .table-responsive { @@ -2395,66 +2595,46 @@ output { .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { - cursor: not-allowed; background-color: #adafae; opacity: 1; } +.form-control[disabled], +fieldset[disabled] .form-control { + cursor: not-allowed; +} textarea.form-control { height: auto; } input[type="search"] { -webkit-appearance: none; } -input[type="date"], -input[type="time"], -input[type="datetime-local"], -input[type="month"] { - line-height: 38px; - line-height: 1.42857143 \0; -} -input[type="date"].input-sm, -input[type="time"].input-sm, -input[type="datetime-local"].input-sm, -input[type="month"].input-sm { - line-height: 30px; - line-height: 1.5 \0; -} -input[type="date"].input-lg, -input[type="time"].input-lg, -input[type="datetime-local"].input-lg, -input[type="month"].input-lg { - line-height: 54px; - line-height: 1.33 \0; -} -_:-ms-fullscreen, -:root input[type="date"], -_:-ms-fullscreen, -:root input[type="time"], -_:-ms-fullscreen, -:root input[type="datetime-local"], -_:-ms-fullscreen, -:root input[type="month"] { - line-height: 1.42857143; -} -_:-ms-fullscreen.input-sm, -:root input[type="date"].input-sm, -_:-ms-fullscreen.input-sm, -:root input[type="time"].input-sm, -_:-ms-fullscreen.input-sm, -:root input[type="datetime-local"].input-sm, -_:-ms-fullscreen.input-sm, -:root input[type="month"].input-sm { - line-height: 1.5; -} -_:-ms-fullscreen.input-lg, -:root input[type="date"].input-lg, -_:-ms-fullscreen.input-lg, -:root input[type="time"].input-lg, -_:-ms-fullscreen.input-lg, -:root input[type="datetime-local"].input-lg, -_:-ms-fullscreen.input-lg, -:root input[type="month"].input-lg { - line-height: 1.33; +@media screen and (-webkit-min-device-pixel-ratio: 0) { + input[type="date"].form-control, + input[type="time"].form-control, + input[type="datetime-local"].form-control, + input[type="month"].form-control { + line-height: 38px; + } + input[type="date"].input-sm, + input[type="time"].input-sm, + input[type="datetime-local"].input-sm, + input[type="month"].input-sm, + .input-group-sm input[type="date"], + .input-group-sm input[type="time"], + .input-group-sm input[type="datetime-local"], + .input-group-sm input[type="month"] { + line-height: 30px; + } + input[type="date"].input-lg, + input[type="time"].input-lg, + input[type="datetime-local"].input-lg, + input[type="month"].input-lg, + .input-group-lg input[type="date"], + .input-group-lg input[type="time"], + .input-group-lg input[type="datetime-local"], + .input-group-lg input[type="month"] { + line-height: 54px; + } } .form-group { margin-bottom: 15px; @@ -2488,6 +2668,7 @@ _:-ms-fullscreen.input-lg, } .radio-inline, .checkbox-inline { + position: relative; display: inline-block; padding-left: 20px; margin-bottom: 0; @@ -2524,50 +2705,87 @@ fieldset[disabled] .checkbox label { padding-top: 9px; padding-bottom: 9px; margin-bottom: 0; + min-height: 34px; } .form-control-static.input-lg, .form-control-static.input-sm { padding-left: 0; padding-right: 0; } -.input-sm, -.form-group-sm .form-control { +.input-sm { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px; } -select.input-sm, -select.form-group-sm .form-control { +select.input-sm { height: 30px; line-height: 30px; } textarea.input-sm, -textarea.form-group-sm .form-control, -select[multiple].input-sm, -select[multiple].form-group-sm .form-control { +select[multiple].input-sm { height: auto; } -.input-lg, -.form-group-lg .form-control { +.form-group-sm .form-control { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +.form-group-sm select.form-control { + height: 30px; + line-height: 30px; +} +.form-group-sm textarea.form-control, +.form-group-sm select[multiple].form-control { + height: auto; +} +.form-group-sm .form-control-static { + height: 30px; + min-height: 32px; + padding: 6px 10px; + font-size: 12px; + line-height: 1.5; +} +.input-lg { height: 54px; padding: 14px 16px; font-size: 18px; line-height: 1.33; border-radius: 6px; } -select.input-lg, -select.form-group-lg .form-control { +select.input-lg { height: 54px; line-height: 54px; } textarea.input-lg, -textarea.form-group-lg .form-control, -select[multiple].input-lg, -select[multiple].form-group-lg .form-control { +select[multiple].input-lg { height: auto; } +.form-group-lg .form-control { + height: 54px; + padding: 14px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; +} +.form-group-lg select.form-control { + height: 54px; + line-height: 54px; +} +.form-group-lg textarea.form-control, +.form-group-lg select[multiple].form-control { + height: auto; +} +.form-group-lg .form-control-static { + height: 54px; + min-height: 38px; + padding: 15px 16px; + font-size: 18px; + line-height: 1.33; +} .has-feedback { position: relative; } @@ -2586,12 +2804,16 @@ select[multiple].form-group-lg .form-control { text-align: center; pointer-events: none; } -.input-lg + .form-control-feedback { +.input-lg + .form-control-feedback, +.input-group-lg + .form-control-feedback, +.form-group-lg .form-control + .form-control-feedback { width: 54px; height: 54px; line-height: 54px; } -.input-sm + .form-control-feedback { +.input-sm + .form-control-feedback, +.input-group-sm + .form-control-feedback, +.form-group-sm .form-control + .form-control-feedback { width: 30px; height: 30px; line-height: 30px; @@ -2777,11 +2999,13 @@ select[multiple].form-group-lg .form-control { @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { padding-top: 19.62px; + font-size: 18px; } } @media (min-width: 768px) { .form-horizontal .form-group-sm .control-label { padding-top: 6px; + font-size: 12px; } } .btn { @@ -2831,20 +3055,31 @@ select[multiple].form-group-lg .form-control { .btn[disabled], fieldset[disabled] .btn { cursor: not-allowed; - pointer-events: none; opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; box-shadow: none; } +a.btn.disabled, +fieldset[disabled] a.btn { + pointer-events: none; +} .btn-default { color: #ffffff; background-color: #424242; border-color: #282828; } -.btn-default:hover, .btn-default:focus, -.btn-default.focus, +.btn-default.focus { + color: #ffffff; + background-color: #282828; + border-color: #000000; +} +.btn-default:hover { + color: #ffffff; + background-color: #282828; + border-color: #090909; +} .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { @@ -2852,6 +3087,19 @@ fieldset[disabled] .btn { background-color: #282828; border-color: #090909; } +.btn-default:active:hover, +.btn-default.active:hover, +.open > .dropdown-toggle.btn-default:hover, +.btn-default:active:focus, +.btn-default.active:focus, +.open > .dropdown-toggle.btn-default:focus, +.btn-default:active.focus, +.btn-default.active.focus, +.open > .dropdown-toggle.btn-default.focus { + color: #ffffff; + background-color: #161616; + border-color: #000000; +} .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { @@ -2887,9 +3135,17 @@ fieldset[disabled] .btn-default.active { background-color: #428bca; border-color: #282828; } -.btn-primary:hover, .btn-primary:focus, -.btn-primary.focus, +.btn-primary.focus { + color: #ffffff; + background-color: #3071a9; + border-color: #000000; +} +.btn-primary:hover { + color: #ffffff; + background-color: #3071a9; + border-color: #090909; +} .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { @@ -2897,6 +3153,19 @@ fieldset[disabled] .btn-default.active { background-color: #3071a9; border-color: #090909; } +.btn-primary:active:hover, +.btn-primary.active:hover, +.open > .dropdown-toggle.btn-primary:hover, +.btn-primary:active:focus, +.btn-primary.active:focus, +.open > .dropdown-toggle.btn-primary:focus, +.btn-primary:active.focus, +.btn-primary.active.focus, +.open > .dropdown-toggle.btn-primary.focus { + color: #ffffff; + background-color: #285e8e; + border-color: #000000; +} .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { @@ -2932,9 +3201,17 @@ fieldset[disabled] .btn-primary.active { background-color: #5cb85c; border-color: #282828; } -.btn-success:hover, .btn-success:focus, -.btn-success.focus, +.btn-success.focus { + color: #ffffff; + background-color: #449d44; + border-color: #000000; +} +.btn-success:hover { + color: #ffffff; + background-color: #449d44; + border-color: #090909; +} .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { @@ -2942,6 +3219,19 @@ fieldset[disabled] .btn-primary.active { background-color: #449d44; border-color: #090909; } +.btn-success:active:hover, +.btn-success.active:hover, +.open > .dropdown-toggle.btn-success:hover, +.btn-success:active:focus, +.btn-success.active:focus, +.open > .dropdown-toggle.btn-success:focus, +.btn-success:active.focus, +.btn-success.active.focus, +.open > .dropdown-toggle.btn-success.focus { + color: #ffffff; + background-color: #398439; + border-color: #000000; +} .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { @@ -2977,9 +3267,17 @@ fieldset[disabled] .btn-success.active { background-color: #5bc0de; border-color: #282828; } -.btn-info:hover, .btn-info:focus, -.btn-info.focus, +.btn-info.focus { + color: #ffffff; + background-color: #31b0d5; + border-color: #000000; +} +.btn-info:hover { + color: #ffffff; + background-color: #31b0d5; + border-color: #090909; +} .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { @@ -2987,6 +3285,19 @@ fieldset[disabled] .btn-success.active { background-color: #31b0d5; border-color: #090909; } +.btn-info:active:hover, +.btn-info.active:hover, +.open > .dropdown-toggle.btn-info:hover, +.btn-info:active:focus, +.btn-info.active:focus, +.open > .dropdown-toggle.btn-info:focus, +.btn-info:active.focus, +.btn-info.active.focus, +.open > .dropdown-toggle.btn-info.focus { + color: #ffffff; + background-color: #269abc; + border-color: #000000; +} .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { @@ -3022,9 +3333,17 @@ fieldset[disabled] .btn-info.active { background-color: #f0ad4e; border-color: #282828; } -.btn-warning:hover, .btn-warning:focus, -.btn-warning.focus, +.btn-warning.focus { + color: #ffffff; + background-color: #ec971f; + border-color: #000000; +} +.btn-warning:hover { + color: #ffffff; + background-color: #ec971f; + border-color: #090909; +} .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { @@ -3032,6 +3351,19 @@ fieldset[disabled] .btn-info.active { background-color: #ec971f; border-color: #090909; } +.btn-warning:active:hover, +.btn-warning.active:hover, +.open > .dropdown-toggle.btn-warning:hover, +.btn-warning:active:focus, +.btn-warning.active:focus, +.open > .dropdown-toggle.btn-warning:focus, +.btn-warning:active.focus, +.btn-warning.active.focus, +.open > .dropdown-toggle.btn-warning.focus { + color: #ffffff; + background-color: #d58512; + border-color: #000000; +} .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { @@ -3067,9 +3399,17 @@ fieldset[disabled] .btn-warning.active { background-color: #d9534f; border-color: #282828; } -.btn-danger:hover, .btn-danger:focus, -.btn-danger.focus, +.btn-danger.focus { + color: #ffffff; + background-color: #c9302c; + border-color: #000000; +} +.btn-danger:hover { + color: #ffffff; + background-color: #c9302c; + border-color: #090909; +} .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { @@ -3077,6 +3417,19 @@ fieldset[disabled] .btn-warning.active { background-color: #c9302c; border-color: #090909; } +.btn-danger:active:hover, +.btn-danger.active:hover, +.open > .dropdown-toggle.btn-danger:hover, +.btn-danger:active:focus, +.btn-danger.active:focus, +.open > .dropdown-toggle.btn-danger:focus, +.btn-danger:active.focus, +.btn-danger.active.focus, +.open > .dropdown-toggle.btn-danger.focus { + color: #ffffff; + background-color: #ac2925; + border-color: #000000; +} .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { @@ -3198,9 +3551,12 @@ tbody.collapse.in { position: relative; height: 0; overflow: hidden; - -webkit-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; + -webkit-transition-property: height, visibility; + transition-property: height, visibility; + -webkit-transition-duration: 0.35s; + transition-duration: 0.35s; + -webkit-transition-timing-function: ease; + transition-timing-function: ease; } .caret { display: inline-block; @@ -3208,10 +3564,12 @@ tbody.collapse.in { height: 0; margin-left: 2px; vertical-align: middle; - border-top: 4px solid; + border-top: 4px dashed; + border-top: 4px solid \9; border-right: 4px solid transparent; border-left: 4px solid transparent; } +.dropup, .dropdown { position: relative; } @@ -3322,14 +3680,15 @@ tbody.collapse.in { .dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; - border-bottom: 4px solid; + border-bottom: 4px dashed; + border-bottom: 4px solid \9; content: ""; } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; - margin-bottom: 1px; + margin-bottom: 2px; } @media (min-width: 768px) { .navbar-right .dropdown-menu { @@ -3362,10 +3721,6 @@ tbody.collapse.in { .btn-group-vertical > .btn.active { z-index: 2; } -.btn-group > .btn:focus, -.btn-group-vertical > .btn:focus { - outline: 0; -} .btn-group .btn + .btn, .btn-group .btn + .btn-group, .btn-group .btn-group + .btn, @@ -3375,6 +3730,7 @@ tbody.collapse.in { .btn-toolbar { margin-left: -5px; } +.btn-toolbar .btn, .btn-toolbar .btn-group, .btn-toolbar .input-group { float: left; @@ -3405,12 +3761,12 @@ tbody.collapse.in { .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0; } -.btn-group > .btn-group:first-child > .btn:last-child, -.btn-group > .btn-group:first-child > .dropdown-toggle { +.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child, +.btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle { border-bottom-right-radius: 0; border-top-right-radius: 0; } -.btn-group > .btn-group:last-child > .btn:first-child { +.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child { border-bottom-left-radius: 0; border-top-left-radius: 0; } @@ -3510,9 +3866,8 @@ tbody.collapse.in { [data-toggle="buttons"] > .btn input[type="checkbox"], [data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] { position: absolute; - z-index: -1; - opacity: 0; - filter: alpha(opacity=0); + clip: rect(0, 0, 0, 0); + pointer-events: none; } .input-group { position: relative; @@ -3666,6 +4021,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group { + z-index: 2; margin-left: -1px; } .nav { @@ -3950,8 +4306,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { right: 0; left: 0; z-index: 1030; - -webkit-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); } @media (min-width: 768px) { .navbar-fixed-top, @@ -4125,6 +4479,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-form .form-group { margin-bottom: 5px; } + .navbar-form .form-group:last-child { + margin-bottom: 0; + } } @media (min-width: 768px) { .navbar-form { @@ -4144,6 +4501,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { border-top-left-radius: 0; } .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { + margin-bottom: 0; + border-top-right-radius: 4px; + border-top-left-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } @@ -4434,6 +4794,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus { + z-index: 3; color: #ffffff; background-color: #428bca; border-color: transparent; @@ -4465,6 +4826,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination-lg > li > span { padding: 14px 16px; font-size: 18px; + line-height: 1.33; } .pagination-lg > li:first-child > a, .pagination-lg > li:first-child > span { @@ -4480,6 +4842,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination-sm > li > span { padding: 5px 10px; font-size: 12px; + line-height: 1.5; } .pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span { @@ -4604,7 +4967,7 @@ a.label:focus { font-weight: bold; color: #ffffff; line-height: 1; - vertical-align: baseline; + vertical-align: middle; white-space: nowrap; text-align: center; background-color: #428bca; @@ -4617,7 +4980,8 @@ a.label:focus { position: relative; top: -1px; } -.btn-xs .badge { +.btn-xs .badge, +.btn-group-xs > .btn .badge { top: 0; padding: 1px 5px; } @@ -4627,16 +4991,23 @@ a.badge:focus { text-decoration: none; cursor: pointer; } -a.list-group-item.active > .badge, +.list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #428bca; background-color: #ffffff; } +.list-group-item > .badge { + float: right; +} +.list-group-item > .badge + .badge { + margin-right: 5px; +} .nav-pills > li > a > .badge { margin-left: 3px; } .jumbotron { - padding: 30px; + padding-top: 30px; + padding-bottom: 30px; margin-bottom: 30px; color: inherit; background-color: #151515; @@ -4665,7 +5036,8 @@ a.list-group-item.active > .badge, padding-top: 48px; padding-bottom: 48px; } - .container .jumbotron { + .container .jumbotron, + .container-fluid .jumbotron { padding-left: 60px; padding-right: 60px; } @@ -4828,13 +5200,6 @@ a.thumbnail.active { -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress-bar[aria-valuenow="0"] { - color: #888888; - min-width: 30px; - background-color: transparent; - background-image: none; - box-shadow: none; -} .progress-bar-success { background-color: #5cb85c; } @@ -4867,29 +5232,49 @@ a.thumbnail.active { background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.media, -.media-body { - overflow: hidden; - zoom: 1; -} -.media, -.media .media { +.media { margin-top: 15px; } .media:first-child { margin-top: 0; } +.media, +.media-body { + zoom: 1; + overflow: hidden; +} +.media-body { + width: 10000px; +} .media-object { display: block; } -.media-heading { - margin: 0 0 5px; +.media-object.img-thumbnail { + max-width: none; +} +.media-right, +.media > .pull-right { + padding-left: 10px; } +.media-left, .media > .pull-left { - margin-right: 10px; + padding-right: 10px; } -.media > .pull-right { - margin-left: 10px; +.media-left, +.media-right, +.media-body { + display: table-cell; + vertical-align: top; +} +.media-middle { + vertical-align: middle; +} +.media-bottom { + vertical-align: bottom; +} +.media-heading { + margin-top: 0; + margin-bottom: 5px; } .media-list { padding-left: 0; @@ -4916,24 +5301,26 @@ a.thumbnail.active { border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; } -.list-group-item > .badge { - float: right; -} -.list-group-item > .badge + .badge { - margin-right: 5px; -} -a.list-group-item { +a.list-group-item, +button.list-group-item { color: #888888; } -a.list-group-item .list-group-item-heading { +a.list-group-item .list-group-item-heading, +button.list-group-item .list-group-item-heading { color: #ffffff; } a.list-group-item:hover, -a.list-group-item:focus { +button.list-group-item:hover, +a.list-group-item:focus, +button.list-group-item:focus { text-decoration: none; color: #888888; background-color: #484848; } +button.list-group-item { + width: 100%; + text-align: left; +} .list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus { @@ -4979,20 +5366,27 @@ a.list-group-item:focus { color: #ffffff; background-color: #5cb85c; } -a.list-group-item-success { +a.list-group-item-success, +button.list-group-item-success { color: #ffffff; } -a.list-group-item-success .list-group-item-heading { +a.list-group-item-success .list-group-item-heading, +button.list-group-item-success .list-group-item-heading { color: inherit; } a.list-group-item-success:hover, -a.list-group-item-success:focus { +button.list-group-item-success:hover, +a.list-group-item-success:focus, +button.list-group-item-success:focus { color: #ffffff; background-color: #4cae4c; } a.list-group-item-success.active, +button.list-group-item-success.active, a.list-group-item-success.active:hover, -a.list-group-item-success.active:focus { +button.list-group-item-success.active:hover, +a.list-group-item-success.active:focus, +button.list-group-item-success.active:focus { color: #fff; background-color: #ffffff; border-color: #ffffff; @@ -5001,20 +5395,27 @@ a.list-group-item-success.active:focus { color: #ffffff; background-color: #5bc0de; } -a.list-group-item-info { +a.list-group-item-info, +button.list-group-item-info { color: #ffffff; } -a.list-group-item-info .list-group-item-heading { +a.list-group-item-info .list-group-item-heading, +button.list-group-item-info .list-group-item-heading { color: inherit; } a.list-group-item-info:hover, -a.list-group-item-info:focus { +button.list-group-item-info:hover, +a.list-group-item-info:focus, +button.list-group-item-info:focus { color: #ffffff; background-color: #46b8da; } a.list-group-item-info.active, +button.list-group-item-info.active, a.list-group-item-info.active:hover, -a.list-group-item-info.active:focus { +button.list-group-item-info.active:hover, +a.list-group-item-info.active:focus, +button.list-group-item-info.active:focus { color: #fff; background-color: #ffffff; border-color: #ffffff; @@ -5023,20 +5424,27 @@ a.list-group-item-info.active:focus { color: #ffffff; background-color: #f0ad4e; } -a.list-group-item-warning { +a.list-group-item-warning, +button.list-group-item-warning { color: #ffffff; } -a.list-group-item-warning .list-group-item-heading { +a.list-group-item-warning .list-group-item-heading, +button.list-group-item-warning .list-group-item-heading { color: inherit; } a.list-group-item-warning:hover, -a.list-group-item-warning:focus { +button.list-group-item-warning:hover, +a.list-group-item-warning:focus, +button.list-group-item-warning:focus { color: #ffffff; background-color: #eea236; } a.list-group-item-warning.active, +button.list-group-item-warning.active, a.list-group-item-warning.active:hover, -a.list-group-item-warning.active:focus { +button.list-group-item-warning.active:hover, +a.list-group-item-warning.active:focus, +button.list-group-item-warning.active:focus { color: #fff; background-color: #ffffff; border-color: #ffffff; @@ -5045,20 +5453,27 @@ a.list-group-item-warning.active:focus { color: #ffffff; background-color: #d9534f; } -a.list-group-item-danger { +a.list-group-item-danger, +button.list-group-item-danger { color: #ffffff; } -a.list-group-item-danger .list-group-item-heading { +a.list-group-item-danger .list-group-item-heading, +button.list-group-item-danger .list-group-item-heading { color: inherit; } a.list-group-item-danger:hover, -a.list-group-item-danger:focus { +button.list-group-item-danger:hover, +a.list-group-item-danger:focus, +button.list-group-item-danger:focus { color: #ffffff; background-color: #d43f3a; } a.list-group-item-danger.active, +button.list-group-item-danger.active, a.list-group-item-danger.active:hover, -a.list-group-item-danger.active:focus { +button.list-group-item-danger.active:hover, +a.list-group-item-danger.active:focus, +button.list-group-item-danger.active:focus { color: #fff; background-color: #ffffff; border-color: #ffffff; @@ -5097,7 +5512,11 @@ a.list-group-item-danger.active:focus { font-size: 16px; color: inherit; } -.panel-title > a { +.panel-title > a, +.panel-title > small, +.panel-title > .small, +.panel-title > small > a, +.panel-title > .small > a { color: inherit; } .panel-footer { @@ -5128,6 +5547,10 @@ a.list-group-item-danger.active:focus { border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; } +.panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child { + border-top-right-radius: 0; + border-top-left-radius: 0; +} .panel-heading + .list-group .list-group-item:first-child { border-top-width: 0; } @@ -5288,7 +5711,8 @@ a.list-group-item-danger.active:focus { .panel-group .panel-heading { border-bottom: 0; } -.panel-group .panel-heading + .panel-collapse > .panel-body { +.panel-group .panel-heading + .panel-collapse > .panel-body, +.panel-group .panel-heading + .panel-collapse > .list-group { border-top: 1px solid #282828; } .panel-group .panel-footer { @@ -5415,7 +5839,8 @@ a.list-group-item-danger.active:focus { .embed-responsive .embed-responsive-item, .embed-responsive iframe, .embed-responsive embed, -.embed-responsive object { +.embed-responsive object, +.embed-responsive video { position: absolute; top: 0; left: 0; @@ -5424,10 +5849,10 @@ a.list-group-item-danger.active:focus { width: 100%; border: 0; } -.embed-responsive.embed-responsive-16by9 { +.embed-responsive-16by9 { padding-bottom: 56.25%; } -.embed-responsive.embed-responsive-4by3 { +.embed-responsive-4by3 { padding-bottom: 75%; } .well { @@ -5493,16 +5918,20 @@ button.close { outline: 0; } .modal.fade .modal-dialog { - -webkit-transform: translate3d(0, -25%, 0); - transform: translate3d(0, -25%, 0); + -webkit-transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + -o-transform: translate(0, -25%); + transform: translate(0, -25%); -webkit-transition: -webkit-transform 0.3s ease-out; -moz-transition: -moz-transform 0.3s ease-out; -o-transition: -o-transform 0.3s ease-out; transition: transform 0.3s ease-out; } .modal.in .modal-dialog { - -webkit-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); + -webkit-transform: translate(0, 0); + -ms-transform: translate(0, 0); + -o-transform: translate(0, 0); + transform: translate(0, 0); } .modal-open .modal { overflow-x: hidden; @@ -5601,9 +6030,22 @@ button.close { position: absolute; z-index: 1070; display: block; - visibility: visible; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-style: normal; + font-weight: normal; + letter-spacing: normal; + line-break: auto; + line-height: 1.42857143; + text-align: left; + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + white-space: normal; + word-break: normal; + word-spacing: normal; + word-wrap: normal; font-size: 12px; - line-height: 1.4; opacity: 0; filter: alpha(opacity=0); } @@ -5632,7 +6074,6 @@ button.close { padding: 3px 8px; color: #ffffff; text-align: center; - text-decoration: none; background-color: rgba(0, 0, 0, 0.9); border-radius: 4px; } @@ -5652,13 +6093,15 @@ button.close { } .tooltip.top-left .tooltip-arrow { bottom: 0; - left: 5px; + right: 5px; + margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: rgba(0, 0, 0, 0.9); } .tooltip.top-right .tooltip-arrow { bottom: 0; - right: 5px; + left: 5px; + margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: rgba(0, 0, 0, 0.9); } @@ -5685,13 +6128,15 @@ button.close { } .tooltip.bottom-left .tooltip-arrow { top: 0; - left: 5px; + right: 5px; + margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: rgba(0, 0, 0, 0.9); } .tooltip.bottom-right .tooltip-arrow { top: 0; - right: 5px; + left: 5px; + margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: rgba(0, 0, 0, 0.9); } @@ -5703,10 +6148,22 @@ button.close { display: none; max-width: 276px; padding: 1px; - font-size: 14px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-style: normal; font-weight: normal; + letter-spacing: normal; + line-break: auto; line-height: 1.42857143; text-align: left; + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + white-space: normal; + word-break: normal; + word-spacing: normal; + word-wrap: normal; + font-size: 14px; background-color: #202020; background-clip: padding-box; border: 1px solid #999999; @@ -5714,7 +6171,6 @@ button.close { border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - white-space: normal; } .popover.top { margin-top: -10px; @@ -5836,23 +6292,33 @@ button.close { } @media all and (transform-3d), (-webkit-transform-3d) { .carousel-inner > .item { + -webkit-transition: -webkit-transform 0.6s ease-in-out; + -moz-transition: -moz-transform 0.6s ease-in-out; + -o-transition: -o-transform 0.6s ease-in-out; transition: transform 0.6s ease-in-out; + -webkit-backface-visibility: hidden; + -moz-backface-visibility: hidden; backface-visibility: hidden; - perspective: 1000; + -webkit-perspective: 1000px; + -moz-perspective: 1000px; + perspective: 1000px; } .carousel-inner > .item.next, .carousel-inner > .item.active.right { + -webkit-transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0); left: 0; } .carousel-inner > .item.prev, .carousel-inner > .item.active.left { + -webkit-transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0); left: 0; } .carousel-inner > .item.next.left, .carousel-inner > .item.prev.right, .carousel-inner > .item.active { + -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); left: 0; } @@ -5930,6 +6396,7 @@ button.close { .carousel-control .glyphicon-chevron-right { position: absolute; top: 50%; + margin-top: -10px; z-index: 5; display: inline-block; } @@ -5947,7 +6414,7 @@ button.close { .carousel-control .icon-next { width: 20px; height: 20px; - margin-top: -10px; + line-height: 1; font-family: serif; } .carousel-control .icon-prev:before { @@ -6106,7 +6573,6 @@ button.close { } .hidden { display: none !important; - visibility: hidden !important; } .affix { position: fixed; @@ -6139,7 +6605,7 @@ button.close { display: block !important; } table.visible-xs { - display: table; + display: table !important; } tr.visible-xs { display: table-row !important; @@ -6169,7 +6635,7 @@ button.close { display: block !important; } table.visible-sm { - display: table; + display: table !important; } tr.visible-sm { display: table-row !important; @@ -6199,7 +6665,7 @@ button.close { display: block !important; } table.visible-md { - display: table; + display: table !important; } tr.visible-md { display: table-row !important; @@ -6229,7 +6695,7 @@ button.close { display: block !important; } table.visible-lg { - display: table; + display: table !important; } tr.visible-lg { display: table-row !important; @@ -6282,7 +6748,7 @@ button.close { display: block !important; } table.visible-print { - display: table; + display: table !important; } tr.visible-print { display: table-row !important; @@ -6328,32 +6794,32 @@ body { color: #888888; } #shifts td.free { - border: 1px solid #888888; + border: 1px solid #d9534f; background-color: #d9534f; } -a#shifts td.free:hover { +a#shifts td.free:hover, +a#shifts td.free:focus { background-color: #c9302c; } #shifts td.occupied { - border: 1px solid #888888; + border: 1px solid #5cb85c; background-color: #5cb85c; } -a#shifts td.occupied:hover { +a#shifts td.occupied:hover, +a#shifts td.occupied:focus { background-color: #449d44; } #shifts td.collides { - border: 1px solid #888888; + border: 1px solid #f0ad4e; background-color: #f0ad4e; } -a#shifts td.collides:hover { +a#shifts td.collides:hover, +a#shifts td.collides:focus { background-color: #ec971f; } #shifts td.own { border: 1px solid #888888; } -.shifts-table { - overflow-x: scroll; -} .row-day { border-top: 2px solid #888888; } diff --git a/public/css/theme2.css b/public/css/theme2.css index 957a09ae..41b16ad9 100644 --- a/public/css/theme2.css +++ b/public/css/theme2.css @@ -1,4 +1,9 @@ -/*! normalize.css v3.0.1 | MIT License | git.io/normalize */ +/*! + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ html { font-family: sans-serif; -ms-text-size-adjust: 100%; @@ -16,6 +21,7 @@ footer, header, hgroup, main, +menu, nav, section, summary { @@ -37,7 +43,7 @@ template { display: none; } a { - background: transparent; + background-color: transparent; } a:active, a:hover { @@ -87,7 +93,6 @@ figure { margin: 1em 40px; } hr { - -moz-box-sizing: content-box; box-sizing: content-box; height: 0; } @@ -147,8 +152,6 @@ input[type="number"]::-webkit-outer-spin-button { } input[type="search"] { -webkit-appearance: textfield; - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; box-sizing: content-box; } input[type="search"]::-webkit-search-cancel-button, @@ -178,8 +181,11 @@ td, th { padding: 0; } +/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */ @media print { - * { + *, + *:before, + *:after { background: transparent !important; color: #000 !important; box-shadow: none !important; @@ -224,9 +230,6 @@ th { h3 { page-break-after: avoid; } - select { - background: #fff !important; - } .navbar { display: none; } @@ -252,7 +255,7 @@ th { @font-face { font-family: 'Glyphicons Halflings'; src: url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.eot'); - src: url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); + src: url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../vendor/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } .glyphicon { position: relative; @@ -271,7 +274,8 @@ th { .glyphicon-plus:before { content: "\2b"; } -.glyphicon-euro:before { +.glyphicon-euro:before, +.glyphicon-eur:before { content: "\20ac"; } .glyphicon-minus:before { @@ -865,6 +869,192 @@ th { .glyphicon-tree-deciduous:before { content: "\e200"; } +.glyphicon-cd:before { + content: "\e201"; +} +.glyphicon-save-file:before { + content: "\e202"; +} +.glyphicon-open-file:before { + content: "\e203"; +} +.glyphicon-level-up:before { + content: "\e204"; +} +.glyphicon-copy:before { + content: "\e205"; +} +.glyphicon-paste:before { + content: "\e206"; +} +.glyphicon-alert:before { + content: "\e209"; +} +.glyphicon-equalizer:before { + content: "\e210"; +} +.glyphicon-king:before { + content: "\e211"; +} +.glyphicon-queen:before { + content: "\e212"; +} +.glyphicon-pawn:before { + content: "\e213"; +} +.glyphicon-bishop:before { + content: "\e214"; +} +.glyphicon-knight:before { + content: "\e215"; +} +.glyphicon-baby-formula:before { + content: "\e216"; +} +.glyphicon-tent:before { + content: "\26fa"; +} +.glyphicon-blackboard:before { + content: "\e218"; +} +.glyphicon-bed:before { + content: "\e219"; +} +.glyphicon-apple:before { + content: "\f8ff"; +} +.glyphicon-erase:before { + content: "\e221"; +} +.glyphicon-hourglass:before { + content: "\231b"; +} +.glyphicon-lamp:before { + content: "\e223"; +} +.glyphicon-duplicate:before { + content: "\e224"; +} +.glyphicon-piggy-bank:before { + content: "\e225"; +} +.glyphicon-scissors:before { + content: "\e226"; +} +.glyphicon-bitcoin:before { + content: "\e227"; +} +.glyphicon-btc:before { + content: "\e227"; +} +.glyphicon-xbt:before { + content: "\e227"; +} +.glyphicon-yen:before { + content: "\00a5"; +} +.glyphicon-jpy:before { + content: "\00a5"; +} +.glyphicon-ruble:before { + content: "\20bd"; +} +.glyphicon-rub:before { + content: "\20bd"; +} +.glyphicon-scale:before { + content: "\e230"; +} +.glyphicon-ice-lolly:before { + content: "\e231"; +} +.glyphicon-ice-lolly-tasted:before { + content: "\e232"; +} +.glyphicon-education:before { + content: "\e233"; +} +.glyphicon-option-horizontal:before { + content: "\e234"; +} +.glyphicon-option-vertical:before { + content: "\e235"; +} +.glyphicon-menu-hamburger:before { + content: "\e236"; +} +.glyphicon-modal-window:before { + content: "\e237"; +} +.glyphicon-oil:before { + content: "\e238"; +} +.glyphicon-grain:before { + content: "\e239"; +} +.glyphicon-sunglasses:before { + content: "\e240"; +} +.glyphicon-text-size:before { + content: "\e241"; +} +.glyphicon-text-color:before { + content: "\e242"; +} +.glyphicon-text-background:before { + content: "\e243"; +} +.glyphicon-object-align-top:before { + content: "\e244"; +} +.glyphicon-object-align-bottom:before { + content: "\e245"; +} +.glyphicon-object-align-horizontal:before { + content: "\e246"; +} +.glyphicon-object-align-left:before { + content: "\e247"; +} +.glyphicon-object-align-vertical:before { + content: "\e248"; +} +.glyphicon-object-align-right:before { + content: "\e249"; +} +.glyphicon-triangle-right:before { + content: "\e250"; +} +.glyphicon-triangle-left:before { + content: "\e251"; +} +.glyphicon-triangle-bottom:before { + content: "\e252"; +} +.glyphicon-triangle-top:before { + content: "\e253"; +} +.glyphicon-console:before { + content: "\e254"; +} +.glyphicon-superscript:before { + content: "\e255"; +} +.glyphicon-subscript:before { + content: "\e256"; +} +.glyphicon-menu-left:before { + content: "\e257"; +} +.glyphicon-menu-right:before { + content: "\e258"; +} +.glyphicon-menu-down:before { + content: "\e259"; +} +.glyphicon-menu-up:before { + content: "\e260"; +} * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -896,12 +1086,12 @@ textarea { line-height: inherit; } a { - color: #41145a; + color: #58585a; text-decoration: none; } a:hover, a:focus { - color: #14061b; + color: #323233; text-decoration: underline; } a:focus { @@ -968,6 +1158,9 @@ hr { overflow: visible; clip: auto; } +[role="button"] { + cursor: pointer; +} h1, h2, h3, @@ -1103,7 +1296,7 @@ small, } mark, .mark { - background-color: #ff8232; + background-color: #ffffff; padding: .2em; } .text-left { @@ -1134,65 +1327,75 @@ mark, color: #777777; } .text-primary { - color: #41145a; + color: #758499; } -a.text-primary:hover { - color: #230b30; +a.text-primary:hover, +a.text-primary:focus { + color: #5d6b7e; } .text-success { - color: #33cc24; + color: #638232; } -a.text-success:hover { - color: #28a11c; +a.text-success:hover, +a.text-success:focus { + color: #475d24; } .text-info { - color: #6e50b4; + color: #826045; } -a.text-info:hover { - color: #583f92; +a.text-info:hover, +a.text-info:focus { + color: #614733; } .text-warning { - color: #8a6d3b; + color: #bc8640; } -a.text-warning:hover { - color: #66512c; +a.text-warning:hover, +a.text-warning:focus { + color: #966b33; } .text-danger { - color: #ff5a46; + color: #694374; } -a.text-danger:hover { - color: #ff2d13; +a.text-danger:hover, +a.text-danger:focus { + color: #4c3054; } .bg-primary { color: #fff; - background-color: #41145a; + background-color: #758499; } -a.bg-primary:hover { - background-color: #230b30; +a.bg-primary:hover, +a.bg-primary:focus { + background-color: #5d6b7e; } .bg-success { - background-color: #cbf5c7; + background-color: #f0f5e7; } -a.bg-success:hover { - background-color: #a3ed9c; +a.bg-success:hover, +a.bg-success:focus { + background-color: #d9e6c3; } .bg-info { - background-color: #e4dff1; + background-color: #fbf9f7; } -a.bg-info:hover { - background-color: #c7bbe2; +a.bg-info:hover, +a.bg-info:focus { + background-color: #e8ded7; } .bg-warning { - background-color: #ff8232; + background-color: #ffffff; } -a.bg-warning:hover { - background-color: #fe6300; +a.bg-warning:hover, +a.bg-warning:focus { + background-color: #e6e6e6; } .bg-danger { - background-color: #ffe2df; + background-color: #f1eaf2; } -a.bg-danger:hover { - background-color: #ffb5ac; +a.bg-danger:hover, +a.bg-danger:focus { + background-color: #dbcadf; } .page-header { padding-bottom: 9px; @@ -1309,10 +1512,6 @@ blockquote.pull-right small:after, blockquote.pull-right .small:after { content: '\00A0 \2014'; } -blockquote:before, -blockquote:after { - content: ""; -} address { margin-bottom: 20px; font-style: normal; @@ -2106,7 +2305,7 @@ th { .table-bordered > thead > tr > td { border-bottom-width: 2px; } -.table-striped > tbody > tr:nth-child(odd) { +.table-striped > tbody > tr:nth-of-type(odd) { background-color: #f9f9f9; } .table-hover > tbody > tr:hover { @@ -2156,14 +2355,14 @@ table th[class*="col-"] { .table > thead > tr.success > th, .table > tbody > tr.success > th, .table > tfoot > tr.success > th { - background-color: #cbf5c7; + background-color: #f0f5e7; } .table-hover > tbody > tr > td.success:hover, .table-hover > tbody > tr > th.success:hover, .table-hover > tbody > tr.success:hover > td, .table-hover > tbody > tr:hover > .success, .table-hover > tbody > tr.success:hover > th { - background-color: #b7f1b1; + background-color: #e5eed5; } .table > thead > tr > td.info, .table > tbody > tr > td.info, @@ -2177,14 +2376,14 @@ table th[class*="col-"] { .table > thead > tr.info > th, .table > tbody > tr.info > th, .table > tfoot > tr.info > th { - background-color: #e4dff1; + background-color: #fbf9f7; } .table-hover > tbody > tr > td.info:hover, .table-hover > tbody > tr > th.info:hover, .table-hover > tbody > tr.info:hover > td, .table-hover > tbody > tr:hover > .info, .table-hover > tbody > tr.info:hover > th { - background-color: #d6cdea; + background-color: #f2ebe7; } .table > thead > tr > td.warning, .table > tbody > tr > td.warning, @@ -2198,14 +2397,14 @@ table th[class*="col-"] { .table > thead > tr.warning > th, .table > tbody > tr.warning > th, .table > tfoot > tr.warning > th { - background-color: #ff8232; + background-color: #ffffff; } .table-hover > tbody > tr > td.warning:hover, .table-hover > tbody > tr > th.warning:hover, .table-hover > tbody > tr.warning:hover > td, .table-hover > tbody > tr:hover > .warning, .table-hover > tbody > tr.warning:hover > th { - background-color: #ff7218; + background-color: #f2f2f2; } .table > thead > tr > td.danger, .table > tbody > tr > td.danger, @@ -2219,17 +2418,18 @@ table th[class*="col-"] { .table > thead > tr.danger > th, .table > tbody > tr.danger > th, .table > tfoot > tr.danger > th { - background-color: #ffe2df; + background-color: #f1eaf2; } .table-hover > tbody > tr > td.danger:hover, .table-hover > tbody > tr > th.danger:hover, .table-hover > tbody > tr.danger:hover > td, .table-hover > tbody > tr:hover > .danger, .table-hover > tbody > tr.danger:hover > th { - background-color: #ffccc5; + background-color: #e6dae9; } .table-responsive { overflow-x: auto; + min-height: 0.01%; } @media screen and (max-width: 767px) { .table-responsive { @@ -2372,66 +2572,46 @@ output { .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { - cursor: not-allowed; background-color: #eeeeee; opacity: 1; } +.form-control[disabled], +fieldset[disabled] .form-control { + cursor: not-allowed; +} textarea.form-control { height: auto; } input[type="search"] { -webkit-appearance: none; } -input[type="date"], -input[type="time"], -input[type="datetime-local"], -input[type="month"] { - line-height: 34px; - line-height: 1.42857143 \0; -} -input[type="date"].input-sm, -input[type="time"].input-sm, -input[type="datetime-local"].input-sm, -input[type="month"].input-sm { - line-height: 30px; - line-height: 1.5 \0; -} -input[type="date"].input-lg, -input[type="time"].input-lg, -input[type="datetime-local"].input-lg, -input[type="month"].input-lg { - line-height: 46px; - line-height: 1.33 \0; -} -_:-ms-fullscreen, -:root input[type="date"], -_:-ms-fullscreen, -:root input[type="time"], -_:-ms-fullscreen, -:root input[type="datetime-local"], -_:-ms-fullscreen, -:root input[type="month"] { - line-height: 1.42857143; -} -_:-ms-fullscreen.input-sm, -:root input[type="date"].input-sm, -_:-ms-fullscreen.input-sm, -:root input[type="time"].input-sm, -_:-ms-fullscreen.input-sm, -:root input[type="datetime-local"].input-sm, -_:-ms-fullscreen.input-sm, -:root input[type="month"].input-sm { - line-height: 1.5; -} -_:-ms-fullscreen.input-lg, -:root input[type="date"].input-lg, -_:-ms-fullscreen.input-lg, -:root input[type="time"].input-lg, -_:-ms-fullscreen.input-lg, -:root input[type="datetime-local"].input-lg, -_:-ms-fullscreen.input-lg, -:root input[type="month"].input-lg { - line-height: 1.33; +@media screen and (-webkit-min-device-pixel-ratio: 0) { + input[type="date"].form-control, + input[type="time"].form-control, + input[type="datetime-local"].form-control, + input[type="month"].form-control { + line-height: 34px; + } + input[type="date"].input-sm, + input[type="time"].input-sm, + input[type="datetime-local"].input-sm, + input[type="month"].input-sm, + .input-group-sm input[type="date"], + .input-group-sm input[type="time"], + .input-group-sm input[type="datetime-local"], + .input-group-sm input[type="month"] { + line-height: 30px; + } + input[type="date"].input-lg, + input[type="time"].input-lg, + input[type="datetime-local"].input-lg, + input[type="month"].input-lg, + .input-group-lg input[type="date"], + .input-group-lg input[type="time"], + .input-group-lg input[type="datetime-local"], + .input-group-lg input[type="month"] { + line-height: 46px; + } } .form-group { margin-bottom: 15px; @@ -2465,6 +2645,7 @@ _:-ms-fullscreen.input-lg, } .radio-inline, .checkbox-inline { + position: relative; display: inline-block; padding-left: 20px; margin-bottom: 0; @@ -2501,50 +2682,87 @@ fieldset[disabled] .checkbox label { padding-top: 7px; padding-bottom: 7px; margin-bottom: 0; + min-height: 34px; } .form-control-static.input-lg, .form-control-static.input-sm { padding-left: 0; padding-right: 0; } -.input-sm, -.form-group-sm .form-control { +.input-sm { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px; } -select.input-sm, -select.form-group-sm .form-control { +select.input-sm { height: 30px; line-height: 30px; } textarea.input-sm, -textarea.form-group-sm .form-control, -select[multiple].input-sm, -select[multiple].form-group-sm .form-control { +select[multiple].input-sm { height: auto; } -.input-lg, -.form-group-lg .form-control { +.form-group-sm .form-control { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +.form-group-sm select.form-control { + height: 30px; + line-height: 30px; +} +.form-group-sm textarea.form-control, +.form-group-sm select[multiple].form-control { + height: auto; +} +.form-group-sm .form-control-static { + height: 30px; + min-height: 32px; + padding: 6px 10px; + font-size: 12px; + line-height: 1.5; +} +.input-lg { height: 46px; padding: 10px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 6px; } -select.input-lg, -select.form-group-lg .form-control { +select.input-lg { height: 46px; line-height: 46px; } textarea.input-lg, -textarea.form-group-lg .form-control, -select[multiple].input-lg, -select[multiple].form-group-lg .form-control { +select[multiple].input-lg { height: auto; } +.form-group-lg .form-control { + height: 46px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.3333333; + border-radius: 6px; +} +.form-group-lg select.form-control { + height: 46px; + line-height: 46px; +} +.form-group-lg textarea.form-control, +.form-group-lg select[multiple].form-control { + height: auto; +} +.form-group-lg .form-control-static { + height: 46px; + min-height: 38px; + padding: 11px 16px; + font-size: 18px; + line-height: 1.3333333; +} .has-feedback { position: relative; } @@ -2563,12 +2781,16 @@ select[multiple].form-group-lg .form-control { text-align: center; pointer-events: none; } -.input-lg + .form-control-feedback { +.input-lg + .form-control-feedback, +.input-group-lg + .form-control-feedback, +.form-group-lg .form-control + .form-control-feedback { width: 46px; height: 46px; line-height: 46px; } -.input-sm + .form-control-feedback { +.input-sm + .form-control-feedback, +.input-group-sm + .form-control-feedback, +.form-group-sm .form-control + .form-control-feedback { width: 30px; height: 30px; line-height: 30px; @@ -2583,25 +2805,25 @@ select[multiple].form-group-lg .form-control { .has-success.checkbox label, .has-success.radio-inline label, .has-success.checkbox-inline label { - color: #33cc24; + color: #638232; } .has-success .form-control { - border-color: #33cc24; + border-color: #638232; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .has-success .form-control:focus { - border-color: #28a11c; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7be670; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7be670; + border-color: #475d24; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #98c05a; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #98c05a; } .has-success .input-group-addon { - color: #33cc24; - border-color: #33cc24; - background-color: #cbf5c7; + color: #638232; + border-color: #638232; + background-color: #f0f5e7; } .has-success .form-control-feedback { - color: #33cc24; + color: #638232; } .has-warning .help-block, .has-warning .control-label, @@ -2613,25 +2835,25 @@ select[multiple].form-group-lg .form-control { .has-warning.checkbox label, .has-warning.radio-inline label, .has-warning.checkbox-inline label { - color: #8a6d3b; + color: #bc8640; } .has-warning .form-control { - border-color: #8a6d3b; + border-color: #bc8640; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .has-warning .form-control:focus { - border-color: #66512c; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b; + border-color: #966b33; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d7b68b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d7b68b; } .has-warning .input-group-addon { - color: #8a6d3b; - border-color: #8a6d3b; - background-color: #ff8232; + color: #bc8640; + border-color: #bc8640; + background-color: #ffffff; } .has-warning .form-control-feedback { - color: #8a6d3b; + color: #bc8640; } .has-error .help-block, .has-error .control-label, @@ -2643,25 +2865,25 @@ select[multiple].form-group-lg .form-control { .has-error.checkbox label, .has-error.radio-inline label, .has-error.checkbox-inline label { - color: #ff5a46; + color: #694374; } .has-error .form-control { - border-color: #ff5a46; + border-color: #694374; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .has-error .form-control:focus { - border-color: #ff2d13; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffb5ac; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffb5ac; + border-color: #4c3054; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #9f70ad; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #9f70ad; } .has-error .input-group-addon { - color: #ff5a46; - border-color: #ff5a46; - background-color: #ffe2df; + color: #694374; + border-color: #694374; + background-color: #f1eaf2; } .has-error .form-control-feedback { - color: #ff5a46; + color: #694374; } .has-feedback label ~ .form-control-feedback { top: 25px; @@ -2753,12 +2975,14 @@ select[multiple].form-group-lg .form-control { } @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { - padding-top: 14.3px; + padding-top: 14.333333px; + font-size: 18px; } } @media (min-width: 768px) { .form-horizontal .form-group-sm .control-label { padding-top: 6px; + font-size: 12px; } } .btn { @@ -2808,20 +3032,31 @@ select[multiple].form-group-lg .form-control { .btn[disabled], fieldset[disabled] .btn { cursor: not-allowed; - pointer-events: none; opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; box-shadow: none; } +a.btn.disabled, +fieldset[disabled] a.btn { + pointer-events: none; +} .btn-default { color: #333333; background-color: #ffffff; border-color: #cccccc; } -.btn-default:hover, .btn-default:focus, -.btn-default.focus, +.btn-default.focus { + color: #333333; + background-color: #e6e6e6; + border-color: #8c8c8c; +} +.btn-default:hover { + color: #333333; + background-color: #e6e6e6; + border-color: #adadad; +} .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { @@ -2829,6 +3064,19 @@ fieldset[disabled] .btn { background-color: #e6e6e6; border-color: #adadad; } +.btn-default:active:hover, +.btn-default.active:hover, +.open > .dropdown-toggle.btn-default:hover, +.btn-default:active:focus, +.btn-default.active:focus, +.open > .dropdown-toggle.btn-default:focus, +.btn-default:active.focus, +.btn-default.active.focus, +.open > .dropdown-toggle.btn-default.focus { + color: #333333; + background-color: #d4d4d4; + border-color: #8c8c8c; +} .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { @@ -2861,18 +3109,39 @@ fieldset[disabled] .btn-default.active { } .btn-primary { color: #ffffff; - background-color: #41145a; - border-color: #320f45; + background-color: #758499; + border-color: #68778d; } -.btn-primary:hover, .btn-primary:focus, -.btn-primary.focus, +.btn-primary.focus { + color: #ffffff; + background-color: #5d6b7e; + border-color: #323943; +} +.btn-primary:hover { + color: #ffffff; + background-color: #5d6b7e; + border-color: #4e5969; +} .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { color: #ffffff; - background-color: #230b30; - border-color: #0e0413; + background-color: #5d6b7e; + border-color: #4e5969; +} +.btn-primary:active:hover, +.btn-primary.active:hover, +.open > .dropdown-toggle.btn-primary:hover, +.btn-primary:active:focus, +.btn-primary.active:focus, +.open > .dropdown-toggle.btn-primary:focus, +.btn-primary:active.focus, +.btn-primary.active.focus, +.open > .dropdown-toggle.btn-primary.focus { + color: #ffffff; + background-color: #4e5969; + border-color: #323943; } .btn-primary:active, .btn-primary.active, @@ -2897,27 +3166,48 @@ fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { - background-color: #41145a; - border-color: #320f45; + background-color: #758499; + border-color: #68778d; } .btn-primary .badge { - color: #41145a; + color: #758499; background-color: #ffffff; } .btn-success { color: #ffffff; - background-color: #33cc24; - border-color: #2eb620; + background-color: #7b9c41; + border-color: #6d8a39; } -.btn-success:hover, .btn-success:focus, -.btn-success.focus, +.btn-success.focus { + color: #ffffff; + background-color: #5f7832; + border-color: #263014; +} +.btn-success:hover { + color: #ffffff; + background-color: #5f7832; + border-color: #4b5f28; +} .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { color: #ffffff; - background-color: #28a11c; - border-color: #218217; + background-color: #5f7832; + border-color: #4b5f28; +} +.btn-success:active:hover, +.btn-success.active:hover, +.open > .dropdown-toggle.btn-success:hover, +.btn-success:active:focus, +.btn-success.active:focus, +.open > .dropdown-toggle.btn-success:focus, +.btn-success:active.focus, +.btn-success.active.focus, +.open > .dropdown-toggle.btn-success.focus { + color: #ffffff; + background-color: #4b5f27; + border-color: #263014; } .btn-success:active, .btn-success.active, @@ -2942,27 +3232,48 @@ fieldset[disabled] .btn-success:active, .btn-success.disabled.active, .btn-success[disabled].active, fieldset[disabled] .btn-success.active { - background-color: #33cc24; - border-color: #2eb620; + background-color: #7b9c41; + border-color: #6d8a39; } .btn-success .badge { - color: #33cc24; + color: #7b9c41; background-color: #ffffff; } .btn-info { color: #ffffff; - background-color: #6e50b4; - border-color: #6246a4; + background-color: #9c7357; + border-color: #8c674e; } -.btn-info:hover, .btn-info:focus, -.btn-info.focus, +.btn-info.focus { + color: #ffffff; + background-color: #7b5b45; + border-color: #3a2b20; +} +.btn-info:hover { + color: #ffffff; + background-color: #7b5b45; + border-color: #644a38; +} .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { color: #ffffff; - background-color: #583f92; - border-color: #493479; + background-color: #7b5b45; + border-color: #644a38; +} +.btn-info:active:hover, +.btn-info.active:hover, +.open > .dropdown-toggle.btn-info:hover, +.btn-info:active:focus, +.btn-info.active:focus, +.open > .dropdown-toggle.btn-info:focus, +.btn-info:active.focus, +.btn-info.active.focus, +.open > .dropdown-toggle.btn-info.focus { + color: #ffffff; + background-color: #644a38; + border-color: #3a2b20; } .btn-info:active, .btn-info.active, @@ -2987,27 +3298,48 @@ fieldset[disabled] .btn-info:active, .btn-info.disabled.active, .btn-info[disabled].active, fieldset[disabled] .btn-info.active { - background-color: #6e50b4; - border-color: #6246a4; + background-color: #9c7357; + border-color: #8c674e; } .btn-info .badge { - color: #6e50b4; + color: #9c7357; background-color: #ffffff; } .btn-warning { color: #ffffff; - background-color: #ff8232; - border-color: #ff7218; + background-color: #e3a14d; + border-color: #e09537; } -.btn-warning:hover, .btn-warning:focus, -.btn-warning.focus, +.btn-warning.focus { + color: #ffffff; + background-color: #db8a22; + border-color: #825215; +} +.btn-warning:hover { + color: #ffffff; + background-color: #db8a22; + border-color: #bc761e; +} .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { color: #ffffff; - background-color: #fe6300; - border-color: #da5500; + background-color: #db8a22; + border-color: #bc761e; +} +.btn-warning:active:hover, +.btn-warning.active:hover, +.open > .dropdown-toggle.btn-warning:hover, +.btn-warning:active:focus, +.btn-warning.active:focus, +.open > .dropdown-toggle.btn-warning:focus, +.btn-warning:active.focus, +.btn-warning.active.focus, +.open > .dropdown-toggle.btn-warning.focus { + color: #ffffff; + background-color: #bc761e; + border-color: #825215; } .btn-warning:active, .btn-warning.active, @@ -3032,27 +3364,48 @@ fieldset[disabled] .btn-warning:active, .btn-warning.disabled.active, .btn-warning[disabled].active, fieldset[disabled] .btn-warning.active { - background-color: #ff8232; - border-color: #ff7218; + background-color: #e3a14d; + border-color: #e09537; } .btn-warning .badge { - color: #ff8232; + color: #e3a14d; background-color: #ffffff; } .btn-danger { color: #ffffff; - background-color: #ff5a46; - border-color: #ff432c; + background-color: #7f528b; + border-color: #70497b; } -.btn-danger:hover, .btn-danger:focus, -.btn-danger.focus, +.btn-danger.focus { + color: #ffffff; + background-color: #623f6b; + border-color: #27192b; +} +.btn-danger:hover { + color: #ffffff; + background-color: #623f6b; + border-color: #4d3254; +} .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { color: #ffffff; - background-color: #ff2d13; - border-color: #ee1a00; + background-color: #623f6b; + border-color: #4d3254; +} +.btn-danger:active:hover, +.btn-danger.active:hover, +.open > .dropdown-toggle.btn-danger:hover, +.btn-danger:active:focus, +.btn-danger.active:focus, +.open > .dropdown-toggle.btn-danger:focus, +.btn-danger:active.focus, +.btn-danger.active.focus, +.open > .dropdown-toggle.btn-danger.focus { + color: #ffffff; + background-color: #4d3254; + border-color: #27192b; } .btn-danger:active, .btn-danger.active, @@ -3077,15 +3430,15 @@ fieldset[disabled] .btn-danger:active, .btn-danger.disabled.active, .btn-danger[disabled].active, fieldset[disabled] .btn-danger.active { - background-color: #ff5a46; - border-color: #ff432c; + background-color: #7f528b; + border-color: #70497b; } .btn-danger .badge { - color: #ff5a46; + color: #7f528b; background-color: #ffffff; } .btn-link { - color: #41145a; + color: #58585a; font-weight: normal; border-radius: 0; } @@ -3106,7 +3459,7 @@ fieldset[disabled] .btn-link { } .btn-link:hover, .btn-link:focus { - color: #14061b; + color: #323233; text-decoration: underline; background-color: transparent; } @@ -3121,7 +3474,7 @@ fieldset[disabled] .btn-link:focus { .btn-group-lg > .btn { padding: 10px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 6px; } .btn-sm, @@ -3175,9 +3528,12 @@ tbody.collapse.in { position: relative; height: 0; overflow: hidden; - -webkit-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; + -webkit-transition-property: height, visibility; + transition-property: height, visibility; + -webkit-transition-duration: 0.35s; + transition-duration: 0.35s; + -webkit-transition-timing-function: ease; + transition-timing-function: ease; } .caret { display: inline-block; @@ -3185,10 +3541,12 @@ tbody.collapse.in { height: 0; margin-left: 2px; vertical-align: middle; - border-top: 4px solid; + border-top: 4px dashed; + border-top: 4px solid \9; border-right: 4px solid transparent; border-left: 4px solid transparent; } +.dropup, .dropdown { position: relative; } @@ -3247,7 +3605,7 @@ tbody.collapse.in { color: #ffffff; text-decoration: none; outline: 0; - background-color: #41145a; + background-color: #758499; } .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, @@ -3299,14 +3657,15 @@ tbody.collapse.in { .dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; - border-bottom: 4px solid; + border-bottom: 4px dashed; + border-bottom: 4px solid \9; content: ""; } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; - margin-bottom: 1px; + margin-bottom: 2px; } @media (min-width: 768px) { .navbar-right .dropdown-menu { @@ -3339,10 +3698,6 @@ tbody.collapse.in { .btn-group-vertical > .btn.active { z-index: 2; } -.btn-group > .btn:focus, -.btn-group-vertical > .btn:focus { - outline: 0; -} .btn-group .btn + .btn, .btn-group .btn + .btn-group, .btn-group .btn-group + .btn, @@ -3352,6 +3707,7 @@ tbody.collapse.in { .btn-toolbar { margin-left: -5px; } +.btn-toolbar .btn, .btn-toolbar .btn-group, .btn-toolbar .input-group { float: left; @@ -3382,12 +3738,12 @@ tbody.collapse.in { .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0; } -.btn-group > .btn-group:first-child > .btn:last-child, -.btn-group > .btn-group:first-child > .dropdown-toggle { +.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child, +.btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle { border-bottom-right-radius: 0; border-top-right-radius: 0; } -.btn-group > .btn-group:last-child > .btn:first-child { +.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child { border-bottom-left-radius: 0; border-top-left-radius: 0; } @@ -3487,9 +3843,8 @@ tbody.collapse.in { [data-toggle="buttons"] > .btn input[type="checkbox"], [data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] { position: absolute; - z-index: -1; - opacity: 0; - filter: alpha(opacity=0); + clip: rect(0, 0, 0, 0); + pointer-events: none; } .input-group { position: relative; @@ -3514,7 +3869,7 @@ tbody.collapse.in { height: 46px; padding: 10px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 6px; } select.input-group-lg > .form-control, @@ -3643,6 +3998,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group { + z-index: 2; margin-left: -1px; } .nav { @@ -3678,7 +4034,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav .open > a:hover, .nav .open > a:focus { background-color: #eeeeee; - border-color: #41145a; + border-color: #58585a; } .nav .nav-divider { height: 1px; @@ -3771,7 +4127,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { color: #ffffff; - background-color: #41145a; + background-color: #758499; } .nav-stacked > li { float: none; @@ -3927,8 +4283,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { right: 0; left: 0; z-index: 1030; - -webkit-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); } @media (min-width: 768px) { .navbar-fixed-top, @@ -4102,6 +4456,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-form .form-group { margin-bottom: 5px; } + .navbar-form .form-group:last-child { + margin-bottom: 0; + } } @media (min-width: 768px) { .navbar-form { @@ -4121,6 +4478,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { border-top-left-radius: 0; } .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { + margin-bottom: 0; + border-top-right-radius: 4px; + border-top-left-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } @@ -4391,7 +4751,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { padding: 6px 12px; line-height: 1.42857143; text-decoration: none; - color: #41145a; + color: #58585a; background-color: #ffffff; border: 1px solid #dddddd; margin-left: -1px; @@ -4411,7 +4771,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus { - color: #14061b; + z-index: 3; + color: #323233; background-color: #eeeeee; border-color: #dddddd; } @@ -4423,8 +4784,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > .active > span:focus { z-index: 2; color: #ffffff; - background-color: #41145a; - border-color: #41145a; + background-color: #758499; + border-color: #758499; cursor: default; } .pagination > .disabled > span, @@ -4442,6 +4803,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination-lg > li > span { padding: 10px 16px; font-size: 18px; + line-height: 1.3333333; } .pagination-lg > li:first-child > a, .pagination-lg > li:first-child > span { @@ -4457,6 +4819,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination-sm > li > span { padding: 5px 10px; font-size: 12px; + line-height: 1.5; } .pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span { @@ -4539,39 +4902,39 @@ a.label:focus { background-color: #5e5e5e; } .label-primary { - background-color: #41145a; + background-color: #758499; } .label-primary[href]:hover, .label-primary[href]:focus { - background-color: #230b30; + background-color: #5d6b7e; } .label-success { - background-color: #33cc24; + background-color: #7b9c41; } .label-success[href]:hover, .label-success[href]:focus { - background-color: #28a11c; + background-color: #5f7832; } .label-info { - background-color: #6e50b4; + background-color: #9c7357; } .label-info[href]:hover, .label-info[href]:focus { - background-color: #583f92; + background-color: #7b5b45; } .label-warning { - background-color: #ff8232; + background-color: #e3a14d; } .label-warning[href]:hover, .label-warning[href]:focus { - background-color: #fe6300; + background-color: #db8a22; } .label-danger { - background-color: #ff5a46; + background-color: #7f528b; } .label-danger[href]:hover, .label-danger[href]:focus { - background-color: #ff2d13; + background-color: #623f6b; } .badge { display: inline-block; @@ -4581,7 +4944,7 @@ a.label:focus { font-weight: bold; color: #ffffff; line-height: 1; - vertical-align: baseline; + vertical-align: middle; white-space: nowrap; text-align: center; background-color: #777777; @@ -4594,7 +4957,8 @@ a.label:focus { position: relative; top: -1px; } -.btn-xs .badge { +.btn-xs .badge, +.btn-group-xs > .btn .badge { top: 0; padding: 1px 5px; } @@ -4604,16 +4968,23 @@ a.badge:focus { text-decoration: none; cursor: pointer; } -a.list-group-item.active > .badge, +.list-group-item.active > .badge, .nav-pills > .active > a > .badge { - color: #41145a; + color: #58585a; background-color: #ffffff; } +.list-group-item > .badge { + float: right; +} +.list-group-item > .badge + .badge { + margin-right: 5px; +} .nav-pills > li > a > .badge { margin-left: 3px; } .jumbotron { - padding: 30px; + padding-top: 30px; + padding-bottom: 30px; margin-bottom: 30px; color: inherit; background-color: #eeeeee; @@ -4642,7 +5013,8 @@ a.list-group-item.active > .badge, padding-top: 48px; padding-bottom: 48px; } - .container .jumbotron { + .container .jumbotron, + .container-fluid .jumbotron { padding-left: 60px; padding-right: 60px; } @@ -4671,7 +5043,7 @@ a.list-group-item.active > .badge, a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active { - border-color: #41145a; + border-color: #58585a; } .thumbnail .caption { padding: 9px; @@ -4709,48 +5081,48 @@ a.thumbnail.active { color: inherit; } .alert-success { - background-color: #cbf5c7; - border-color: #c2f1b1; - color: #33cc24; + background-color: #f0f5e7; + border-color: #7b9c41; + color: #638232; } .alert-success hr { - border-top-color: #b1ed9c; + border-top-color: #6d8a39; } .alert-success .alert-link { - color: #28a11c; + color: #475d24; } .alert-info { - background-color: #e4dff1; - border-color: #cac6e6; - color: #6e50b4; + background-color: #fbf9f7; + border-color: #9c7357; + color: #826045; } .alert-info hr { - border-top-color: #bab4df; + border-top-color: #8c674e; } .alert-info .alert-link { - color: #583f92; + color: #614733; } .alert-warning { - background-color: #ff8232; - border-color: #ff4c18; - color: #8a6d3b; + background-color: #ffffff; + border-color: #e3a14d; + color: #bc8640; } .alert-warning hr { - border-top-color: #fe3900; + border-top-color: #e09537; } .alert-warning .alert-link { - color: #66512c; + color: #966b33; } .alert-danger { - background-color: #ffe2df; - border-color: #ffc5c9; - color: #ff5a46; + background-color: #f1eaf2; + border-color: #7f528b; + color: #694374; } .alert-danger hr { - border-top-color: #ffacb1; + border-top-color: #70497b; } .alert-danger .alert-link { - color: #ff2d13; + color: #4c3054; } @-webkit-keyframes progress-bar-stripes { from { @@ -4785,7 +5157,7 @@ a.thumbnail.active { line-height: 20px; color: #ffffff; text-align: center; - background-color: #41145a; + background-color: #758499; -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-transition: width 0.6s ease; @@ -4805,15 +5177,8 @@ a.thumbnail.active { -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress-bar[aria-valuenow="0"] { - color: #777777; - min-width: 30px; - background-color: transparent; - background-image: none; - box-shadow: none; -} .progress-bar-success { - background-color: #33cc24; + background-color: #7b9c41; } .progress-striped .progress-bar-success { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -4821,7 +5186,7 @@ a.thumbnail.active { background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .progress-bar-info { - background-color: #6e50b4; + background-color: #9c7357; } .progress-striped .progress-bar-info { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -4829,7 +5194,7 @@ a.thumbnail.active { background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .progress-bar-warning { - background-color: #ff8232; + background-color: #e3a14d; } .progress-striped .progress-bar-warning { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -4837,36 +5202,56 @@ a.thumbnail.active { background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .progress-bar-danger { - background-color: #ff5a46; + background-color: #7f528b; } .progress-striped .progress-bar-danger { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.media, -.media-body { - overflow: hidden; - zoom: 1; -} -.media, -.media .media { +.media { margin-top: 15px; } .media:first-child { margin-top: 0; } +.media, +.media-body { + zoom: 1; + overflow: hidden; +} +.media-body { + width: 10000px; +} .media-object { display: block; } -.media-heading { - margin: 0 0 5px; +.media-object.img-thumbnail { + max-width: none; +} +.media-right, +.media > .pull-right { + padding-left: 10px; } +.media-left, .media > .pull-left { - margin-right: 10px; + padding-right: 10px; } -.media > .pull-right { - margin-left: 10px; +.media-left, +.media-right, +.media-body { + display: table-cell; + vertical-align: top; +} +.media-middle { + vertical-align: middle; +} +.media-bottom { + vertical-align: bottom; +} +.media-heading { + margin-top: 0; + margin-bottom: 5px; } .media-list { padding-left: 0; @@ -4893,24 +5278,26 @@ a.thumbnail.active { border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; } -.list-group-item > .badge { - float: right; -} -.list-group-item > .badge + .badge { - margin-right: 5px; -} -a.list-group-item { +a.list-group-item, +button.list-group-item { color: #555555; } -a.list-group-item .list-group-item-heading { +a.list-group-item .list-group-item-heading, +button.list-group-item .list-group-item-heading { color: #333333; } a.list-group-item:hover, -a.list-group-item:focus { +button.list-group-item:hover, +a.list-group-item:focus, +button.list-group-item:focus { text-decoration: none; color: #555555; background-color: #f5f5f5; } +button.list-group-item { + width: 100%; + text-align: left; +} .list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus { @@ -4933,8 +5320,8 @@ a.list-group-item:focus { .list-group-item.active:focus { z-index: 2; color: #ffffff; - background-color: #41145a; - border-color: #41145a; + background-color: #758499; + border-color: #758499; } .list-group-item.active .list-group-item-heading, .list-group-item.active:hover .list-group-item-heading, @@ -4950,95 +5337,123 @@ a.list-group-item:focus { .list-group-item.active .list-group-item-text, .list-group-item.active:hover .list-group-item-text, .list-group-item.active:focus .list-group-item-text { - color: #af5fdb; + color: #eaedf0; } .list-group-item-success { - color: #33cc24; - background-color: #cbf5c7; + color: #638232; + background-color: #f0f5e7; } -a.list-group-item-success { - color: #33cc24; +a.list-group-item-success, +button.list-group-item-success { + color: #638232; } -a.list-group-item-success .list-group-item-heading { +a.list-group-item-success .list-group-item-heading, +button.list-group-item-success .list-group-item-heading { color: inherit; } a.list-group-item-success:hover, -a.list-group-item-success:focus { - color: #33cc24; - background-color: #b7f1b1; +button.list-group-item-success:hover, +a.list-group-item-success:focus, +button.list-group-item-success:focus { + color: #638232; + background-color: #e5eed5; } a.list-group-item-success.active, +button.list-group-item-success.active, a.list-group-item-success.active:hover, -a.list-group-item-success.active:focus { +button.list-group-item-success.active:hover, +a.list-group-item-success.active:focus, +button.list-group-item-success.active:focus { color: #fff; - background-color: #33cc24; - border-color: #33cc24; + background-color: #638232; + border-color: #638232; } .list-group-item-info { - color: #6e50b4; - background-color: #e4dff1; + color: #826045; + background-color: #fbf9f7; } -a.list-group-item-info { - color: #6e50b4; +a.list-group-item-info, +button.list-group-item-info { + color: #826045; } -a.list-group-item-info .list-group-item-heading { +a.list-group-item-info .list-group-item-heading, +button.list-group-item-info .list-group-item-heading { color: inherit; } a.list-group-item-info:hover, -a.list-group-item-info:focus { - color: #6e50b4; - background-color: #d6cdea; +button.list-group-item-info:hover, +a.list-group-item-info:focus, +button.list-group-item-info:focus { + color: #826045; + background-color: #f2ebe7; } a.list-group-item-info.active, +button.list-group-item-info.active, a.list-group-item-info.active:hover, -a.list-group-item-info.active:focus { +button.list-group-item-info.active:hover, +a.list-group-item-info.active:focus, +button.list-group-item-info.active:focus { color: #fff; - background-color: #6e50b4; - border-color: #6e50b4; + background-color: #826045; + border-color: #826045; } .list-group-item-warning { - color: #8a6d3b; - background-color: #ff8232; + color: #bc8640; + background-color: #ffffff; } -a.list-group-item-warning { - color: #8a6d3b; +a.list-group-item-warning, +button.list-group-item-warning { + color: #bc8640; } -a.list-group-item-warning .list-group-item-heading { +a.list-group-item-warning .list-group-item-heading, +button.list-group-item-warning .list-group-item-heading { color: inherit; } a.list-group-item-warning:hover, -a.list-group-item-warning:focus { - color: #8a6d3b; - background-color: #ff7218; +button.list-group-item-warning:hover, +a.list-group-item-warning:focus, +button.list-group-item-warning:focus { + color: #bc8640; + background-color: #f2f2f2; } a.list-group-item-warning.active, +button.list-group-item-warning.active, a.list-group-item-warning.active:hover, -a.list-group-item-warning.active:focus { +button.list-group-item-warning.active:hover, +a.list-group-item-warning.active:focus, +button.list-group-item-warning.active:focus { color: #fff; - background-color: #8a6d3b; - border-color: #8a6d3b; + background-color: #bc8640; + border-color: #bc8640; } .list-group-item-danger { - color: #ff5a46; - background-color: #ffe2df; + color: #694374; + background-color: #f1eaf2; } -a.list-group-item-danger { - color: #ff5a46; +a.list-group-item-danger, +button.list-group-item-danger { + color: #694374; } -a.list-group-item-danger .list-group-item-heading { +a.list-group-item-danger .list-group-item-heading, +button.list-group-item-danger .list-group-item-heading { color: inherit; } a.list-group-item-danger:hover, -a.list-group-item-danger:focus { - color: #ff5a46; - background-color: #ffccc5; +button.list-group-item-danger:hover, +a.list-group-item-danger:focus, +button.list-group-item-danger:focus { + color: #694374; + background-color: #e6dae9; } a.list-group-item-danger.active, +button.list-group-item-danger.active, a.list-group-item-danger.active:hover, -a.list-group-item-danger.active:focus { +button.list-group-item-danger.active:hover, +a.list-group-item-danger.active:focus, +button.list-group-item-danger.active:focus { color: #fff; - background-color: #ff5a46; - border-color: #ff5a46; + background-color: #694374; + border-color: #694374; } .list-group-item-heading { margin-top: 0; @@ -5074,7 +5489,11 @@ a.list-group-item-danger.active:focus { font-size: 16px; color: inherit; } -.panel-title > a { +.panel-title > a, +.panel-title > small, +.panel-title > .small, +.panel-title > small > a, +.panel-title > .small > a { color: inherit; } .panel-footer { @@ -5105,6 +5524,10 @@ a.list-group-item-danger.active:focus { border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; } +.panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child { + border-top-right-radius: 0; + border-top-left-radius: 0; +} .panel-heading + .list-group .list-group-item:first-child { border-top-width: 0; } @@ -5265,7 +5688,8 @@ a.list-group-item-danger.active:focus { .panel-group .panel-heading { border-bottom: 0; } -.panel-group .panel-heading + .panel-collapse > .panel-body { +.panel-group .panel-heading + .panel-collapse > .panel-body, +.panel-group .panel-heading + .panel-collapse > .list-group { border-top: 1px solid #dddddd; } .panel-group .panel-footer { @@ -5293,94 +5717,94 @@ a.list-group-item-danger.active:focus { border-bottom-color: #dddddd; } .panel-primary { - border-color: #41145a; + border-color: #758499; } .panel-primary > .panel-heading { color: #ffffff; - background-color: #41145a; - border-color: #41145a; + background-color: #758499; + border-color: #758499; } .panel-primary > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #41145a; + border-top-color: #758499; } .panel-primary > .panel-heading .badge { - color: #41145a; + color: #758499; background-color: #ffffff; } .panel-primary > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #41145a; + border-bottom-color: #758499; } .panel-success { - border-color: #c2f1b1; + border-color: #7b9c41; } .panel-success > .panel-heading { - color: #33cc24; - background-color: #cbf5c7; - border-color: #c2f1b1; + color: #638232; + background-color: #f0f5e7; + border-color: #7b9c41; } .panel-success > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #c2f1b1; + border-top-color: #7b9c41; } .panel-success > .panel-heading .badge { - color: #cbf5c7; - background-color: #33cc24; + color: #f0f5e7; + background-color: #638232; } .panel-success > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #c2f1b1; + border-bottom-color: #7b9c41; } .panel-info { - border-color: #cac6e6; + border-color: #9c7357; } .panel-info > .panel-heading { - color: #6e50b4; - background-color: #e4dff1; - border-color: #cac6e6; + color: #826045; + background-color: #fbf9f7; + border-color: #9c7357; } .panel-info > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #cac6e6; + border-top-color: #9c7357; } .panel-info > .panel-heading .badge { - color: #e4dff1; - background-color: #6e50b4; + color: #fbf9f7; + background-color: #826045; } .panel-info > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #cac6e6; + border-bottom-color: #9c7357; } .panel-warning { - border-color: #ff4c18; + border-color: #e3a14d; } .panel-warning > .panel-heading { - color: #8a6d3b; - background-color: #ff8232; - border-color: #ff4c18; + color: #bc8640; + background-color: #ffffff; + border-color: #e3a14d; } .panel-warning > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #ff4c18; + border-top-color: #e3a14d; } .panel-warning > .panel-heading .badge { - color: #ff8232; - background-color: #8a6d3b; + color: #ffffff; + background-color: #bc8640; } .panel-warning > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #ff4c18; + border-bottom-color: #e3a14d; } .panel-danger { - border-color: #ffc5c9; + border-color: #7f528b; } .panel-danger > .panel-heading { - color: #ff5a46; - background-color: #ffe2df; - border-color: #ffc5c9; + color: #694374; + background-color: #f1eaf2; + border-color: #7f528b; } .panel-danger > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #ffc5c9; + border-top-color: #7f528b; } .panel-danger > .panel-heading .badge { - color: #ffe2df; - background-color: #ff5a46; + color: #f1eaf2; + background-color: #694374; } .panel-danger > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #ffc5c9; + border-bottom-color: #7f528b; } .embed-responsive { position: relative; @@ -5392,7 +5816,8 @@ a.list-group-item-danger.active:focus { .embed-responsive .embed-responsive-item, .embed-responsive iframe, .embed-responsive embed, -.embed-responsive object { +.embed-responsive object, +.embed-responsive video { position: absolute; top: 0; left: 0; @@ -5401,10 +5826,10 @@ a.list-group-item-danger.active:focus { width: 100%; border: 0; } -.embed-responsive.embed-responsive-16by9 { +.embed-responsive-16by9 { padding-bottom: 56.25%; } -.embed-responsive.embed-responsive-4by3 { +.embed-responsive-4by3 { padding-bottom: 75%; } .well { @@ -5470,16 +5895,20 @@ button.close { outline: 0; } .modal.fade .modal-dialog { - -webkit-transform: translate3d(0, -25%, 0); - transform: translate3d(0, -25%, 0); + -webkit-transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + -o-transform: translate(0, -25%); + transform: translate(0, -25%); -webkit-transition: -webkit-transform 0.3s ease-out; -moz-transition: -moz-transform 0.3s ease-out; -o-transition: -o-transform 0.3s ease-out; transition: transform 0.3s ease-out; } .modal.in .modal-dialog { - -webkit-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); + -webkit-transform: translate(0, 0); + -ms-transform: translate(0, 0); + -o-transform: translate(0, 0); + transform: translate(0, 0); } .modal-open .modal { overflow-x: hidden; @@ -5578,9 +6007,22 @@ button.close { position: absolute; z-index: 1070; display: block; - visibility: visible; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-style: normal; + font-weight: normal; + letter-spacing: normal; + line-break: auto; + line-height: 1.42857143; + text-align: left; + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + white-space: normal; + word-break: normal; + word-spacing: normal; + word-wrap: normal; font-size: 12px; - line-height: 1.4; opacity: 0; filter: alpha(opacity=0); } @@ -5609,7 +6051,6 @@ button.close { padding: 3px 8px; color: #ffffff; text-align: center; - text-decoration: none; background-color: #000000; border-radius: 4px; } @@ -5629,13 +6070,15 @@ button.close { } .tooltip.top-left .tooltip-arrow { bottom: 0; - left: 5px; + right: 5px; + margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000000; } .tooltip.top-right .tooltip-arrow { bottom: 0; - right: 5px; + left: 5px; + margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000000; } @@ -5662,13 +6105,15 @@ button.close { } .tooltip.bottom-left .tooltip-arrow { top: 0; - left: 5px; + right: 5px; + margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000000; } .tooltip.bottom-right .tooltip-arrow { top: 0; - right: 5px; + left: 5px; + margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000000; } @@ -5680,10 +6125,22 @@ button.close { display: none; max-width: 276px; padding: 1px; - font-size: 14px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-style: normal; font-weight: normal; + letter-spacing: normal; + line-break: auto; line-height: 1.42857143; text-align: left; + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + white-space: normal; + word-break: normal; + word-spacing: normal; + word-wrap: normal; + font-size: 14px; background-color: #ffffff; background-clip: padding-box; border: 1px solid #cccccc; @@ -5691,7 +6148,6 @@ button.close { border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - white-space: normal; } .popover.top { margin-top: -10px; @@ -5813,23 +6269,33 @@ button.close { } @media all and (transform-3d), (-webkit-transform-3d) { .carousel-inner > .item { + -webkit-transition: -webkit-transform 0.6s ease-in-out; + -moz-transition: -moz-transform 0.6s ease-in-out; + -o-transition: -o-transform 0.6s ease-in-out; transition: transform 0.6s ease-in-out; + -webkit-backface-visibility: hidden; + -moz-backface-visibility: hidden; backface-visibility: hidden; - perspective: 1000; + -webkit-perspective: 1000px; + -moz-perspective: 1000px; + perspective: 1000px; } .carousel-inner > .item.next, .carousel-inner > .item.active.right { + -webkit-transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0); left: 0; } .carousel-inner > .item.prev, .carousel-inner > .item.active.left { + -webkit-transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0); left: 0; } .carousel-inner > .item.next.left, .carousel-inner > .item.prev.right, .carousel-inner > .item.active { + -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); left: 0; } @@ -5907,6 +6373,7 @@ button.close { .carousel-control .glyphicon-chevron-right { position: absolute; top: 50%; + margin-top: -10px; z-index: 5; display: inline-block; } @@ -5924,7 +6391,7 @@ button.close { .carousel-control .icon-next { width: 20px; height: 20px; - margin-top: -10px; + line-height: 1; font-family: serif; } .carousel-control .icon-prev:before { @@ -6083,7 +6550,6 @@ button.close { } .hidden { display: none !important; - visibility: hidden !important; } .affix { position: fixed; @@ -6116,7 +6582,7 @@ button.close { display: block !important; } table.visible-xs { - display: table; + display: table !important; } tr.visible-xs { display: table-row !important; @@ -6146,7 +6612,7 @@ button.close { display: block !important; } table.visible-sm { - display: table; + display: table !important; } tr.visible-sm { display: table-row !important; @@ -6176,7 +6642,7 @@ button.close { display: block !important; } table.visible-md { - display: table; + display: table !important; } tr.visible-md { display: table-row !important; @@ -6206,7 +6672,7 @@ button.close { display: block !important; } table.visible-lg { - display: table; + display: table !important; } tr.visible-lg { display: table-row !important; @@ -6259,7 +6725,7 @@ button.close { display: block !important; } table.visible-print { - display: table; + display: table !important; } tr.visible-print { display: table-row !important; @@ -6305,32 +6771,32 @@ body { color: #777777; } #shifts td.free { - border: 1px solid #777777; - background-color: #ffe2df; + border: 1px solid #7f528b; + background-color: #f1eaf2; } -a#shifts td.free:hover { - background-color: #ffb5ac; +a#shifts td.free:hover, +a#shifts td.free:focus { + background-color: #dbcadf; } #shifts td.occupied { - border: 1px solid #777777; - background-color: #cbf5c7; + border: 1px solid #7b9c41; + background-color: #f0f5e7; } -a#shifts td.occupied:hover { - background-color: #a3ed9c; +a#shifts td.occupied:hover, +a#shifts td.occupied:focus { + background-color: #d9e6c3; } #shifts td.collides { - border: 1px solid #777777; - background-color: #ff8232; + border: 1px solid #e3a14d; + background-color: #ffffff; } -a#shifts td.collides:hover { - background-color: #fe6300; +a#shifts td.collides:hover, +a#shifts td.collides:focus { + background-color: #e6e6e6; } #shifts td.own { border: 1px solid #777777; } -.shifts-table { - overflow-x: scroll; -} .row-day { border-top: 2px solid #777777; } diff --git a/public/index.php b/public/index.php index 967fe3a7..2a9f456c 100644 --- a/public/index.php +++ b/public/index.php @@ -1,85 +1,5 @@ <?php -require_once realpath(__DIR__ . '/../includes/mysqli_provider.php'); - -require_once realpath(__DIR__ . '/../includes/sys_auth.php'); -require_once realpath(__DIR__ . '/../includes/sys_counter.php'); -require_once realpath(__DIR__ . '/../includes/sys_log.php'); -require_once realpath(__DIR__ . '/../includes/sys_menu.php'); -require_once realpath(__DIR__ . '/../includes/sys_page.php'); -require_once realpath(__DIR__ . '/../includes/sys_template.php'); - -require_once realpath(__DIR__ . '/../includes/model/AngelType_model.php'); -require_once realpath(__DIR__ . '/../includes/model/LogEntries_model.php'); -require_once realpath(__DIR__ . '/../includes/model/Message_model.php'); -require_once realpath(__DIR__ . '/../includes/model/NeededAngelTypes_model.php'); -require_once realpath(__DIR__ . '/../includes/model/Room_model.php'); -require_once realpath(__DIR__ . '/../includes/model/ShiftEntry_model.php'); -require_once realpath(__DIR__ . '/../includes/model/Shifts_model.php'); -require_once realpath(__DIR__ . '/../includes/model/ShiftTypes_model.php'); -require_once realpath(__DIR__ . '/../includes/model/UserAngelTypes_model.php'); -require_once realpath(__DIR__ . '/../includes/model/UserGroups_model.php'); -require_once realpath(__DIR__ . '/../includes/model/User_model.php'); - -require_once realpath(__DIR__ . '/../includes/view/AngelTypes_view.php'); -require_once realpath(__DIR__ . '/../includes/view/Questions_view.php'); -require_once realpath(__DIR__ . '/../includes/view/Rooms_view.php'); -require_once realpath(__DIR__ . '/../includes/view/Shifts_view.php'); -require_once realpath(__DIR__ . '/../includes/view/ShiftEntry_view.php'); -require_once realpath(__DIR__ . '/../includes/view/ShiftTypes_view.php'); -require_once realpath(__DIR__ . '/../includes/view/UserAngelTypes_view.php'); -require_once realpath(__DIR__ . '/../includes/view/User_view.php'); - -require_once realpath(__DIR__ . '/../includes/controller/angeltypes_controller.php'); -require_once realpath(__DIR__ . '/../includes/controller/rooms_controller.php'); -require_once realpath(__DIR__ . '/../includes/controller/shifts_controller.php'); -require_once realpath(__DIR__ . '/../includes/controller/shifttypes_controller.php'); -require_once realpath(__DIR__ . '/../includes/controller/users_controller.php'); -require_once realpath(__DIR__ . '/../includes/controller/user_angeltypes_controller.php'); - -require_once realpath(__DIR__ . '/../includes/helper/internationalization_helper.php'); -require_once realpath(__DIR__ . '/../includes/helper/message_helper.php'); -require_once realpath(__DIR__ . '/../includes/helper/error_helper.php'); -require_once realpath(__DIR__ . '/../includes/helper/email_helper.php'); -require_once realpath(__DIR__ . '/../includes/helper/session_helper.php'); - -require_once realpath(__DIR__ . '/../includes/mailer/shifts_mailer.php'); - -require_once realpath(__DIR__ . '/../config/config.default.php'); -if (file_exists(realpath(__DIR__ . '/../config/config.php'))) - require_once realpath(__DIR__ . '/../config/config.php'); - -require_once realpath(__DIR__ . '/../includes/pages/admin_active.php'); -require_once realpath(__DIR__ . '/../includes/pages/admin_arrive.php'); -require_once realpath(__DIR__ . '/../includes/pages/admin_free.php'); -require_once realpath(__DIR__ . '/../includes/pages/admin_groups.php'); -require_once realpath(__DIR__ . '/../includes/pages/admin_import.php'); -require_once realpath(__DIR__ . '/../includes/pages/admin_log.php'); -require_once realpath(__DIR__ . '/../includes/pages/admin_questions.php'); -require_once realpath(__DIR__ . '/../includes/pages/admin_rooms.php'); -require_once realpath(__DIR__ . '/../includes/pages/admin_shifts.php'); -require_once realpath(__DIR__ . '/../includes/pages/admin_user.php'); -require_once realpath(__DIR__ . '/../includes/pages/guest_login.php'); -require_once realpath(__DIR__ . '/../includes/pages/user_messages.php'); -require_once realpath(__DIR__ . '/../includes/pages/user_myshifts.php'); -require_once realpath(__DIR__ . '/../includes/pages/user_news.php'); -require_once realpath(__DIR__ . '/../includes/pages/user_questions.php'); -require_once realpath(__DIR__ . '/../includes/pages/user_settings.php'); -require_once realpath(__DIR__ . '/../includes/pages/user_shifts.php'); - -require_once realpath(__DIR__ . '/../vendor/parsedown/Parsedown.php'); - -session_lifetime(24 * 60, preg_replace("/[^a-z0-9-]/", '', md5(__DIR__))); -session_start(); - -gettext_init(); - -sql_connect($config['host'], $config['user'], $config['pw'], $config['db']); - -load_auth(); - -// JSON Authorisierung gewünscht? -if (isset($_REQUEST['auth'])) - json_auth_service(); +require_once realpath(__DIR__ . '/../includes/engelsystem_provider.php'); $free_pages = array( 'stats', @@ -236,9 +156,7 @@ echo template_render('../templates/layout.html', array( 'content' => msg() . $content, 'header_toolbar' => header_toolbar(), 'faq_url' => $faq_url, - 'locale' => $_SESSION['locale'] + 'locale' => locale() )); -counter(); - ?> diff --git a/public/maintenance.html b/public/maintenance.html new file mode 100644 index 00000000..1f37834c --- /dev/null +++ b/public/maintenance.html @@ -0,0 +1,73 @@ +<!DOCTYPE html> +<html> +<head> +<title>Maintenance - Engelsystem</title> +<meta charset="UTF-8" /> +<meta name="viewport" content="width=device-width, initial-scale=1"> +<link rel="stylesheet" type="text/css" href="css/theme0.css" /> +<link rel="stylesheet" type="text/css" href="vendor/icomoon/style.css" /> +<link rel="stylesheet" type="text/css" href="vendor/bootstrap-datepicker-1.4.0/css/bootstrap-datepicker3.min.css" /> +<script type="text/javascript" src="vendor/jquery-2.1.1.min.js"></script> +<script type="text/javascript" src="vendor/jquery-ui.min.js"></script> +</head> +<body> + <div class="navbar navbar-default navbar-fixed-top"> + <div class="container-fluid"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1"> + <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> + </button> + <a class="navbar-brand" href="?"><span class="icon-icon_angel"></span> <strong class="visible-lg-inline">ENGELSYSTEM</strong></a> + </div> + <div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="nav navbar-nav"></ul> + <ul class="nav navbar-nav navbar-right"> + </ul> + </div> + </div> + </div> + <div class="container-fluid"> + <div class="row"> + <div class="jumbotron"> + <div class="container text-center"> + <h1> + <span class="glyphicon glyphicon-tree-conifer"></span> <span class="glyphicon glyphicon-tent"></span><span class="glyphicon glyphicon-tree-deciduous"></span> <span class="glyphicon glyphicon-scissors"></span> <span class="glyphicon glyphicon-wrench"></span> <span + class="glyphicon glyphicon-fire"></span> + </h1> + <div class="col-md-6"> + <h2> + The <span class="icon-icon_angel"></span> <strong>ENGELSYSTEM</strong> is in maintenance mode. + </h2> + <p>This may be due to...</p> + <p> + ...cats eating the fiber.<br> ...archangels closing the gates of heaven. <br>...somebody's stolen the power chord and now the battery is empty. <br>...DHCP decided to give me another ip address. + </p> + </div> + <div class="col-md-6"> + <iframe width="560" height="315" src="https://www.youtube.com/embed/0aV_vHcunSQ?rel=0" frameborder="0" allowfullscreen></iframe> + </div> + </div> + </div> + </div> + <div class="row"> + <div class="col-md-12"> + <div class="text-center footer"> + <a href="mailto:erzengel@lists.ccc.de"><span class="glyphicon glyphicon-envelope"></span> Contact</a> · <a href="https://github.com/engelsystem/engelsystem/issues">Bugs / Features</a> · <a href="https://github.com/engelsystem/engelsystem/">Development Platform</a> + </div> + </div> + </div> + </div> + <script type="text/javascript" src="vendor/bootstrap/js/bootstrap.min.js"></script> + <script type="text/javascript" src="vendor/bootstrap-datepicker-1.4.0/js/bootstrap-datepicker.min.js"></script> + <script type="text/javascript" src="vendor/bootstrap-datepicker-1.4.0/locales/bootstrap-datepicker.de.min.js"></script> + <script type="text/javascript" src="vendor/Chart.min.js"></script> + <script type="text/javascript" src="js/forms.js"></script> + <script type="text/javascript" src="vendor/moment-with-locales.min.js"></script> + <script type="text/javascript"> + $(function() { + moment.locale("en_US.UTF-8"); + }); + </script> + <script type="text/javascript" src="js/moment-countdown.js"></script> +</body> +</html> diff --git a/public/pic/avatar/avatar1.gif b/public/pic/avatar/avatar1.gif Binary files differdeleted file mode 100644 index 1404f299..00000000 --- a/public/pic/avatar/avatar1.gif +++ /dev/null diff --git a/public/pic/avatar/avatar10.gif b/public/pic/avatar/avatar10.gif Binary files differdeleted file mode 100644 index 6ef61330..00000000 --- a/public/pic/avatar/avatar10.gif +++ /dev/null diff --git a/public/pic/avatar/avatar100.gif b/public/pic/avatar/avatar100.gif Binary files differdeleted file mode 100644 index 1e00f0d3..00000000 --- a/public/pic/avatar/avatar100.gif +++ /dev/null diff --git a/public/pic/avatar/avatar101.gif b/public/pic/avatar/avatar101.gif Binary files differdeleted file mode 100644 index 15a41959..00000000 --- a/public/pic/avatar/avatar101.gif +++ /dev/null diff --git a/public/pic/avatar/avatar102.gif b/public/pic/avatar/avatar102.gif Binary files differdeleted file mode 100644 index 325d9173..00000000 --- a/public/pic/avatar/avatar102.gif +++ /dev/null diff --git a/public/pic/avatar/avatar103.gif b/public/pic/avatar/avatar103.gif Binary files differdeleted file mode 100644 index c842fcdf..00000000 --- a/public/pic/avatar/avatar103.gif +++ /dev/null diff --git a/public/pic/avatar/avatar104.gif b/public/pic/avatar/avatar104.gif Binary files differdeleted file mode 100644 index 83483253..00000000 --- a/public/pic/avatar/avatar104.gif +++ /dev/null diff --git a/public/pic/avatar/avatar105.gif b/public/pic/avatar/avatar105.gif Binary files differdeleted file mode 100644 index 1cdc0d10..00000000 --- a/public/pic/avatar/avatar105.gif +++ /dev/null diff --git a/public/pic/avatar/avatar106.gif b/public/pic/avatar/avatar106.gif Binary files differdeleted file mode 100644 index be773e15..00000000 --- a/public/pic/avatar/avatar106.gif +++ /dev/null diff --git a/public/pic/avatar/avatar107.gif b/public/pic/avatar/avatar107.gif Binary files differdeleted file mode 100644 index b111f9c8..00000000 --- a/public/pic/avatar/avatar107.gif +++ /dev/null diff --git a/public/pic/avatar/avatar108.gif b/public/pic/avatar/avatar108.gif Binary files differdeleted file mode 100644 index 12a21a94..00000000 --- a/public/pic/avatar/avatar108.gif +++ /dev/null diff --git a/public/pic/avatar/avatar109.gif b/public/pic/avatar/avatar109.gif Binary files differdeleted file mode 100644 index 32534f83..00000000 --- a/public/pic/avatar/avatar109.gif +++ /dev/null diff --git a/public/pic/avatar/avatar11.gif b/public/pic/avatar/avatar11.gif Binary files differdeleted file mode 100644 index 199b085d..00000000 --- a/public/pic/avatar/avatar11.gif +++ /dev/null diff --git a/public/pic/avatar/avatar110.gif b/public/pic/avatar/avatar110.gif Binary files differdeleted file mode 100644 index e2c70f54..00000000 --- a/public/pic/avatar/avatar110.gif +++ /dev/null diff --git a/public/pic/avatar/avatar111.gif b/public/pic/avatar/avatar111.gif Binary files differdeleted file mode 100644 index f197ea67..00000000 --- a/public/pic/avatar/avatar111.gif +++ /dev/null diff --git a/public/pic/avatar/avatar112.gif b/public/pic/avatar/avatar112.gif Binary files differdeleted file mode 100644 index ff4ec284..00000000 --- a/public/pic/avatar/avatar112.gif +++ /dev/null diff --git a/public/pic/avatar/avatar113.gif b/public/pic/avatar/avatar113.gif Binary files differdeleted file mode 100644 index 1dbd37aa..00000000 --- a/public/pic/avatar/avatar113.gif +++ /dev/null diff --git a/public/pic/avatar/avatar114.gif b/public/pic/avatar/avatar114.gif Binary files differdeleted file mode 100644 index 6b4b107e..00000000 --- a/public/pic/avatar/avatar114.gif +++ /dev/null diff --git a/public/pic/avatar/avatar115.gif b/public/pic/avatar/avatar115.gif Binary files differdeleted file mode 100644 index 2af52d2b..00000000 --- a/public/pic/avatar/avatar115.gif +++ /dev/null diff --git a/public/pic/avatar/avatar116.gif b/public/pic/avatar/avatar116.gif Binary files differdeleted file mode 100644 index 7db21919..00000000 --- a/public/pic/avatar/avatar116.gif +++ /dev/null diff --git a/public/pic/avatar/avatar117.gif b/public/pic/avatar/avatar117.gif Binary files differdeleted file mode 100644 index 5cb57d35..00000000 --- a/public/pic/avatar/avatar117.gif +++ /dev/null diff --git a/public/pic/avatar/avatar118.gif b/public/pic/avatar/avatar118.gif Binary files differdeleted file mode 100644 index fb1e43b5..00000000 --- a/public/pic/avatar/avatar118.gif +++ /dev/null diff --git a/public/pic/avatar/avatar119.gif b/public/pic/avatar/avatar119.gif Binary files differdeleted file mode 100644 index 6a78fee5..00000000 --- a/public/pic/avatar/avatar119.gif +++ /dev/null diff --git a/public/pic/avatar/avatar12.gif b/public/pic/avatar/avatar12.gif Binary files differdeleted file mode 100644 index c6ee6937..00000000 --- a/public/pic/avatar/avatar12.gif +++ /dev/null diff --git a/public/pic/avatar/avatar120.gif b/public/pic/avatar/avatar120.gif Binary files differdeleted file mode 100644 index 278c5b14..00000000 --- a/public/pic/avatar/avatar120.gif +++ /dev/null diff --git a/public/pic/avatar/avatar121.gif b/public/pic/avatar/avatar121.gif Binary files differdeleted file mode 100644 index 77bb5793..00000000 --- a/public/pic/avatar/avatar121.gif +++ /dev/null diff --git a/public/pic/avatar/avatar122.gif b/public/pic/avatar/avatar122.gif Binary files differdeleted file mode 100644 index 67c03bfd..00000000 --- a/public/pic/avatar/avatar122.gif +++ /dev/null diff --git a/public/pic/avatar/avatar123.gif b/public/pic/avatar/avatar123.gif Binary files differdeleted file mode 100644 index 351c7ee0..00000000 --- a/public/pic/avatar/avatar123.gif +++ /dev/null diff --git a/public/pic/avatar/avatar124.gif b/public/pic/avatar/avatar124.gif Binary files differdeleted file mode 100644 index 13a090bc..00000000 --- a/public/pic/avatar/avatar124.gif +++ /dev/null diff --git a/public/pic/avatar/avatar125.gif b/public/pic/avatar/avatar125.gif Binary files differdeleted file mode 100644 index e4338b9f..00000000 --- a/public/pic/avatar/avatar125.gif +++ /dev/null diff --git a/public/pic/avatar/avatar126.gif b/public/pic/avatar/avatar126.gif Binary files differdeleted file mode 100644 index 80759725..00000000 --- a/public/pic/avatar/avatar126.gif +++ /dev/null diff --git a/public/pic/avatar/avatar127.gif b/public/pic/avatar/avatar127.gif Binary files differdeleted file mode 100644 index e3c7e056..00000000 --- a/public/pic/avatar/avatar127.gif +++ /dev/null diff --git a/public/pic/avatar/avatar128.gif b/public/pic/avatar/avatar128.gif Binary files differdeleted file mode 100644 index fb00ebd9..00000000 --- a/public/pic/avatar/avatar128.gif +++ /dev/null diff --git a/public/pic/avatar/avatar129.gif b/public/pic/avatar/avatar129.gif Binary files differdeleted file mode 100644 index 40651db7..00000000 --- a/public/pic/avatar/avatar129.gif +++ /dev/null diff --git a/public/pic/avatar/avatar13.gif b/public/pic/avatar/avatar13.gif Binary files differdeleted file mode 100644 index 8328c337..00000000 --- a/public/pic/avatar/avatar13.gif +++ /dev/null diff --git a/public/pic/avatar/avatar130.gif b/public/pic/avatar/avatar130.gif Binary files differdeleted file mode 100644 index 45faa378..00000000 --- a/public/pic/avatar/avatar130.gif +++ /dev/null diff --git a/public/pic/avatar/avatar131.gif b/public/pic/avatar/avatar131.gif Binary files differdeleted file mode 100644 index 92cff06c..00000000 --- a/public/pic/avatar/avatar131.gif +++ /dev/null diff --git a/public/pic/avatar/avatar132.gif b/public/pic/avatar/avatar132.gif Binary files differdeleted file mode 100644 index 8835d905..00000000 --- a/public/pic/avatar/avatar132.gif +++ /dev/null diff --git a/public/pic/avatar/avatar133.gif b/public/pic/avatar/avatar133.gif Binary files differdeleted file mode 100644 index 15abbcbe..00000000 --- a/public/pic/avatar/avatar133.gif +++ /dev/null diff --git a/public/pic/avatar/avatar134.gif b/public/pic/avatar/avatar134.gif Binary files differdeleted file mode 100644 index f559359f..00000000 --- a/public/pic/avatar/avatar134.gif +++ /dev/null diff --git a/public/pic/avatar/avatar135.gif b/public/pic/avatar/avatar135.gif Binary files differdeleted file mode 100644 index d9a07c47..00000000 --- a/public/pic/avatar/avatar135.gif +++ /dev/null diff --git a/public/pic/avatar/avatar136.gif b/public/pic/avatar/avatar136.gif Binary files differdeleted file mode 100644 index e7f9f76c..00000000 --- a/public/pic/avatar/avatar136.gif +++ /dev/null diff --git a/public/pic/avatar/avatar137.gif b/public/pic/avatar/avatar137.gif Binary files differdeleted file mode 100644 index b62b374b..00000000 --- a/public/pic/avatar/avatar137.gif +++ /dev/null diff --git a/public/pic/avatar/avatar138.gif b/public/pic/avatar/avatar138.gif Binary files differdeleted file mode 100644 index 49c44308..00000000 --- a/public/pic/avatar/avatar138.gif +++ /dev/null diff --git a/public/pic/avatar/avatar139.gif b/public/pic/avatar/avatar139.gif Binary files differdeleted file mode 100644 index 4281e84a..00000000 --- a/public/pic/avatar/avatar139.gif +++ /dev/null diff --git a/public/pic/avatar/avatar14.gif b/public/pic/avatar/avatar14.gif Binary files differdeleted file mode 100644 index 1edaa2ca..00000000 --- a/public/pic/avatar/avatar14.gif +++ /dev/null diff --git a/public/pic/avatar/avatar140.gif b/public/pic/avatar/avatar140.gif Binary files differdeleted file mode 100644 index b058941a..00000000 --- a/public/pic/avatar/avatar140.gif +++ /dev/null diff --git a/public/pic/avatar/avatar141.gif b/public/pic/avatar/avatar141.gif Binary files differdeleted file mode 100644 index 33def8f5..00000000 --- a/public/pic/avatar/avatar141.gif +++ /dev/null diff --git a/public/pic/avatar/avatar142.gif b/public/pic/avatar/avatar142.gif Binary files differdeleted file mode 100644 index 416e7c26..00000000 --- a/public/pic/avatar/avatar142.gif +++ /dev/null diff --git a/public/pic/avatar/avatar143.gif b/public/pic/avatar/avatar143.gif Binary files differdeleted file mode 100644 index 18ee70d9..00000000 --- a/public/pic/avatar/avatar143.gif +++ /dev/null diff --git a/public/pic/avatar/avatar144.gif b/public/pic/avatar/avatar144.gif Binary files differdeleted file mode 100644 index e322ac57..00000000 --- a/public/pic/avatar/avatar144.gif +++ /dev/null diff --git a/public/pic/avatar/avatar145.gif b/public/pic/avatar/avatar145.gif Binary files differdeleted file mode 100644 index 5f047a5f..00000000 --- a/public/pic/avatar/avatar145.gif +++ /dev/null diff --git a/public/pic/avatar/avatar146.gif b/public/pic/avatar/avatar146.gif Binary files differdeleted file mode 100644 index 3d2fe843..00000000 --- a/public/pic/avatar/avatar146.gif +++ /dev/null diff --git a/public/pic/avatar/avatar147.gif b/public/pic/avatar/avatar147.gif Binary files differdeleted file mode 100644 index d1d54f74..00000000 --- a/public/pic/avatar/avatar147.gif +++ /dev/null diff --git a/public/pic/avatar/avatar148.gif b/public/pic/avatar/avatar148.gif Binary files differdeleted file mode 100644 index 0e715ed8..00000000 --- a/public/pic/avatar/avatar148.gif +++ /dev/null diff --git a/public/pic/avatar/avatar149.gif b/public/pic/avatar/avatar149.gif Binary files differdeleted file mode 100644 index 9cbe72c6..00000000 --- a/public/pic/avatar/avatar149.gif +++ /dev/null diff --git a/public/pic/avatar/avatar15.gif b/public/pic/avatar/avatar15.gif Binary files differdeleted file mode 100644 index d197e82a..00000000 --- a/public/pic/avatar/avatar15.gif +++ /dev/null diff --git a/public/pic/avatar/avatar150.gif b/public/pic/avatar/avatar150.gif Binary files differdeleted file mode 100644 index b790d296..00000000 --- a/public/pic/avatar/avatar150.gif +++ /dev/null diff --git a/public/pic/avatar/avatar151.gif b/public/pic/avatar/avatar151.gif Binary files differdeleted file mode 100644 index afc3b333..00000000 --- a/public/pic/avatar/avatar151.gif +++ /dev/null diff --git a/public/pic/avatar/avatar152.gif b/public/pic/avatar/avatar152.gif Binary files differdeleted file mode 100644 index e30287d6..00000000 --- a/public/pic/avatar/avatar152.gif +++ /dev/null diff --git a/public/pic/avatar/avatar153.gif b/public/pic/avatar/avatar153.gif Binary files differdeleted file mode 100644 index 82bb1775..00000000 --- a/public/pic/avatar/avatar153.gif +++ /dev/null diff --git a/public/pic/avatar/avatar154.gif b/public/pic/avatar/avatar154.gif Binary files differdeleted file mode 100644 index 872008da..00000000 --- a/public/pic/avatar/avatar154.gif +++ /dev/null diff --git a/public/pic/avatar/avatar155.gif b/public/pic/avatar/avatar155.gif Binary files differdeleted file mode 100644 index 51931858..00000000 --- a/public/pic/avatar/avatar155.gif +++ /dev/null diff --git a/public/pic/avatar/avatar156.gif b/public/pic/avatar/avatar156.gif Binary files differdeleted file mode 100644 index 8b3781ff..00000000 --- a/public/pic/avatar/avatar156.gif +++ /dev/null diff --git a/public/pic/avatar/avatar157.gif b/public/pic/avatar/avatar157.gif Binary files differdeleted file mode 100644 index 7c8667cf..00000000 --- a/public/pic/avatar/avatar157.gif +++ /dev/null diff --git a/public/pic/avatar/avatar158.gif b/public/pic/avatar/avatar158.gif Binary files differdeleted file mode 100644 index ce3472cd..00000000 --- a/public/pic/avatar/avatar158.gif +++ /dev/null diff --git a/public/pic/avatar/avatar159.gif b/public/pic/avatar/avatar159.gif Binary files differdeleted file mode 100644 index c54f2b29..00000000 --- a/public/pic/avatar/avatar159.gif +++ /dev/null diff --git a/public/pic/avatar/avatar16.gif b/public/pic/avatar/avatar16.gif Binary files differdeleted file mode 100644 index d76a15cd..00000000 --- a/public/pic/avatar/avatar16.gif +++ /dev/null diff --git a/public/pic/avatar/avatar160.gif b/public/pic/avatar/avatar160.gif Binary files differdeleted file mode 100644 index deb3507c..00000000 --- a/public/pic/avatar/avatar160.gif +++ /dev/null diff --git a/public/pic/avatar/avatar161.gif b/public/pic/avatar/avatar161.gif Binary files differdeleted file mode 100644 index f425b1f2..00000000 --- a/public/pic/avatar/avatar161.gif +++ /dev/null diff --git a/public/pic/avatar/avatar162.gif b/public/pic/avatar/avatar162.gif Binary files differdeleted file mode 100644 index 5625fe09..00000000 --- a/public/pic/avatar/avatar162.gif +++ /dev/null diff --git a/public/pic/avatar/avatar163.gif b/public/pic/avatar/avatar163.gif Binary files differdeleted file mode 100644 index 8146a09d..00000000 --- a/public/pic/avatar/avatar163.gif +++ /dev/null diff --git a/public/pic/avatar/avatar164.gif b/public/pic/avatar/avatar164.gif Binary files differdeleted file mode 100644 index 4690f9cb..00000000 --- a/public/pic/avatar/avatar164.gif +++ /dev/null diff --git a/public/pic/avatar/avatar165.gif b/public/pic/avatar/avatar165.gif Binary files differdeleted file mode 100644 index efe72a35..00000000 --- a/public/pic/avatar/avatar165.gif +++ /dev/null diff --git a/public/pic/avatar/avatar166.gif b/public/pic/avatar/avatar166.gif Binary files differdeleted file mode 100644 index a1720be3..00000000 --- a/public/pic/avatar/avatar166.gif +++ /dev/null diff --git a/public/pic/avatar/avatar167.gif b/public/pic/avatar/avatar167.gif Binary files differdeleted file mode 100644 index 04d31691..00000000 --- a/public/pic/avatar/avatar167.gif +++ /dev/null diff --git a/public/pic/avatar/avatar168.gif b/public/pic/avatar/avatar168.gif Binary files differdeleted file mode 100644 index 4d804c2a..00000000 --- a/public/pic/avatar/avatar168.gif +++ /dev/null diff --git a/public/pic/avatar/avatar169.gif b/public/pic/avatar/avatar169.gif Binary files differdeleted file mode 100644 index afe58a3f..00000000 --- a/public/pic/avatar/avatar169.gif +++ /dev/null diff --git a/public/pic/avatar/avatar17.gif b/public/pic/avatar/avatar17.gif Binary files differdeleted file mode 100644 index 994836b7..00000000 --- a/public/pic/avatar/avatar17.gif +++ /dev/null diff --git a/public/pic/avatar/avatar170.gif b/public/pic/avatar/avatar170.gif Binary files differdeleted file mode 100644 index dae4c36a..00000000 --- a/public/pic/avatar/avatar170.gif +++ /dev/null diff --git a/public/pic/avatar/avatar171.gif b/public/pic/avatar/avatar171.gif Binary files differdeleted file mode 100644 index 774aa9c2..00000000 --- a/public/pic/avatar/avatar171.gif +++ /dev/null diff --git a/public/pic/avatar/avatar172.gif b/public/pic/avatar/avatar172.gif Binary files differdeleted file mode 100644 index e6f7bc6c..00000000 --- a/public/pic/avatar/avatar172.gif +++ /dev/null diff --git a/public/pic/avatar/avatar173.gif b/public/pic/avatar/avatar173.gif Binary files differdeleted file mode 100644 index 3222ac99..00000000 --- a/public/pic/avatar/avatar173.gif +++ /dev/null diff --git a/public/pic/avatar/avatar174.gif b/public/pic/avatar/avatar174.gif Binary files differdeleted file mode 100644 index a64201ca..00000000 --- a/public/pic/avatar/avatar174.gif +++ /dev/null diff --git a/public/pic/avatar/avatar175.gif b/public/pic/avatar/avatar175.gif Binary files differdeleted file mode 100644 index c172a6eb..00000000 --- a/public/pic/avatar/avatar175.gif +++ /dev/null diff --git a/public/pic/avatar/avatar176.gif b/public/pic/avatar/avatar176.gif Binary files differdeleted file mode 100644 index bda3bae5..00000000 --- a/public/pic/avatar/avatar176.gif +++ /dev/null diff --git a/public/pic/avatar/avatar177.gif b/public/pic/avatar/avatar177.gif Binary files differdeleted file mode 100644 index d2951985..00000000 --- a/public/pic/avatar/avatar177.gif +++ /dev/null diff --git a/public/pic/avatar/avatar178.gif b/public/pic/avatar/avatar178.gif Binary files differdeleted file mode 100644 index 400ae2eb..00000000 --- a/public/pic/avatar/avatar178.gif +++ /dev/null diff --git a/public/pic/avatar/avatar179.gif b/public/pic/avatar/avatar179.gif Binary files differdeleted file mode 100644 index cfb7a1cf..00000000 --- a/public/pic/avatar/avatar179.gif +++ /dev/null diff --git a/public/pic/avatar/avatar18.gif b/public/pic/avatar/avatar18.gif Binary files differdeleted file mode 100644 index 4c1d9b57..00000000 --- a/public/pic/avatar/avatar18.gif +++ /dev/null diff --git a/public/pic/avatar/avatar180.gif b/public/pic/avatar/avatar180.gif Binary files differdeleted file mode 100644 index 5be98c79..00000000 --- a/public/pic/avatar/avatar180.gif +++ /dev/null diff --git a/public/pic/avatar/avatar181.gif b/public/pic/avatar/avatar181.gif Binary files differdeleted file mode 100644 index 44918224..00000000 --- a/public/pic/avatar/avatar181.gif +++ /dev/null diff --git a/public/pic/avatar/avatar182.gif b/public/pic/avatar/avatar182.gif Binary files differdeleted file mode 100644 index 914c3efc..00000000 --- a/public/pic/avatar/avatar182.gif +++ /dev/null diff --git a/public/pic/avatar/avatar183.gif b/public/pic/avatar/avatar183.gif Binary files differdeleted file mode 100644 index 27d55f8f..00000000 --- a/public/pic/avatar/avatar183.gif +++ /dev/null diff --git a/public/pic/avatar/avatar184.gif b/public/pic/avatar/avatar184.gif Binary files differdeleted file mode 100644 index 2ce57015..00000000 --- a/public/pic/avatar/avatar184.gif +++ /dev/null diff --git a/public/pic/avatar/avatar185.gif b/public/pic/avatar/avatar185.gif Binary files differdeleted file mode 100644 index 8eb60378..00000000 --- a/public/pic/avatar/avatar185.gif +++ /dev/null diff --git a/public/pic/avatar/avatar186.gif b/public/pic/avatar/avatar186.gif Binary files differdeleted file mode 100644 index d30bc664..00000000 --- a/public/pic/avatar/avatar186.gif +++ /dev/null diff --git a/public/pic/avatar/avatar187.gif b/public/pic/avatar/avatar187.gif Binary files differdeleted file mode 100644 index 34bcc7d2..00000000 --- a/public/pic/avatar/avatar187.gif +++ /dev/null diff --git a/public/pic/avatar/avatar188.gif b/public/pic/avatar/avatar188.gif Binary files differdeleted file mode 100644 index 3056d45a..00000000 --- a/public/pic/avatar/avatar188.gif +++ /dev/null diff --git a/public/pic/avatar/avatar189.gif b/public/pic/avatar/avatar189.gif Binary files differdeleted file mode 100644 index 9fb4cd83..00000000 --- a/public/pic/avatar/avatar189.gif +++ /dev/null diff --git a/public/pic/avatar/avatar19.gif b/public/pic/avatar/avatar19.gif Binary files differdeleted file mode 100644 index 40d42724..00000000 --- a/public/pic/avatar/avatar19.gif +++ /dev/null diff --git a/public/pic/avatar/avatar190.gif b/public/pic/avatar/avatar190.gif Binary files differdeleted file mode 100644 index f8c38853..00000000 --- a/public/pic/avatar/avatar190.gif +++ /dev/null diff --git a/public/pic/avatar/avatar191.gif b/public/pic/avatar/avatar191.gif Binary files differdeleted file mode 100644 index e6af0d88..00000000 --- a/public/pic/avatar/avatar191.gif +++ /dev/null diff --git a/public/pic/avatar/avatar192.gif b/public/pic/avatar/avatar192.gif Binary files differdeleted file mode 100644 index 123ed736..00000000 --- a/public/pic/avatar/avatar192.gif +++ /dev/null diff --git a/public/pic/avatar/avatar193.gif b/public/pic/avatar/avatar193.gif Binary files differdeleted file mode 100644 index f82524d9..00000000 --- a/public/pic/avatar/avatar193.gif +++ /dev/null diff --git a/public/pic/avatar/avatar194.gif b/public/pic/avatar/avatar194.gif Binary files differdeleted file mode 100644 index ae1d743b..00000000 --- a/public/pic/avatar/avatar194.gif +++ /dev/null diff --git a/public/pic/avatar/avatar195.gif b/public/pic/avatar/avatar195.gif Binary files differdeleted file mode 100644 index e22c9ba0..00000000 --- a/public/pic/avatar/avatar195.gif +++ /dev/null diff --git a/public/pic/avatar/avatar196.gif b/public/pic/avatar/avatar196.gif Binary files differdeleted file mode 100644 index 87e6293d..00000000 --- a/public/pic/avatar/avatar196.gif +++ /dev/null diff --git a/public/pic/avatar/avatar197.gif b/public/pic/avatar/avatar197.gif Binary files differdeleted file mode 100644 index 88764c73..00000000 --- a/public/pic/avatar/avatar197.gif +++ /dev/null diff --git a/public/pic/avatar/avatar198.gif b/public/pic/avatar/avatar198.gif Binary files differdeleted file mode 100644 index 58a64280..00000000 --- a/public/pic/avatar/avatar198.gif +++ /dev/null diff --git a/public/pic/avatar/avatar199.gif b/public/pic/avatar/avatar199.gif Binary files differdeleted file mode 100644 index e3861e3e..00000000 --- a/public/pic/avatar/avatar199.gif +++ /dev/null diff --git a/public/pic/avatar/avatar2.gif b/public/pic/avatar/avatar2.gif Binary files differdeleted file mode 100644 index 6c1e79a7..00000000 --- a/public/pic/avatar/avatar2.gif +++ /dev/null diff --git a/public/pic/avatar/avatar20.gif b/public/pic/avatar/avatar20.gif Binary files differdeleted file mode 100644 index 7480ddd1..00000000 --- a/public/pic/avatar/avatar20.gif +++ /dev/null diff --git a/public/pic/avatar/avatar200.gif b/public/pic/avatar/avatar200.gif Binary files differdeleted file mode 100644 index bcee18dd..00000000 --- a/public/pic/avatar/avatar200.gif +++ /dev/null diff --git a/public/pic/avatar/avatar201.gif b/public/pic/avatar/avatar201.gif Binary files differdeleted file mode 100644 index 7ff54bd0..00000000 --- a/public/pic/avatar/avatar201.gif +++ /dev/null diff --git a/public/pic/avatar/avatar202.gif b/public/pic/avatar/avatar202.gif Binary files differdeleted file mode 100644 index 9b9ad5aa..00000000 --- a/public/pic/avatar/avatar202.gif +++ /dev/null diff --git a/public/pic/avatar/avatar203.gif b/public/pic/avatar/avatar203.gif Binary files differdeleted file mode 100644 index 777e6ab9..00000000 --- a/public/pic/avatar/avatar203.gif +++ /dev/null diff --git a/public/pic/avatar/avatar204.gif b/public/pic/avatar/avatar204.gif Binary files differdeleted file mode 100644 index 6e16ed30..00000000 --- a/public/pic/avatar/avatar204.gif +++ /dev/null diff --git a/public/pic/avatar/avatar205.gif b/public/pic/avatar/avatar205.gif Binary files differdeleted file mode 100644 index f780d7d8..00000000 --- a/public/pic/avatar/avatar205.gif +++ /dev/null diff --git a/public/pic/avatar/avatar206.gif b/public/pic/avatar/avatar206.gif Binary files differdeleted file mode 100644 index 6a5b3ad7..00000000 --- a/public/pic/avatar/avatar206.gif +++ /dev/null diff --git a/public/pic/avatar/avatar207.gif b/public/pic/avatar/avatar207.gif Binary files differdeleted file mode 100644 index d956d1f9..00000000 --- a/public/pic/avatar/avatar207.gif +++ /dev/null diff --git a/public/pic/avatar/avatar208.gif b/public/pic/avatar/avatar208.gif Binary files differdeleted file mode 100644 index 571e059f..00000000 --- a/public/pic/avatar/avatar208.gif +++ /dev/null diff --git a/public/pic/avatar/avatar209.gif b/public/pic/avatar/avatar209.gif Binary files differdeleted file mode 100644 index d2976d85..00000000 --- a/public/pic/avatar/avatar209.gif +++ /dev/null diff --git a/public/pic/avatar/avatar21.gif b/public/pic/avatar/avatar21.gif Binary files differdeleted file mode 100644 index 45b1b8a3..00000000 --- a/public/pic/avatar/avatar21.gif +++ /dev/null diff --git a/public/pic/avatar/avatar210.gif b/public/pic/avatar/avatar210.gif Binary files differdeleted file mode 100644 index 2bd579b9..00000000 --- a/public/pic/avatar/avatar210.gif +++ /dev/null diff --git a/public/pic/avatar/avatar211.gif b/public/pic/avatar/avatar211.gif Binary files differdeleted file mode 100644 index 6e95b7d5..00000000 --- a/public/pic/avatar/avatar211.gif +++ /dev/null diff --git a/public/pic/avatar/avatar212.gif b/public/pic/avatar/avatar212.gif Binary files differdeleted file mode 100644 index 39e012b7..00000000 --- a/public/pic/avatar/avatar212.gif +++ /dev/null diff --git a/public/pic/avatar/avatar213.gif b/public/pic/avatar/avatar213.gif Binary files differdeleted file mode 100644 index 659fbb65..00000000 --- a/public/pic/avatar/avatar213.gif +++ /dev/null diff --git a/public/pic/avatar/avatar214.gif b/public/pic/avatar/avatar214.gif Binary files differdeleted file mode 100644 index 822d3530..00000000 --- a/public/pic/avatar/avatar214.gif +++ /dev/null diff --git a/public/pic/avatar/avatar215.gif b/public/pic/avatar/avatar215.gif Binary files differdeleted file mode 100644 index e0909042..00000000 --- a/public/pic/avatar/avatar215.gif +++ /dev/null diff --git a/public/pic/avatar/avatar216.gif b/public/pic/avatar/avatar216.gif Binary files differdeleted file mode 100644 index 7ba52487..00000000 --- a/public/pic/avatar/avatar216.gif +++ /dev/null diff --git a/public/pic/avatar/avatar217.gif b/public/pic/avatar/avatar217.gif Binary files differdeleted file mode 100644 index 1d69bb45..00000000 --- a/public/pic/avatar/avatar217.gif +++ /dev/null diff --git a/public/pic/avatar/avatar218.gif b/public/pic/avatar/avatar218.gif Binary files differdeleted file mode 100644 index 508bff13..00000000 --- a/public/pic/avatar/avatar218.gif +++ /dev/null diff --git a/public/pic/avatar/avatar219.gif b/public/pic/avatar/avatar219.gif Binary files differdeleted file mode 100644 index 6c695dd8..00000000 --- a/public/pic/avatar/avatar219.gif +++ /dev/null diff --git a/public/pic/avatar/avatar22.gif b/public/pic/avatar/avatar22.gif Binary files differdeleted file mode 100644 index 7f7d9a26..00000000 --- a/public/pic/avatar/avatar22.gif +++ /dev/null diff --git a/public/pic/avatar/avatar220.gif b/public/pic/avatar/avatar220.gif Binary files differdeleted file mode 100644 index 76604ced..00000000 --- a/public/pic/avatar/avatar220.gif +++ /dev/null diff --git a/public/pic/avatar/avatar221.gif b/public/pic/avatar/avatar221.gif Binary files differdeleted file mode 100644 index 2d5ed7db..00000000 --- a/public/pic/avatar/avatar221.gif +++ /dev/null diff --git a/public/pic/avatar/avatar222.gif b/public/pic/avatar/avatar222.gif Binary files differdeleted file mode 100644 index 607887e5..00000000 --- a/public/pic/avatar/avatar222.gif +++ /dev/null diff --git a/public/pic/avatar/avatar223.gif b/public/pic/avatar/avatar223.gif Binary files differdeleted file mode 100644 index 5c7f782f..00000000 --- a/public/pic/avatar/avatar223.gif +++ /dev/null diff --git a/public/pic/avatar/avatar224.gif b/public/pic/avatar/avatar224.gif Binary files differdeleted file mode 100644 index 46e7f845..00000000 --- a/public/pic/avatar/avatar224.gif +++ /dev/null diff --git a/public/pic/avatar/avatar225.gif b/public/pic/avatar/avatar225.gif Binary files differdeleted file mode 100644 index 7eb3bfcd..00000000 --- a/public/pic/avatar/avatar225.gif +++ /dev/null diff --git a/public/pic/avatar/avatar226.gif b/public/pic/avatar/avatar226.gif Binary files differdeleted file mode 100644 index a030d2f9..00000000 --- a/public/pic/avatar/avatar226.gif +++ /dev/null diff --git a/public/pic/avatar/avatar227.gif b/public/pic/avatar/avatar227.gif Binary files differdeleted file mode 100644 index fe631b92..00000000 --- a/public/pic/avatar/avatar227.gif +++ /dev/null diff --git a/public/pic/avatar/avatar228.gif b/public/pic/avatar/avatar228.gif Binary files differdeleted file mode 100644 index 459ed140..00000000 --- a/public/pic/avatar/avatar228.gif +++ /dev/null diff --git a/public/pic/avatar/avatar229.gif b/public/pic/avatar/avatar229.gif Binary files differdeleted file mode 100644 index 35546746..00000000 --- a/public/pic/avatar/avatar229.gif +++ /dev/null diff --git a/public/pic/avatar/avatar23.gif b/public/pic/avatar/avatar23.gif Binary files differdeleted file mode 100644 index 55f84741..00000000 --- a/public/pic/avatar/avatar23.gif +++ /dev/null diff --git a/public/pic/avatar/avatar230.gif b/public/pic/avatar/avatar230.gif Binary files differdeleted file mode 100644 index 22ffccb0..00000000 --- a/public/pic/avatar/avatar230.gif +++ /dev/null diff --git a/public/pic/avatar/avatar231.gif b/public/pic/avatar/avatar231.gif Binary files differdeleted file mode 100644 index 52a82830..00000000 --- a/public/pic/avatar/avatar231.gif +++ /dev/null diff --git a/public/pic/avatar/avatar232.gif b/public/pic/avatar/avatar232.gif Binary files differdeleted file mode 100644 index a442015b..00000000 --- a/public/pic/avatar/avatar232.gif +++ /dev/null diff --git a/public/pic/avatar/avatar233.gif b/public/pic/avatar/avatar233.gif Binary files differdeleted file mode 100644 index ad676d9c..00000000 --- a/public/pic/avatar/avatar233.gif +++ /dev/null diff --git a/public/pic/avatar/avatar234.gif b/public/pic/avatar/avatar234.gif Binary files differdeleted file mode 100644 index bf9200c2..00000000 --- a/public/pic/avatar/avatar234.gif +++ /dev/null diff --git a/public/pic/avatar/avatar235.gif b/public/pic/avatar/avatar235.gif Binary files differdeleted file mode 100644 index 80aee34d..00000000 --- a/public/pic/avatar/avatar235.gif +++ /dev/null diff --git a/public/pic/avatar/avatar236.gif b/public/pic/avatar/avatar236.gif Binary files differdeleted file mode 100644 index 036c71e1..00000000 --- a/public/pic/avatar/avatar236.gif +++ /dev/null diff --git a/public/pic/avatar/avatar237.gif b/public/pic/avatar/avatar237.gif Binary files differdeleted file mode 100644 index bf78ace7..00000000 --- a/public/pic/avatar/avatar237.gif +++ /dev/null diff --git a/public/pic/avatar/avatar238.gif b/public/pic/avatar/avatar238.gif Binary files differdeleted file mode 100644 index 276187e1..00000000 --- a/public/pic/avatar/avatar238.gif +++ /dev/null diff --git a/public/pic/avatar/avatar239.gif b/public/pic/avatar/avatar239.gif Binary files differdeleted file mode 100644 index 818b54a3..00000000 --- a/public/pic/avatar/avatar239.gif +++ /dev/null diff --git a/public/pic/avatar/avatar24.gif b/public/pic/avatar/avatar24.gif Binary files differdeleted file mode 100644 index 99226b50..00000000 --- a/public/pic/avatar/avatar24.gif +++ /dev/null diff --git a/public/pic/avatar/avatar240.gif b/public/pic/avatar/avatar240.gif Binary files differdeleted file mode 100644 index ccfa1346..00000000 --- a/public/pic/avatar/avatar240.gif +++ /dev/null diff --git a/public/pic/avatar/avatar241.gif b/public/pic/avatar/avatar241.gif Binary files differdeleted file mode 100644 index b2afaa82..00000000 --- a/public/pic/avatar/avatar241.gif +++ /dev/null diff --git a/public/pic/avatar/avatar242.gif b/public/pic/avatar/avatar242.gif Binary files differdeleted file mode 100644 index dfdb3baa..00000000 --- a/public/pic/avatar/avatar242.gif +++ /dev/null diff --git a/public/pic/avatar/avatar243.gif b/public/pic/avatar/avatar243.gif Binary files differdeleted file mode 100644 index 14b7e935..00000000 --- a/public/pic/avatar/avatar243.gif +++ /dev/null diff --git a/public/pic/avatar/avatar244.gif b/public/pic/avatar/avatar244.gif Binary files differdeleted file mode 100644 index bfc10515..00000000 --- a/public/pic/avatar/avatar244.gif +++ /dev/null diff --git a/public/pic/avatar/avatar245.gif b/public/pic/avatar/avatar245.gif Binary files differdeleted file mode 100644 index 79dd0453..00000000 --- a/public/pic/avatar/avatar245.gif +++ /dev/null diff --git a/public/pic/avatar/avatar246.gif b/public/pic/avatar/avatar246.gif Binary files differdeleted file mode 100644 index 26878722..00000000 --- a/public/pic/avatar/avatar246.gif +++ /dev/null diff --git a/public/pic/avatar/avatar247.gif b/public/pic/avatar/avatar247.gif Binary files differdeleted file mode 100644 index 0b041108..00000000 --- a/public/pic/avatar/avatar247.gif +++ /dev/null diff --git a/public/pic/avatar/avatar248.gif b/public/pic/avatar/avatar248.gif Binary files differdeleted file mode 100644 index 7aa13465..00000000 --- a/public/pic/avatar/avatar248.gif +++ /dev/null diff --git a/public/pic/avatar/avatar249.gif b/public/pic/avatar/avatar249.gif Binary files differdeleted file mode 100644 index c5cdf5d8..00000000 --- a/public/pic/avatar/avatar249.gif +++ /dev/null diff --git a/public/pic/avatar/avatar25.gif b/public/pic/avatar/avatar25.gif Binary files differdeleted file mode 100644 index d5e29f52..00000000 --- a/public/pic/avatar/avatar25.gif +++ /dev/null diff --git a/public/pic/avatar/avatar250.gif b/public/pic/avatar/avatar250.gif Binary files differdeleted file mode 100644 index 61c2b962..00000000 --- a/public/pic/avatar/avatar250.gif +++ /dev/null diff --git a/public/pic/avatar/avatar251.gif b/public/pic/avatar/avatar251.gif Binary files differdeleted file mode 100644 index 01c2a370..00000000 --- a/public/pic/avatar/avatar251.gif +++ /dev/null diff --git a/public/pic/avatar/avatar252.gif b/public/pic/avatar/avatar252.gif Binary files differdeleted file mode 100644 index 6656fe75..00000000 --- a/public/pic/avatar/avatar252.gif +++ /dev/null diff --git a/public/pic/avatar/avatar253.gif b/public/pic/avatar/avatar253.gif Binary files differdeleted file mode 100644 index 4aaa9318..00000000 --- a/public/pic/avatar/avatar253.gif +++ /dev/null diff --git a/public/pic/avatar/avatar254.gif b/public/pic/avatar/avatar254.gif Binary files differdeleted file mode 100644 index 4439c722..00000000 --- a/public/pic/avatar/avatar254.gif +++ /dev/null diff --git a/public/pic/avatar/avatar255.gif b/public/pic/avatar/avatar255.gif Binary files differdeleted file mode 100644 index 3a5fd768..00000000 --- a/public/pic/avatar/avatar255.gif +++ /dev/null diff --git a/public/pic/avatar/avatar256.gif b/public/pic/avatar/avatar256.gif Binary files differdeleted file mode 100644 index 200dc450..00000000 --- a/public/pic/avatar/avatar256.gif +++ /dev/null diff --git a/public/pic/avatar/avatar257.gif b/public/pic/avatar/avatar257.gif Binary files differdeleted file mode 100644 index 9d9c823c..00000000 --- a/public/pic/avatar/avatar257.gif +++ /dev/null diff --git a/public/pic/avatar/avatar258.gif b/public/pic/avatar/avatar258.gif Binary files differdeleted file mode 100644 index 044edc01..00000000 --- a/public/pic/avatar/avatar258.gif +++ /dev/null diff --git a/public/pic/avatar/avatar259.gif b/public/pic/avatar/avatar259.gif Binary files differdeleted file mode 100644 index 83334fb9..00000000 --- a/public/pic/avatar/avatar259.gif +++ /dev/null diff --git a/public/pic/avatar/avatar26.gif b/public/pic/avatar/avatar26.gif Binary files differdeleted file mode 100644 index 40d42724..00000000 --- a/public/pic/avatar/avatar26.gif +++ /dev/null diff --git a/public/pic/avatar/avatar260.gif b/public/pic/avatar/avatar260.gif Binary files differdeleted file mode 100644 index 8ec72dbe..00000000 --- a/public/pic/avatar/avatar260.gif +++ /dev/null diff --git a/public/pic/avatar/avatar261.gif b/public/pic/avatar/avatar261.gif Binary files differdeleted file mode 100644 index 90505322..00000000 --- a/public/pic/avatar/avatar261.gif +++ /dev/null diff --git a/public/pic/avatar/avatar262.gif b/public/pic/avatar/avatar262.gif Binary files differdeleted file mode 100644 index 4656c222..00000000 --- a/public/pic/avatar/avatar262.gif +++ /dev/null diff --git a/public/pic/avatar/avatar263.gif b/public/pic/avatar/avatar263.gif Binary files differdeleted file mode 100644 index 6954e902..00000000 --- a/public/pic/avatar/avatar263.gif +++ /dev/null diff --git a/public/pic/avatar/avatar264.gif b/public/pic/avatar/avatar264.gif Binary files differdeleted file mode 100644 index 4e46f7b9..00000000 --- a/public/pic/avatar/avatar264.gif +++ /dev/null diff --git a/public/pic/avatar/avatar265.gif b/public/pic/avatar/avatar265.gif Binary files differdeleted file mode 100644 index df18535c..00000000 --- a/public/pic/avatar/avatar265.gif +++ /dev/null diff --git a/public/pic/avatar/avatar266.gif b/public/pic/avatar/avatar266.gif Binary files differdeleted file mode 100644 index 838305a7..00000000 --- a/public/pic/avatar/avatar266.gif +++ /dev/null diff --git a/public/pic/avatar/avatar267.gif b/public/pic/avatar/avatar267.gif Binary files differdeleted file mode 100644 index 8ac405e4..00000000 --- a/public/pic/avatar/avatar267.gif +++ /dev/null diff --git a/public/pic/avatar/avatar268.gif b/public/pic/avatar/avatar268.gif Binary files differdeleted file mode 100644 index fe61c645..00000000 --- a/public/pic/avatar/avatar268.gif +++ /dev/null diff --git a/public/pic/avatar/avatar269.gif b/public/pic/avatar/avatar269.gif Binary files differdeleted file mode 100644 index c71da25a..00000000 --- a/public/pic/avatar/avatar269.gif +++ /dev/null diff --git a/public/pic/avatar/avatar27.gif b/public/pic/avatar/avatar27.gif Binary files differdeleted file mode 100644 index 43cf2125..00000000 --- a/public/pic/avatar/avatar27.gif +++ /dev/null diff --git a/public/pic/avatar/avatar270.gif b/public/pic/avatar/avatar270.gif Binary files differdeleted file mode 100644 index 9c11d479..00000000 --- a/public/pic/avatar/avatar270.gif +++ /dev/null diff --git a/public/pic/avatar/avatar271.gif b/public/pic/avatar/avatar271.gif Binary files differdeleted file mode 100644 index ac95c950..00000000 --- a/public/pic/avatar/avatar271.gif +++ /dev/null diff --git a/public/pic/avatar/avatar272.gif b/public/pic/avatar/avatar272.gif Binary files differdeleted file mode 100644 index 4d451488..00000000 --- a/public/pic/avatar/avatar272.gif +++ /dev/null diff --git a/public/pic/avatar/avatar273.gif b/public/pic/avatar/avatar273.gif Binary files differdeleted file mode 100644 index e26b9106..00000000 --- a/public/pic/avatar/avatar273.gif +++ /dev/null diff --git a/public/pic/avatar/avatar274.gif b/public/pic/avatar/avatar274.gif Binary files differdeleted file mode 100644 index a941aa4c..00000000 --- a/public/pic/avatar/avatar274.gif +++ /dev/null diff --git a/public/pic/avatar/avatar275.gif b/public/pic/avatar/avatar275.gif Binary files differdeleted file mode 100644 index f324f6c0..00000000 --- a/public/pic/avatar/avatar275.gif +++ /dev/null diff --git a/public/pic/avatar/avatar276.gif b/public/pic/avatar/avatar276.gif Binary files differdeleted file mode 100644 index 6b0d8fee..00000000 --- a/public/pic/avatar/avatar276.gif +++ /dev/null diff --git a/public/pic/avatar/avatar277.gif b/public/pic/avatar/avatar277.gif Binary files differdeleted file mode 100644 index 6fddc745..00000000 --- a/public/pic/avatar/avatar277.gif +++ /dev/null diff --git a/public/pic/avatar/avatar278.gif b/public/pic/avatar/avatar278.gif Binary files differdeleted file mode 100644 index 59e3b51d..00000000 --- a/public/pic/avatar/avatar278.gif +++ /dev/null diff --git a/public/pic/avatar/avatar279.gif b/public/pic/avatar/avatar279.gif Binary files differdeleted file mode 100644 index c8c0bb84..00000000 --- a/public/pic/avatar/avatar279.gif +++ /dev/null diff --git a/public/pic/avatar/avatar28.gif b/public/pic/avatar/avatar28.gif Binary files differdeleted file mode 100644 index 9251bdb6..00000000 --- a/public/pic/avatar/avatar28.gif +++ /dev/null diff --git a/public/pic/avatar/avatar280.gif b/public/pic/avatar/avatar280.gif Binary files differdeleted file mode 100644 index 954920d5..00000000 --- a/public/pic/avatar/avatar280.gif +++ /dev/null diff --git a/public/pic/avatar/avatar281.gif b/public/pic/avatar/avatar281.gif Binary files differdeleted file mode 100644 index 68ebd8cc..00000000 --- a/public/pic/avatar/avatar281.gif +++ /dev/null diff --git a/public/pic/avatar/avatar282.gif b/public/pic/avatar/avatar282.gif Binary files differdeleted file mode 100644 index ec06f9f5..00000000 --- a/public/pic/avatar/avatar282.gif +++ /dev/null diff --git a/public/pic/avatar/avatar283.gif b/public/pic/avatar/avatar283.gif Binary files differdeleted file mode 100644 index 2d0fad8a..00000000 --- a/public/pic/avatar/avatar283.gif +++ /dev/null diff --git a/public/pic/avatar/avatar284.gif b/public/pic/avatar/avatar284.gif Binary files differdeleted file mode 100644 index 9cc79890..00000000 --- a/public/pic/avatar/avatar284.gif +++ /dev/null diff --git a/public/pic/avatar/avatar285.gif b/public/pic/avatar/avatar285.gif Binary files differdeleted file mode 100644 index baf2c0b0..00000000 --- a/public/pic/avatar/avatar285.gif +++ /dev/null diff --git a/public/pic/avatar/avatar286.gif b/public/pic/avatar/avatar286.gif Binary files differdeleted file mode 100644 index d74af8d4..00000000 --- a/public/pic/avatar/avatar286.gif +++ /dev/null diff --git a/public/pic/avatar/avatar287.gif b/public/pic/avatar/avatar287.gif Binary files differdeleted file mode 100644 index 0e4169ef..00000000 --- a/public/pic/avatar/avatar287.gif +++ /dev/null diff --git a/public/pic/avatar/avatar288.gif b/public/pic/avatar/avatar288.gif Binary files differdeleted file mode 100644 index 41c2e9b4..00000000 --- a/public/pic/avatar/avatar288.gif +++ /dev/null diff --git a/public/pic/avatar/avatar289.gif b/public/pic/avatar/avatar289.gif Binary files differdeleted file mode 100644 index c68b431a..00000000 --- a/public/pic/avatar/avatar289.gif +++ /dev/null diff --git a/public/pic/avatar/avatar29.gif b/public/pic/avatar/avatar29.gif Binary files differdeleted file mode 100644 index 10063690..00000000 --- a/public/pic/avatar/avatar29.gif +++ /dev/null diff --git a/public/pic/avatar/avatar290.gif b/public/pic/avatar/avatar290.gif Binary files differdeleted file mode 100644 index f2ca018b..00000000 --- a/public/pic/avatar/avatar290.gif +++ /dev/null diff --git a/public/pic/avatar/avatar291.gif b/public/pic/avatar/avatar291.gif Binary files differdeleted file mode 100644 index b9b0bbc3..00000000 --- a/public/pic/avatar/avatar291.gif +++ /dev/null diff --git a/public/pic/avatar/avatar292.gif b/public/pic/avatar/avatar292.gif Binary files differdeleted file mode 100644 index 6eecd4d1..00000000 --- a/public/pic/avatar/avatar292.gif +++ /dev/null diff --git a/public/pic/avatar/avatar293.gif b/public/pic/avatar/avatar293.gif Binary files differdeleted file mode 100644 index a1834818..00000000 --- a/public/pic/avatar/avatar293.gif +++ /dev/null diff --git a/public/pic/avatar/avatar294.gif b/public/pic/avatar/avatar294.gif Binary files differdeleted file mode 100644 index 6ef5611a..00000000 --- a/public/pic/avatar/avatar294.gif +++ /dev/null diff --git a/public/pic/avatar/avatar295.gif b/public/pic/avatar/avatar295.gif Binary files differdeleted file mode 100644 index 4c9fa7c6..00000000 --- a/public/pic/avatar/avatar295.gif +++ /dev/null diff --git a/public/pic/avatar/avatar296.gif b/public/pic/avatar/avatar296.gif Binary files differdeleted file mode 100644 index b6ab2095..00000000 --- a/public/pic/avatar/avatar296.gif +++ /dev/null diff --git a/public/pic/avatar/avatar297.gif b/public/pic/avatar/avatar297.gif Binary files differdeleted file mode 100644 index 38d1d659..00000000 --- a/public/pic/avatar/avatar297.gif +++ /dev/null diff --git a/public/pic/avatar/avatar298.gif b/public/pic/avatar/avatar298.gif Binary files differdeleted file mode 100644 index f1ee804c..00000000 --- a/public/pic/avatar/avatar298.gif +++ /dev/null diff --git a/public/pic/avatar/avatar299.gif b/public/pic/avatar/avatar299.gif Binary files differdeleted file mode 100644 index 0d0b77b6..00000000 --- a/public/pic/avatar/avatar299.gif +++ /dev/null diff --git a/public/pic/avatar/avatar3.gif b/public/pic/avatar/avatar3.gif Binary files differdeleted file mode 100644 index d8cd4306..00000000 --- a/public/pic/avatar/avatar3.gif +++ /dev/null diff --git a/public/pic/avatar/avatar30.gif b/public/pic/avatar/avatar30.gif Binary files differdeleted file mode 100644 index b339d48d..00000000 --- a/public/pic/avatar/avatar30.gif +++ /dev/null diff --git a/public/pic/avatar/avatar300.gif b/public/pic/avatar/avatar300.gif Binary files differdeleted file mode 100644 index 2582b3a4..00000000 --- a/public/pic/avatar/avatar300.gif +++ /dev/null diff --git a/public/pic/avatar/avatar301.gif b/public/pic/avatar/avatar301.gif Binary files differdeleted file mode 100644 index 2350bc8f..00000000 --- a/public/pic/avatar/avatar301.gif +++ /dev/null diff --git a/public/pic/avatar/avatar302.gif b/public/pic/avatar/avatar302.gif Binary files differdeleted file mode 100644 index 2e05d242..00000000 --- a/public/pic/avatar/avatar302.gif +++ /dev/null diff --git a/public/pic/avatar/avatar303.gif b/public/pic/avatar/avatar303.gif Binary files differdeleted file mode 100644 index 776cec3b..00000000 --- a/public/pic/avatar/avatar303.gif +++ /dev/null diff --git a/public/pic/avatar/avatar304.gif b/public/pic/avatar/avatar304.gif Binary files differdeleted file mode 100644 index 219a1184..00000000 --- a/public/pic/avatar/avatar304.gif +++ /dev/null diff --git a/public/pic/avatar/avatar305.gif b/public/pic/avatar/avatar305.gif Binary files differdeleted file mode 100644 index 27071b78..00000000 --- a/public/pic/avatar/avatar305.gif +++ /dev/null diff --git a/public/pic/avatar/avatar306.gif b/public/pic/avatar/avatar306.gif Binary files differdeleted file mode 100644 index 6ab781bf..00000000 --- a/public/pic/avatar/avatar306.gif +++ /dev/null diff --git a/public/pic/avatar/avatar307.gif b/public/pic/avatar/avatar307.gif Binary files differdeleted file mode 100644 index d40998b8..00000000 --- a/public/pic/avatar/avatar307.gif +++ /dev/null diff --git a/public/pic/avatar/avatar308.gif b/public/pic/avatar/avatar308.gif Binary files differdeleted file mode 100644 index aafbe741..00000000 --- a/public/pic/avatar/avatar308.gif +++ /dev/null diff --git a/public/pic/avatar/avatar309.gif b/public/pic/avatar/avatar309.gif Binary files differdeleted file mode 100644 index fe701cbf..00000000 --- a/public/pic/avatar/avatar309.gif +++ /dev/null diff --git a/public/pic/avatar/avatar31.gif b/public/pic/avatar/avatar31.gif Binary files differdeleted file mode 100644 index d5a9caf6..00000000 --- a/public/pic/avatar/avatar31.gif +++ /dev/null diff --git a/public/pic/avatar/avatar310.gif b/public/pic/avatar/avatar310.gif Binary files differdeleted file mode 100644 index e6072552..00000000 --- a/public/pic/avatar/avatar310.gif +++ /dev/null diff --git a/public/pic/avatar/avatar311.gif b/public/pic/avatar/avatar311.gif Binary files differdeleted file mode 100644 index 9b77a2a3..00000000 --- a/public/pic/avatar/avatar311.gif +++ /dev/null diff --git a/public/pic/avatar/avatar312.gif b/public/pic/avatar/avatar312.gif Binary files differdeleted file mode 100644 index 89acef5f..00000000 --- a/public/pic/avatar/avatar312.gif +++ /dev/null diff --git a/public/pic/avatar/avatar313.gif b/public/pic/avatar/avatar313.gif Binary files differdeleted file mode 100644 index fee5e41b..00000000 --- a/public/pic/avatar/avatar313.gif +++ /dev/null diff --git a/public/pic/avatar/avatar314.gif b/public/pic/avatar/avatar314.gif Binary files differdeleted file mode 100644 index e706e088..00000000 --- a/public/pic/avatar/avatar314.gif +++ /dev/null diff --git a/public/pic/avatar/avatar315.gif b/public/pic/avatar/avatar315.gif Binary files differdeleted file mode 100644 index fb3ee057..00000000 --- a/public/pic/avatar/avatar315.gif +++ /dev/null diff --git a/public/pic/avatar/avatar316.gif b/public/pic/avatar/avatar316.gif Binary files differdeleted file mode 100644 index 662fe276..00000000 --- a/public/pic/avatar/avatar316.gif +++ /dev/null diff --git a/public/pic/avatar/avatar317.gif b/public/pic/avatar/avatar317.gif Binary files differdeleted file mode 100644 index 0a858151..00000000 --- a/public/pic/avatar/avatar317.gif +++ /dev/null diff --git a/public/pic/avatar/avatar318.gif b/public/pic/avatar/avatar318.gif Binary files differdeleted file mode 100644 index 4ca84803..00000000 --- a/public/pic/avatar/avatar318.gif +++ /dev/null diff --git a/public/pic/avatar/avatar319.gif b/public/pic/avatar/avatar319.gif Binary files differdeleted file mode 100644 index 503cae0a..00000000 --- a/public/pic/avatar/avatar319.gif +++ /dev/null diff --git a/public/pic/avatar/avatar32.gif b/public/pic/avatar/avatar32.gif Binary files differdeleted file mode 100644 index 5f3b5d43..00000000 --- a/public/pic/avatar/avatar32.gif +++ /dev/null diff --git a/public/pic/avatar/avatar320.gif b/public/pic/avatar/avatar320.gif Binary files differdeleted file mode 100644 index 0cd51805..00000000 --- a/public/pic/avatar/avatar320.gif +++ /dev/null diff --git a/public/pic/avatar/avatar321.gif b/public/pic/avatar/avatar321.gif Binary files differdeleted file mode 100644 index eefbbda9..00000000 --- a/public/pic/avatar/avatar321.gif +++ /dev/null diff --git a/public/pic/avatar/avatar322.gif b/public/pic/avatar/avatar322.gif Binary files differdeleted file mode 100644 index 0243065b..00000000 --- a/public/pic/avatar/avatar322.gif +++ /dev/null diff --git a/public/pic/avatar/avatar323.gif b/public/pic/avatar/avatar323.gif Binary files differdeleted file mode 100644 index b1e08c05..00000000 --- a/public/pic/avatar/avatar323.gif +++ /dev/null diff --git a/public/pic/avatar/avatar324.gif b/public/pic/avatar/avatar324.gif Binary files differdeleted file mode 100644 index a2168e48..00000000 --- a/public/pic/avatar/avatar324.gif +++ /dev/null diff --git a/public/pic/avatar/avatar325.gif b/public/pic/avatar/avatar325.gif Binary files differdeleted file mode 100644 index dac85af5..00000000 --- a/public/pic/avatar/avatar325.gif +++ /dev/null diff --git a/public/pic/avatar/avatar326.gif b/public/pic/avatar/avatar326.gif Binary files differdeleted file mode 100644 index afe5442f..00000000 --- a/public/pic/avatar/avatar326.gif +++ /dev/null diff --git a/public/pic/avatar/avatar327.gif b/public/pic/avatar/avatar327.gif Binary files differdeleted file mode 100644 index 7db04c45..00000000 --- a/public/pic/avatar/avatar327.gif +++ /dev/null diff --git a/public/pic/avatar/avatar328.gif b/public/pic/avatar/avatar328.gif Binary files differdeleted file mode 100644 index 4d1d8a4a..00000000 --- a/public/pic/avatar/avatar328.gif +++ /dev/null diff --git a/public/pic/avatar/avatar329.gif b/public/pic/avatar/avatar329.gif Binary files differdeleted file mode 100644 index ede4d487..00000000 --- a/public/pic/avatar/avatar329.gif +++ /dev/null diff --git a/public/pic/avatar/avatar33.gif b/public/pic/avatar/avatar33.gif Binary files differdeleted file mode 100644 index 03ca160e..00000000 --- a/public/pic/avatar/avatar33.gif +++ /dev/null diff --git a/public/pic/avatar/avatar330.gif b/public/pic/avatar/avatar330.gif Binary files differdeleted file mode 100644 index e4a0a821..00000000 --- a/public/pic/avatar/avatar330.gif +++ /dev/null diff --git a/public/pic/avatar/avatar331.gif b/public/pic/avatar/avatar331.gif Binary files differdeleted file mode 100644 index 6a047501..00000000 --- a/public/pic/avatar/avatar331.gif +++ /dev/null diff --git a/public/pic/avatar/avatar332.gif b/public/pic/avatar/avatar332.gif Binary files differdeleted file mode 100644 index 6bde912c..00000000 --- a/public/pic/avatar/avatar332.gif +++ /dev/null diff --git a/public/pic/avatar/avatar333.gif b/public/pic/avatar/avatar333.gif Binary files differdeleted file mode 100644 index 1bb07ba9..00000000 --- a/public/pic/avatar/avatar333.gif +++ /dev/null diff --git a/public/pic/avatar/avatar334.gif b/public/pic/avatar/avatar334.gif Binary files differdeleted file mode 100644 index c4ec9f85..00000000 --- a/public/pic/avatar/avatar334.gif +++ /dev/null diff --git a/public/pic/avatar/avatar335.gif b/public/pic/avatar/avatar335.gif Binary files differdeleted file mode 100644 index 3ce39e43..00000000 --- a/public/pic/avatar/avatar335.gif +++ /dev/null diff --git a/public/pic/avatar/avatar336.gif b/public/pic/avatar/avatar336.gif Binary files differdeleted file mode 100644 index e9876066..00000000 --- a/public/pic/avatar/avatar336.gif +++ /dev/null diff --git a/public/pic/avatar/avatar337.gif b/public/pic/avatar/avatar337.gif Binary files differdeleted file mode 100644 index f4e15213..00000000 --- a/public/pic/avatar/avatar337.gif +++ /dev/null diff --git a/public/pic/avatar/avatar338.gif b/public/pic/avatar/avatar338.gif Binary files differdeleted file mode 100644 index 0b70f568..00000000 --- a/public/pic/avatar/avatar338.gif +++ /dev/null diff --git a/public/pic/avatar/avatar339.gif b/public/pic/avatar/avatar339.gif Binary files differdeleted file mode 100644 index 08afad48..00000000 --- a/public/pic/avatar/avatar339.gif +++ /dev/null diff --git a/public/pic/avatar/avatar34.gif b/public/pic/avatar/avatar34.gif Binary files differdeleted file mode 100644 index 49c49577..00000000 --- a/public/pic/avatar/avatar34.gif +++ /dev/null diff --git a/public/pic/avatar/avatar340.gif b/public/pic/avatar/avatar340.gif Binary files differdeleted file mode 100644 index 640984a3..00000000 --- a/public/pic/avatar/avatar340.gif +++ /dev/null diff --git a/public/pic/avatar/avatar341.gif b/public/pic/avatar/avatar341.gif Binary files differdeleted file mode 100644 index a4556966..00000000 --- a/public/pic/avatar/avatar341.gif +++ /dev/null diff --git a/public/pic/avatar/avatar342.gif b/public/pic/avatar/avatar342.gif Binary files differdeleted file mode 100644 index 8022e7a2..00000000 --- a/public/pic/avatar/avatar342.gif +++ /dev/null diff --git a/public/pic/avatar/avatar343.gif b/public/pic/avatar/avatar343.gif Binary files differdeleted file mode 100644 index 71a99e9a..00000000 --- a/public/pic/avatar/avatar343.gif +++ /dev/null diff --git a/public/pic/avatar/avatar344.gif b/public/pic/avatar/avatar344.gif Binary files differdeleted file mode 100644 index fcdc99e8..00000000 --- a/public/pic/avatar/avatar344.gif +++ /dev/null diff --git a/public/pic/avatar/avatar345.gif b/public/pic/avatar/avatar345.gif Binary files differdeleted file mode 100644 index 57a63f4b..00000000 --- a/public/pic/avatar/avatar345.gif +++ /dev/null diff --git a/public/pic/avatar/avatar346.gif b/public/pic/avatar/avatar346.gif Binary files differdeleted file mode 100644 index f41dcd30..00000000 --- a/public/pic/avatar/avatar346.gif +++ /dev/null diff --git a/public/pic/avatar/avatar347.gif b/public/pic/avatar/avatar347.gif Binary files differdeleted file mode 100644 index 8d8a54cb..00000000 --- a/public/pic/avatar/avatar347.gif +++ /dev/null diff --git a/public/pic/avatar/avatar348.gif b/public/pic/avatar/avatar348.gif Binary files differdeleted file mode 100644 index 7c54eb39..00000000 --- a/public/pic/avatar/avatar348.gif +++ /dev/null diff --git a/public/pic/avatar/avatar349.gif b/public/pic/avatar/avatar349.gif Binary files differdeleted file mode 100644 index 64de8b9e..00000000 --- a/public/pic/avatar/avatar349.gif +++ /dev/null diff --git a/public/pic/avatar/avatar35.gif b/public/pic/avatar/avatar35.gif Binary files differdeleted file mode 100644 index 29eec4ac..00000000 --- a/public/pic/avatar/avatar35.gif +++ /dev/null diff --git a/public/pic/avatar/avatar350.gif b/public/pic/avatar/avatar350.gif Binary files differdeleted file mode 100644 index c57f1061..00000000 --- a/public/pic/avatar/avatar350.gif +++ /dev/null diff --git a/public/pic/avatar/avatar351.gif b/public/pic/avatar/avatar351.gif Binary files differdeleted file mode 100644 index 8ccb8185..00000000 --- a/public/pic/avatar/avatar351.gif +++ /dev/null diff --git a/public/pic/avatar/avatar352.gif b/public/pic/avatar/avatar352.gif Binary files differdeleted file mode 100644 index 8737e658..00000000 --- a/public/pic/avatar/avatar352.gif +++ /dev/null diff --git a/public/pic/avatar/avatar353.gif b/public/pic/avatar/avatar353.gif Binary files differdeleted file mode 100644 index b6da0623..00000000 --- a/public/pic/avatar/avatar353.gif +++ /dev/null diff --git a/public/pic/avatar/avatar354.gif b/public/pic/avatar/avatar354.gif Binary files differdeleted file mode 100644 index 7565e6f9..00000000 --- a/public/pic/avatar/avatar354.gif +++ /dev/null diff --git a/public/pic/avatar/avatar355.gif b/public/pic/avatar/avatar355.gif Binary files differdeleted file mode 100644 index 3b08b30f..00000000 --- a/public/pic/avatar/avatar355.gif +++ /dev/null diff --git a/public/pic/avatar/avatar356.gif b/public/pic/avatar/avatar356.gif Binary files differdeleted file mode 100644 index 7d0dc95b..00000000 --- a/public/pic/avatar/avatar356.gif +++ /dev/null diff --git a/public/pic/avatar/avatar357.gif b/public/pic/avatar/avatar357.gif Binary files differdeleted file mode 100644 index ed1157a0..00000000 --- a/public/pic/avatar/avatar357.gif +++ /dev/null diff --git a/public/pic/avatar/avatar358.gif b/public/pic/avatar/avatar358.gif Binary files differdeleted file mode 100644 index 2dc844a5..00000000 --- a/public/pic/avatar/avatar358.gif +++ /dev/null diff --git a/public/pic/avatar/avatar359.gif b/public/pic/avatar/avatar359.gif Binary files differdeleted file mode 100644 index 8ac3f7fd..00000000 --- a/public/pic/avatar/avatar359.gif +++ /dev/null diff --git a/public/pic/avatar/avatar36.gif b/public/pic/avatar/avatar36.gif Binary files differdeleted file mode 100644 index cab160e5..00000000 --- a/public/pic/avatar/avatar36.gif +++ /dev/null diff --git a/public/pic/avatar/avatar360.gif b/public/pic/avatar/avatar360.gif Binary files differdeleted file mode 100644 index b01fb184..00000000 --- a/public/pic/avatar/avatar360.gif +++ /dev/null diff --git a/public/pic/avatar/avatar361.gif b/public/pic/avatar/avatar361.gif Binary files differdeleted file mode 100644 index c4573da7..00000000 --- a/public/pic/avatar/avatar361.gif +++ /dev/null diff --git a/public/pic/avatar/avatar362.gif b/public/pic/avatar/avatar362.gif Binary files differdeleted file mode 100644 index 189c9276..00000000 --- a/public/pic/avatar/avatar362.gif +++ /dev/null diff --git a/public/pic/avatar/avatar363.gif b/public/pic/avatar/avatar363.gif Binary files differdeleted file mode 100644 index 8ff0b39c..00000000 --- a/public/pic/avatar/avatar363.gif +++ /dev/null diff --git a/public/pic/avatar/avatar364.gif b/public/pic/avatar/avatar364.gif Binary files differdeleted file mode 100644 index 8f22d79f..00000000 --- a/public/pic/avatar/avatar364.gif +++ /dev/null diff --git a/public/pic/avatar/avatar365.gif b/public/pic/avatar/avatar365.gif Binary files differdeleted file mode 100644 index 950aea2a..00000000 --- a/public/pic/avatar/avatar365.gif +++ /dev/null diff --git a/public/pic/avatar/avatar366.gif b/public/pic/avatar/avatar366.gif Binary files differdeleted file mode 100644 index b1dc12d2..00000000 --- a/public/pic/avatar/avatar366.gif +++ /dev/null diff --git a/public/pic/avatar/avatar367.gif b/public/pic/avatar/avatar367.gif Binary files differdeleted file mode 100644 index 0de8fe4b..00000000 --- a/public/pic/avatar/avatar367.gif +++ /dev/null diff --git a/public/pic/avatar/avatar368.gif b/public/pic/avatar/avatar368.gif Binary files differdeleted file mode 100644 index b3f7e0f6..00000000 --- a/public/pic/avatar/avatar368.gif +++ /dev/null diff --git a/public/pic/avatar/avatar369.gif b/public/pic/avatar/avatar369.gif Binary files differdeleted file mode 100644 index 0efb8393..00000000 --- a/public/pic/avatar/avatar369.gif +++ /dev/null diff --git a/public/pic/avatar/avatar37.gif b/public/pic/avatar/avatar37.gif Binary files differdeleted file mode 100644 index 32b73e09..00000000 --- a/public/pic/avatar/avatar37.gif +++ /dev/null diff --git a/public/pic/avatar/avatar370.gif b/public/pic/avatar/avatar370.gif Binary files differdeleted file mode 100644 index d5dbc5df..00000000 --- a/public/pic/avatar/avatar370.gif +++ /dev/null diff --git a/public/pic/avatar/avatar371.gif b/public/pic/avatar/avatar371.gif Binary files differdeleted file mode 100644 index 868546f7..00000000 --- a/public/pic/avatar/avatar371.gif +++ /dev/null diff --git a/public/pic/avatar/avatar372.gif b/public/pic/avatar/avatar372.gif Binary files differdeleted file mode 100644 index 6458885d..00000000 --- a/public/pic/avatar/avatar372.gif +++ /dev/null diff --git a/public/pic/avatar/avatar373.gif b/public/pic/avatar/avatar373.gif Binary files differdeleted file mode 100644 index b1e04070..00000000 --- a/public/pic/avatar/avatar373.gif +++ /dev/null diff --git a/public/pic/avatar/avatar374.gif b/public/pic/avatar/avatar374.gif Binary files differdeleted file mode 100644 index e29653ba..00000000 --- a/public/pic/avatar/avatar374.gif +++ /dev/null diff --git a/public/pic/avatar/avatar375.gif b/public/pic/avatar/avatar375.gif Binary files differdeleted file mode 100644 index e5aefc87..00000000 --- a/public/pic/avatar/avatar375.gif +++ /dev/null diff --git a/public/pic/avatar/avatar376.gif b/public/pic/avatar/avatar376.gif Binary files differdeleted file mode 100644 index b5785477..00000000 --- a/public/pic/avatar/avatar376.gif +++ /dev/null diff --git a/public/pic/avatar/avatar377.gif b/public/pic/avatar/avatar377.gif Binary files differdeleted file mode 100644 index 67fd7cf4..00000000 --- a/public/pic/avatar/avatar377.gif +++ /dev/null diff --git a/public/pic/avatar/avatar378.gif b/public/pic/avatar/avatar378.gif Binary files differdeleted file mode 100644 index c3924d9c..00000000 --- a/public/pic/avatar/avatar378.gif +++ /dev/null diff --git a/public/pic/avatar/avatar379.gif b/public/pic/avatar/avatar379.gif Binary files differdeleted file mode 100644 index def8a49d..00000000 --- a/public/pic/avatar/avatar379.gif +++ /dev/null diff --git a/public/pic/avatar/avatar38.gif b/public/pic/avatar/avatar38.gif Binary files differdeleted file mode 100644 index 109ce01a..00000000 --- a/public/pic/avatar/avatar38.gif +++ /dev/null diff --git a/public/pic/avatar/avatar380.gif b/public/pic/avatar/avatar380.gif Binary files differdeleted file mode 100644 index d02ed852..00000000 --- a/public/pic/avatar/avatar380.gif +++ /dev/null diff --git a/public/pic/avatar/avatar381.gif b/public/pic/avatar/avatar381.gif Binary files differdeleted file mode 100644 index 762871c2..00000000 --- a/public/pic/avatar/avatar381.gif +++ /dev/null diff --git a/public/pic/avatar/avatar382.gif b/public/pic/avatar/avatar382.gif Binary files differdeleted file mode 100644 index 201872f9..00000000 --- a/public/pic/avatar/avatar382.gif +++ /dev/null diff --git a/public/pic/avatar/avatar383.gif b/public/pic/avatar/avatar383.gif Binary files differdeleted file mode 100644 index a71bbad9..00000000 --- a/public/pic/avatar/avatar383.gif +++ /dev/null diff --git a/public/pic/avatar/avatar384.gif b/public/pic/avatar/avatar384.gif Binary files differdeleted file mode 100644 index 6a9e2a45..00000000 --- a/public/pic/avatar/avatar384.gif +++ /dev/null diff --git a/public/pic/avatar/avatar385.gif b/public/pic/avatar/avatar385.gif Binary files differdeleted file mode 100644 index 8b51fdef..00000000 --- a/public/pic/avatar/avatar385.gif +++ /dev/null diff --git a/public/pic/avatar/avatar386.gif b/public/pic/avatar/avatar386.gif Binary files differdeleted file mode 100644 index e1d42707..00000000 --- a/public/pic/avatar/avatar386.gif +++ /dev/null diff --git a/public/pic/avatar/avatar387.gif b/public/pic/avatar/avatar387.gif Binary files differdeleted file mode 100644 index 186869c5..00000000 --- a/public/pic/avatar/avatar387.gif +++ /dev/null diff --git a/public/pic/avatar/avatar388.gif b/public/pic/avatar/avatar388.gif Binary files differdeleted file mode 100644 index 369f01bb..00000000 --- a/public/pic/avatar/avatar388.gif +++ /dev/null diff --git a/public/pic/avatar/avatar389.gif b/public/pic/avatar/avatar389.gif Binary files differdeleted file mode 100644 index d0cb95e4..00000000 --- a/public/pic/avatar/avatar389.gif +++ /dev/null diff --git a/public/pic/avatar/avatar39.gif b/public/pic/avatar/avatar39.gif Binary files differdeleted file mode 100644 index 307632c4..00000000 --- a/public/pic/avatar/avatar39.gif +++ /dev/null diff --git a/public/pic/avatar/avatar390.gif b/public/pic/avatar/avatar390.gif Binary files differdeleted file mode 100644 index 901e2a4e..00000000 --- a/public/pic/avatar/avatar390.gif +++ /dev/null diff --git a/public/pic/avatar/avatar391.gif b/public/pic/avatar/avatar391.gif Binary files differdeleted file mode 100644 index 65f58627..00000000 --- a/public/pic/avatar/avatar391.gif +++ /dev/null diff --git a/public/pic/avatar/avatar392.gif b/public/pic/avatar/avatar392.gif Binary files differdeleted file mode 100644 index ff98710d..00000000 --- a/public/pic/avatar/avatar392.gif +++ /dev/null diff --git a/public/pic/avatar/avatar393.gif b/public/pic/avatar/avatar393.gif Binary files differdeleted file mode 100644 index 693be70b..00000000 --- a/public/pic/avatar/avatar393.gif +++ /dev/null diff --git a/public/pic/avatar/avatar394.gif b/public/pic/avatar/avatar394.gif Binary files differdeleted file mode 100644 index baf43448..00000000 --- a/public/pic/avatar/avatar394.gif +++ /dev/null diff --git a/public/pic/avatar/avatar395.gif b/public/pic/avatar/avatar395.gif Binary files differdeleted file mode 100644 index bff14e63..00000000 --- a/public/pic/avatar/avatar395.gif +++ /dev/null diff --git a/public/pic/avatar/avatar396.gif b/public/pic/avatar/avatar396.gif Binary files differdeleted file mode 100644 index 882469c0..00000000 --- a/public/pic/avatar/avatar396.gif +++ /dev/null diff --git a/public/pic/avatar/avatar397.gif b/public/pic/avatar/avatar397.gif Binary files differdeleted file mode 100644 index de246f0d..00000000 --- a/public/pic/avatar/avatar397.gif +++ /dev/null diff --git a/public/pic/avatar/avatar398.gif b/public/pic/avatar/avatar398.gif Binary files differdeleted file mode 100644 index 07bae656..00000000 --- a/public/pic/avatar/avatar398.gif +++ /dev/null diff --git a/public/pic/avatar/avatar399.gif b/public/pic/avatar/avatar399.gif Binary files differdeleted file mode 100644 index c3b92047..00000000 --- a/public/pic/avatar/avatar399.gif +++ /dev/null diff --git a/public/pic/avatar/avatar4.gif b/public/pic/avatar/avatar4.gif Binary files differdeleted file mode 100644 index e525aa86..00000000 --- a/public/pic/avatar/avatar4.gif +++ /dev/null diff --git a/public/pic/avatar/avatar40.gif b/public/pic/avatar/avatar40.gif Binary files differdeleted file mode 100644 index 34e32133..00000000 --- a/public/pic/avatar/avatar40.gif +++ /dev/null diff --git a/public/pic/avatar/avatar400.gif b/public/pic/avatar/avatar400.gif Binary files differdeleted file mode 100644 index fe77d5a7..00000000 --- a/public/pic/avatar/avatar400.gif +++ /dev/null diff --git a/public/pic/avatar/avatar401.gif b/public/pic/avatar/avatar401.gif Binary files differdeleted file mode 100644 index a4d84be4..00000000 --- a/public/pic/avatar/avatar401.gif +++ /dev/null diff --git a/public/pic/avatar/avatar402.gif b/public/pic/avatar/avatar402.gif Binary files differdeleted file mode 100644 index f8b7834f..00000000 --- a/public/pic/avatar/avatar402.gif +++ /dev/null diff --git a/public/pic/avatar/avatar403.gif b/public/pic/avatar/avatar403.gif Binary files differdeleted file mode 100644 index 7f5f4bcb..00000000 --- a/public/pic/avatar/avatar403.gif +++ /dev/null diff --git a/public/pic/avatar/avatar404.gif b/public/pic/avatar/avatar404.gif Binary files differdeleted file mode 100644 index 00ac94bc..00000000 --- a/public/pic/avatar/avatar404.gif +++ /dev/null diff --git a/public/pic/avatar/avatar405.gif b/public/pic/avatar/avatar405.gif Binary files differdeleted file mode 100644 index c8b2506c..00000000 --- a/public/pic/avatar/avatar405.gif +++ /dev/null diff --git a/public/pic/avatar/avatar406.gif b/public/pic/avatar/avatar406.gif Binary files differdeleted file mode 100644 index 831ccfc6..00000000 --- a/public/pic/avatar/avatar406.gif +++ /dev/null diff --git a/public/pic/avatar/avatar407.gif b/public/pic/avatar/avatar407.gif Binary files differdeleted file mode 100644 index 9b989638..00000000 --- a/public/pic/avatar/avatar407.gif +++ /dev/null diff --git a/public/pic/avatar/avatar408.gif b/public/pic/avatar/avatar408.gif Binary files differdeleted file mode 100644 index 5699f755..00000000 --- a/public/pic/avatar/avatar408.gif +++ /dev/null diff --git a/public/pic/avatar/avatar409.gif b/public/pic/avatar/avatar409.gif Binary files differdeleted file mode 100644 index 4300f609..00000000 --- a/public/pic/avatar/avatar409.gif +++ /dev/null diff --git a/public/pic/avatar/avatar41.gif b/public/pic/avatar/avatar41.gif Binary files differdeleted file mode 100644 index f6f631ba..00000000 --- a/public/pic/avatar/avatar41.gif +++ /dev/null diff --git a/public/pic/avatar/avatar410.gif b/public/pic/avatar/avatar410.gif Binary files differdeleted file mode 100644 index a2ddb3e0..00000000 --- a/public/pic/avatar/avatar410.gif +++ /dev/null diff --git a/public/pic/avatar/avatar411.gif b/public/pic/avatar/avatar411.gif Binary files differdeleted file mode 100644 index 8658510f..00000000 --- a/public/pic/avatar/avatar411.gif +++ /dev/null diff --git a/public/pic/avatar/avatar412.gif b/public/pic/avatar/avatar412.gif Binary files differdeleted file mode 100644 index 1a4bae4b..00000000 --- a/public/pic/avatar/avatar412.gif +++ /dev/null diff --git a/public/pic/avatar/avatar413.gif b/public/pic/avatar/avatar413.gif Binary files differdeleted file mode 100644 index 14eb3a92..00000000 --- a/public/pic/avatar/avatar413.gif +++ /dev/null diff --git a/public/pic/avatar/avatar414.gif b/public/pic/avatar/avatar414.gif Binary files differdeleted file mode 100644 index 5f23cc79..00000000 --- a/public/pic/avatar/avatar414.gif +++ /dev/null diff --git a/public/pic/avatar/avatar415.gif b/public/pic/avatar/avatar415.gif Binary files differdeleted file mode 100644 index c7312a64..00000000 --- a/public/pic/avatar/avatar415.gif +++ /dev/null diff --git a/public/pic/avatar/avatar416.gif b/public/pic/avatar/avatar416.gif Binary files differdeleted file mode 100644 index fee5e41b..00000000 --- a/public/pic/avatar/avatar416.gif +++ /dev/null diff --git a/public/pic/avatar/avatar417.gif b/public/pic/avatar/avatar417.gif Binary files differdeleted file mode 100644 index d3b3dbbe..00000000 --- a/public/pic/avatar/avatar417.gif +++ /dev/null diff --git a/public/pic/avatar/avatar418.gif b/public/pic/avatar/avatar418.gif Binary files differdeleted file mode 100644 index 3f648c4f..00000000 --- a/public/pic/avatar/avatar418.gif +++ /dev/null diff --git a/public/pic/avatar/avatar419.gif b/public/pic/avatar/avatar419.gif Binary files differdeleted file mode 100644 index 87587fe5..00000000 --- a/public/pic/avatar/avatar419.gif +++ /dev/null diff --git a/public/pic/avatar/avatar42.gif b/public/pic/avatar/avatar42.gif Binary files differdeleted file mode 100644 index 5828d2af..00000000 --- a/public/pic/avatar/avatar42.gif +++ /dev/null diff --git a/public/pic/avatar/avatar420.gif b/public/pic/avatar/avatar420.gif Binary files differdeleted file mode 100644 index 2aca0620..00000000 --- a/public/pic/avatar/avatar420.gif +++ /dev/null diff --git a/public/pic/avatar/avatar421.gif b/public/pic/avatar/avatar421.gif Binary files differdeleted file mode 100644 index 152f5252..00000000 --- a/public/pic/avatar/avatar421.gif +++ /dev/null diff --git a/public/pic/avatar/avatar422.gif b/public/pic/avatar/avatar422.gif Binary files differdeleted file mode 100644 index 228f17d5..00000000 --- a/public/pic/avatar/avatar422.gif +++ /dev/null diff --git a/public/pic/avatar/avatar423.gif b/public/pic/avatar/avatar423.gif Binary files differdeleted file mode 100644 index 5f25f9c4..00000000 --- a/public/pic/avatar/avatar423.gif +++ /dev/null diff --git a/public/pic/avatar/avatar424.gif b/public/pic/avatar/avatar424.gif Binary files differdeleted file mode 100644 index d8e9b029..00000000 --- a/public/pic/avatar/avatar424.gif +++ /dev/null diff --git a/public/pic/avatar/avatar425.gif b/public/pic/avatar/avatar425.gif Binary files differdeleted file mode 100644 index ec35e12b..00000000 --- a/public/pic/avatar/avatar425.gif +++ /dev/null diff --git a/public/pic/avatar/avatar426.gif b/public/pic/avatar/avatar426.gif Binary files differdeleted file mode 100644 index 9e13452d..00000000 --- a/public/pic/avatar/avatar426.gif +++ /dev/null diff --git a/public/pic/avatar/avatar427.gif b/public/pic/avatar/avatar427.gif Binary files differdeleted file mode 100644 index aca392ec..00000000 --- a/public/pic/avatar/avatar427.gif +++ /dev/null diff --git a/public/pic/avatar/avatar428.gif b/public/pic/avatar/avatar428.gif Binary files differdeleted file mode 100644 index 2663bb30..00000000 --- a/public/pic/avatar/avatar428.gif +++ /dev/null diff --git a/public/pic/avatar/avatar429.gif b/public/pic/avatar/avatar429.gif Binary files differdeleted file mode 100644 index f6ae8487..00000000 --- a/public/pic/avatar/avatar429.gif +++ /dev/null diff --git a/public/pic/avatar/avatar43.gif b/public/pic/avatar/avatar43.gif Binary files differdeleted file mode 100644 index 4ba29bd2..00000000 --- a/public/pic/avatar/avatar43.gif +++ /dev/null diff --git a/public/pic/avatar/avatar430.gif b/public/pic/avatar/avatar430.gif Binary files differdeleted file mode 100644 index f64e8229..00000000 --- a/public/pic/avatar/avatar430.gif +++ /dev/null diff --git a/public/pic/avatar/avatar431.gif b/public/pic/avatar/avatar431.gif Binary files differdeleted file mode 100644 index 28791161..00000000 --- a/public/pic/avatar/avatar431.gif +++ /dev/null diff --git a/public/pic/avatar/avatar432.gif b/public/pic/avatar/avatar432.gif Binary files differdeleted file mode 100644 index 7edc6132..00000000 --- a/public/pic/avatar/avatar432.gif +++ /dev/null diff --git a/public/pic/avatar/avatar433.gif b/public/pic/avatar/avatar433.gif Binary files differdeleted file mode 100644 index b300940b..00000000 --- a/public/pic/avatar/avatar433.gif +++ /dev/null diff --git a/public/pic/avatar/avatar434.gif b/public/pic/avatar/avatar434.gif Binary files differdeleted file mode 100644 index 020863e3..00000000 --- a/public/pic/avatar/avatar434.gif +++ /dev/null diff --git a/public/pic/avatar/avatar435.gif b/public/pic/avatar/avatar435.gif Binary files differdeleted file mode 100644 index 98122e5b..00000000 --- a/public/pic/avatar/avatar435.gif +++ /dev/null diff --git a/public/pic/avatar/avatar436.gif b/public/pic/avatar/avatar436.gif Binary files differdeleted file mode 100644 index 7698c886..00000000 --- a/public/pic/avatar/avatar436.gif +++ /dev/null diff --git a/public/pic/avatar/avatar437.gif b/public/pic/avatar/avatar437.gif Binary files differdeleted file mode 100644 index 262ace97..00000000 --- a/public/pic/avatar/avatar437.gif +++ /dev/null diff --git a/public/pic/avatar/avatar438.gif b/public/pic/avatar/avatar438.gif Binary files differdeleted file mode 100644 index 84033e11..00000000 --- a/public/pic/avatar/avatar438.gif +++ /dev/null diff --git a/public/pic/avatar/avatar439.gif b/public/pic/avatar/avatar439.gif Binary files differdeleted file mode 100644 index 04fb6876..00000000 --- a/public/pic/avatar/avatar439.gif +++ /dev/null diff --git a/public/pic/avatar/avatar44.gif b/public/pic/avatar/avatar44.gif Binary files differdeleted file mode 100644 index 9db2cd9f..00000000 --- a/public/pic/avatar/avatar44.gif +++ /dev/null diff --git a/public/pic/avatar/avatar440.gif b/public/pic/avatar/avatar440.gif Binary files differdeleted file mode 100644 index b414dfcb..00000000 --- a/public/pic/avatar/avatar440.gif +++ /dev/null diff --git a/public/pic/avatar/avatar441.gif b/public/pic/avatar/avatar441.gif Binary files differdeleted file mode 100644 index db79f0c8..00000000 --- a/public/pic/avatar/avatar441.gif +++ /dev/null diff --git a/public/pic/avatar/avatar442.gif b/public/pic/avatar/avatar442.gif Binary files differdeleted file mode 100644 index 341395ac..00000000 --- a/public/pic/avatar/avatar442.gif +++ /dev/null diff --git a/public/pic/avatar/avatar443.gif b/public/pic/avatar/avatar443.gif Binary files differdeleted file mode 100644 index 063034ac..00000000 --- a/public/pic/avatar/avatar443.gif +++ /dev/null diff --git a/public/pic/avatar/avatar444.gif b/public/pic/avatar/avatar444.gif Binary files differdeleted file mode 100644 index c4f6aa92..00000000 --- a/public/pic/avatar/avatar444.gif +++ /dev/null diff --git a/public/pic/avatar/avatar445.gif b/public/pic/avatar/avatar445.gif Binary files differdeleted file mode 100644 index 5c26ccb3..00000000 --- a/public/pic/avatar/avatar445.gif +++ /dev/null diff --git a/public/pic/avatar/avatar446.gif b/public/pic/avatar/avatar446.gif Binary files differdeleted file mode 100644 index 0e14a043..00000000 --- a/public/pic/avatar/avatar446.gif +++ /dev/null diff --git a/public/pic/avatar/avatar447.gif b/public/pic/avatar/avatar447.gif Binary files differdeleted file mode 100644 index 8622aafb..00000000 --- a/public/pic/avatar/avatar447.gif +++ /dev/null diff --git a/public/pic/avatar/avatar448.gif b/public/pic/avatar/avatar448.gif Binary files differdeleted file mode 100644 index 3e35bfe4..00000000 --- a/public/pic/avatar/avatar448.gif +++ /dev/null diff --git a/public/pic/avatar/avatar449.gif b/public/pic/avatar/avatar449.gif Binary files differdeleted file mode 100644 index d53551f8..00000000 --- a/public/pic/avatar/avatar449.gif +++ /dev/null diff --git a/public/pic/avatar/avatar45.gif b/public/pic/avatar/avatar45.gif Binary files differdeleted file mode 100644 index c216f489..00000000 --- a/public/pic/avatar/avatar45.gif +++ /dev/null diff --git a/public/pic/avatar/avatar450.gif b/public/pic/avatar/avatar450.gif Binary files differdeleted file mode 100644 index 6e0ab918..00000000 --- a/public/pic/avatar/avatar450.gif +++ /dev/null diff --git a/public/pic/avatar/avatar451.gif b/public/pic/avatar/avatar451.gif Binary files differdeleted file mode 100644 index 7d0d79bd..00000000 --- a/public/pic/avatar/avatar451.gif +++ /dev/null diff --git a/public/pic/avatar/avatar452.gif b/public/pic/avatar/avatar452.gif Binary files differdeleted file mode 100644 index c64e07fc..00000000 --- a/public/pic/avatar/avatar452.gif +++ /dev/null diff --git a/public/pic/avatar/avatar453.gif b/public/pic/avatar/avatar453.gif Binary files differdeleted file mode 100644 index 22f597a4..00000000 --- a/public/pic/avatar/avatar453.gif +++ /dev/null diff --git a/public/pic/avatar/avatar454.gif b/public/pic/avatar/avatar454.gif Binary files differdeleted file mode 100644 index 81fd63c4..00000000 --- a/public/pic/avatar/avatar454.gif +++ /dev/null diff --git a/public/pic/avatar/avatar455.gif b/public/pic/avatar/avatar455.gif Binary files differdeleted file mode 100644 index 8e6e39ee..00000000 --- a/public/pic/avatar/avatar455.gif +++ /dev/null diff --git a/public/pic/avatar/avatar456.gif b/public/pic/avatar/avatar456.gif Binary files differdeleted file mode 100644 index 6fba116c..00000000 --- a/public/pic/avatar/avatar456.gif +++ /dev/null diff --git a/public/pic/avatar/avatar457.gif b/public/pic/avatar/avatar457.gif Binary files differdeleted file mode 100644 index 1a685aa9..00000000 --- a/public/pic/avatar/avatar457.gif +++ /dev/null diff --git a/public/pic/avatar/avatar458.gif b/public/pic/avatar/avatar458.gif Binary files differdeleted file mode 100644 index 20f5e33a..00000000 --- a/public/pic/avatar/avatar458.gif +++ /dev/null diff --git a/public/pic/avatar/avatar459.gif b/public/pic/avatar/avatar459.gif Binary files differdeleted file mode 100644 index 049cfc17..00000000 --- a/public/pic/avatar/avatar459.gif +++ /dev/null diff --git a/public/pic/avatar/avatar46.gif b/public/pic/avatar/avatar46.gif Binary files differdeleted file mode 100644 index 112346ca..00000000 --- a/public/pic/avatar/avatar46.gif +++ /dev/null diff --git a/public/pic/avatar/avatar460.gif b/public/pic/avatar/avatar460.gif Binary files differdeleted file mode 100644 index 155e84b5..00000000 --- a/public/pic/avatar/avatar460.gif +++ /dev/null diff --git a/public/pic/avatar/avatar461.gif b/public/pic/avatar/avatar461.gif Binary files differdeleted file mode 100644 index 28057664..00000000 --- a/public/pic/avatar/avatar461.gif +++ /dev/null diff --git a/public/pic/avatar/avatar462.gif b/public/pic/avatar/avatar462.gif Binary files differdeleted file mode 100644 index acd3d942..00000000 --- a/public/pic/avatar/avatar462.gif +++ /dev/null diff --git a/public/pic/avatar/avatar463.gif b/public/pic/avatar/avatar463.gif Binary files differdeleted file mode 100644 index caf0b9c5..00000000 --- a/public/pic/avatar/avatar463.gif +++ /dev/null diff --git a/public/pic/avatar/avatar464.gif b/public/pic/avatar/avatar464.gif Binary files differdeleted file mode 100644 index 30a066f3..00000000 --- a/public/pic/avatar/avatar464.gif +++ /dev/null diff --git a/public/pic/avatar/avatar465.gif b/public/pic/avatar/avatar465.gif Binary files differdeleted file mode 100644 index 768c4003..00000000 --- a/public/pic/avatar/avatar465.gif +++ /dev/null diff --git a/public/pic/avatar/avatar466.gif b/public/pic/avatar/avatar466.gif Binary files differdeleted file mode 100644 index ddf8c54c..00000000 --- a/public/pic/avatar/avatar466.gif +++ /dev/null diff --git a/public/pic/avatar/avatar467.gif b/public/pic/avatar/avatar467.gif Binary files differdeleted file mode 100644 index c293c4c8..00000000 --- a/public/pic/avatar/avatar467.gif +++ /dev/null diff --git a/public/pic/avatar/avatar468.gif b/public/pic/avatar/avatar468.gif Binary files differdeleted file mode 100644 index ec0c778f..00000000 --- a/public/pic/avatar/avatar468.gif +++ /dev/null diff --git a/public/pic/avatar/avatar469.gif b/public/pic/avatar/avatar469.gif Binary files differdeleted file mode 100644 index 12a62367..00000000 --- a/public/pic/avatar/avatar469.gif +++ /dev/null diff --git a/public/pic/avatar/avatar47.gif b/public/pic/avatar/avatar47.gif Binary files differdeleted file mode 100644 index f9edc8c9..00000000 --- a/public/pic/avatar/avatar47.gif +++ /dev/null diff --git a/public/pic/avatar/avatar470.gif b/public/pic/avatar/avatar470.gif Binary files differdeleted file mode 100644 index a6feb187..00000000 --- a/public/pic/avatar/avatar470.gif +++ /dev/null diff --git a/public/pic/avatar/avatar471.gif b/public/pic/avatar/avatar471.gif Binary files differdeleted file mode 100644 index 3ce796c4..00000000 --- a/public/pic/avatar/avatar471.gif +++ /dev/null diff --git a/public/pic/avatar/avatar472.gif b/public/pic/avatar/avatar472.gif Binary files differdeleted file mode 100644 index 467432c9..00000000 --- a/public/pic/avatar/avatar472.gif +++ /dev/null diff --git a/public/pic/avatar/avatar473.gif b/public/pic/avatar/avatar473.gif Binary files differdeleted file mode 100644 index 47bf9a19..00000000 --- a/public/pic/avatar/avatar473.gif +++ /dev/null diff --git a/public/pic/avatar/avatar474.gif b/public/pic/avatar/avatar474.gif Binary files differdeleted file mode 100644 index 7518dc8d..00000000 --- a/public/pic/avatar/avatar474.gif +++ /dev/null diff --git a/public/pic/avatar/avatar475.gif b/public/pic/avatar/avatar475.gif Binary files differdeleted file mode 100644 index 1cd12980..00000000 --- a/public/pic/avatar/avatar475.gif +++ /dev/null diff --git a/public/pic/avatar/avatar476.gif b/public/pic/avatar/avatar476.gif Binary files differdeleted file mode 100644 index b300940b..00000000 --- a/public/pic/avatar/avatar476.gif +++ /dev/null diff --git a/public/pic/avatar/avatar477.gif b/public/pic/avatar/avatar477.gif Binary files differdeleted file mode 100644 index d2ea55a0..00000000 --- a/public/pic/avatar/avatar477.gif +++ /dev/null diff --git a/public/pic/avatar/avatar478.gif b/public/pic/avatar/avatar478.gif Binary files differdeleted file mode 100644 index 924b2282..00000000 --- a/public/pic/avatar/avatar478.gif +++ /dev/null diff --git a/public/pic/avatar/avatar479.gif b/public/pic/avatar/avatar479.gif Binary files differdeleted file mode 100644 index 1b4756ee..00000000 --- a/public/pic/avatar/avatar479.gif +++ /dev/null diff --git a/public/pic/avatar/avatar48.gif b/public/pic/avatar/avatar48.gif Binary files differdeleted file mode 100644 index c34d4a50..00000000 --- a/public/pic/avatar/avatar48.gif +++ /dev/null diff --git a/public/pic/avatar/avatar480.gif b/public/pic/avatar/avatar480.gif Binary files differdeleted file mode 100644 index 5fa9878f..00000000 --- a/public/pic/avatar/avatar480.gif +++ /dev/null diff --git a/public/pic/avatar/avatar481.gif b/public/pic/avatar/avatar481.gif Binary files differdeleted file mode 100644 index f48cf52f..00000000 --- a/public/pic/avatar/avatar481.gif +++ /dev/null diff --git a/public/pic/avatar/avatar482.gif b/public/pic/avatar/avatar482.gif Binary files differdeleted file mode 100644 index 754fa21c..00000000 --- a/public/pic/avatar/avatar482.gif +++ /dev/null diff --git a/public/pic/avatar/avatar483.gif b/public/pic/avatar/avatar483.gif Binary files differdeleted file mode 100644 index d72a4c09..00000000 --- a/public/pic/avatar/avatar483.gif +++ /dev/null diff --git a/public/pic/avatar/avatar484.gif b/public/pic/avatar/avatar484.gif Binary files differdeleted file mode 100644 index 7429a913..00000000 --- a/public/pic/avatar/avatar484.gif +++ /dev/null diff --git a/public/pic/avatar/avatar485.gif b/public/pic/avatar/avatar485.gif Binary files differdeleted file mode 100644 index aab93132..00000000 --- a/public/pic/avatar/avatar485.gif +++ /dev/null diff --git a/public/pic/avatar/avatar486.gif b/public/pic/avatar/avatar486.gif Binary files differdeleted file mode 100644 index 99278401..00000000 --- a/public/pic/avatar/avatar486.gif +++ /dev/null diff --git a/public/pic/avatar/avatar487.gif b/public/pic/avatar/avatar487.gif Binary files differdeleted file mode 100644 index 2e41a5e9..00000000 --- a/public/pic/avatar/avatar487.gif +++ /dev/null diff --git a/public/pic/avatar/avatar488.gif b/public/pic/avatar/avatar488.gif Binary files differdeleted file mode 100644 index 3444526d..00000000 --- a/public/pic/avatar/avatar488.gif +++ /dev/null diff --git a/public/pic/avatar/avatar489.gif b/public/pic/avatar/avatar489.gif Binary files differdeleted file mode 100644 index 6f63b13d..00000000 --- a/public/pic/avatar/avatar489.gif +++ /dev/null diff --git a/public/pic/avatar/avatar49.gif b/public/pic/avatar/avatar49.gif Binary files differdeleted file mode 100644 index 2c637ed0..00000000 --- a/public/pic/avatar/avatar49.gif +++ /dev/null diff --git a/public/pic/avatar/avatar490.gif b/public/pic/avatar/avatar490.gif Binary files differdeleted file mode 100644 index 80a07e2b..00000000 --- a/public/pic/avatar/avatar490.gif +++ /dev/null diff --git a/public/pic/avatar/avatar491.gif b/public/pic/avatar/avatar491.gif Binary files differdeleted file mode 100644 index 65bb584e..00000000 --- a/public/pic/avatar/avatar491.gif +++ /dev/null diff --git a/public/pic/avatar/avatar492.gif b/public/pic/avatar/avatar492.gif Binary files differdeleted file mode 100644 index c8ce0d9d..00000000 --- a/public/pic/avatar/avatar492.gif +++ /dev/null diff --git a/public/pic/avatar/avatar493.gif b/public/pic/avatar/avatar493.gif Binary files differdeleted file mode 100644 index 4ed86532..00000000 --- a/public/pic/avatar/avatar493.gif +++ /dev/null diff --git a/public/pic/avatar/avatar494.gif b/public/pic/avatar/avatar494.gif Binary files differdeleted file mode 100644 index 47d5e2e2..00000000 --- a/public/pic/avatar/avatar494.gif +++ /dev/null diff --git a/public/pic/avatar/avatar495.gif b/public/pic/avatar/avatar495.gif Binary files differdeleted file mode 100644 index 9b7bdd44..00000000 --- a/public/pic/avatar/avatar495.gif +++ /dev/null diff --git a/public/pic/avatar/avatar496.gif b/public/pic/avatar/avatar496.gif Binary files differdeleted file mode 100644 index 2a4429e8..00000000 --- a/public/pic/avatar/avatar496.gif +++ /dev/null diff --git a/public/pic/avatar/avatar497.gif b/public/pic/avatar/avatar497.gif Binary files differdeleted file mode 100644 index aebb9cad..00000000 --- a/public/pic/avatar/avatar497.gif +++ /dev/null diff --git a/public/pic/avatar/avatar498.gif b/public/pic/avatar/avatar498.gif Binary files differdeleted file mode 100644 index 2dab371f..00000000 --- a/public/pic/avatar/avatar498.gif +++ /dev/null diff --git a/public/pic/avatar/avatar499.gif b/public/pic/avatar/avatar499.gif Binary files differdeleted file mode 100644 index c23e44fd..00000000 --- a/public/pic/avatar/avatar499.gif +++ /dev/null diff --git a/public/pic/avatar/avatar5.gif b/public/pic/avatar/avatar5.gif Binary files differdeleted file mode 100644 index c0134ee8..00000000 --- a/public/pic/avatar/avatar5.gif +++ /dev/null diff --git a/public/pic/avatar/avatar50.gif b/public/pic/avatar/avatar50.gif Binary files differdeleted file mode 100644 index 101883c4..00000000 --- a/public/pic/avatar/avatar50.gif +++ /dev/null diff --git a/public/pic/avatar/avatar51.gif b/public/pic/avatar/avatar51.gif Binary files differdeleted file mode 100644 index 310d6f66..00000000 --- a/public/pic/avatar/avatar51.gif +++ /dev/null diff --git a/public/pic/avatar/avatar52.gif b/public/pic/avatar/avatar52.gif Binary files differdeleted file mode 100644 index 01ce7062..00000000 --- a/public/pic/avatar/avatar52.gif +++ /dev/null diff --git a/public/pic/avatar/avatar53.gif b/public/pic/avatar/avatar53.gif Binary files differdeleted file mode 100644 index 7ba2db43..00000000 --- a/public/pic/avatar/avatar53.gif +++ /dev/null diff --git a/public/pic/avatar/avatar54.gif b/public/pic/avatar/avatar54.gif Binary files differdeleted file mode 100644 index 2f4ef2a0..00000000 --- a/public/pic/avatar/avatar54.gif +++ /dev/null diff --git a/public/pic/avatar/avatar55.gif b/public/pic/avatar/avatar55.gif Binary files differdeleted file mode 100644 index 7e9cd013..00000000 --- a/public/pic/avatar/avatar55.gif +++ /dev/null diff --git a/public/pic/avatar/avatar56.gif b/public/pic/avatar/avatar56.gif Binary files differdeleted file mode 100644 index e9d115b5..00000000 --- a/public/pic/avatar/avatar56.gif +++ /dev/null diff --git a/public/pic/avatar/avatar57.gif b/public/pic/avatar/avatar57.gif Binary files differdeleted file mode 100644 index a4d85078..00000000 --- a/public/pic/avatar/avatar57.gif +++ /dev/null diff --git a/public/pic/avatar/avatar58.gif b/public/pic/avatar/avatar58.gif Binary files differdeleted file mode 100644 index 597b70bd..00000000 --- a/public/pic/avatar/avatar58.gif +++ /dev/null diff --git a/public/pic/avatar/avatar59.gif b/public/pic/avatar/avatar59.gif Binary files differdeleted file mode 100644 index 9032b75b..00000000 --- a/public/pic/avatar/avatar59.gif +++ /dev/null diff --git a/public/pic/avatar/avatar6.gif b/public/pic/avatar/avatar6.gif Binary files differdeleted file mode 100644 index 6c0416b1..00000000 --- a/public/pic/avatar/avatar6.gif +++ /dev/null diff --git a/public/pic/avatar/avatar60.gif b/public/pic/avatar/avatar60.gif Binary files differdeleted file mode 100644 index 33744c36..00000000 --- a/public/pic/avatar/avatar60.gif +++ /dev/null diff --git a/public/pic/avatar/avatar61.gif b/public/pic/avatar/avatar61.gif Binary files differdeleted file mode 100644 index a88f6971..00000000 --- a/public/pic/avatar/avatar61.gif +++ /dev/null diff --git a/public/pic/avatar/avatar62.gif b/public/pic/avatar/avatar62.gif Binary files differdeleted file mode 100644 index 4f8d1bee..00000000 --- a/public/pic/avatar/avatar62.gif +++ /dev/null diff --git a/public/pic/avatar/avatar63.gif b/public/pic/avatar/avatar63.gif Binary files differdeleted file mode 100644 index d55fe2bd..00000000 --- a/public/pic/avatar/avatar63.gif +++ /dev/null diff --git a/public/pic/avatar/avatar64.gif b/public/pic/avatar/avatar64.gif Binary files differdeleted file mode 100644 index b7cf7a83..00000000 --- a/public/pic/avatar/avatar64.gif +++ /dev/null diff --git a/public/pic/avatar/avatar65.gif b/public/pic/avatar/avatar65.gif Binary files differdeleted file mode 100644 index e7d2ad6b..00000000 --- a/public/pic/avatar/avatar65.gif +++ /dev/null diff --git a/public/pic/avatar/avatar66.gif b/public/pic/avatar/avatar66.gif Binary files differdeleted file mode 100644 index 0ce01bfc..00000000 --- a/public/pic/avatar/avatar66.gif +++ /dev/null diff --git a/public/pic/avatar/avatar67.gif b/public/pic/avatar/avatar67.gif Binary files differdeleted file mode 100644 index a99192c7..00000000 --- a/public/pic/avatar/avatar67.gif +++ /dev/null diff --git a/public/pic/avatar/avatar68.gif b/public/pic/avatar/avatar68.gif Binary files differdeleted file mode 100644 index d41c748c..00000000 --- a/public/pic/avatar/avatar68.gif +++ /dev/null diff --git a/public/pic/avatar/avatar69.gif b/public/pic/avatar/avatar69.gif Binary files differdeleted file mode 100644 index d8e3a099..00000000 --- a/public/pic/avatar/avatar69.gif +++ /dev/null diff --git a/public/pic/avatar/avatar7.gif b/public/pic/avatar/avatar7.gif Binary files differdeleted file mode 100644 index 32e2aab7..00000000 --- a/public/pic/avatar/avatar7.gif +++ /dev/null diff --git a/public/pic/avatar/avatar70.gif b/public/pic/avatar/avatar70.gif Binary files differdeleted file mode 100644 index c38e5813..00000000 --- a/public/pic/avatar/avatar70.gif +++ /dev/null diff --git a/public/pic/avatar/avatar71.gif b/public/pic/avatar/avatar71.gif Binary files differdeleted file mode 100644 index bc81138d..00000000 --- a/public/pic/avatar/avatar71.gif +++ /dev/null diff --git a/public/pic/avatar/avatar72.gif b/public/pic/avatar/avatar72.gif Binary files differdeleted file mode 100644 index 7105469a..00000000 --- a/public/pic/avatar/avatar72.gif +++ /dev/null diff --git a/public/pic/avatar/avatar73.gif b/public/pic/avatar/avatar73.gif Binary files differdeleted file mode 100644 index c5cf7b5f..00000000 --- a/public/pic/avatar/avatar73.gif +++ /dev/null diff --git a/public/pic/avatar/avatar74.gif b/public/pic/avatar/avatar74.gif Binary files differdeleted file mode 100644 index 3c6b4e38..00000000 --- a/public/pic/avatar/avatar74.gif +++ /dev/null diff --git a/public/pic/avatar/avatar75.gif b/public/pic/avatar/avatar75.gif Binary files differdeleted file mode 100644 index c193589f..00000000 --- a/public/pic/avatar/avatar75.gif +++ /dev/null diff --git a/public/pic/avatar/avatar76.gif b/public/pic/avatar/avatar76.gif Binary files differdeleted file mode 100644 index 7926bb97..00000000 --- a/public/pic/avatar/avatar76.gif +++ /dev/null diff --git a/public/pic/avatar/avatar77.gif b/public/pic/avatar/avatar77.gif Binary files differdeleted file mode 100644 index 72991ce6..00000000 --- a/public/pic/avatar/avatar77.gif +++ /dev/null diff --git a/public/pic/avatar/avatar78.gif b/public/pic/avatar/avatar78.gif Binary files differdeleted file mode 100644 index 2972aa4f..00000000 --- a/public/pic/avatar/avatar78.gif +++ /dev/null diff --git a/public/pic/avatar/avatar79.gif b/public/pic/avatar/avatar79.gif Binary files differdeleted file mode 100644 index d20e13af..00000000 --- a/public/pic/avatar/avatar79.gif +++ /dev/null diff --git a/public/pic/avatar/avatar8.gif b/public/pic/avatar/avatar8.gif Binary files differdeleted file mode 100644 index b3e710cb..00000000 --- a/public/pic/avatar/avatar8.gif +++ /dev/null diff --git a/public/pic/avatar/avatar80.gif b/public/pic/avatar/avatar80.gif Binary files differdeleted file mode 100644 index 4c6afccc..00000000 --- a/public/pic/avatar/avatar80.gif +++ /dev/null diff --git a/public/pic/avatar/avatar81.gif b/public/pic/avatar/avatar81.gif Binary files differdeleted file mode 100644 index 2513d085..00000000 --- a/public/pic/avatar/avatar81.gif +++ /dev/null diff --git a/public/pic/avatar/avatar82.gif b/public/pic/avatar/avatar82.gif Binary files differdeleted file mode 100644 index ba761468..00000000 --- a/public/pic/avatar/avatar82.gif +++ /dev/null diff --git a/public/pic/avatar/avatar83.gif b/public/pic/avatar/avatar83.gif Binary files differdeleted file mode 100644 index 085cab2b..00000000 --- a/public/pic/avatar/avatar83.gif +++ /dev/null diff --git a/public/pic/avatar/avatar84.gif b/public/pic/avatar/avatar84.gif Binary files differdeleted file mode 100644 index 07ee7424..00000000 --- a/public/pic/avatar/avatar84.gif +++ /dev/null diff --git a/public/pic/avatar/avatar85.gif b/public/pic/avatar/avatar85.gif Binary files differdeleted file mode 100644 index cd510ece..00000000 --- a/public/pic/avatar/avatar85.gif +++ /dev/null diff --git a/public/pic/avatar/avatar86.gif b/public/pic/avatar/avatar86.gif Binary files differdeleted file mode 100644 index 0c791d78..00000000 --- a/public/pic/avatar/avatar86.gif +++ /dev/null diff --git a/public/pic/avatar/avatar87.gif b/public/pic/avatar/avatar87.gif Binary files differdeleted file mode 100644 index dac9b589..00000000 --- a/public/pic/avatar/avatar87.gif +++ /dev/null diff --git a/public/pic/avatar/avatar88.gif b/public/pic/avatar/avatar88.gif Binary files differdeleted file mode 100644 index e27c3b3b..00000000 --- a/public/pic/avatar/avatar88.gif +++ /dev/null diff --git a/public/pic/avatar/avatar89.gif b/public/pic/avatar/avatar89.gif Binary files differdeleted file mode 100644 index c07019c0..00000000 --- a/public/pic/avatar/avatar89.gif +++ /dev/null diff --git a/public/pic/avatar/avatar9.gif b/public/pic/avatar/avatar9.gif Binary files differdeleted file mode 100644 index 448c6ecc..00000000 --- a/public/pic/avatar/avatar9.gif +++ /dev/null diff --git a/public/pic/avatar/avatar90.gif b/public/pic/avatar/avatar90.gif Binary files differdeleted file mode 100644 index f71a5957..00000000 --- a/public/pic/avatar/avatar90.gif +++ /dev/null diff --git a/public/pic/avatar/avatar91.gif b/public/pic/avatar/avatar91.gif Binary files differdeleted file mode 100644 index 9b12113f..00000000 --- a/public/pic/avatar/avatar91.gif +++ /dev/null diff --git a/public/pic/avatar/avatar92.gif b/public/pic/avatar/avatar92.gif Binary files differdeleted file mode 100644 index c3c22c89..00000000 --- a/public/pic/avatar/avatar92.gif +++ /dev/null diff --git a/public/pic/avatar/avatar93.gif b/public/pic/avatar/avatar93.gif Binary files differdeleted file mode 100644 index 1c33f2af..00000000 --- a/public/pic/avatar/avatar93.gif +++ /dev/null diff --git a/public/pic/avatar/avatar94.gif b/public/pic/avatar/avatar94.gif Binary files differdeleted file mode 100644 index a91b90a2..00000000 --- a/public/pic/avatar/avatar94.gif +++ /dev/null diff --git a/public/pic/avatar/avatar95.gif b/public/pic/avatar/avatar95.gif Binary files differdeleted file mode 100644 index dc7fe45f..00000000 --- a/public/pic/avatar/avatar95.gif +++ /dev/null diff --git a/public/pic/avatar/avatar96.gif b/public/pic/avatar/avatar96.gif Binary files differdeleted file mode 100644 index f9aec5bf..00000000 --- a/public/pic/avatar/avatar96.gif +++ /dev/null diff --git a/public/pic/avatar/avatar97.gif b/public/pic/avatar/avatar97.gif Binary files differdeleted file mode 100644 index 018fd0dc..00000000 --- a/public/pic/avatar/avatar97.gif +++ /dev/null diff --git a/public/pic/avatar/avatar98.gif b/public/pic/avatar/avatar98.gif Binary files differdeleted file mode 100644 index e963d44f..00000000 --- a/public/pic/avatar/avatar98.gif +++ /dev/null diff --git a/public/pic/avatar/avatar99.gif b/public/pic/avatar/avatar99.gif Binary files differdeleted file mode 100644 index 3270bd87..00000000 --- a/public/pic/avatar/avatar99.gif +++ /dev/null diff --git a/public/pic/engelsystem_logo.png b/public/pic/engelsystem_logo.png Binary files differdeleted file mode 100644 index eae66b6f..00000000 --- a/public/pic/engelsystem_logo.png +++ /dev/null diff --git a/public/pic/engelsystem_logo_28c3.png b/public/pic/engelsystem_logo_28c3.png Binary files differdeleted file mode 100644 index 56602083..00000000 --- a/public/pic/engelsystem_logo_28c3.png +++ /dev/null diff --git a/public/pic/engelsystem_logo_29c3.png b/public/pic/engelsystem_logo_29c3.png Binary files differdeleted file mode 100644 index cbaefd6f..00000000 --- a/public/pic/engelsystem_logo_29c3.png +++ /dev/null diff --git a/public/pic/engelsystem_logo_30c3.png b/public/pic/engelsystem_logo_30c3.png Binary files differdeleted file mode 100644 index b51296e3..00000000 --- a/public/pic/engelsystem_logo_30c3.png +++ /dev/null diff --git a/public/pic/engelsystem_logo_cccamp2011.png b/public/pic/engelsystem_logo_cccamp2011.png Binary files differdeleted file mode 100644 index b017302e..00000000 --- a/public/pic/engelsystem_logo_cccamp2011.png +++ /dev/null diff --git a/public/pic/engelsystem_logo_sigint2012.png b/public/pic/engelsystem_logo_sigint2012.png Binary files differdeleted file mode 100644 index ded27298..00000000 --- a/public/pic/engelsystem_logo_sigint2012.png +++ /dev/null diff --git a/public/pic/external.png b/public/pic/external.png Binary files differdeleted file mode 100644 index 8ae475d8..00000000 --- a/public/pic/external.png +++ /dev/null diff --git a/public/pic/header_30c3.png b/public/pic/header_30c3.png Binary files differdeleted file mode 100644 index 29006aa8..00000000 --- a/public/pic/header_30c3.png +++ /dev/null diff --git a/public/pic/himmel.png b/public/pic/himmel.png Binary files differdeleted file mode 100644 index 6a2b5000..00000000 --- a/public/pic/himmel.png +++ /dev/null diff --git a/public/pic/himmel_drohnen.png b/public/pic/himmel_drohnen.png Binary files differdeleted file mode 100644 index cea1113d..00000000 --- a/public/pic/himmel_drohnen.png +++ /dev/null diff --git a/public/pic/himmel_w.png b/public/pic/himmel_w.png Binary files differdeleted file mode 100644 index 2dd648ab..00000000 --- a/public/pic/himmel_w.png +++ /dev/null diff --git a/public/vendor/Chart.min.js b/public/vendor/Chart.min.js new file mode 100755 index 00000000..3a0a2c87 --- /dev/null +++ b/public/vendor/Chart.min.js @@ -0,0 +1,11 @@ +/*! + * Chart.js + * http://chartjs.org/ + * Version: 1.0.2 + * + * Copyright 2015 Nick Downie + * Released under the MIT license + * https://github.com/nnnick/Chart.js/blob/master/LICENSE.md + */ +(function(){"use strict";var t=this,i=t.Chart,e=function(t){this.canvas=t.canvas,this.ctx=t;var i=function(t,i){return t["offset"+i]?t["offset"+i]:document.defaultView.getComputedStyle(t).getPropertyValue(i)},e=this.width=i(t.canvas,"Width"),n=this.height=i(t.canvas,"Height");t.canvas.width=e,t.canvas.height=n;var e=this.width=t.canvas.width,n=this.height=t.canvas.height;return this.aspectRatio=this.width/this.height,s.retinaScale(this),this};e.defaults={global:{animation:!0,animationSteps:60,animationEasing:"easeOutQuart",showScale:!0,scaleOverride:!1,scaleSteps:null,scaleStepWidth:null,scaleStartValue:null,scaleLineColor:"rgba(0,0,0,.1)",scaleLineWidth:1,scaleShowLabels:!0,scaleLabel:"<%=value%>",scaleIntegersOnly:!0,scaleBeginAtZero:!1,scaleFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",scaleFontSize:12,scaleFontStyle:"normal",scaleFontColor:"#666",responsive:!1,maintainAspectRatio:!0,showTooltips:!0,customTooltips:!1,tooltipEvents:["mousemove","touchstart","touchmove","mouseout"],tooltipFillColor:"rgba(0,0,0,0.8)",tooltipFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",tooltipFontSize:14,tooltipFontStyle:"normal",tooltipFontColor:"#fff",tooltipTitleFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",tooltipTitleFontSize:14,tooltipTitleFontStyle:"bold",tooltipTitleFontColor:"#fff",tooltipYPadding:6,tooltipXPadding:6,tooltipCaretSize:8,tooltipCornerRadius:6,tooltipXOffset:10,tooltipTemplate:"<%if (label){%><%=label%>: <%}%><%= value %>",multiTooltipTemplate:"<%= value %>",multiTooltipKeyBackground:"#fff",onAnimationProgress:function(){},onAnimationComplete:function(){}}},e.types={};var s=e.helpers={},n=s.each=function(t,i,e){var s=Array.prototype.slice.call(arguments,3);if(t)if(t.length===+t.length){var n;for(n=0;n<t.length;n++)i.apply(e,[t[n],n].concat(s))}else for(var o in t)i.apply(e,[t[o],o].concat(s))},o=s.clone=function(t){var i={};return n(t,function(e,s){t.hasOwnProperty(s)&&(i[s]=e)}),i},a=s.extend=function(t){return n(Array.prototype.slice.call(arguments,1),function(i){n(i,function(e,s){i.hasOwnProperty(s)&&(t[s]=e)})}),t},h=s.merge=function(){var t=Array.prototype.slice.call(arguments,0);return t.unshift({}),a.apply(null,t)},l=s.indexOf=function(t,i){if(Array.prototype.indexOf)return t.indexOf(i);for(var e=0;e<t.length;e++)if(t[e]===i)return e;return-1},r=(s.where=function(t,i){var e=[];return s.each(t,function(t){i(t)&&e.push(t)}),e},s.findNextWhere=function(t,i,e){e||(e=-1);for(var s=e+1;s<t.length;s++){var n=t[s];if(i(n))return n}},s.findPreviousWhere=function(t,i,e){e||(e=t.length);for(var s=e-1;s>=0;s--){var n=t[s];if(i(n))return n}},s.inherits=function(t){var i=this,e=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return i.apply(this,arguments)},s=function(){this.constructor=e};return s.prototype=i.prototype,e.prototype=new s,e.extend=r,t&&a(e.prototype,t),e.__super__=i.prototype,e}),c=s.noop=function(){},u=s.uid=function(){var t=0;return function(){return"chart-"+t++}}(),d=s.warn=function(t){window.console&&"function"==typeof window.console.warn&&console.warn(t)},p=s.amd="function"==typeof define&&define.amd,f=s.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},g=s.max=function(t){return Math.max.apply(Math,t)},m=s.min=function(t){return Math.min.apply(Math,t)},v=(s.cap=function(t,i,e){if(f(i)){if(t>i)return i}else if(f(e)&&e>t)return e;return t},s.getDecimalPlaces=function(t){return t%1!==0&&f(t)?t.toString().split(".")[1].length:0}),S=s.radians=function(t){return t*(Math.PI/180)},x=(s.getAngleFromPoint=function(t,i){var e=i.x-t.x,s=i.y-t.y,n=Math.sqrt(e*e+s*s),o=2*Math.PI+Math.atan2(s,e);return 0>e&&0>s&&(o+=2*Math.PI),{angle:o,distance:n}},s.aliasPixel=function(t){return t%2===0?0:.5}),y=(s.splineCurve=function(t,i,e,s){var n=Math.sqrt(Math.pow(i.x-t.x,2)+Math.pow(i.y-t.y,2)),o=Math.sqrt(Math.pow(e.x-i.x,2)+Math.pow(e.y-i.y,2)),a=s*n/(n+o),h=s*o/(n+o);return{inner:{x:i.x-a*(e.x-t.x),y:i.y-a*(e.y-t.y)},outer:{x:i.x+h*(e.x-t.x),y:i.y+h*(e.y-t.y)}}},s.calculateOrderOfMagnitude=function(t){return Math.floor(Math.log(t)/Math.LN10)}),C=(s.calculateScaleRange=function(t,i,e,s,n){var o=2,a=Math.floor(i/(1.5*e)),h=o>=a,l=g(t),r=m(t);l===r&&(l+=.5,r>=.5&&!s?r-=.5:l+=.5);for(var c=Math.abs(l-r),u=y(c),d=Math.ceil(l/(1*Math.pow(10,u)))*Math.pow(10,u),p=s?0:Math.floor(r/(1*Math.pow(10,u)))*Math.pow(10,u),f=d-p,v=Math.pow(10,u),S=Math.round(f/v);(S>a||a>2*S)&&!h;)if(S>a)v*=2,S=Math.round(f/v),S%1!==0&&(h=!0);else if(n&&u>=0){if(v/2%1!==0)break;v/=2,S=Math.round(f/v)}else v/=2,S=Math.round(f/v);return h&&(S=o,v=f/S),{steps:S,stepValue:v,min:p,max:p+S*v}},s.template=function(t,i){function e(t,i){var e=/\W/.test(t)?new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+t.replace(/[\r\t\n]/g," ").split("<%").join(" ").replace(/((^|%>)[^\t]*)'/g,"$1\r").replace(/\t=(.*?)%>/g,"',$1,'").split(" ").join("');").split("%>").join("p.push('").split("\r").join("\\'")+"');}return p.join('');"):s[t]=s[t];return i?e(i):e}if(t instanceof Function)return t(i);var s={};return e(t,i)}),w=(s.generateLabels=function(t,i,e,s){var o=new Array(i);return labelTemplateString&&n(o,function(i,n){o[n]=C(t,{value:e+s*(n+1)})}),o},s.easingEffects={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-1*t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-0.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return 1*((t=t/1-1)*t*t+1)},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-1*((t=t/1-1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-0.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return 1*(t/=1)*t*t*t*t},easeOutQuint:function(t){return 1*((t=t/1-1)*t*t*t*t+1)},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return-1*Math.cos(t/1*(Math.PI/2))+1},easeOutSine:function(t){return 1*Math.sin(t/1*(Math.PI/2))},easeInOutSine:function(t){return-0.5*(Math.cos(Math.PI*t/1)-1)},easeInExpo:function(t){return 0===t?1:1*Math.pow(2,10*(t/1-1))},easeOutExpo:function(t){return 1===t?1:1*(-Math.pow(2,-10*t/1)+1)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(-Math.pow(2,-10*--t)+2)},easeInCirc:function(t){return t>=1?t:-1*(Math.sqrt(1-(t/=1)*t)-1)},easeOutCirc:function(t){return 1*Math.sqrt(1-(t=t/1-1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-0.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var i=1.70158,e=0,s=1;return 0===t?0:1==(t/=1)?1:(e||(e=.3),s<Math.abs(1)?(s=1,i=e/4):i=e/(2*Math.PI)*Math.asin(1/s),-(s*Math.pow(2,10*(t-=1))*Math.sin(2*(1*t-i)*Math.PI/e)))},easeOutElastic:function(t){var i=1.70158,e=0,s=1;return 0===t?0:1==(t/=1)?1:(e||(e=.3),s<Math.abs(1)?(s=1,i=e/4):i=e/(2*Math.PI)*Math.asin(1/s),s*Math.pow(2,-10*t)*Math.sin(2*(1*t-i)*Math.PI/e)+1)},easeInOutElastic:function(t){var i=1.70158,e=0,s=1;return 0===t?0:2==(t/=.5)?1:(e||(e=.3*1.5),s<Math.abs(1)?(s=1,i=e/4):i=e/(2*Math.PI)*Math.asin(1/s),1>t?-.5*s*Math.pow(2,10*(t-=1))*Math.sin(2*(1*t-i)*Math.PI/e):s*Math.pow(2,-10*(t-=1))*Math.sin(2*(1*t-i)*Math.PI/e)*.5+1)},easeInBack:function(t){var i=1.70158;return 1*(t/=1)*t*((i+1)*t-i)},easeOutBack:function(t){var i=1.70158;return 1*((t=t/1-1)*t*((i+1)*t+i)+1)},easeInOutBack:function(t){var i=1.70158;return(t/=.5)<1?.5*t*t*(((i*=1.525)+1)*t-i):.5*((t-=2)*t*(((i*=1.525)+1)*t+i)+2)},easeInBounce:function(t){return 1-w.easeOutBounce(1-t)},easeOutBounce:function(t){return(t/=1)<1/2.75?7.5625*t*t:2/2.75>t?1*(7.5625*(t-=1.5/2.75)*t+.75):2.5/2.75>t?1*(7.5625*(t-=2.25/2.75)*t+.9375):1*(7.5625*(t-=2.625/2.75)*t+.984375)},easeInOutBounce:function(t){return.5>t?.5*w.easeInBounce(2*t):.5*w.easeOutBounce(2*t-1)+.5}}),b=s.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)}}(),P=s.cancelAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelAnimationFrame||window.mozCancelAnimationFrame||window.oCancelAnimationFrame||window.msCancelAnimationFrame||function(t){return window.clearTimeout(t,1e3/60)}}(),L=(s.animationLoop=function(t,i,e,s,n,o){var a=0,h=w[e]||w.linear,l=function(){a++;var e=a/i,r=h(e);t.call(o,r,e,a),s.call(o,r,e),i>a?o.animationFrame=b(l):n.apply(o)};b(l)},s.getRelativePosition=function(t){var i,e,s=t.originalEvent||t,n=t.currentTarget||t.srcElement,o=n.getBoundingClientRect();return s.touches?(i=s.touches[0].clientX-o.left,e=s.touches[0].clientY-o.top):(i=s.clientX-o.left,e=s.clientY-o.top),{x:i,y:e}},s.addEvent=function(t,i,e){t.addEventListener?t.addEventListener(i,e):t.attachEvent?t.attachEvent("on"+i,e):t["on"+i]=e}),k=s.removeEvent=function(t,i,e){t.removeEventListener?t.removeEventListener(i,e,!1):t.detachEvent?t.detachEvent("on"+i,e):t["on"+i]=c},F=(s.bindEvents=function(t,i,e){t.events||(t.events={}),n(i,function(i){t.events[i]=function(){e.apply(t,arguments)},L(t.chart.canvas,i,t.events[i])})},s.unbindEvents=function(t,i){n(i,function(i,e){k(t.chart.canvas,e,i)})}),R=s.getMaximumWidth=function(t){var i=t.parentNode;return i.clientWidth},T=s.getMaximumHeight=function(t){var i=t.parentNode;return i.clientHeight},A=(s.getMaximumSize=s.getMaximumWidth,s.retinaScale=function(t){var i=t.ctx,e=t.canvas.width,s=t.canvas.height;window.devicePixelRatio&&(i.canvas.style.width=e+"px",i.canvas.style.height=s+"px",i.canvas.height=s*window.devicePixelRatio,i.canvas.width=e*window.devicePixelRatio,i.scale(window.devicePixelRatio,window.devicePixelRatio))}),M=s.clear=function(t){t.ctx.clearRect(0,0,t.width,t.height)},W=s.fontString=function(t,i,e){return i+" "+t+"px "+e},z=s.longestText=function(t,i,e){t.font=i;var s=0;return n(e,function(i){var e=t.measureText(i).width;s=e>s?e:s}),s},B=s.drawRoundedRectangle=function(t,i,e,s,n,o){t.beginPath(),t.moveTo(i+o,e),t.lineTo(i+s-o,e),t.quadraticCurveTo(i+s,e,i+s,e+o),t.lineTo(i+s,e+n-o),t.quadraticCurveTo(i+s,e+n,i+s-o,e+n),t.lineTo(i+o,e+n),t.quadraticCurveTo(i,e+n,i,e+n-o),t.lineTo(i,e+o),t.quadraticCurveTo(i,e,i+o,e),t.closePath()};e.instances={},e.Type=function(t,i,s){this.options=i,this.chart=s,this.id=u(),e.instances[this.id]=this,i.responsive&&this.resize(),this.initialize.call(this,t)},a(e.Type.prototype,{initialize:function(){return this},clear:function(){return M(this.chart),this},stop:function(){return P(this.animationFrame),this},resize:function(t){this.stop();var i=this.chart.canvas,e=R(this.chart.canvas),s=this.options.maintainAspectRatio?e/this.chart.aspectRatio:T(this.chart.canvas);return i.width=this.chart.width=e,i.height=this.chart.height=s,A(this.chart),"function"==typeof t&&t.apply(this,Array.prototype.slice.call(arguments,1)),this},reflow:c,render:function(t){return t&&this.reflow(),this.options.animation&&!t?s.animationLoop(this.draw,this.options.animationSteps,this.options.animationEasing,this.options.onAnimationProgress,this.options.onAnimationComplete,this):(this.draw(),this.options.onAnimationComplete.call(this)),this},generateLegend:function(){return C(this.options.legendTemplate,this)},destroy:function(){this.clear(),F(this,this.events);var t=this.chart.canvas;t.width=this.chart.width,t.height=this.chart.height,t.style.removeProperty?(t.style.removeProperty("width"),t.style.removeProperty("height")):(t.style.removeAttribute("width"),t.style.removeAttribute("height")),delete e.instances[this.id]},showTooltip:function(t,i){"undefined"==typeof this.activeElements&&(this.activeElements=[]);var o=function(t){var i=!1;return t.length!==this.activeElements.length?i=!0:(n(t,function(t,e){t!==this.activeElements[e]&&(i=!0)},this),i)}.call(this,t);if(o||i){if(this.activeElements=t,this.draw(),this.options.customTooltips&&this.options.customTooltips(!1),t.length>0)if(this.datasets&&this.datasets.length>1){for(var a,h,r=this.datasets.length-1;r>=0&&(a=this.datasets[r].points||this.datasets[r].bars||this.datasets[r].segments,h=l(a,t[0]),-1===h);r--);var c=[],u=[],d=function(){var t,i,e,n,o,a=[],l=[],r=[];return s.each(this.datasets,function(i){t=i.points||i.bars||i.segments,t[h]&&t[h].hasValue()&&a.push(t[h])}),s.each(a,function(t){l.push(t.x),r.push(t.y),c.push(s.template(this.options.multiTooltipTemplate,t)),u.push({fill:t._saved.fillColor||t.fillColor,stroke:t._saved.strokeColor||t.strokeColor})},this),o=m(r),e=g(r),n=m(l),i=g(l),{x:n>this.chart.width/2?n:i,y:(o+e)/2}}.call(this,h);new e.MultiTooltip({x:d.x,y:d.y,xPadding:this.options.tooltipXPadding,yPadding:this.options.tooltipYPadding,xOffset:this.options.tooltipXOffset,fillColor:this.options.tooltipFillColor,textColor:this.options.tooltipFontColor,fontFamily:this.options.tooltipFontFamily,fontStyle:this.options.tooltipFontStyle,fontSize:this.options.tooltipFontSize,titleTextColor:this.options.tooltipTitleFontColor,titleFontFamily:this.options.tooltipTitleFontFamily,titleFontStyle:this.options.tooltipTitleFontStyle,titleFontSize:this.options.tooltipTitleFontSize,cornerRadius:this.options.tooltipCornerRadius,labels:c,legendColors:u,legendColorBackground:this.options.multiTooltipKeyBackground,title:t[0].label,chart:this.chart,ctx:this.chart.ctx,custom:this.options.customTooltips}).draw()}else n(t,function(t){var i=t.tooltipPosition();new e.Tooltip({x:Math.round(i.x),y:Math.round(i.y),xPadding:this.options.tooltipXPadding,yPadding:this.options.tooltipYPadding,fillColor:this.options.tooltipFillColor,textColor:this.options.tooltipFontColor,fontFamily:this.options.tooltipFontFamily,fontStyle:this.options.tooltipFontStyle,fontSize:this.options.tooltipFontSize,caretHeight:this.options.tooltipCaretSize,cornerRadius:this.options.tooltipCornerRadius,text:C(this.options.tooltipTemplate,t),chart:this.chart,custom:this.options.customTooltips}).draw()},this);return this}},toBase64Image:function(){return this.chart.canvas.toDataURL.apply(this.chart.canvas,arguments)}}),e.Type.extend=function(t){var i=this,s=function(){return i.apply(this,arguments)};if(s.prototype=o(i.prototype),a(s.prototype,t),s.extend=e.Type.extend,t.name||i.prototype.name){var n=t.name||i.prototype.name,l=e.defaults[i.prototype.name]?o(e.defaults[i.prototype.name]):{};e.defaults[n]=a(l,t.defaults),e.types[n]=s,e.prototype[n]=function(t,i){var o=h(e.defaults.global,e.defaults[n],i||{});return new s(t,o,this)}}else d("Name not provided for this chart, so it hasn't been registered");return i},e.Element=function(t){a(this,t),this.initialize.apply(this,arguments),this.save()},a(e.Element.prototype,{initialize:function(){},restore:function(t){return t?n(t,function(t){this[t]=this._saved[t]},this):a(this,this._saved),this},save:function(){return this._saved=o(this),delete this._saved._saved,this},update:function(t){return n(t,function(t,i){this._saved[i]=this[i],this[i]=t},this),this},transition:function(t,i){return n(t,function(t,e){this[e]=(t-this._saved[e])*i+this._saved[e]},this),this},tooltipPosition:function(){return{x:this.x,y:this.y}},hasValue:function(){return f(this.value)}}),e.Element.extend=r,e.Point=e.Element.extend({display:!0,inRange:function(t,i){var e=this.hitDetectionRadius+this.radius;return Math.pow(t-this.x,2)+Math.pow(i-this.y,2)<Math.pow(e,2)},draw:function(){if(this.display){var t=this.ctx;t.beginPath(),t.arc(this.x,this.y,this.radius,0,2*Math.PI),t.closePath(),t.strokeStyle=this.strokeColor,t.lineWidth=this.strokeWidth,t.fillStyle=this.fillColor,t.fill(),t.stroke()}}}),e.Arc=e.Element.extend({inRange:function(t,i){var e=s.getAngleFromPoint(this,{x:t,y:i}),n=e.angle>=this.startAngle&&e.angle<=this.endAngle,o=e.distance>=this.innerRadius&&e.distance<=this.outerRadius;return n&&o},tooltipPosition:function(){var t=this.startAngle+(this.endAngle-this.startAngle)/2,i=(this.outerRadius-this.innerRadius)/2+this.innerRadius;return{x:this.x+Math.cos(t)*i,y:this.y+Math.sin(t)*i}},draw:function(t){var i=this.ctx;i.beginPath(),i.arc(this.x,this.y,this.outerRadius,this.startAngle,this.endAngle),i.arc(this.x,this.y,this.innerRadius,this.endAngle,this.startAngle,!0),i.closePath(),i.strokeStyle=this.strokeColor,i.lineWidth=this.strokeWidth,i.fillStyle=this.fillColor,i.fill(),i.lineJoin="bevel",this.showStroke&&i.stroke()}}),e.Rectangle=e.Element.extend({draw:function(){var t=this.ctx,i=this.width/2,e=this.x-i,s=this.x+i,n=this.base-(this.base-this.y),o=this.strokeWidth/2;this.showStroke&&(e+=o,s-=o,n+=o),t.beginPath(),t.fillStyle=this.fillColor,t.strokeStyle=this.strokeColor,t.lineWidth=this.strokeWidth,t.moveTo(e,this.base),t.lineTo(e,n),t.lineTo(s,n),t.lineTo(s,this.base),t.fill(),this.showStroke&&t.stroke()},height:function(){return this.base-this.y},inRange:function(t,i){return t>=this.x-this.width/2&&t<=this.x+this.width/2&&i>=this.y&&i<=this.base}}),e.Tooltip=e.Element.extend({draw:function(){var t=this.chart.ctx;t.font=W(this.fontSize,this.fontStyle,this.fontFamily),this.xAlign="center",this.yAlign="above";var i=this.caretPadding=2,e=t.measureText(this.text).width+2*this.xPadding,s=this.fontSize+2*this.yPadding,n=s+this.caretHeight+i;this.x+e/2>this.chart.width?this.xAlign="left":this.x-e/2<0&&(this.xAlign="right"),this.y-n<0&&(this.yAlign="below");var o=this.x-e/2,a=this.y-n;if(t.fillStyle=this.fillColor,this.custom)this.custom(this);else{switch(this.yAlign){case"above":t.beginPath(),t.moveTo(this.x,this.y-i),t.lineTo(this.x+this.caretHeight,this.y-(i+this.caretHeight)),t.lineTo(this.x-this.caretHeight,this.y-(i+this.caretHeight)),t.closePath(),t.fill();break;case"below":a=this.y+i+this.caretHeight,t.beginPath(),t.moveTo(this.x,this.y+i),t.lineTo(this.x+this.caretHeight,this.y+i+this.caretHeight),t.lineTo(this.x-this.caretHeight,this.y+i+this.caretHeight),t.closePath(),t.fill()}switch(this.xAlign){case"left":o=this.x-e+(this.cornerRadius+this.caretHeight);break;case"right":o=this.x-(this.cornerRadius+this.caretHeight)}B(t,o,a,e,s,this.cornerRadius),t.fill(),t.fillStyle=this.textColor,t.textAlign="center",t.textBaseline="middle",t.fillText(this.text,o+e/2,a+s/2)}}}),e.MultiTooltip=e.Element.extend({initialize:function(){this.font=W(this.fontSize,this.fontStyle,this.fontFamily),this.titleFont=W(this.titleFontSize,this.titleFontStyle,this.titleFontFamily),this.height=this.labels.length*this.fontSize+(this.labels.length-1)*(this.fontSize/2)+2*this.yPadding+1.5*this.titleFontSize,this.ctx.font=this.titleFont;var t=this.ctx.measureText(this.title).width,i=z(this.ctx,this.font,this.labels)+this.fontSize+3,e=g([i,t]);this.width=e+2*this.xPadding;var s=this.height/2;this.y-s<0?this.y=s:this.y+s>this.chart.height&&(this.y=this.chart.height-s),this.x>this.chart.width/2?this.x-=this.xOffset+this.width:this.x+=this.xOffset},getLineHeight:function(t){var i=this.y-this.height/2+this.yPadding,e=t-1;return 0===t?i+this.titleFontSize/2:i+(1.5*this.fontSize*e+this.fontSize/2)+1.5*this.titleFontSize},draw:function(){if(this.custom)this.custom(this);else{B(this.ctx,this.x,this.y-this.height/2,this.width,this.height,this.cornerRadius);var t=this.ctx;t.fillStyle=this.fillColor,t.fill(),t.closePath(),t.textAlign="left",t.textBaseline="middle",t.fillStyle=this.titleTextColor,t.font=this.titleFont,t.fillText(this.title,this.x+this.xPadding,this.getLineHeight(0)),t.font=this.font,s.each(this.labels,function(i,e){t.fillStyle=this.textColor,t.fillText(i,this.x+this.xPadding+this.fontSize+3,this.getLineHeight(e+1)),t.fillStyle=this.legendColorBackground,t.fillRect(this.x+this.xPadding,this.getLineHeight(e+1)-this.fontSize/2,this.fontSize,this.fontSize),t.fillStyle=this.legendColors[e].fill,t.fillRect(this.x+this.xPadding,this.getLineHeight(e+1)-this.fontSize/2,this.fontSize,this.fontSize)},this)}}}),e.Scale=e.Element.extend({initialize:function(){this.fit()},buildYLabels:function(){this.yLabels=[];for(var t=v(this.stepValue),i=0;i<=this.steps;i++)this.yLabels.push(C(this.templateString,{value:(this.min+i*this.stepValue).toFixed(t)}));this.yLabelWidth=this.display&&this.showLabels?z(this.ctx,this.font,this.yLabels):0},addXLabel:function(t){this.xLabels.push(t),this.valuesCount++,this.fit()},removeXLabel:function(){this.xLabels.shift(),this.valuesCount--,this.fit()},fit:function(){this.startPoint=this.display?this.fontSize:0,this.endPoint=this.display?this.height-1.5*this.fontSize-5:this.height,this.startPoint+=this.padding,this.endPoint-=this.padding;var t,i=this.endPoint-this.startPoint;for(this.calculateYRange(i),this.buildYLabels(),this.calculateXLabelRotation();i>this.endPoint-this.startPoint;)i=this.endPoint-this.startPoint,t=this.yLabelWidth,this.calculateYRange(i),this.buildYLabels(),t<this.yLabelWidth&&this.calculateXLabelRotation()},calculateXLabelRotation:function(){this.ctx.font=this.font;var t,i,e=this.ctx.measureText(this.xLabels[0]).width,s=this.ctx.measureText(this.xLabels[this.xLabels.length-1]).width;if(this.xScalePaddingRight=s/2+3,this.xScalePaddingLeft=e/2>this.yLabelWidth+10?e/2:this.yLabelWidth+10,this.xLabelRotation=0,this.display){var n,o=z(this.ctx,this.font,this.xLabels);this.xLabelWidth=o;for(var a=Math.floor(this.calculateX(1)-this.calculateX(0))-6;this.xLabelWidth>a&&0===this.xLabelRotation||this.xLabelWidth>a&&this.xLabelRotation<=90&&this.xLabelRotation>0;)n=Math.cos(S(this.xLabelRotation)),t=n*e,i=n*s,t+this.fontSize/2>this.yLabelWidth+8&&(this.xScalePaddingLeft=t+this.fontSize/2),this.xScalePaddingRight=this.fontSize/2,this.xLabelRotation++,this.xLabelWidth=n*o;this.xLabelRotation>0&&(this.endPoint-=Math.sin(S(this.xLabelRotation))*o+3)}else this.xLabelWidth=0,this.xScalePaddingRight=this.padding,this.xScalePaddingLeft=this.padding},calculateYRange:c,drawingArea:function(){return this.startPoint-this.endPoint},calculateY:function(t){var i=this.drawingArea()/(this.min-this.max);return this.endPoint-i*(t-this.min)},calculateX:function(t){var i=(this.xLabelRotation>0,this.width-(this.xScalePaddingLeft+this.xScalePaddingRight)),e=i/Math.max(this.valuesCount-(this.offsetGridLines?0:1),1),s=e*t+this.xScalePaddingLeft;return this.offsetGridLines&&(s+=e/2),Math.round(s)},update:function(t){s.extend(this,t),this.fit()},draw:function(){var t=this.ctx,i=(this.endPoint-this.startPoint)/this.steps,e=Math.round(this.xScalePaddingLeft);this.display&&(t.fillStyle=this.textColor,t.font=this.font,n(this.yLabels,function(n,o){var a=this.endPoint-i*o,h=Math.round(a),l=this.showHorizontalLines;t.textAlign="right",t.textBaseline="middle",this.showLabels&&t.fillText(n,e-10,a),0!==o||l||(l=!0),l&&t.beginPath(),o>0?(t.lineWidth=this.gridLineWidth,t.strokeStyle=this.gridLineColor):(t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor),h+=s.aliasPixel(t.lineWidth),l&&(t.moveTo(e,h),t.lineTo(this.width,h),t.stroke(),t.closePath()),t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor,t.beginPath(),t.moveTo(e-5,h),t.lineTo(e,h),t.stroke(),t.closePath()},this),n(this.xLabels,function(i,e){var s=this.calculateX(e)+x(this.lineWidth),n=this.calculateX(e-(this.offsetGridLines?.5:0))+x(this.lineWidth),o=this.xLabelRotation>0,a=this.showVerticalLines;0!==e||a||(a=!0),a&&t.beginPath(),e>0?(t.lineWidth=this.gridLineWidth,t.strokeStyle=this.gridLineColor):(t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor),a&&(t.moveTo(n,this.endPoint),t.lineTo(n,this.startPoint-3),t.stroke(),t.closePath()),t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor,t.beginPath(),t.moveTo(n,this.endPoint),t.lineTo(n,this.endPoint+5),t.stroke(),t.closePath(),t.save(),t.translate(s,o?this.endPoint+12:this.endPoint+8),t.rotate(-1*S(this.xLabelRotation)),t.font=this.font,t.textAlign=o?"right":"center",t.textBaseline=o?"middle":"top",t.fillText(i,0,0),t.restore()},this))}}),e.RadialScale=e.Element.extend({initialize:function(){this.size=m([this.height,this.width]),this.drawingArea=this.display?this.size/2-(this.fontSize/2+this.backdropPaddingY):this.size/2},calculateCenterOffset:function(t){var i=this.drawingArea/(this.max-this.min);return(t-this.min)*i},update:function(){this.lineArc?this.drawingArea=this.display?this.size/2-(this.fontSize/2+this.backdropPaddingY):this.size/2:this.setScaleSize(),this.buildYLabels()},buildYLabels:function(){this.yLabels=[];for(var t=v(this.stepValue),i=0;i<=this.steps;i++)this.yLabels.push(C(this.templateString,{value:(this.min+i*this.stepValue).toFixed(t)}))},getCircumference:function(){return 2*Math.PI/this.valuesCount},setScaleSize:function(){var t,i,e,s,n,o,a,h,l,r,c,u,d=m([this.height/2-this.pointLabelFontSize-5,this.width/2]),p=this.width,g=0;for(this.ctx.font=W(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),i=0;i<this.valuesCount;i++)t=this.getPointPosition(i,d),e=this.ctx.measureText(C(this.templateString,{value:this.labels[i]})).width+5,0===i||i===this.valuesCount/2?(s=e/2,t.x+s>p&&(p=t.x+s,n=i),t.x-s<g&&(g=t.x-s,a=i)):i<this.valuesCount/2?t.x+e>p&&(p=t.x+e,n=i):i>this.valuesCount/2&&t.x-e<g&&(g=t.x-e,a=i);l=g,r=Math.ceil(p-this.width),o=this.getIndexAngle(n),h=this.getIndexAngle(a),c=r/Math.sin(o+Math.PI/2),u=l/Math.sin(h+Math.PI/2),c=f(c)?c:0,u=f(u)?u:0,this.drawingArea=d-(u+c)/2,this.setCenterPoint(u,c)},setCenterPoint:function(t,i){var e=this.width-i-this.drawingArea,s=t+this.drawingArea;this.xCenter=(s+e)/2,this.yCenter=this.height/2},getIndexAngle:function(t){var i=2*Math.PI/this.valuesCount;return t*i-Math.PI/2},getPointPosition:function(t,i){var e=this.getIndexAngle(t);return{x:Math.cos(e)*i+this.xCenter,y:Math.sin(e)*i+this.yCenter}},draw:function(){if(this.display){var t=this.ctx;if(n(this.yLabels,function(i,e){if(e>0){var s,n=e*(this.drawingArea/this.steps),o=this.yCenter-n;if(this.lineWidth>0)if(t.strokeStyle=this.lineColor,t.lineWidth=this.lineWidth,this.lineArc)t.beginPath(),t.arc(this.xCenter,this.yCenter,n,0,2*Math.PI),t.closePath(),t.stroke();else{t.beginPath();for(var a=0;a<this.valuesCount;a++)s=this.getPointPosition(a,this.calculateCenterOffset(this.min+e*this.stepValue)),0===a?t.moveTo(s.x,s.y):t.lineTo(s.x,s.y);t.closePath(),t.stroke()}if(this.showLabels){if(t.font=W(this.fontSize,this.fontStyle,this.fontFamily),this.showLabelBackdrop){var h=t.measureText(i).width;t.fillStyle=this.backdropColor,t.fillRect(this.xCenter-h/2-this.backdropPaddingX,o-this.fontSize/2-this.backdropPaddingY,h+2*this.backdropPaddingX,this.fontSize+2*this.backdropPaddingY)}t.textAlign="center",t.textBaseline="middle",t.fillStyle=this.fontColor,t.fillText(i,this.xCenter,o)}}},this),!this.lineArc){t.lineWidth=this.angleLineWidth,t.strokeStyle=this.angleLineColor;for(var i=this.valuesCount-1;i>=0;i--){if(this.angleLineWidth>0){var e=this.getPointPosition(i,this.calculateCenterOffset(this.max));t.beginPath(),t.moveTo(this.xCenter,this.yCenter),t.lineTo(e.x,e.y),t.stroke(),t.closePath()}var s=this.getPointPosition(i,this.calculateCenterOffset(this.max)+5);t.font=W(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),t.fillStyle=this.pointLabelFontColor;var o=this.labels.length,a=this.labels.length/2,h=a/2,l=h>i||i>o-h,r=i===h||i===o-h;t.textAlign=0===i?"center":i===a?"center":a>i?"left":"right",t.textBaseline=r?"middle":l?"bottom":"top",t.fillText(this.labels[i],s.x,s.y)}}}}}),s.addEvent(window,"resize",function(){var t;return function(){clearTimeout(t),t=setTimeout(function(){n(e.instances,function(t){t.options.responsive&&t.resize(t.render,!0)})},50)}}()),p?define(function(){return e}):"object"==typeof module&&module.exports&&(module.exports=e),t.Chart=e,e.noConflict=function(){return t.Chart=i,e}}).call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={scaleBeginAtZero:!0,scaleShowGridLines:!0,scaleGridLineColor:"rgba(0,0,0,.05)",scaleGridLineWidth:1,scaleShowHorizontalLines:!0,scaleShowVerticalLines:!0,barShowStroke:!0,barStrokeWidth:2,barValueSpacing:5,barDatasetSpacing:1,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].fillColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"Bar",defaults:s,initialize:function(t){var s=this.options;this.ScaleClass=i.Scale.extend({offsetGridLines:!0,calculateBarX:function(t,i,e){var n=this.calculateBaseWidth(),o=this.calculateX(e)-n/2,a=this.calculateBarWidth(t);return o+a*i+i*s.barDatasetSpacing+a/2},calculateBaseWidth:function(){return this.calculateX(1)-this.calculateX(0)-2*s.barValueSpacing},calculateBarWidth:function(t){var i=this.calculateBaseWidth()-(t-1)*s.barDatasetSpacing;return i/t}}),this.datasets=[],this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getBarsAtEvent(t):[];this.eachBars(function(t){t.restore(["fillColor","strokeColor"])}),e.each(i,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(i)}),this.BarClass=i.Rectangle.extend({strokeWidth:this.options.barStrokeWidth,showStroke:this.options.barShowStroke,ctx:this.chart.ctx}),e.each(t.datasets,function(i){var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,bars:[]};this.datasets.push(s),e.each(i.data,function(e,n){s.bars.push(new this.BarClass({value:e,label:t.labels[n],datasetLabel:i.label,strokeColor:i.strokeColor,fillColor:i.fillColor,highlightFill:i.highlightFill||i.fillColor,highlightStroke:i.highlightStroke||i.strokeColor}))},this)},this),this.buildScale(t.labels),this.BarClass.prototype.base=this.scale.endPoint,this.eachBars(function(t,i,s){e.extend(t,{width:this.scale.calculateBarWidth(this.datasets.length),x:this.scale.calculateBarX(this.datasets.length,s,i),y:this.scale.endPoint}),t.save()},this),this.render()},update:function(){this.scale.update(),e.each(this.activeElements,function(t){t.restore(["fillColor","strokeColor"])}),this.eachBars(function(t){t.save()}),this.render()},eachBars:function(t){e.each(this.datasets,function(i,s){e.each(i.bars,t,this,s)},this)},getBarsAtEvent:function(t){for(var i,s=[],n=e.getRelativePosition(t),o=function(t){s.push(t.bars[i])},a=0;a<this.datasets.length;a++)for(i=0;i<this.datasets[a].bars.length;i++)if(this.datasets[a].bars[i].inRange(n.x,n.y))return e.each(this.datasets,o),s;return s},buildScale:function(t){var i=this,s=function(){var t=[];return i.eachBars(function(i){t.push(i.value)}),t},n={templateString:this.options.scaleLabel,height:this.chart.height,width:this.chart.width,ctx:this.chart.ctx,textColor:this.options.scaleFontColor,fontSize:this.options.scaleFontSize,fontStyle:this.options.scaleFontStyle,fontFamily:this.options.scaleFontFamily,valuesCount:t.length,beginAtZero:this.options.scaleBeginAtZero,integersOnly:this.options.scaleIntegersOnly,calculateYRange:function(t){var i=e.calculateScaleRange(s(),t,this.fontSize,this.beginAtZero,this.integersOnly);e.extend(this,i)},xLabels:t,font:e.fontString(this.options.scaleFontSize,this.options.scaleFontStyle,this.options.scaleFontFamily),lineWidth:this.options.scaleLineWidth,lineColor:this.options.scaleLineColor,showHorizontalLines:this.options.scaleShowHorizontalLines,showVerticalLines:this.options.scaleShowVerticalLines,gridLineWidth:this.options.scaleShowGridLines?this.options.scaleGridLineWidth:0,gridLineColor:this.options.scaleShowGridLines?this.options.scaleGridLineColor:"rgba(0,0,0,0)",padding:this.options.showScale?0:this.options.barShowStroke?this.options.barStrokeWidth:0,showLabels:this.options.scaleShowLabels,display:this.options.showScale};this.options.scaleOverride&&e.extend(n,{calculateYRange:e.noop,steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}),this.scale=new this.ScaleClass(n)},addData:function(t,i){e.each(t,function(t,e){this.datasets[e].bars.push(new this.BarClass({value:t,label:i,x:this.scale.calculateBarX(this.datasets.length,e,this.scale.valuesCount+1),y:this.scale.endPoint,width:this.scale.calculateBarWidth(this.datasets.length),base:this.scale.endPoint,strokeColor:this.datasets[e].strokeColor,fillColor:this.datasets[e].fillColor})) +},this),this.scale.addXLabel(i),this.update()},removeData:function(){this.scale.removeXLabel(),e.each(this.datasets,function(t){t.bars.shift()},this),this.update()},reflow:function(){e.extend(this.BarClass.prototype,{y:this.scale.endPoint,base:this.scale.endPoint});var t=e.extend({height:this.chart.height,width:this.chart.width});this.scale.update(t)},draw:function(t){var i=t||1;this.clear();this.chart.ctx;this.scale.draw(i),e.each(this.datasets,function(t,s){e.each(t.bars,function(t,e){t.hasValue()&&(t.base=this.scale.endPoint,t.transition({x:this.scale.calculateBarX(this.datasets.length,s,e),y:this.scale.calculateY(t.value),width:this.scale.calculateBarWidth(this.datasets.length)},i).draw())},this)},this)}})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={segmentShowStroke:!0,segmentStrokeColor:"#fff",segmentStrokeWidth:2,percentageInnerCutout:50,animationSteps:100,animationEasing:"easeOutBounce",animateRotate:!0,animateScale:!1,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<segments.length; i++){%><li><span style="background-color:<%=segments[i].fillColor%>"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"Doughnut",defaults:s,initialize:function(t){this.segments=[],this.outerRadius=(e.min([this.chart.width,this.chart.height])-this.options.segmentStrokeWidth/2)/2,this.SegmentArc=i.Arc.extend({ctx:this.chart.ctx,x:this.chart.width/2,y:this.chart.height/2}),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getSegmentsAtEvent(t):[];e.each(this.segments,function(t){t.restore(["fillColor"])}),e.each(i,function(t){t.fillColor=t.highlightColor}),this.showTooltip(i)}),this.calculateTotal(t),e.each(t,function(t,i){this.addData(t,i,!0)},this),this.render()},getSegmentsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.segments,function(t){t.inRange(s.x,s.y)&&i.push(t)},this),i},addData:function(t,i,e){var s=i||this.segments.length;this.segments.splice(s,0,new this.SegmentArc({value:t.value,outerRadius:this.options.animateScale?0:this.outerRadius,innerRadius:this.options.animateScale?0:this.outerRadius/100*this.options.percentageInnerCutout,fillColor:t.color,highlightColor:t.highlight||t.color,showStroke:this.options.segmentShowStroke,strokeWidth:this.options.segmentStrokeWidth,strokeColor:this.options.segmentStrokeColor,startAngle:1.5*Math.PI,circumference:this.options.animateRotate?0:this.calculateCircumference(t.value),label:t.label})),e||(this.reflow(),this.update())},calculateCircumference:function(t){return 2*Math.PI*(Math.abs(t)/this.total)},calculateTotal:function(t){this.total=0,e.each(t,function(t){this.total+=Math.abs(t.value)},this)},update:function(){this.calculateTotal(this.segments),e.each(this.activeElements,function(t){t.restore(["fillColor"])}),e.each(this.segments,function(t){t.save()}),this.render()},removeData:function(t){var i=e.isNumber(t)?t:this.segments.length-1;this.segments.splice(i,1),this.reflow(),this.update()},reflow:function(){e.extend(this.SegmentArc.prototype,{x:this.chart.width/2,y:this.chart.height/2}),this.outerRadius=(e.min([this.chart.width,this.chart.height])-this.options.segmentStrokeWidth/2)/2,e.each(this.segments,function(t){t.update({outerRadius:this.outerRadius,innerRadius:this.outerRadius/100*this.options.percentageInnerCutout})},this)},draw:function(t){var i=t?t:1;this.clear(),e.each(this.segments,function(t,e){t.transition({circumference:this.calculateCircumference(t.value),outerRadius:this.outerRadius,innerRadius:this.outerRadius/100*this.options.percentageInnerCutout},i),t.endAngle=t.startAngle+t.circumference,t.draw(),0===e&&(t.startAngle=1.5*Math.PI),e<this.segments.length-1&&(this.segments[e+1].startAngle=t.endAngle)},this)}}),i.types.Doughnut.extend({name:"Pie",defaults:e.merge(s,{percentageInnerCutout:0})})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={scaleShowGridLines:!0,scaleGridLineColor:"rgba(0,0,0,.05)",scaleGridLineWidth:1,scaleShowHorizontalLines:!0,scaleShowVerticalLines:!0,bezierCurve:!0,bezierCurveTension:.4,pointDot:!0,pointDotRadius:4,pointDotStrokeWidth:1,pointHitDetectionRadius:20,datasetStroke:!0,datasetStrokeWidth:2,datasetFill:!0,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].strokeColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"Line",defaults:s,initialize:function(t){this.PointClass=i.Point.extend({strokeWidth:this.options.pointDotStrokeWidth,radius:this.options.pointDotRadius,display:this.options.pointDot,hitDetectionRadius:this.options.pointHitDetectionRadius,ctx:this.chart.ctx,inRange:function(t){return Math.pow(t-this.x,2)<Math.pow(this.radius+this.hitDetectionRadius,2)}}),this.datasets=[],this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getPointsAtEvent(t):[];this.eachPoints(function(t){t.restore(["fillColor","strokeColor"])}),e.each(i,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(i)}),e.each(t.datasets,function(i){var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,pointColor:i.pointColor,pointStrokeColor:i.pointStrokeColor,points:[]};this.datasets.push(s),e.each(i.data,function(e,n){s.points.push(new this.PointClass({value:e,label:t.labels[n],datasetLabel:i.label,strokeColor:i.pointStrokeColor,fillColor:i.pointColor,highlightFill:i.pointHighlightFill||i.pointColor,highlightStroke:i.pointHighlightStroke||i.pointStrokeColor}))},this),this.buildScale(t.labels),this.eachPoints(function(t,i){e.extend(t,{x:this.scale.calculateX(i),y:this.scale.endPoint}),t.save()},this)},this),this.render()},update:function(){this.scale.update(),e.each(this.activeElements,function(t){t.restore(["fillColor","strokeColor"])}),this.eachPoints(function(t){t.save()}),this.render()},eachPoints:function(t){e.each(this.datasets,function(i){e.each(i.points,t,this)},this)},getPointsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.datasets,function(t){e.each(t.points,function(t){t.inRange(s.x,s.y)&&i.push(t)})},this),i},buildScale:function(t){var s=this,n=function(){var t=[];return s.eachPoints(function(i){t.push(i.value)}),t},o={templateString:this.options.scaleLabel,height:this.chart.height,width:this.chart.width,ctx:this.chart.ctx,textColor:this.options.scaleFontColor,fontSize:this.options.scaleFontSize,fontStyle:this.options.scaleFontStyle,fontFamily:this.options.scaleFontFamily,valuesCount:t.length,beginAtZero:this.options.scaleBeginAtZero,integersOnly:this.options.scaleIntegersOnly,calculateYRange:function(t){var i=e.calculateScaleRange(n(),t,this.fontSize,this.beginAtZero,this.integersOnly);e.extend(this,i)},xLabels:t,font:e.fontString(this.options.scaleFontSize,this.options.scaleFontStyle,this.options.scaleFontFamily),lineWidth:this.options.scaleLineWidth,lineColor:this.options.scaleLineColor,showHorizontalLines:this.options.scaleShowHorizontalLines,showVerticalLines:this.options.scaleShowVerticalLines,gridLineWidth:this.options.scaleShowGridLines?this.options.scaleGridLineWidth:0,gridLineColor:this.options.scaleShowGridLines?this.options.scaleGridLineColor:"rgba(0,0,0,0)",padding:this.options.showScale?0:this.options.pointDotRadius+this.options.pointDotStrokeWidth,showLabels:this.options.scaleShowLabels,display:this.options.showScale};this.options.scaleOverride&&e.extend(o,{calculateYRange:e.noop,steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}),this.scale=new i.Scale(o)},addData:function(t,i){e.each(t,function(t,e){this.datasets[e].points.push(new this.PointClass({value:t,label:i,x:this.scale.calculateX(this.scale.valuesCount+1),y:this.scale.endPoint,strokeColor:this.datasets[e].pointStrokeColor,fillColor:this.datasets[e].pointColor}))},this),this.scale.addXLabel(i),this.update()},removeData:function(){this.scale.removeXLabel(),e.each(this.datasets,function(t){t.points.shift()},this),this.update()},reflow:function(){var t=e.extend({height:this.chart.height,width:this.chart.width});this.scale.update(t)},draw:function(t){var i=t||1;this.clear();var s=this.chart.ctx,n=function(t){return null!==t.value},o=function(t,i,s){return e.findNextWhere(i,n,s)||t},a=function(t,i,s){return e.findPreviousWhere(i,n,s)||t};this.scale.draw(i),e.each(this.datasets,function(t){var h=e.where(t.points,n);e.each(t.points,function(t,e){t.hasValue()&&t.transition({y:this.scale.calculateY(t.value),x:this.scale.calculateX(e)},i)},this),this.options.bezierCurve&&e.each(h,function(t,i){var s=i>0&&i<h.length-1?this.options.bezierCurveTension:0;t.controlPoints=e.splineCurve(a(t,h,i),t,o(t,h,i),s),t.controlPoints.outer.y>this.scale.endPoint?t.controlPoints.outer.y=this.scale.endPoint:t.controlPoints.outer.y<this.scale.startPoint&&(t.controlPoints.outer.y=this.scale.startPoint),t.controlPoints.inner.y>this.scale.endPoint?t.controlPoints.inner.y=this.scale.endPoint:t.controlPoints.inner.y<this.scale.startPoint&&(t.controlPoints.inner.y=this.scale.startPoint)},this),s.lineWidth=this.options.datasetStrokeWidth,s.strokeStyle=t.strokeColor,s.beginPath(),e.each(h,function(t,i){if(0===i)s.moveTo(t.x,t.y);else if(this.options.bezierCurve){var e=a(t,h,i);s.bezierCurveTo(e.controlPoints.outer.x,e.controlPoints.outer.y,t.controlPoints.inner.x,t.controlPoints.inner.y,t.x,t.y)}else s.lineTo(t.x,t.y)},this),s.stroke(),this.options.datasetFill&&h.length>0&&(s.lineTo(h[h.length-1].x,this.scale.endPoint),s.lineTo(h[0].x,this.scale.endPoint),s.fillStyle=t.fillColor,s.closePath(),s.fill()),e.each(h,function(t){t.draw()})},this)}})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={scaleShowLabelBackdrop:!0,scaleBackdropColor:"rgba(255,255,255,0.75)",scaleBeginAtZero:!0,scaleBackdropPaddingY:2,scaleBackdropPaddingX:2,scaleShowLine:!0,segmentShowStroke:!0,segmentStrokeColor:"#fff",segmentStrokeWidth:2,animationSteps:100,animationEasing:"easeOutBounce",animateRotate:!0,animateScale:!1,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<segments.length; i++){%><li><span style="background-color:<%=segments[i].fillColor%>"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"PolarArea",defaults:s,initialize:function(t){this.segments=[],this.SegmentArc=i.Arc.extend({showStroke:this.options.segmentShowStroke,strokeWidth:this.options.segmentStrokeWidth,strokeColor:this.options.segmentStrokeColor,ctx:this.chart.ctx,innerRadius:0,x:this.chart.width/2,y:this.chart.height/2}),this.scale=new i.RadialScale({display:this.options.showScale,fontStyle:this.options.scaleFontStyle,fontSize:this.options.scaleFontSize,fontFamily:this.options.scaleFontFamily,fontColor:this.options.scaleFontColor,showLabels:this.options.scaleShowLabels,showLabelBackdrop:this.options.scaleShowLabelBackdrop,backdropColor:this.options.scaleBackdropColor,backdropPaddingY:this.options.scaleBackdropPaddingY,backdropPaddingX:this.options.scaleBackdropPaddingX,lineWidth:this.options.scaleShowLine?this.options.scaleLineWidth:0,lineColor:this.options.scaleLineColor,lineArc:!0,width:this.chart.width,height:this.chart.height,xCenter:this.chart.width/2,yCenter:this.chart.height/2,ctx:this.chart.ctx,templateString:this.options.scaleLabel,valuesCount:t.length}),this.updateScaleRange(t),this.scale.update(),e.each(t,function(t,i){this.addData(t,i,!0)},this),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getSegmentsAtEvent(t):[];e.each(this.segments,function(t){t.restore(["fillColor"])}),e.each(i,function(t){t.fillColor=t.highlightColor}),this.showTooltip(i)}),this.render()},getSegmentsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.segments,function(t){t.inRange(s.x,s.y)&&i.push(t)},this),i},addData:function(t,i,e){var s=i||this.segments.length;this.segments.splice(s,0,new this.SegmentArc({fillColor:t.color,highlightColor:t.highlight||t.color,label:t.label,value:t.value,outerRadius:this.options.animateScale?0:this.scale.calculateCenterOffset(t.value),circumference:this.options.animateRotate?0:this.scale.getCircumference(),startAngle:1.5*Math.PI})),e||(this.reflow(),this.update())},removeData:function(t){var i=e.isNumber(t)?t:this.segments.length-1;this.segments.splice(i,1),this.reflow(),this.update()},calculateTotal:function(t){this.total=0,e.each(t,function(t){this.total+=t.value},this),this.scale.valuesCount=this.segments.length},updateScaleRange:function(t){var i=[];e.each(t,function(t){i.push(t.value)});var s=this.options.scaleOverride?{steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}:e.calculateScaleRange(i,e.min([this.chart.width,this.chart.height])/2,this.options.scaleFontSize,this.options.scaleBeginAtZero,this.options.scaleIntegersOnly);e.extend(this.scale,s,{size:e.min([this.chart.width,this.chart.height]),xCenter:this.chart.width/2,yCenter:this.chart.height/2})},update:function(){this.calculateTotal(this.segments),e.each(this.segments,function(t){t.save()}),this.reflow(),this.render()},reflow:function(){e.extend(this.SegmentArc.prototype,{x:this.chart.width/2,y:this.chart.height/2}),this.updateScaleRange(this.segments),this.scale.update(),e.extend(this.scale,{xCenter:this.chart.width/2,yCenter:this.chart.height/2}),e.each(this.segments,function(t){t.update({outerRadius:this.scale.calculateCenterOffset(t.value)})},this)},draw:function(t){var i=t||1;this.clear(),e.each(this.segments,function(t,e){t.transition({circumference:this.scale.getCircumference(),outerRadius:this.scale.calculateCenterOffset(t.value)},i),t.endAngle=t.startAngle+t.circumference,0===e&&(t.startAngle=1.5*Math.PI),e<this.segments.length-1&&(this.segments[e+1].startAngle=t.endAngle),t.draw()},this),this.scale.draw()}})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers;i.Type.extend({name:"Radar",defaults:{scaleShowLine:!0,angleShowLineOut:!0,scaleShowLabels:!1,scaleBeginAtZero:!0,angleLineColor:"rgba(0,0,0,.1)",angleLineWidth:1,pointLabelFontFamily:"'Arial'",pointLabelFontStyle:"normal",pointLabelFontSize:10,pointLabelFontColor:"#666",pointDot:!0,pointDotRadius:3,pointDotStrokeWidth:1,pointHitDetectionRadius:20,datasetStroke:!0,datasetStrokeWidth:2,datasetFill:!0,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].strokeColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'},initialize:function(t){this.PointClass=i.Point.extend({strokeWidth:this.options.pointDotStrokeWidth,radius:this.options.pointDotRadius,display:this.options.pointDot,hitDetectionRadius:this.options.pointHitDetectionRadius,ctx:this.chart.ctx}),this.datasets=[],this.buildScale(t),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getPointsAtEvent(t):[];this.eachPoints(function(t){t.restore(["fillColor","strokeColor"])}),e.each(i,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(i)}),e.each(t.datasets,function(i){var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,pointColor:i.pointColor,pointStrokeColor:i.pointStrokeColor,points:[]};this.datasets.push(s),e.each(i.data,function(e,n){var o;this.scale.animation||(o=this.scale.getPointPosition(n,this.scale.calculateCenterOffset(e))),s.points.push(new this.PointClass({value:e,label:t.labels[n],datasetLabel:i.label,x:this.options.animation?this.scale.xCenter:o.x,y:this.options.animation?this.scale.yCenter:o.y,strokeColor:i.pointStrokeColor,fillColor:i.pointColor,highlightFill:i.pointHighlightFill||i.pointColor,highlightStroke:i.pointHighlightStroke||i.pointStrokeColor}))},this)},this),this.render()},eachPoints:function(t){e.each(this.datasets,function(i){e.each(i.points,t,this)},this)},getPointsAtEvent:function(t){var i=e.getRelativePosition(t),s=e.getAngleFromPoint({x:this.scale.xCenter,y:this.scale.yCenter},i),n=2*Math.PI/this.scale.valuesCount,o=Math.round((s.angle-1.5*Math.PI)/n),a=[];return(o>=this.scale.valuesCount||0>o)&&(o=0),s.distance<=this.scale.drawingArea&&e.each(this.datasets,function(t){a.push(t.points[o])}),a},buildScale:function(t){this.scale=new i.RadialScale({display:this.options.showScale,fontStyle:this.options.scaleFontStyle,fontSize:this.options.scaleFontSize,fontFamily:this.options.scaleFontFamily,fontColor:this.options.scaleFontColor,showLabels:this.options.scaleShowLabels,showLabelBackdrop:this.options.scaleShowLabelBackdrop,backdropColor:this.options.scaleBackdropColor,backdropPaddingY:this.options.scaleBackdropPaddingY,backdropPaddingX:this.options.scaleBackdropPaddingX,lineWidth:this.options.scaleShowLine?this.options.scaleLineWidth:0,lineColor:this.options.scaleLineColor,angleLineColor:this.options.angleLineColor,angleLineWidth:this.options.angleShowLineOut?this.options.angleLineWidth:0,pointLabelFontColor:this.options.pointLabelFontColor,pointLabelFontSize:this.options.pointLabelFontSize,pointLabelFontFamily:this.options.pointLabelFontFamily,pointLabelFontStyle:this.options.pointLabelFontStyle,height:this.chart.height,width:this.chart.width,xCenter:this.chart.width/2,yCenter:this.chart.height/2,ctx:this.chart.ctx,templateString:this.options.scaleLabel,labels:t.labels,valuesCount:t.datasets[0].data.length}),this.scale.setScaleSize(),this.updateScaleRange(t.datasets),this.scale.buildYLabels()},updateScaleRange:function(t){var i=function(){var i=[];return e.each(t,function(t){t.data?i=i.concat(t.data):e.each(t.points,function(t){i.push(t.value)})}),i}(),s=this.options.scaleOverride?{steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}:e.calculateScaleRange(i,e.min([this.chart.width,this.chart.height])/2,this.options.scaleFontSize,this.options.scaleBeginAtZero,this.options.scaleIntegersOnly);e.extend(this.scale,s)},addData:function(t,i){this.scale.valuesCount++,e.each(t,function(t,e){var s=this.scale.getPointPosition(this.scale.valuesCount,this.scale.calculateCenterOffset(t));this.datasets[e].points.push(new this.PointClass({value:t,label:i,x:s.x,y:s.y,strokeColor:this.datasets[e].pointStrokeColor,fillColor:this.datasets[e].pointColor}))},this),this.scale.labels.push(i),this.reflow(),this.update()},removeData:function(){this.scale.valuesCount--,this.scale.labels.shift(),e.each(this.datasets,function(t){t.points.shift()},this),this.reflow(),this.update()},update:function(){this.eachPoints(function(t){t.save()}),this.reflow(),this.render()},reflow:function(){e.extend(this.scale,{width:this.chart.width,height:this.chart.height,size:e.min([this.chart.width,this.chart.height]),xCenter:this.chart.width/2,yCenter:this.chart.height/2}),this.updateScaleRange(this.datasets),this.scale.setScaleSize(),this.scale.buildYLabels()},draw:function(t){var i=t||1,s=this.chart.ctx;this.clear(),this.scale.draw(),e.each(this.datasets,function(t){e.each(t.points,function(t,e){t.hasValue()&&t.transition(this.scale.getPointPosition(e,this.scale.calculateCenterOffset(t.value)),i)},this),s.lineWidth=this.options.datasetStrokeWidth,s.strokeStyle=t.strokeColor,s.beginPath(),e.each(t.points,function(t,i){0===i?s.moveTo(t.x,t.y):s.lineTo(t.x,t.y)},this),s.closePath(),s.stroke(),s.fillStyle=t.fillColor,s.fill(),e.each(t.points,function(t){t.hasValue()&&t.draw()})},this)}})}.call(this);
\ No newline at end of file diff --git a/public/vendor/bootstrap-datepicker-1.4.0/LICENSE b/public/vendor/bootstrap-datepicker-1.4.0/LICENSE new file mode 100644 index 00000000..6b0b1270 --- /dev/null +++ b/public/vendor/bootstrap-datepicker-1.4.0/LICENSE @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/public/vendor/bootstrap-datepicker-1.4.0/css/bootstrap-datepicker3.min.css b/public/vendor/bootstrap-datepicker-1.4.0/css/bootstrap-datepicker3.min.css new file mode 100644 index 00000000..679e25cc --- /dev/null +++ b/public/vendor/bootstrap-datepicker-1.4.0/css/bootstrap-datepicker3.min.css @@ -0,0 +1,8 @@ +/*! + * Datepicker for Bootstrap v1.4.0 (https://github.com/eternicode/bootstrap-datepicker) + * + * Copyright 2012 Stefan Petre + * Improvements by Andrew Rowls + * Licensed under the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) + */ +.datepicker{padding:4px;border-radius:4px;direction:ltr}.datepicker-inline{width:220px}.datepicker.datepicker-rtl{direction:rtl}.datepicker.datepicker-rtl table tr td span{float:right}.datepicker-dropdown{top:0;left:0}.datepicker-dropdown:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-top:0;border-bottom-color:rgba(0,0,0,.2);position:absolute}.datepicker-dropdown:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;border-top:0;position:absolute}.datepicker-dropdown.datepicker-orient-left:before{left:6px}.datepicker-dropdown.datepicker-orient-left:after{left:7px}.datepicker-dropdown.datepicker-orient-right:before{right:6px}.datepicker-dropdown.datepicker-orient-right:after{right:7px}.datepicker-dropdown.datepicker-orient-top:before{top:-7px}.datepicker-dropdown.datepicker-orient-top:after{top:-6px}.datepicker-dropdown.datepicker-orient-bottom:before{bottom:-7px;border-bottom:0;border-top:7px solid #999}.datepicker-dropdown.datepicker-orient-bottom:after{bottom:-6px;border-bottom:0;border-top:6px solid #fff}.datepicker>div{display:none}.datepicker.days .datepicker-days,.datepicker.months .datepicker-months,.datepicker.years .datepicker-years{display:block}.datepicker table{margin:0;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.datepicker table tr td,.datepicker table tr th{text-align:center;width:30px;height:30px;border-radius:4px;border:none}.table-striped .datepicker table tr td,.table-striped .datepicker table tr th{background-color:transparent}.datepicker table tr td.day:hover,.datepicker table tr td.day.focused{background:#eee;cursor:pointer}.datepicker table tr td.old,.datepicker table tr td.new{color:#999}.datepicker table tr td.disabled,.datepicker table tr td.disabled:hover{background:0 0;color:#999;cursor:default}.datepicker table tr td.today,.datepicker table tr td.today:hover,.datepicker table tr td.today.disabled,.datepicker table tr td.today.disabled:hover{color:#000;background-color:#ffdb99;border-color:#ffb733}.datepicker table tr td.today:hover,.datepicker table tr td.today:hover:hover,.datepicker table tr td.today.disabled:hover,.datepicker table tr td.today.disabled:hover:hover,.datepicker table tr td.today:focus,.datepicker table tr td.today:hover:focus,.datepicker table tr td.today.disabled:focus,.datepicker table tr td.today.disabled:hover:focus,.datepicker table tr td.today:active,.datepicker table tr td.today:hover:active,.datepicker table tr td.today.disabled:active,.datepicker table tr td.today.disabled:hover:active,.datepicker table tr td.today.active,.datepicker table tr td.today:hover.active,.datepicker table tr td.today.disabled.active,.datepicker table tr td.today.disabled:hover.active,.open .dropdown-toggle.datepicker table tr td.today,.open .dropdown-toggle.datepicker table tr td.today:hover,.open .dropdown-toggle.datepicker table tr td.today.disabled,.open .dropdown-toggle.datepicker table tr td.today.disabled:hover{color:#000;background-color:#ffcd70;border-color:#f59e00}.datepicker table tr td.today:active,.datepicker table tr td.today:hover:active,.datepicker table tr td.today.disabled:active,.datepicker table tr td.today.disabled:hover:active,.datepicker table tr td.today.active,.datepicker table tr td.today:hover.active,.datepicker table tr td.today.disabled.active,.datepicker table tr td.today.disabled:hover.active,.open .dropdown-toggle.datepicker table tr td.today,.open .dropdown-toggle.datepicker table tr td.today:hover,.open .dropdown-toggle.datepicker table tr td.today.disabled,.open .dropdown-toggle.datepicker table tr td.today.disabled:hover{background-image:none}.datepicker table tr td.today.disabled,.datepicker table tr td.today:hover.disabled,.datepicker table tr td.today.disabled.disabled,.datepicker table tr td.today.disabled:hover.disabled,.datepicker table tr td.today[disabled],.datepicker table tr td.today:hover[disabled],.datepicker table tr td.today.disabled[disabled],.datepicker table tr td.today.disabled:hover[disabled],fieldset[disabled] .datepicker table tr td.today,fieldset[disabled] .datepicker table tr td.today:hover,fieldset[disabled] .datepicker table tr td.today.disabled,fieldset[disabled] .datepicker table tr td.today.disabled:hover,.datepicker table tr td.today.disabled:hover,.datepicker table tr td.today:hover.disabled:hover,.datepicker table tr td.today.disabled.disabled:hover,.datepicker table tr td.today.disabled:hover.disabled:hover,.datepicker table tr td.today[disabled]:hover,.datepicker table tr td.today:hover[disabled]:hover,.datepicker table tr td.today.disabled[disabled]:hover,.datepicker table tr td.today.disabled:hover[disabled]:hover,fieldset[disabled] .datepicker table tr td.today:hover,fieldset[disabled] .datepicker table tr td.today:hover:hover,fieldset[disabled] .datepicker table tr td.today.disabled:hover,fieldset[disabled] .datepicker table tr td.today.disabled:hover:hover,.datepicker table tr td.today.disabled:focus,.datepicker table tr td.today:hover.disabled:focus,.datepicker table tr td.today.disabled.disabled:focus,.datepicker table tr td.today.disabled:hover.disabled:focus,.datepicker table tr td.today[disabled]:focus,.datepicker table tr td.today:hover[disabled]:focus,.datepicker table tr td.today.disabled[disabled]:focus,.datepicker table tr td.today.disabled:hover[disabled]:focus,fieldset[disabled] .datepicker table tr td.today:focus,fieldset[disabled] .datepicker table tr td.today:hover:focus,fieldset[disabled] .datepicker table tr td.today.disabled:focus,fieldset[disabled] .datepicker table tr td.today.disabled:hover:focus,.datepicker table tr td.today.disabled:active,.datepicker table tr td.today:hover.disabled:active,.datepicker table tr td.today.disabled.disabled:active,.datepicker table tr td.today.disabled:hover.disabled:active,.datepicker table tr td.today[disabled]:active,.datepicker table tr td.today:hover[disabled]:active,.datepicker table tr td.today.disabled[disabled]:active,.datepicker table tr td.today.disabled:hover[disabled]:active,fieldset[disabled] .datepicker table tr td.today:active,fieldset[disabled] .datepicker table tr td.today:hover:active,fieldset[disabled] .datepicker table tr td.today.disabled:active,fieldset[disabled] .datepicker table tr td.today.disabled:hover:active,.datepicker table tr td.today.disabled.active,.datepicker table tr td.today:hover.disabled.active,.datepicker table tr td.today.disabled.disabled.active,.datepicker table tr td.today.disabled:hover.disabled.active,.datepicker table tr td.today[disabled].active,.datepicker table tr td.today:hover[disabled].active,.datepicker table tr td.today.disabled[disabled].active,.datepicker table tr td.today.disabled:hover[disabled].active,fieldset[disabled] .datepicker table tr td.today.active,fieldset[disabled] .datepicker table tr td.today:hover.active,fieldset[disabled] .datepicker table tr td.today.disabled.active,fieldset[disabled] .datepicker table tr td.today.disabled:hover.active{background-color:#ffdb99;border-color:#ffb733}.datepicker table tr td.today:hover:hover{color:#000}.datepicker table tr td.today.active:hover{color:#fff}.datepicker table tr td.range,.datepicker table tr td.range:hover,.datepicker table tr td.range.disabled,.datepicker table tr td.range.disabled:hover{background:#eee;border-radius:0}.datepicker table tr td.range.today,.datepicker table tr td.range.today:hover,.datepicker table tr td.range.today.disabled,.datepicker table tr td.range.today.disabled:hover{color:#000;background-color:#f7ca77;border-color:#f1a417;border-radius:0}.datepicker table tr td.range.today:hover,.datepicker table tr td.range.today:hover:hover,.datepicker table tr td.range.today.disabled:hover,.datepicker table tr td.range.today.disabled:hover:hover,.datepicker table tr td.range.today:focus,.datepicker table tr td.range.today:hover:focus,.datepicker table tr td.range.today.disabled:focus,.datepicker table tr td.range.today.disabled:hover:focus,.datepicker table tr td.range.today:active,.datepicker table tr td.range.today:hover:active,.datepicker table tr td.range.today.disabled:active,.datepicker table tr td.range.today.disabled:hover:active,.datepicker table tr td.range.today.active,.datepicker table tr td.range.today:hover.active,.datepicker table tr td.range.today.disabled.active,.datepicker table tr td.range.today.disabled:hover.active,.open .dropdown-toggle.datepicker table tr td.range.today,.open .dropdown-toggle.datepicker table tr td.range.today:hover,.open .dropdown-toggle.datepicker table tr td.range.today.disabled,.open .dropdown-toggle.datepicker table tr td.range.today.disabled:hover{color:#000;background-color:#f4bb51;border-color:#bf800c}.datepicker table tr td.range.today:active,.datepicker table tr td.range.today:hover:active,.datepicker table tr td.range.today.disabled:active,.datepicker table tr td.range.today.disabled:hover:active,.datepicker table tr td.range.today.active,.datepicker table tr td.range.today:hover.active,.datepicker table tr td.range.today.disabled.active,.datepicker table tr td.range.today.disabled:hover.active,.open .dropdown-toggle.datepicker table tr td.range.today,.open .dropdown-toggle.datepicker table tr td.range.today:hover,.open .dropdown-toggle.datepicker table tr td.range.today.disabled,.open .dropdown-toggle.datepicker table tr td.range.today.disabled:hover{background-image:none}.datepicker table tr td.range.today.disabled,.datepicker table tr td.range.today:hover.disabled,.datepicker table tr td.range.today.disabled.disabled,.datepicker table tr td.range.today.disabled:hover.disabled,.datepicker table tr td.range.today[disabled],.datepicker table tr td.range.today:hover[disabled],.datepicker table tr td.range.today.disabled[disabled],.datepicker table tr td.range.today.disabled:hover[disabled],fieldset[disabled] .datepicker table tr td.range.today,fieldset[disabled] .datepicker table tr td.range.today:hover,fieldset[disabled] .datepicker table tr td.range.today.disabled,fieldset[disabled] .datepicker table tr td.range.today.disabled:hover,.datepicker table tr td.range.today.disabled:hover,.datepicker table tr td.range.today:hover.disabled:hover,.datepicker table tr td.range.today.disabled.disabled:hover,.datepicker table tr td.range.today.disabled:hover.disabled:hover,.datepicker table tr td.range.today[disabled]:hover,.datepicker table tr td.range.today:hover[disabled]:hover,.datepicker table tr td.range.today.disabled[disabled]:hover,.datepicker table tr td.range.today.disabled:hover[disabled]:hover,fieldset[disabled] .datepicker table tr td.range.today:hover,fieldset[disabled] .datepicker table tr td.range.today:hover:hover,fieldset[disabled] .datepicker table tr td.range.today.disabled:hover,fieldset[disabled] .datepicker table tr td.range.today.disabled:hover:hover,.datepicker table tr td.range.today.disabled:focus,.datepicker table tr td.range.today:hover.disabled:focus,.datepicker table tr td.range.today.disabled.disabled:focus,.datepicker table tr td.range.today.disabled:hover.disabled:focus,.datepicker table tr td.range.today[disabled]:focus,.datepicker table tr td.range.today:hover[disabled]:focus,.datepicker table tr td.range.today.disabled[disabled]:focus,.datepicker table tr td.range.today.disabled:hover[disabled]:focus,fieldset[disabled] .datepicker table tr td.range.today:focus,fieldset[disabled] .datepicker table tr td.range.today:hover:focus,fieldset[disabled] .datepicker table tr td.range.today.disabled:focus,fieldset[disabled] .datepicker table tr td.range.today.disabled:hover:focus,.datepicker table tr td.range.today.disabled:active,.datepicker table tr td.range.today:hover.disabled:active,.datepicker table tr td.range.today.disabled.disabled:active,.datepicker table tr td.range.today.disabled:hover.disabled:active,.datepicker table tr td.range.today[disabled]:active,.datepicker table tr td.range.today:hover[disabled]:active,.datepicker table tr td.range.today.disabled[disabled]:active,.datepicker table tr td.range.today.disabled:hover[disabled]:active,fieldset[disabled] .datepicker table tr td.range.today:active,fieldset[disabled] .datepicker table tr td.range.today:hover:active,fieldset[disabled] .datepicker table tr td.range.today.disabled:active,fieldset[disabled] .datepicker table tr td.range.today.disabled:hover:active,.datepicker table tr td.range.today.disabled.active,.datepicker table tr td.range.today:hover.disabled.active,.datepicker table tr td.range.today.disabled.disabled.active,.datepicker table tr td.range.today.disabled:hover.disabled.active,.datepicker table tr td.range.today[disabled].active,.datepicker table tr td.range.today:hover[disabled].active,.datepicker table tr td.range.today.disabled[disabled].active,.datepicker table tr td.range.today.disabled:hover[disabled].active,fieldset[disabled] .datepicker table tr td.range.today.active,fieldset[disabled] .datepicker table tr td.range.today:hover.active,fieldset[disabled] .datepicker table tr td.range.today.disabled.active,fieldset[disabled] .datepicker table tr td.range.today.disabled:hover.active{background-color:#f7ca77;border-color:#f1a417}.datepicker table tr td.selected,.datepicker table tr td.selected:hover,.datepicker table tr td.selected.disabled,.datepicker table tr td.selected.disabled:hover{color:#fff;background-color:#999;border-color:#555;text-shadow:0 -1px 0 rgba(0,0,0,.25)}.datepicker table tr td.selected:hover,.datepicker table tr td.selected:hover:hover,.datepicker table tr td.selected.disabled:hover,.datepicker table tr td.selected.disabled:hover:hover,.datepicker table tr td.selected:focus,.datepicker table tr td.selected:hover:focus,.datepicker table tr td.selected.disabled:focus,.datepicker table tr td.selected.disabled:hover:focus,.datepicker table tr td.selected:active,.datepicker table tr td.selected:hover:active,.datepicker table tr td.selected.disabled:active,.datepicker table tr td.selected.disabled:hover:active,.datepicker table tr td.selected.active,.datepicker table tr td.selected:hover.active,.datepicker table tr td.selected.disabled.active,.datepicker table tr td.selected.disabled:hover.active,.open .dropdown-toggle.datepicker table tr td.selected,.open .dropdown-toggle.datepicker table tr td.selected:hover,.open .dropdown-toggle.datepicker table tr td.selected.disabled,.open .dropdown-toggle.datepicker table tr td.selected.disabled:hover{color:#fff;background-color:#858585;border-color:#373737}.datepicker table tr td.selected:active,.datepicker table tr td.selected:hover:active,.datepicker table tr td.selected.disabled:active,.datepicker table tr td.selected.disabled:hover:active,.datepicker table tr td.selected.active,.datepicker table tr td.selected:hover.active,.datepicker table tr td.selected.disabled.active,.datepicker table tr td.selected.disabled:hover.active,.open .dropdown-toggle.datepicker table tr td.selected,.open .dropdown-toggle.datepicker table tr td.selected:hover,.open .dropdown-toggle.datepicker table tr td.selected.disabled,.open .dropdown-toggle.datepicker table tr td.selected.disabled:hover{background-image:none}.datepicker table tr td.selected.disabled,.datepicker table tr td.selected:hover.disabled,.datepicker table tr td.selected.disabled.disabled,.datepicker table tr td.selected.disabled:hover.disabled,.datepicker table tr td.selected[disabled],.datepicker table tr td.selected:hover[disabled],.datepicker table tr td.selected.disabled[disabled],.datepicker table tr td.selected.disabled:hover[disabled],fieldset[disabled] .datepicker table tr td.selected,fieldset[disabled] .datepicker table tr td.selected:hover,fieldset[disabled] .datepicker table tr td.selected.disabled,fieldset[disabled] .datepicker table tr td.selected.disabled:hover,.datepicker table tr td.selected.disabled:hover,.datepicker table tr td.selected:hover.disabled:hover,.datepicker table tr td.selected.disabled.disabled:hover,.datepicker table tr td.selected.disabled:hover.disabled:hover,.datepicker table tr td.selected[disabled]:hover,.datepicker table tr td.selected:hover[disabled]:hover,.datepicker table tr td.selected.disabled[disabled]:hover,.datepicker table tr td.selected.disabled:hover[disabled]:hover,fieldset[disabled] .datepicker table tr td.selected:hover,fieldset[disabled] .datepicker table tr td.selected:hover:hover,fieldset[disabled] .datepicker table tr td.selected.disabled:hover,fieldset[disabled] .datepicker table tr td.selected.disabled:hover:hover,.datepicker table tr td.selected.disabled:focus,.datepicker table tr td.selected:hover.disabled:focus,.datepicker table tr td.selected.disabled.disabled:focus,.datepicker table tr td.selected.disabled:hover.disabled:focus,.datepicker table tr td.selected[disabled]:focus,.datepicker table tr td.selected:hover[disabled]:focus,.datepicker table tr td.selected.disabled[disabled]:focus,.datepicker table tr td.selected.disabled:hover[disabled]:focus,fieldset[disabled] .datepicker table tr td.selected:focus,fieldset[disabled] .datepicker table tr td.selected:hover:focus,fieldset[disabled] .datepicker table tr td.selected.disabled:focus,fieldset[disabled] .datepicker table tr td.selected.disabled:hover:focus,.datepicker table tr td.selected.disabled:active,.datepicker table tr td.selected:hover.disabled:active,.datepicker table tr td.selected.disabled.disabled:active,.datepicker table tr td.selected.disabled:hover.disabled:active,.datepicker table tr td.selected[disabled]:active,.datepicker table tr td.selected:hover[disabled]:active,.datepicker table tr td.selected.disabled[disabled]:active,.datepicker table tr td.selected.disabled:hover[disabled]:active,fieldset[disabled] .datepicker table tr td.selected:active,fieldset[disabled] .datepicker table tr td.selected:hover:active,fieldset[disabled] .datepicker table tr td.selected.disabled:active,fieldset[disabled] .datepicker table tr td.selected.disabled:hover:active,.datepicker table tr td.selected.disabled.active,.datepicker table tr td.selected:hover.disabled.active,.datepicker table tr td.selected.disabled.disabled.active,.datepicker table tr td.selected.disabled:hover.disabled.active,.datepicker table tr td.selected[disabled].active,.datepicker table tr td.selected:hover[disabled].active,.datepicker table tr td.selected.disabled[disabled].active,.datepicker table tr td.selected.disabled:hover[disabled].active,fieldset[disabled] .datepicker table tr td.selected.active,fieldset[disabled] .datepicker table tr td.selected:hover.active,fieldset[disabled] .datepicker table tr td.selected.disabled.active,fieldset[disabled] .datepicker table tr td.selected.disabled:hover.active{background-color:#999;border-color:#555}.datepicker table tr td.active,.datepicker table tr td.active:hover,.datepicker table tr td.active.disabled,.datepicker table tr td.active.disabled:hover{color:#fff;background-color:#428bca;border-color:#357ebd;text-shadow:0 -1px 0 rgba(0,0,0,.25)}.datepicker table tr td.active:hover,.datepicker table tr td.active:hover:hover,.datepicker table tr td.active.disabled:hover,.datepicker table tr td.active.disabled:hover:hover,.datepicker table tr td.active:focus,.datepicker table tr td.active:hover:focus,.datepicker table tr td.active.disabled:focus,.datepicker table tr td.active.disabled:hover:focus,.datepicker table tr td.active:active,.datepicker table tr td.active:hover:active,.datepicker table tr td.active.disabled:active,.datepicker table tr td.active.disabled:hover:active,.datepicker table tr td.active.active,.datepicker table tr td.active:hover.active,.datepicker table tr td.active.disabled.active,.datepicker table tr td.active.disabled:hover.active,.open .dropdown-toggle.datepicker table tr td.active,.open .dropdown-toggle.datepicker table tr td.active:hover,.open .dropdown-toggle.datepicker table tr td.active.disabled,.open .dropdown-toggle.datepicker table tr td.active.disabled:hover{color:#fff;background-color:#3276b1;border-color:#285e8e}.datepicker table tr td.active:active,.datepicker table tr td.active:hover:active,.datepicker table tr td.active.disabled:active,.datepicker table tr td.active.disabled:hover:active,.datepicker table tr td.active.active,.datepicker table tr td.active:hover.active,.datepicker table tr td.active.disabled.active,.datepicker table tr td.active.disabled:hover.active,.open .dropdown-toggle.datepicker table tr td.active,.open .dropdown-toggle.datepicker table tr td.active:hover,.open .dropdown-toggle.datepicker table tr td.active.disabled,.open .dropdown-toggle.datepicker table tr td.active.disabled:hover{background-image:none}.datepicker table tr td.active.disabled,.datepicker table tr td.active:hover.disabled,.datepicker table tr td.active.disabled.disabled,.datepicker table tr td.active.disabled:hover.disabled,.datepicker table tr td.active[disabled],.datepicker table tr td.active:hover[disabled],.datepicker table tr td.active.disabled[disabled],.datepicker table tr td.active.disabled:hover[disabled],fieldset[disabled] .datepicker table tr td.active,fieldset[disabled] .datepicker table tr td.active:hover,fieldset[disabled] .datepicker table tr td.active.disabled,fieldset[disabled] .datepicker table tr td.active.disabled:hover,.datepicker table tr td.active.disabled:hover,.datepicker table tr td.active:hover.disabled:hover,.datepicker table tr td.active.disabled.disabled:hover,.datepicker table tr td.active.disabled:hover.disabled:hover,.datepicker table tr td.active[disabled]:hover,.datepicker table tr td.active:hover[disabled]:hover,.datepicker table tr td.active.disabled[disabled]:hover,.datepicker table tr td.active.disabled:hover[disabled]:hover,fieldset[disabled] .datepicker table tr td.active:hover,fieldset[disabled] .datepicker table tr td.active:hover:hover,fieldset[disabled] .datepicker table tr td.active.disabled:hover,fieldset[disabled] .datepicker table tr td.active.disabled:hover:hover,.datepicker table tr td.active.disabled:focus,.datepicker table tr td.active:hover.disabled:focus,.datepicker table tr td.active.disabled.disabled:focus,.datepicker table tr td.active.disabled:hover.disabled:focus,.datepicker table tr td.active[disabled]:focus,.datepicker table tr td.active:hover[disabled]:focus,.datepicker table tr td.active.disabled[disabled]:focus,.datepicker table tr td.active.disabled:hover[disabled]:focus,fieldset[disabled] .datepicker table tr td.active:focus,fieldset[disabled] .datepicker table tr td.active:hover:focus,fieldset[disabled] .datepicker table tr td.active.disabled:focus,fieldset[disabled] .datepicker table tr td.active.disabled:hover:focus,.datepicker table tr td.active.disabled:active,.datepicker table tr td.active:hover.disabled:active,.datepicker table tr td.active.disabled.disabled:active,.datepicker table tr td.active.disabled:hover.disabled:active,.datepicker table tr td.active[disabled]:active,.datepicker table tr td.active:hover[disabled]:active,.datepicker table tr td.active.disabled[disabled]:active,.datepicker table tr td.active.disabled:hover[disabled]:active,fieldset[disabled] .datepicker table tr td.active:active,fieldset[disabled] .datepicker table tr td.active:hover:active,fieldset[disabled] .datepicker table tr td.active.disabled:active,fieldset[disabled] .datepicker table tr td.active.disabled:hover:active,.datepicker table tr td.active.disabled.active,.datepicker table tr td.active:hover.disabled.active,.datepicker table tr td.active.disabled.disabled.active,.datepicker table tr td.active.disabled:hover.disabled.active,.datepicker table tr td.active[disabled].active,.datepicker table tr td.active:hover[disabled].active,.datepicker table tr td.active.disabled[disabled].active,.datepicker table tr td.active.disabled:hover[disabled].active,fieldset[disabled] .datepicker table tr td.active.active,fieldset[disabled] .datepicker table tr td.active:hover.active,fieldset[disabled] .datepicker table tr td.active.disabled.active,fieldset[disabled] .datepicker table tr td.active.disabled:hover.active{background-color:#428bca;border-color:#357ebd}.datepicker table tr td span{display:block;width:23%;height:54px;line-height:54px;float:left;margin:1%;cursor:pointer;border-radius:4px}.datepicker table tr td span:hover{background:#eee}.datepicker table tr td span.disabled,.datepicker table tr td span.disabled:hover{background:0 0;color:#999;cursor:default}.datepicker table tr td span.active,.datepicker table tr td span.active:hover,.datepicker table tr td span.active.disabled,.datepicker table tr td span.active.disabled:hover{color:#fff;background-color:#428bca;border-color:#357ebd;text-shadow:0 -1px 0 rgba(0,0,0,.25)}.datepicker table tr td span.active:hover,.datepicker table tr td span.active:hover:hover,.datepicker table tr td span.active.disabled:hover,.datepicker table tr td span.active.disabled:hover:hover,.datepicker table tr td span.active:focus,.datepicker table tr td span.active:hover:focus,.datepicker table tr td span.active.disabled:focus,.datepicker table tr td span.active.disabled:hover:focus,.datepicker table tr td span.active:active,.datepicker table tr td span.active:hover:active,.datepicker table tr td span.active.disabled:active,.datepicker table tr td span.active.disabled:hover:active,.datepicker table tr td span.active.active,.datepicker table tr td span.active:hover.active,.datepicker table tr td span.active.disabled.active,.datepicker table tr td span.active.disabled:hover.active,.open .dropdown-toggle.datepicker table tr td span.active,.open .dropdown-toggle.datepicker table tr td span.active:hover,.open .dropdown-toggle.datepicker table tr td span.active.disabled,.open .dropdown-toggle.datepicker table tr td span.active.disabled:hover{color:#fff;background-color:#3276b1;border-color:#285e8e}.datepicker table tr td span.active:active,.datepicker table tr td span.active:hover:active,.datepicker table tr td span.active.disabled:active,.datepicker table tr td span.active.disabled:hover:active,.datepicker table tr td span.active.active,.datepicker table tr td span.active:hover.active,.datepicker table tr td span.active.disabled.active,.datepicker table tr td span.active.disabled:hover.active,.open .dropdown-toggle.datepicker table tr td span.active,.open .dropdown-toggle.datepicker table tr td span.active:hover,.open .dropdown-toggle.datepicker table tr td span.active.disabled,.open .dropdown-toggle.datepicker table tr td span.active.disabled:hover{background-image:none}.datepicker table tr td span.active.disabled,.datepicker table tr td span.active:hover.disabled,.datepicker table tr td span.active.disabled.disabled,.datepicker table tr td span.active.disabled:hover.disabled,.datepicker table tr td span.active[disabled],.datepicker table tr td span.active:hover[disabled],.datepicker table tr td span.active.disabled[disabled],.datepicker table tr td span.active.disabled:hover[disabled],fieldset[disabled] .datepicker table tr td span.active,fieldset[disabled] .datepicker table tr td span.active:hover,fieldset[disabled] .datepicker table tr td span.active.disabled,fieldset[disabled] .datepicker table tr td span.active.disabled:hover,.datepicker table tr td span.active.disabled:hover,.datepicker table tr td span.active:hover.disabled:hover,.datepicker table tr td span.active.disabled.disabled:hover,.datepicker table tr td span.active.disabled:hover.disabled:hover,.datepicker table tr td span.active[disabled]:hover,.datepicker table tr td span.active:hover[disabled]:hover,.datepicker table tr td span.active.disabled[disabled]:hover,.datepicker table tr td span.active.disabled:hover[disabled]:hover,fieldset[disabled] .datepicker table tr td span.active:hover,fieldset[disabled] .datepicker table tr td span.active:hover:hover,fieldset[disabled] .datepicker table tr td span.active.disabled:hover,fieldset[disabled] .datepicker table tr td span.active.disabled:hover:hover,.datepicker table tr td span.active.disabled:focus,.datepicker table tr td span.active:hover.disabled:focus,.datepicker table tr td span.active.disabled.disabled:focus,.datepicker table tr td span.active.disabled:hover.disabled:focus,.datepicker table tr td span.active[disabled]:focus,.datepicker table tr td span.active:hover[disabled]:focus,.datepicker table tr td span.active.disabled[disabled]:focus,.datepicker table tr td span.active.disabled:hover[disabled]:focus,fieldset[disabled] .datepicker table tr td span.active:focus,fieldset[disabled] .datepicker table tr td span.active:hover:focus,fieldset[disabled] .datepicker table tr td span.active.disabled:focus,fieldset[disabled] .datepicker table tr td span.active.disabled:hover:focus,.datepicker table tr td span.active.disabled:active,.datepicker table tr td span.active:hover.disabled:active,.datepicker table tr td span.active.disabled.disabled:active,.datepicker table tr td span.active.disabled:hover.disabled:active,.datepicker table tr td span.active[disabled]:active,.datepicker table tr td span.active:hover[disabled]:active,.datepicker table tr td span.active.disabled[disabled]:active,.datepicker table tr td span.active.disabled:hover[disabled]:active,fieldset[disabled] .datepicker table tr td span.active:active,fieldset[disabled] .datepicker table tr td span.active:hover:active,fieldset[disabled] .datepicker table tr td span.active.disabled:active,fieldset[disabled] .datepicker table tr td span.active.disabled:hover:active,.datepicker table tr td span.active.disabled.active,.datepicker table tr td span.active:hover.disabled.active,.datepicker table tr td span.active.disabled.disabled.active,.datepicker table tr td span.active.disabled:hover.disabled.active,.datepicker table tr td span.active[disabled].active,.datepicker table tr td span.active:hover[disabled].active,.datepicker table tr td span.active.disabled[disabled].active,.datepicker table tr td span.active.disabled:hover[disabled].active,fieldset[disabled] .datepicker table tr td span.active.active,fieldset[disabled] .datepicker table tr td span.active:hover.active,fieldset[disabled] .datepicker table tr td span.active.disabled.active,fieldset[disabled] .datepicker table tr td span.active.disabled:hover.active{background-color:#428bca;border-color:#357ebd}.datepicker table tr td span.old,.datepicker table tr td span.new{color:#999}.datepicker .datepicker-switch{width:145px}.datepicker thead tr:first-child th,.datepicker tfoot tr th{cursor:pointer}.datepicker thead tr:first-child th:hover,.datepicker tfoot tr th:hover{background:#eee}.datepicker .cw{font-size:10px;width:12px;padding:0 2px 0 5px;vertical-align:middle}.datepicker thead tr:first-child .cw{cursor:default;background-color:transparent}.input-group.date .input-group-addon{cursor:pointer}.input-daterange{width:100%}.input-daterange input{text-align:center}.input-daterange input:first-child{border-radius:3px 0 0 3px}.input-daterange input:last-child{border-radius:0 3px 3px 0}.input-daterange .input-group-addon{width:auto;min-width:16px;padding:4px 5px;font-weight:400;line-height:1.42857143;text-align:center;text-shadow:0 1px 0 #fff;vertical-align:middle;background-color:#eee;border:solid #ccc;border-width:1px 0;margin-left:-5px;margin-right:-5px}
\ No newline at end of file diff --git a/public/vendor/bootstrap-datepicker-1.4.0/js/bootstrap-datepicker.min.js b/public/vendor/bootstrap-datepicker-1.4.0/js/bootstrap-datepicker.min.js new file mode 100644 index 00000000..f26d0d86 --- /dev/null +++ b/public/vendor/bootstrap-datepicker-1.4.0/js/bootstrap-datepicker.min.js @@ -0,0 +1,8 @@ +/*! + * Datepicker for Bootstrap v1.4.0 (https://github.com/eternicode/bootstrap-datepicker) + * + * Copyright 2012 Stefan Petre + * Improvements by Andrew Rowls + * Licensed under the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) + */ +!function(a,b){function c(){return new Date(Date.UTC.apply(Date,arguments))}function d(){var a=new Date;return c(a.getFullYear(),a.getMonth(),a.getDate())}function e(a,b){return a.getUTCFullYear()===b.getUTCFullYear()&&a.getUTCMonth()===b.getUTCMonth()&&a.getUTCDate()===b.getUTCDate()}function f(a){return function(){return this[a].apply(this,arguments)}}function g(b,c){function d(a,b){return b.toLowerCase()}var e,f=a(b).data(),g={},h=new RegExp("^"+c.toLowerCase()+"([A-Z])");c=new RegExp("^"+c.toLowerCase());for(var i in f)c.test(i)&&(e=i.replace(h,d),g[e]=f[i]);return g}function h(b){var c={};if(p[b]||(b=b.split("-")[0],p[b])){var d=p[b];return a.each(o,function(a,b){b in d&&(c[b]=d[b])}),c}}var i=function(){var b={get:function(a){return this.slice(a)[0]},contains:function(a){for(var b=a&&a.valueOf(),c=0,d=this.length;d>c;c++)if(this[c].valueOf()===b)return c;return-1},remove:function(a){this.splice(a,1)},replace:function(b){b&&(a.isArray(b)||(b=[b]),this.clear(),this.push.apply(this,b))},clear:function(){this.length=0},copy:function(){var a=new i;return a.replace(this),a}};return function(){var c=[];return c.push.apply(c,arguments),a.extend(c,b),c}}(),j=function(b,c){this._process_options(c),this.dates=new i,this.viewDate=this.o.defaultViewDate,this.focusDate=null,this.element=a(b),this.isInline=!1,this.isInput=this.element.is("input"),this.component=this.element.hasClass("date")?this.element.find(".add-on, .input-group-addon, .btn"):!1,this.hasInput=this.component&&this.element.find("input").length,this.component&&0===this.component.length&&(this.component=!1),this.picker=a(q.template),this._buildEvents(),this._attachEvents(),this.isInline?this.picker.addClass("datepicker-inline").appendTo(this.element):this.picker.addClass("datepicker-dropdown dropdown-menu"),this.o.rtl&&this.picker.addClass("datepicker-rtl"),this.viewMode=this.o.startView,this.o.calendarWeeks&&this.picker.find("tfoot .today, tfoot .clear").attr("colspan",function(a,b){return parseInt(b)+1}),this._allow_update=!1,this.setStartDate(this._o.startDate),this.setEndDate(this._o.endDate),this.setDaysOfWeekDisabled(this.o.daysOfWeekDisabled),this.setDatesDisabled(this.o.datesDisabled),this.fillDow(),this.fillMonths(),this._allow_update=!0,this.update(),this.showMode(),this.isInline&&this.show()};j.prototype={constructor:j,_process_options:function(e){this._o=a.extend({},this._o,e);var f=this.o=a.extend({},this._o),g=f.language;switch(p[g]||(g=g.split("-")[0],p[g]||(g=n.language)),f.language=g,f.startView){case 2:case"decade":f.startView=2;break;case 1:case"year":f.startView=1;break;default:f.startView=0}switch(f.minViewMode){case 1:case"months":f.minViewMode=1;break;case 2:case"years":f.minViewMode=2;break;default:f.minViewMode=0}f.startView=Math.max(f.startView,f.minViewMode),f.multidate!==!0&&(f.multidate=Number(f.multidate)||!1,f.multidate!==!1&&(f.multidate=Math.max(0,f.multidate))),f.multidateSeparator=String(f.multidateSeparator),f.weekStart%=7,f.weekEnd=(f.weekStart+6)%7;var h=q.parseFormat(f.format);if(f.startDate!==-1/0&&(f.startDate=f.startDate?f.startDate instanceof Date?this._local_to_utc(this._zero_time(f.startDate)):q.parseDate(f.startDate,h,f.language):-1/0),1/0!==f.endDate&&(f.endDate=f.endDate?f.endDate instanceof Date?this._local_to_utc(this._zero_time(f.endDate)):q.parseDate(f.endDate,h,f.language):1/0),f.daysOfWeekDisabled=f.daysOfWeekDisabled||[],a.isArray(f.daysOfWeekDisabled)||(f.daysOfWeekDisabled=f.daysOfWeekDisabled.split(/[,\s]*/)),f.daysOfWeekDisabled=a.map(f.daysOfWeekDisabled,function(a){return parseInt(a,10)}),f.datesDisabled=f.datesDisabled||[],!a.isArray(f.datesDisabled)){var i=[];i.push(q.parseDate(f.datesDisabled,h,f.language)),f.datesDisabled=i}f.datesDisabled=a.map(f.datesDisabled,function(a){return q.parseDate(a,h,f.language)});var j=String(f.orientation).toLowerCase().split(/\s+/g),k=f.orientation.toLowerCase();if(j=a.grep(j,function(a){return/^auto|left|right|top|bottom$/.test(a)}),f.orientation={x:"auto",y:"auto"},k&&"auto"!==k)if(1===j.length)switch(j[0]){case"top":case"bottom":f.orientation.y=j[0];break;case"left":case"right":f.orientation.x=j[0]}else k=a.grep(j,function(a){return/^left|right$/.test(a)}),f.orientation.x=k[0]||"auto",k=a.grep(j,function(a){return/^top|bottom$/.test(a)}),f.orientation.y=k[0]||"auto";else;if(f.defaultViewDate){var l=f.defaultViewDate.year||(new Date).getFullYear(),m=f.defaultViewDate.month||0,o=f.defaultViewDate.day||1;f.defaultViewDate=c(l,m,o)}else f.defaultViewDate=d();f.showOnFocus=f.showOnFocus!==b?f.showOnFocus:!0},_events:[],_secondaryEvents:[],_applyEvents:function(a){for(var c,d,e,f=0;f<a.length;f++)c=a[f][0],2===a[f].length?(d=b,e=a[f][1]):3===a[f].length&&(d=a[f][1],e=a[f][2]),c.on(e,d)},_unapplyEvents:function(a){for(var c,d,e,f=0;f<a.length;f++)c=a[f][0],2===a[f].length?(e=b,d=a[f][1]):3===a[f].length&&(e=a[f][1],d=a[f][2]),c.off(d,e)},_buildEvents:function(){var b={keyup:a.proxy(function(b){-1===a.inArray(b.keyCode,[27,37,39,38,40,32,13,9])&&this.update()},this),keydown:a.proxy(this.keydown,this)};this.o.showOnFocus===!0&&(b.focus=a.proxy(this.show,this)),this.isInput?this._events=[[this.element,b]]:this.component&&this.hasInput?this._events=[[this.element.find("input"),b],[this.component,{click:a.proxy(this.show,this)}]]:this.element.is("div")?this.isInline=!0:this._events=[[this.element,{click:a.proxy(this.show,this)}]],this._events.push([this.element,"*",{blur:a.proxy(function(a){this._focused_from=a.target},this)}],[this.element,{blur:a.proxy(function(a){this._focused_from=a.target},this)}]),this._secondaryEvents=[[this.picker,{click:a.proxy(this.click,this)}],[a(window),{resize:a.proxy(this.place,this)}],[a(document),{"mousedown touchstart":a.proxy(function(a){this.element.is(a.target)||this.element.find(a.target).length||this.picker.is(a.target)||this.picker.find(a.target).length||this.hide()},this)}]]},_attachEvents:function(){this._detachEvents(),this._applyEvents(this._events)},_detachEvents:function(){this._unapplyEvents(this._events)},_attachSecondaryEvents:function(){this._detachSecondaryEvents(),this._applyEvents(this._secondaryEvents)},_detachSecondaryEvents:function(){this._unapplyEvents(this._secondaryEvents)},_trigger:function(b,c){var d=c||this.dates.get(-1),e=this._utc_to_local(d);this.element.trigger({type:b,date:e,dates:a.map(this.dates,this._utc_to_local),format:a.proxy(function(a,b){0===arguments.length?(a=this.dates.length-1,b=this.o.format):"string"==typeof a&&(b=a,a=this.dates.length-1),b=b||this.o.format;var c=this.dates.get(a);return q.formatDate(c,b,this.o.language)},this)})},show:function(){return this.element.attr("readonly")&&this.o.enableOnReadonly===!1?void 0:(this.isInline||this.picker.appendTo(this.o.container),this.place(),this.picker.show(),this._attachSecondaryEvents(),this._trigger("show"),(window.navigator.msMaxTouchPoints||"ontouchstart"in document)&&this.o.disableTouchKeyboard&&a(this.element).blur(),this)},hide:function(){return this.isInline?this:this.picker.is(":visible")?(this.focusDate=null,this.picker.hide().detach(),this._detachSecondaryEvents(),this.viewMode=this.o.startView,this.showMode(),this.o.forceParse&&(this.isInput&&this.element.val()||this.hasInput&&this.element.find("input").val())&&this.setValue(),this._trigger("hide"),this):this},remove:function(){return this.hide(),this._detachEvents(),this._detachSecondaryEvents(),this.picker.remove(),delete this.element.data().datepicker,this.isInput||delete this.element.data().date,this},_utc_to_local:function(a){return a&&new Date(a.getTime()+6e4*a.getTimezoneOffset())},_local_to_utc:function(a){return a&&new Date(a.getTime()-6e4*a.getTimezoneOffset())},_zero_time:function(a){return a&&new Date(a.getFullYear(),a.getMonth(),a.getDate())},_zero_utc_time:function(a){return a&&new Date(Date.UTC(a.getUTCFullYear(),a.getUTCMonth(),a.getUTCDate()))},getDates:function(){return a.map(this.dates,this._utc_to_local)},getUTCDates:function(){return a.map(this.dates,function(a){return new Date(a)})},getDate:function(){return this._utc_to_local(this.getUTCDate())},getUTCDate:function(){var a=this.dates.get(-1);return"undefined"!=typeof a?new Date(a):null},clearDates:function(){var a;this.isInput?a=this.element:this.component&&(a=this.element.find("input")),a&&a.val("").change(),this.update(),this._trigger("changeDate"),this.o.autoclose&&this.hide()},setDates:function(){var b=a.isArray(arguments[0])?arguments[0]:arguments;return this.update.apply(this,b),this._trigger("changeDate"),this.setValue(),this},setUTCDates:function(){var b=a.isArray(arguments[0])?arguments[0]:arguments;return this.update.apply(this,a.map(b,this._utc_to_local)),this._trigger("changeDate"),this.setValue(),this},setDate:f("setDates"),setUTCDate:f("setUTCDates"),setValue:function(){var a=this.getFormattedDate();return this.isInput?this.element.val(a).change():this.component&&this.element.find("input").val(a).change(),this},getFormattedDate:function(c){c===b&&(c=this.o.format);var d=this.o.language;return a.map(this.dates,function(a){return q.formatDate(a,c,d)}).join(this.o.multidateSeparator)},setStartDate:function(a){return this._process_options({startDate:a}),this.update(),this.updateNavArrows(),this},setEndDate:function(a){return this._process_options({endDate:a}),this.update(),this.updateNavArrows(),this},setDaysOfWeekDisabled:function(a){return this._process_options({daysOfWeekDisabled:a}),this.update(),this.updateNavArrows(),this},setDatesDisabled:function(a){this._process_options({datesDisabled:a}),this.update(),this.updateNavArrows()},place:function(){if(this.isInline)return this;var b=this.picker.outerWidth(),c=this.picker.outerHeight(),d=10,e=a(this.o.container).width(),f=a(this.o.container).height(),g=a(this.o.container).scrollTop(),h=a(this.o.container).offset(),i=[];this.element.parents().each(function(){var b=a(this).css("z-index");"auto"!==b&&0!==b&&i.push(parseInt(b))});var j=Math.max.apply(Math,i)+10,k=this.component?this.component.parent().offset():this.element.offset(),l=this.component?this.component.outerHeight(!0):this.element.outerHeight(!1),m=this.component?this.component.outerWidth(!0):this.element.outerWidth(!1),n=k.left-h.left,o=k.top-h.top;this.picker.removeClass("datepicker-orient-top datepicker-orient-bottom datepicker-orient-right datepicker-orient-left"),"auto"!==this.o.orientation.x?(this.picker.addClass("datepicker-orient-"+this.o.orientation.x),"right"===this.o.orientation.x&&(n-=b-m)):k.left<0?(this.picker.addClass("datepicker-orient-left"),n-=k.left-d):n+b>e?(this.picker.addClass("datepicker-orient-right"),n=k.left+m-b):this.picker.addClass("datepicker-orient-left");var p,q,r=this.o.orientation.y;if("auto"===r&&(p=-g+o-c,q=g+f-(o+l+c),r=Math.max(p,q)===q?"top":"bottom"),this.picker.addClass("datepicker-orient-"+r),"top"===r?o+=l:o-=c+parseInt(this.picker.css("padding-top")),this.o.rtl){var s=e-(n+m);this.picker.css({top:o,right:s,zIndex:j})}else this.picker.css({top:o,left:n,zIndex:j});return this},_allow_update:!0,update:function(){if(!this._allow_update)return this;var b=this.dates.copy(),c=[],d=!1;return arguments.length?(a.each(arguments,a.proxy(function(a,b){b instanceof Date&&(b=this._local_to_utc(b)),c.push(b)},this)),d=!0):(c=this.isInput?this.element.val():this.element.data("date")||this.element.find("input").val(),c=c&&this.o.multidate?c.split(this.o.multidateSeparator):[c],delete this.element.data().date),c=a.map(c,a.proxy(function(a){return q.parseDate(a,this.o.format,this.o.language)},this)),c=a.grep(c,a.proxy(function(a){return a<this.o.startDate||a>this.o.endDate||!a},this),!0),this.dates.replace(c),this.dates.length?this.viewDate=new Date(this.dates.get(-1)):this.viewDate<this.o.startDate?this.viewDate=new Date(this.o.startDate):this.viewDate>this.o.endDate&&(this.viewDate=new Date(this.o.endDate)),d?this.setValue():c.length&&String(b)!==String(this.dates)&&this._trigger("changeDate"),!this.dates.length&&b.length&&this._trigger("clearDate"),this.fill(),this},fillDow:function(){var a=this.o.weekStart,b="<tr>";if(this.o.calendarWeeks){this.picker.find(".datepicker-days thead tr:first-child .datepicker-switch").attr("colspan",function(a,b){return parseInt(b)+1});var c='<th class="cw"> </th>';b+=c}for(;a<this.o.weekStart+7;)b+='<th class="dow">'+p[this.o.language].daysMin[a++%7]+"</th>";b+="</tr>",this.picker.find(".datepicker-days thead").append(b)},fillMonths:function(){for(var a="",b=0;12>b;)a+='<span class="month">'+p[this.o.language].monthsShort[b++]+"</span>";this.picker.find(".datepicker-months td").html(a)},setRange:function(b){b&&b.length?this.range=a.map(b,function(a){return a.valueOf()}):delete this.range,this.fill()},getClassNames:function(b){var c=[],d=this.viewDate.getUTCFullYear(),f=this.viewDate.getUTCMonth(),g=new Date;return b.getUTCFullYear()<d||b.getUTCFullYear()===d&&b.getUTCMonth()<f?c.push("old"):(b.getUTCFullYear()>d||b.getUTCFullYear()===d&&b.getUTCMonth()>f)&&c.push("new"),this.focusDate&&b.valueOf()===this.focusDate.valueOf()&&c.push("focused"),this.o.todayHighlight&&b.getUTCFullYear()===g.getFullYear()&&b.getUTCMonth()===g.getMonth()&&b.getUTCDate()===g.getDate()&&c.push("today"),-1!==this.dates.contains(b)&&c.push("active"),(b.valueOf()<this.o.startDate||b.valueOf()>this.o.endDate||-1!==a.inArray(b.getUTCDay(),this.o.daysOfWeekDisabled))&&c.push("disabled"),this.o.datesDisabled.length>0&&a.grep(this.o.datesDisabled,function(a){return e(b,a)}).length>0&&c.push("disabled","disabled-date"),this.range&&(b>this.range[0]&&b<this.range[this.range.length-1]&&c.push("range"),-1!==a.inArray(b.valueOf(),this.range)&&c.push("selected")),c},fill:function(){var d,e=new Date(this.viewDate),f=e.getUTCFullYear(),g=e.getUTCMonth(),h=this.o.startDate!==-1/0?this.o.startDate.getUTCFullYear():-1/0,i=this.o.startDate!==-1/0?this.o.startDate.getUTCMonth():-1/0,j=1/0!==this.o.endDate?this.o.endDate.getUTCFullYear():1/0,k=1/0!==this.o.endDate?this.o.endDate.getUTCMonth():1/0,l=p[this.o.language].today||p.en.today||"",m=p[this.o.language].clear||p.en.clear||"";if(!isNaN(f)&&!isNaN(g)){this.picker.find(".datepicker-days thead .datepicker-switch").text(p[this.o.language].months[g]+" "+f),this.picker.find("tfoot .today").text(l).toggle(this.o.todayBtn!==!1),this.picker.find("tfoot .clear").text(m).toggle(this.o.clearBtn!==!1),this.updateNavArrows(),this.fillMonths();var n=c(f,g-1,28),o=q.getDaysInMonth(n.getUTCFullYear(),n.getUTCMonth());n.setUTCDate(o),n.setUTCDate(o-(n.getUTCDay()-this.o.weekStart+7)%7);var r=new Date(n);r.setUTCDate(r.getUTCDate()+42),r=r.valueOf();for(var s,t=[];n.valueOf()<r;){if(n.getUTCDay()===this.o.weekStart&&(t.push("<tr>"),this.o.calendarWeeks)){var u=new Date(+n+(this.o.weekStart-n.getUTCDay()-7)%7*864e5),v=new Date(Number(u)+(11-u.getUTCDay())%7*864e5),w=new Date(Number(w=c(v.getUTCFullYear(),0,1))+(11-w.getUTCDay())%7*864e5),x=(v-w)/864e5/7+1;t.push('<td class="cw">'+x+"</td>")}if(s=this.getClassNames(n),s.push("day"),this.o.beforeShowDay!==a.noop){var y=this.o.beforeShowDay(this._utc_to_local(n));y===b?y={}:"boolean"==typeof y?y={enabled:y}:"string"==typeof y&&(y={classes:y}),y.enabled===!1&&s.push("disabled"),y.classes&&(s=s.concat(y.classes.split(/\s+/))),y.tooltip&&(d=y.tooltip)}s=a.unique(s),t.push('<td class="'+s.join(" ")+'"'+(d?' title="'+d+'"':"")+">"+n.getUTCDate()+"</td>"),d=null,n.getUTCDay()===this.o.weekEnd&&t.push("</tr>"),n.setUTCDate(n.getUTCDate()+1)}this.picker.find(".datepicker-days tbody").empty().append(t.join(""));var z=this.picker.find(".datepicker-months").find("th:eq(1)").text(f).end().find("span").removeClass("active");if(a.each(this.dates,function(a,b){b.getUTCFullYear()===f&&z.eq(b.getUTCMonth()).addClass("active")}),(h>f||f>j)&&z.addClass("disabled"),f===h&&z.slice(0,i).addClass("disabled"),f===j&&z.slice(k+1).addClass("disabled"),this.o.beforeShowMonth!==a.noop){var A=this;a.each(z,function(b,c){if(!a(c).hasClass("disabled")){var d=new Date(f,b,1),e=A.o.beforeShowMonth(d);e===!1&&a(c).addClass("disabled")}})}t="",f=10*parseInt(f/10,10);var B=this.picker.find(".datepicker-years").find("th:eq(1)").text(f+"-"+(f+9)).end().find("td");f-=1;for(var C,D=a.map(this.dates,function(a){return a.getUTCFullYear()}),E=-1;11>E;E++)C=["year"],-1===E?C.push("old"):10===E&&C.push("new"),-1!==a.inArray(f,D)&&C.push("active"),(h>f||f>j)&&C.push("disabled"),t+='<span class="'+C.join(" ")+'">'+f+"</span>",f+=1;B.html(t)}},updateNavArrows:function(){if(this._allow_update){var a=new Date(this.viewDate),b=a.getUTCFullYear(),c=a.getUTCMonth();switch(this.viewMode){case 0:this.picker.find(".prev").css(this.o.startDate!==-1/0&&b<=this.o.startDate.getUTCFullYear()&&c<=this.o.startDate.getUTCMonth()?{visibility:"hidden"}:{visibility:"visible"}),this.picker.find(".next").css(1/0!==this.o.endDate&&b>=this.o.endDate.getUTCFullYear()&&c>=this.o.endDate.getUTCMonth()?{visibility:"hidden"}:{visibility:"visible"});break;case 1:case 2:this.picker.find(".prev").css(this.o.startDate!==-1/0&&b<=this.o.startDate.getUTCFullYear()?{visibility:"hidden"}:{visibility:"visible"}),this.picker.find(".next").css(1/0!==this.o.endDate&&b>=this.o.endDate.getUTCFullYear()?{visibility:"hidden"}:{visibility:"visible"})}}},click:function(b){b.preventDefault();var d,e,f,g=a(b.target).closest("span, td, th");if(1===g.length)switch(g[0].nodeName.toLowerCase()){case"th":switch(g[0].className){case"datepicker-switch":this.showMode(1);break;case"prev":case"next":var h=q.modes[this.viewMode].navStep*("prev"===g[0].className?-1:1);switch(this.viewMode){case 0:this.viewDate=this.moveMonth(this.viewDate,h),this._trigger("changeMonth",this.viewDate);break;case 1:case 2:this.viewDate=this.moveYear(this.viewDate,h),1===this.viewMode&&this._trigger("changeYear",this.viewDate)}this.fill();break;case"today":var i=new Date;i=c(i.getFullYear(),i.getMonth(),i.getDate(),0,0,0),this.showMode(-2);var j="linked"===this.o.todayBtn?null:"view";this._setDate(i,j);break;case"clear":this.clearDates()}break;case"span":g.hasClass("disabled")||(this.viewDate.setUTCDate(1),g.hasClass("month")?(f=1,e=g.parent().find("span").index(g),d=this.viewDate.getUTCFullYear(),this.viewDate.setUTCMonth(e),this._trigger("changeMonth",this.viewDate),1===this.o.minViewMode&&this._setDate(c(d,e,f))):(f=1,e=0,d=parseInt(g.text(),10)||0,this.viewDate.setUTCFullYear(d),this._trigger("changeYear",this.viewDate),2===this.o.minViewMode&&this._setDate(c(d,e,f))),this.showMode(-1),this.fill());break;case"td":g.hasClass("day")&&!g.hasClass("disabled")&&(f=parseInt(g.text(),10)||1,d=this.viewDate.getUTCFullYear(),e=this.viewDate.getUTCMonth(),g.hasClass("old")?0===e?(e=11,d-=1):e-=1:g.hasClass("new")&&(11===e?(e=0,d+=1):e+=1),this._setDate(c(d,e,f)))}this.picker.is(":visible")&&this._focused_from&&a(this._focused_from).focus(),delete this._focused_from},_toggle_multidate:function(a){var b=this.dates.contains(a);if(a||this.dates.clear(),-1!==b?(this.o.multidate===!0||this.o.multidate>1||this.o.toggleActive)&&this.dates.remove(b):this.o.multidate===!1?(this.dates.clear(),this.dates.push(a)):this.dates.push(a),"number"==typeof this.o.multidate)for(;this.dates.length>this.o.multidate;)this.dates.remove(0)},_setDate:function(a,b){b&&"date"!==b||this._toggle_multidate(a&&new Date(a)),b&&"view"!==b||(this.viewDate=a&&new Date(a)),this.fill(),this.setValue(),b&&"view"===b||this._trigger("changeDate");var c;this.isInput?c=this.element:this.component&&(c=this.element.find("input")),c&&c.change(),!this.o.autoclose||b&&"date"!==b||this.hide()},moveMonth:function(a,c){if(!a)return b;if(!c)return a;var d,e,f=new Date(a.valueOf()),g=f.getUTCDate(),h=f.getUTCMonth(),i=Math.abs(c);if(c=c>0?1:-1,1===i)e=-1===c?function(){return f.getUTCMonth()===h}:function(){return f.getUTCMonth()!==d},d=h+c,f.setUTCMonth(d),(0>d||d>11)&&(d=(d+12)%12);else{for(var j=0;i>j;j++)f=this.moveMonth(f,c);d=f.getUTCMonth(),f.setUTCDate(g),e=function(){return d!==f.getUTCMonth()}}for(;e();)f.setUTCDate(--g),f.setUTCMonth(d);return f},moveYear:function(a,b){return this.moveMonth(a,12*b)},dateWithinRange:function(a){return a>=this.o.startDate&&a<=this.o.endDate},keydown:function(a){if(!this.picker.is(":visible"))return void(27===a.keyCode&&this.show());var b,c,e,f=!1,g=this.focusDate||this.viewDate;switch(a.keyCode){case 27:this.focusDate?(this.focusDate=null,this.viewDate=this.dates.get(-1)||this.viewDate,this.fill()):this.hide(),a.preventDefault();break;case 37:case 39:if(!this.o.keyboardNavigation)break;b=37===a.keyCode?-1:1,a.ctrlKey?(c=this.moveYear(this.dates.get(-1)||d(),b),e=this.moveYear(g,b),this._trigger("changeYear",this.viewDate)):a.shiftKey?(c=this.moveMonth(this.dates.get(-1)||d(),b),e=this.moveMonth(g,b),this._trigger("changeMonth",this.viewDate)):(c=new Date(this.dates.get(-1)||d()),c.setUTCDate(c.getUTCDate()+b),e=new Date(g),e.setUTCDate(g.getUTCDate()+b)),this.dateWithinRange(e)&&(this.focusDate=this.viewDate=e,this.setValue(),this.fill(),a.preventDefault());break;case 38:case 40:if(!this.o.keyboardNavigation)break;b=38===a.keyCode?-1:1,a.ctrlKey?(c=this.moveYear(this.dates.get(-1)||d(),b),e=this.moveYear(g,b),this._trigger("changeYear",this.viewDate)):a.shiftKey?(c=this.moveMonth(this.dates.get(-1)||d(),b),e=this.moveMonth(g,b),this._trigger("changeMonth",this.viewDate)):(c=new Date(this.dates.get(-1)||d()),c.setUTCDate(c.getUTCDate()+7*b),e=new Date(g),e.setUTCDate(g.getUTCDate()+7*b)),this.dateWithinRange(e)&&(this.focusDate=this.viewDate=e,this.setValue(),this.fill(),a.preventDefault());break;case 32:break;case 13:g=this.focusDate||this.dates.get(-1)||this.viewDate,this.o.keyboardNavigation&&(this._toggle_multidate(g),f=!0),this.focusDate=null,this.viewDate=this.dates.get(-1)||this.viewDate,this.setValue(),this.fill(),this.picker.is(":visible")&&(a.preventDefault(),"function"==typeof a.stopPropagation?a.stopPropagation():a.cancelBubble=!0,this.o.autoclose&&this.hide());break;case 9:this.focusDate=null,this.viewDate=this.dates.get(-1)||this.viewDate,this.fill(),this.hide()}if(f){this._trigger(this.dates.length?"changeDate":"clearDate");var h;this.isInput?h=this.element:this.component&&(h=this.element.find("input")),h&&h.change()}},showMode:function(a){a&&(this.viewMode=Math.max(this.o.minViewMode,Math.min(2,this.viewMode+a))),this.picker.children("div").hide().filter(".datepicker-"+q.modes[this.viewMode].clsName).css("display","block"),this.updateNavArrows()}};var k=function(b,c){this.element=a(b),this.inputs=a.map(c.inputs,function(a){return a.jquery?a[0]:a}),delete c.inputs,m.call(a(this.inputs),c).bind("changeDate",a.proxy(this.dateUpdated,this)),this.pickers=a.map(this.inputs,function(b){return a(b).data("datepicker")}),this.updateDates()};k.prototype={updateDates:function(){this.dates=a.map(this.pickers,function(a){return a.getUTCDate()}),this.updateRanges()},updateRanges:function(){var b=a.map(this.dates,function(a){return a.valueOf()});a.each(this.pickers,function(a,c){c.setRange(b)})},dateUpdated:function(b){if(!this.updating){this.updating=!0;var c=a(b.target).data("datepicker"),d=c.getUTCDate(),e=a.inArray(b.target,this.inputs),f=e-1,g=e+1,h=this.inputs.length;if(-1!==e){if(a.each(this.pickers,function(a,b){b.getUTCDate()||b.setUTCDate(d)}),d<this.dates[f])for(;f>=0&&d<this.dates[f];)this.pickers[f--].setUTCDate(d);else if(d>this.dates[g])for(;h>g&&d>this.dates[g];)this.pickers[g++].setUTCDate(d);this.updateDates(),delete this.updating}}},remove:function(){a.map(this.pickers,function(a){a.remove()}),delete this.element.data().datepicker}};var l=a.fn.datepicker,m=function(c){var d=Array.apply(null,arguments);d.shift();var e;return this.each(function(){var f=a(this),i=f.data("datepicker"),l="object"==typeof c&&c;if(!i){var m=g(this,"date"),o=a.extend({},n,m,l),p=h(o.language),q=a.extend({},n,p,m,l);if(f.hasClass("input-daterange")||q.inputs){var r={inputs:q.inputs||f.find("input").toArray()};f.data("datepicker",i=new k(this,a.extend(q,r)))}else f.data("datepicker",i=new j(this,q))}return"string"==typeof c&&"function"==typeof i[c]&&(e=i[c].apply(i,d),e!==b)?!1:void 0}),e!==b?e:this};a.fn.datepicker=m;var n=a.fn.datepicker.defaults={autoclose:!1,beforeShowDay:a.noop,beforeShowMonth:a.noop,calendarWeeks:!1,clearBtn:!1,toggleActive:!1,daysOfWeekDisabled:[],datesDisabled:[],endDate:1/0,forceParse:!0,format:"mm/dd/yyyy",keyboardNavigation:!0,language:"en",minViewMode:0,multidate:!1,multidateSeparator:",",orientation:"auto",rtl:!1,startDate:-1/0,startView:0,todayBtn:!1,todayHighlight:!1,weekStart:0,disableTouchKeyboard:!1,enableOnReadonly:!0,container:"body"},o=a.fn.datepicker.locale_opts=["format","rtl","weekStart"];a.fn.datepicker.Constructor=j;var p=a.fn.datepicker.dates={en:{days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat","Sun"],daysMin:["Su","Mo","Tu","We","Th","Fr","Sa","Su"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],today:"Today",clear:"Clear"}},q={modes:[{clsName:"days",navFnc:"Month",navStep:1},{clsName:"months",navFnc:"FullYear",navStep:1},{clsName:"years",navFnc:"FullYear",navStep:10}],isLeapYear:function(a){return a%4===0&&a%100!==0||a%400===0},getDaysInMonth:function(a,b){return[31,q.isLeapYear(a)?29:28,31,30,31,30,31,31,30,31,30,31][b]},validParts:/dd?|DD?|mm?|MM?|yy(?:yy)?/g,nonpunctuation:/[^ -\/:-@\[\u3400-\u9fff-`{-~\t\n\r]+/g,parseFormat:function(a){var b=a.replace(this.validParts,"\x00").split("\x00"),c=a.match(this.validParts);if(!b||!b.length||!c||0===c.length)throw new Error("Invalid date format.");return{separators:b,parts:c}},parseDate:function(d,e,f){function g(){var a=this.slice(0,m[k].length),b=m[k].slice(0,a.length);return a.toLowerCase()===b.toLowerCase()}if(!d)return b;if(d instanceof Date)return d;"string"==typeof e&&(e=q.parseFormat(e));var h,i,k,l=/([\-+]\d+)([dmwy])/,m=d.match(/([\-+]\d+)([dmwy])/g);if(/^[\-+]\d+[dmwy]([\s,]+[\-+]\d+[dmwy])*$/.test(d)){for(d=new Date,k=0;k<m.length;k++)switch(h=l.exec(m[k]),i=parseInt(h[1]),h[2]){case"d":d.setUTCDate(d.getUTCDate()+i);break;case"m":d=j.prototype.moveMonth.call(j.prototype,d,i);break;case"w":d.setUTCDate(d.getUTCDate()+7*i);break;case"y":d=j.prototype.moveYear.call(j.prototype,d,i)}return c(d.getUTCFullYear(),d.getUTCMonth(),d.getUTCDate(),0,0,0)}m=d&&d.match(this.nonpunctuation)||[],d=new Date;var n,o,r={},s=["yyyy","yy","M","MM","m","mm","d","dd"],t={yyyy:function(a,b){return a.setUTCFullYear(b)},yy:function(a,b){return a.setUTCFullYear(2e3+b)},m:function(a,b){if(isNaN(a))return a;for(b-=1;0>b;)b+=12;for(b%=12,a.setUTCMonth(b);a.getUTCMonth()!==b;)a.setUTCDate(a.getUTCDate()-1);return a},d:function(a,b){return a.setUTCDate(b)}};t.M=t.MM=t.mm=t.m,t.dd=t.d,d=c(d.getFullYear(),d.getMonth(),d.getDate(),0,0,0);var u=e.parts.slice();if(m.length!==u.length&&(u=a(u).filter(function(b,c){return-1!==a.inArray(c,s)}).toArray()),m.length===u.length){var v;for(k=0,v=u.length;v>k;k++){if(n=parseInt(m[k],10),h=u[k],isNaN(n))switch(h){case"MM":o=a(p[f].months).filter(g),n=a.inArray(o[0],p[f].months)+1;break;case"M":o=a(p[f].monthsShort).filter(g),n=a.inArray(o[0],p[f].monthsShort)+1}r[h]=n}var w,x;for(k=0;k<s.length;k++)x=s[k],x in r&&!isNaN(r[x])&&(w=new Date(d),t[x](w,r[x]),isNaN(w)||(d=w))}return d},formatDate:function(b,c,d){if(!b)return"";"string"==typeof c&&(c=q.parseFormat(c));var e={d:b.getUTCDate(),D:p[d].daysShort[b.getUTCDay()],DD:p[d].days[b.getUTCDay()],m:b.getUTCMonth()+1,M:p[d].monthsShort[b.getUTCMonth()],MM:p[d].months[b.getUTCMonth()],yy:b.getUTCFullYear().toString().substring(2),yyyy:b.getUTCFullYear()};e.dd=(e.d<10?"0":"")+e.d,e.mm=(e.m<10?"0":"")+e.m,b=[];for(var f=a.extend([],c.separators),g=0,h=c.parts.length;h>=g;g++)f.length&&b.push(f.shift()),b.push(e[c.parts[g]]);return b.join("")},headTemplate:'<thead><tr><th class="prev">«</th><th colspan="5" class="datepicker-switch"></th><th class="next">»</th></tr></thead>',contTemplate:'<tbody><tr><td colspan="7"></td></tr></tbody>',footTemplate:'<tfoot><tr><th colspan="7" class="today"></th></tr><tr><th colspan="7" class="clear"></th></tr></tfoot>'};q.template='<div class="datepicker"><div class="datepicker-days"><table class=" table-condensed">'+q.headTemplate+"<tbody></tbody>"+q.footTemplate+'</table></div><div class="datepicker-months"><table class="table-condensed">'+q.headTemplate+q.contTemplate+q.footTemplate+'</table></div><div class="datepicker-years"><table class="table-condensed">'+q.headTemplate+q.contTemplate+q.footTemplate+"</table></div></div>",a.fn.datepicker.DPGlobal=q,a.fn.datepicker.noConflict=function(){return a.fn.datepicker=l,this},a.fn.datepicker.version="1.4.0",a(document).on("focus.datepicker.data-api click.datepicker.data-api",'[data-provide="datepicker"]',function(b){var c=a(this);c.data("datepicker")||(b.preventDefault(),m.call(c,"show"))}),a(function(){m.call(a('[data-provide="datepicker-inline"]'))})}(window.jQuery);
\ No newline at end of file diff --git a/public/vendor/bootstrap-datepicker-1.4.0/locales/bootstrap-datepicker.de.min.js b/public/vendor/bootstrap-datepicker-1.4.0/locales/bootstrap-datepicker.de.min.js new file mode 100644 index 00000000..f0842162 --- /dev/null +++ b/public/vendor/bootstrap-datepicker-1.4.0/locales/bootstrap-datepicker.de.min.js @@ -0,0 +1 @@ +!function(a){a.fn.datepicker.dates.de={days:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag","Sonntag"],daysShort:["Son","Mon","Die","Mit","Don","Fre","Sam","Son"],daysMin:["So","Mo","Di","Mi","Do","Fr","Sa","So"],months:["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],monthsShort:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],today:"Heute",clear:"Löschen",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);
\ No newline at end of file diff --git a/templates/guest_credits.html b/templates/guest_credits.html index afcc6f38..5d000f8b 100644 --- a/templates/guest_credits.html +++ b/templates/guest_credits.html @@ -1,3 +1,4 @@ +<div style="margin: 5px;"> <h2>Source code</h2> <p>The original system was written by <a href="https://github.com/cookieBerlin/engelsystem">cookie</a>. It was then completely rewritten and greatly enhanced by <a href="http://notrademark.de/">msquare</a> and <a href="http://mortzu.de/">mortzu</a> of <a href="http://planetcyborg.de">planet cyborg</a> and <a href="http://jplitza.de/">jplitza</a>.</p> @@ -10,3 +11,4 @@ and adminstrated by <a href="http://mortzu.de/">mortzu</a>, <a href="http://derf <h2>Icons</h2> <p>Some icons from the <a href="http://www.famfamfam.com/lab/icons/silk/">famfamfam.com silk iconset</a> have been used. They are licensed under the <a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a>.</p> +</div> diff --git a/templates/layout.html b/templates/layout.html index dba4753d..e1a884f6 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -3,15 +3,10 @@ <head> <title>%title% - Engelsystem</title> <meta charset="UTF-8" /> -<meta http-equiv="content-type" content="text/html;charset=utf-8" /> -<meta name="content-style-type" content="text/css" /> -<meta name="keywords" content="Engel, Himmelsverwaltung" /> -<meta http-equiv="Content-Style-Type" content="text/css" /> -<meta http-equiv="expires" content="0" /> -<meta name="robots" content="index" /> -<meta name="revisit-after" content="1 days" /> +<meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" type="text/css" href="css/theme%theme%.css" /> <link rel="stylesheet" type="text/css" href="vendor/icomoon/style.css" /> +<link rel="stylesheet" type="text/css" href="vendor/bootstrap-datepicker-1.4.0/css/bootstrap-datepicker3.min.css" /> <script type="text/javascript" src="vendor/jquery-2.1.1.min.js"></script> <script type="text/javascript" src="vendor/jquery-ui.min.js"></script> %atom_link% @@ -29,20 +24,21 @@ </div> </div> <div class="container-fluid"> - <div class="row"> - %content% - </div> + <div class="row">%content%</div> <div class="row"> <div class="col-md-12"> <hr /> - <div class="text-center footer"> - <a href="%faq_url%">FAQ</a> · <a href="mailto:erzengel@lists.ccc.de"><span class="glyphicon glyphicon-envelope"></span> Contact</a> · <a href="https://github.com/engelsystem/engelsystem/issues">Bugs / Features</a> · <a - href="https://github.com/engelsystem/engelsystem/">Development Platform</a> · <a href="?p=credits">Credits</a> + <div class="text-center footer" style="margin-bottom: 10px;"> + <a href="%faq_url%">FAQ</a> · <a href="mailto:erzengel@lists.ccc.de"><span class="glyphicon glyphicon-envelope"></span> Contact</a> · <a href="https://github.com/engelsystem/engelsystem/issues">Bugs / Features</a> · <a href="https://github.com/engelsystem/engelsystem/">Development + Platform</a> · <a href="?p=credits">Credits</a> </div> </div> </div> </div> <script type="text/javascript" src="vendor/bootstrap/js/bootstrap.min.js"></script> + <script type="text/javascript" src="vendor/bootstrap-datepicker-1.4.0/js/bootstrap-datepicker.min.js"></script> + <script type="text/javascript" src="vendor/bootstrap-datepicker-1.4.0/locales/bootstrap-datepicker.de.min.js"></script> + <script type="text/javascript" src="vendor/Chart.min.js"></script> <script type="text/javascript" src="js/forms.js"></script> <script type="text/javascript" src="vendor/moment-with-locales.min.js"></script> <script type="text/javascript"> diff --git a/templates/user_shifts.html b/templates/user_shifts.html index 153af7ee..b5762271 100644 --- a/templates/user_shifts.html +++ b/templates/user_shifts.html @@ -1,13 +1,10 @@ <script type="text/javascript"> function set_to_now(id) { - var now = new Date(); - document.getElementById(id + '_time').value = now.getHours() + ':' - + now.getMinutes(); + document.getElementById(id + '_time').value = moment().format('HH:mm'); var days = document.getElementById(id + '_day').getElementsByTagName( 'option'); for ( var i = 0; i < days.length; i++) { - if (days[i].value == (1900 + now.getYear()) + '-' - + (1 + now.getMonth()) + '-' + now.getDate()) + if (days[i].value == moment().format('YYYY-MM-DD')) days[i].selected = true; } } diff --git a/test/model/LogEntries_model_test.php b/test/model/LogEntries_model_test.php new file mode 100644 index 00000000..cefc4177 --- /dev/null +++ b/test/model/LogEntries_model_test.php @@ -0,0 +1,32 @@ +<?php + +class LogEntries_model_test extends PHPUnit_Framework_TestCase { + + public function create_LogEntry() { + LogEntry_create('test', 'test'); + } + + public function test_LogEntry_create() { + $count = count(LogEntries()); + $this->assertNotFalse(LogEntry_create('test', 'test_LogEntry_create')); + + // There should be one more log entry now + $this->assertEquals(count(LogEntries()), $count + 1); + } + + public function test_LogEntries_clear_all() { + $this->create_LogEntry(); + $this->assertTrue(count(LogEntries()) > 0); + $this->assertNotFalse(LogEntries_clear_all()); + $this->assertEquals(count(LogEntries()), 0); + } + + /** + * @after + */ + public function teardown() { + LogEntries_clear_all(); + } +} + +?>
\ No newline at end of file diff --git a/test/model/Room_model_test.php b/test/model/Room_model_test.php new file mode 100644 index 00000000..d95c5787 --- /dev/null +++ b/test/model/Room_model_test.php @@ -0,0 +1,32 @@ +<?php + +class Room_model_test extends PHPUnit_Framework_TestCase { + + private $room_id = null; + + public function create_Room() { + $this->room_id = Room_create('test', false, true, ''); + } + + public function test_Room() { + $this->create_Room(); + + $room = Room($this->room_id); + + $this->assertNotFalse($room); + $this->assertNotNull($room); + $this->assertEquals($room['Name'], 'test'); + + $this->assertNull(Room(- 1)); + } + + /** + * @after + */ + public function teardown() { + if ($this->room_id != null) + Room_delete($this->room_id); + } +} + +?>
\ No newline at end of file diff --git a/test/phpunit.xml b/test/phpunit.xml new file mode 100644 index 00000000..a27b9c1d --- /dev/null +++ b/test/phpunit.xml @@ -0,0 +1,14 @@ +<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.0/phpunit.xsd" + bootstrap="../includes/engelsystem_provider.php" colors="true" + convertErrorsToExceptions="true" convertNoticesToExceptions="true" + convertWarningsToExceptions="true" forceCoversAnnotation="false"> + <testsuites> + <testsuite name="Models"> + <directory>model</directory> + </testsuite> + </testsuites> + <php> + <const name="PHPUNIT_TESTSUITE" value="true" /> + </php> +</phpunit> diff --git a/themes/base.less b/themes/base.less index 99c7cfc5..83602c3b 100644 --- a/themes/base.less +++ b/themes/base.less @@ -1,6 +1,6 @@ @import "../vendor/bootstrap/less/bootstrap"; -@icon-font-path: "../vendor/bootstrap/fonts/"; +@icon-font-path: "../fonts/"; body { padding-top: 50px; @@ -13,15 +13,15 @@ body { #shifts { td { &.free { - border: 1px solid @gray-light; + border: 1px solid @brand-danger; .bg-danger(); } &.occupied { - border: 1px solid @gray-light; + border: 1px solid @brand-success; .bg-success(); } &.collides { - border: 1px solid @gray-light; + border: 1px solid @brand-warning; .bg-warning(); } &.own { @@ -30,10 +30,6 @@ body { } } -.shifts-table { - overflow-x: scroll; -} - .row-day { border-top: 2px solid @gray-light; } diff --git a/themes/build-themes.sh b/themes/build-themes.sh index 5260ecb4..5ea1d63b 100755 --- a/themes/build-themes.sh +++ b/themes/build-themes.sh @@ -1,5 +1,5 @@ #!/bin/sh -lessc theme0.less ../public/css/theme0.css -lessc theme1.less ../public/css/theme1.css -lessc theme2.less ../public/css/theme2.css +lessc theme0.less > ../public/css/theme0.css +lessc theme1.less > ../public/css/theme1.css +lessc theme2.less > ../public/css/theme2.css diff --git a/themes/theme2.less b/themes/theme2.less index 8e49cffd..d5cac763 100644 --- a/themes/theme2.less +++ b/themes/theme2.less @@ -1,25 +1,27 @@ @import "../vendor/bootstrap/less/variables"; -@brand-primary: #41145A; -@brand-success: #33CC24; -@brand-info: #6E50B4; -@brand-warning: #FF8232; -@brand-danger: #FF5A46; +@brand-primary: #758499; +@brand-success: #7b9c41; +@brand-info: #9c7357; +@brand-warning: #e3a14d; +@brand-danger: #7f528b; -@state-success-text: @brand-success; -@state-success-bg: lighten(@brand-success,40%); -@state-success-border: darken(spin(@state-success-bg, -10), 5%); +@link-color: #58585a; -@state-info-text: @brand-info; -@state-info-bg: lighten(@brand-info,40%);//#d9edf7; -@state-info-border: darken(spin(@state-info-bg, -10), 7%); +@state-success-text: #638232; +@state-success-bg: lighten(@brand-success,50%); +@state-success-border: @brand-success; -@state-warning-text: #8a6d3b; -@state-warning-bg: @brand-warning;//#fcf8e3; -@state-warning-border: darken(spin(@state-warning-bg, -10), 5%); +@state-info-text: #826045; +@state-info-bg: lighten(@brand-info,50%); +@state-info-border: @brand-info; -@state-danger-text: @brand-danger; -@state-danger-bg: lighten(@brand-danger,30%);//#f2dede; -@state-danger-border: darken(spin(@state-danger-bg, -10), 5%); +@state-warning-text: #bc8640; +@state-warning-bg: lighten(@brand-warning,50%); +@state-warning-border: @brand-warning; + +@state-danger-text: #694374; +@state-danger-bg: lighten(@brand-danger,50%); +@state-danger-border: @brand-danger; @import "base.less"; diff --git a/vendor/bootstrap b/vendor/bootstrap -Subproject 9f5660c3e3b3d392529d07c4f2cfe0aba2abbe8 +Subproject 16b48259a62f576e52c903c476bd42b90ab2248 |
